diff options
| author | Thomas White <taw@physics.org> | 2013-02-09 22:16:25 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-02-09 22:16:25 -0800 |
| commit | 00d4c6ce684b1352d585a287f8ef31c1c30a7c35 (patch) | |
| tree | 90a8442ff28aa1a64e9840043ee7b72faa6081da /libcrystfel/src/dirax.c | |
| parent | 11fe97d53a627fd5caf067bd9fe8f967cf3a72df (diff) | |
Complain if a unit cell is needed and not provided
Diffstat (limited to 'libcrystfel/src/dirax.c')
| -rw-r--r-- | libcrystfel/src/dirax.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libcrystfel/src/dirax.c b/libcrystfel/src/dirax.c index 414e6406..b7fc68ea 100644 --- a/libcrystfel/src/dirax.c +++ b/libcrystfel/src/dirax.c @@ -3,11 +3,11 @@ * * Invoke the DirAx auto-indexing program * - * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, - * a research centre of the Helmholtz Association. + * Copyright © 2012-2013 Deutsches Elektronen-Synchrotron DESY, + * a research centre of the Helmholtz Association. * * Authors: - * 2010-2012 Thomas White <taw@physics.org> + * 2010-2013 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * @@ -631,6 +631,15 @@ IndexingPrivate *dirax_prepare(IndexingMethod indm, UnitCell *cell, struct beam_params *beam, float *ltl) { struct dirax_private *dp; + int need_cell = 0; + + if ( indm & INDEXING_CHECK_CELL_COMBINATIONS ) need_cell = 1; + if ( indm & INDEXING_CHECK_CELL_AXES ) need_cell = 1; + + if ( need_cell && (cell == NULL) ) { + ERROR("DirAx needs a unit cell for this set of flags.\n"); + return NULL; + } dp = malloc(sizeof(struct dirax_private)); if ( dp == NULL ) return NULL; |