diff options
| author | Thomas White <taw@physics.org> | 2017-09-08 11:41:51 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-09-15 14:31:01 +0200 |
| commit | 60c48f3876b0d3c30bf729ce691dbd3f56665c4c (patch) | |
| tree | 44868373d7053924a3de614568cdc148e01de61e /libcrystfel/src/taketwo.c | |
| parent | 3f1c6a1fbc241721aafeb9e1e6c0cbdb1eb810b5 (diff) | |
Simplify indexing options
mosflm-cell-nolatt-multi-refine-bad-retry.... it's all getting a bit
too much. This commit removes all the options from the indexing methods
except for the prior information flags (cell/nocell and latt/nolatt).
All the other options are now given at the top level with new
indexamajig options, e.g. --no-multi and --no-retry. They are applied
to all the methods, with no option to (say) use retry for one method and
not for another.
This also makes the "peak alignment test" default to OFF, and
multi-lattice indexing ON. I think that the prediction refinement does
a good enough job of checking the validity of indexing solutions,
allowing us to turn off the alignment check which filters out most
multi-lattice solutions.
Diffstat (limited to 'libcrystfel/src/taketwo.c')
| -rw-r--r-- | libcrystfel/src/taketwo.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/libcrystfel/src/taketwo.c b/libcrystfel/src/taketwo.c index 87da44a1..f7a2fda9 100644 --- a/libcrystfel/src/taketwo.c +++ b/libcrystfel/src/taketwo.c @@ -1460,7 +1460,7 @@ static void cleanup_taketwo_cell(struct TakeTwoCell *ttCell) * successful. **/ static UnitCell *run_taketwo(UnitCell *cell, const struct taketwo_options *opts, - struct rvec *rlps, int rlp_count) + struct rvec *rlps, int rlp_count) { int cell_vec_count = 0; int asym_vec_count = 0; @@ -1581,18 +1581,6 @@ int taketwo_index(struct image *image, const struct taketwo_options *opts, crystal_set_cell(cr, cell); - if ( tp->indm & INDEXING_CHECK_PEAKS ) { - if ( !peak_sanity_check(image, &cr, 1) ) { - cell_free(cell); - crystal_free(cr); - // STATUS("Rubbish!!\n"); - - return 0; - } else { - // STATUS("That's good!\n"); - } - } - image_add_crystal(image, cr); return 1; @@ -1605,9 +1593,8 @@ void *taketwo_prepare(IndexingMethod *indm, UnitCell *cell, struct taketwo_private *tp; /* Flags that TakeTwo knows about */ - *indm &= INDEXING_METHOD_MASK | INDEXING_CHECK_PEAKS - | INDEXING_USE_LATTICE_TYPE | INDEXING_USE_CELL_PARAMETERS - | INDEXING_CONTROL_FLAGS; + *indm &= INDEXING_METHOD_MASK | INDEXING_USE_LATTICE_TYPE + | INDEXING_USE_CELL_PARAMETERS; if ( !( (*indm & INDEXING_USE_LATTICE_TYPE) && (*indm & INDEXING_USE_CELL_PARAMETERS)) ) |