diff options
| author | Thomas White <taw@physics.org> | 2014-11-25 11:44:39 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-11-25 11:44:39 +0100 |
| commit | f569ac9cf1dea0967181fbead97c25fc52a29736 (patch) | |
| tree | a4390e34d67cec39437dd0c07f2930893f65fde9 /libcrystfel/src | |
| parent | 816388a49973aa9de29125394b1497b49a4b0348 (diff) | |
Update mosflm logic for axis permutation warning, now that unit cell parameters aren't compulsory
Diffstat (limited to 'libcrystfel/src')
| -rw-r--r-- | libcrystfel/src/mosflm.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libcrystfel/src/mosflm.c b/libcrystfel/src/mosflm.c index 0328c174..c28acd4a 100644 --- a/libcrystfel/src/mosflm.c +++ b/libcrystfel/src/mosflm.c @@ -858,15 +858,16 @@ IndexingPrivate *mosflm_prepare(IndexingMethod *indm, UnitCell *cell, | INDEXING_CHECK_CELL_AXES | INDEXING_CHECK_PEAKS | INDEXING_USE_LATTICE_TYPE; - if ( *indm & INDEXING_USE_LATTICE_TYPE ) { - if ( !((*indm & INDEXING_CHECK_CELL_COMBINATIONS) - || (*indm & INDEXING_CHECK_CELL_AXES)) ) { - ERROR("WARNING: The unit cell from %s might have had " - "its axes permuted from the unit cell you gave.\n" - "If this is a problem, consider using " - "mosflm-axes-latt or mosflm-comb-latt instead of " - "mosflm-raw-latt.\n", indexer_str(*indm)); - } + if ( (*indm & INDEXING_USE_LATTICE_TYPE) + && !((*indm & INDEXING_CHECK_CELL_COMBINATIONS) + || (*indm & INDEXING_CHECK_CELL_AXES)) + && cell_has_parameters(cell) ) + { + ERROR("WARNING: The unit cell from %s might have had " + "its axes permuted from the unit cell you gave.\n" + "If this is a problem, consider using " + "mosflm-axes-latt or mosflm-comb-latt instead of " + "mosflm-raw-latt.\n", indexer_str(*indm)); } |