diff options
| author | Thomas White <taw@physics.org> | 2017-09-22 11:13:30 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-09-22 11:13:30 +0200 |
| commit | 9f265dd89b1fbb1db5f0d5998a85eebc5514ed5b (patch) | |
| tree | 31369e68ab5224d6d157d1b079ec6237a8dd4584 /libcrystfel/src/xds.c | |
| parent | 855be9e57a660473ae43a189d6e8f2cb792321b3 (diff) | |
If no cell params or lattice type, set nocell/nolatt at top level
Another thing that the indexing engines don't need to be repsonsible
for.
Diffstat (limited to 'libcrystfel/src/xds.c')
| -rw-r--r-- | libcrystfel/src/xds.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libcrystfel/src/xds.c b/libcrystfel/src/xds.c index 646561ca..e6309eb6 100644 --- a/libcrystfel/src/xds.c +++ b/libcrystfel/src/xds.c @@ -597,30 +597,11 @@ void *xds_prepare(IndexingMethod *indm, UnitCell *cell, struct detector *det, float *ltl) { struct xds_private *xp; - int need_cell = 0; - - /* Check if cell parameters are needed/provided */ - if ( *indm & INDEXING_USE_CELL_PARAMETERS ) need_cell = 1; - if ( need_cell && !cell_has_parameters(cell) ) { - ERROR("Altering your XDS flags because cell parameters were" - " not provided.\n"); - *indm &= ~INDEXING_USE_CELL_PARAMETERS; - } /* Either cell,latt and cell provided, or nocell-nolatt and no cell * - complain about anything else. Could figure this out automatically, * but we'd have to decide whether the user just forgot the cell, or * forgot "-nolatt", or whatever. */ - if ( ((*indm & INDEXING_USE_LATTICE_TYPE) - || (*indm & INDEXING_USE_CELL_PARAMETERS)) - && !cell_has_parameters(cell) ) - { - ERROR("No cell parameters provided. If you wanted to use XDS " - "without prior cell information, use " - "xds-nolatt-nocell.\n"); - return NULL; - } - if ( (*indm & INDEXING_USE_LATTICE_TYPE) && !(*indm & INDEXING_USE_CELL_PARAMETERS) ) { |