diff options
| author | Thomas White <taw@physics.org> | 2016-01-30 20:22:56 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2016-01-30 20:22:56 +0100 |
| commit | 4b2cc069a16bf564404d9f1020733dd2ec0b2275 (patch) | |
| tree | 825b3b5031264f2ca54ccfd4cd7fb640952b52d3 /libcrystfel/src/index.h | |
| parent | c9c756db807f3ea22dcf2d01401a4ce69f73f4df (diff) | |
indexamajig: Restore --no-refine
Adds yet another indexing option...
Diffstat (limited to 'libcrystfel/src/index.h')
| -rw-r--r-- | libcrystfel/src/index.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h index fc2477da..2fb5a13d 100644 --- a/libcrystfel/src/index.h +++ b/libcrystfel/src/index.h @@ -41,29 +41,29 @@ #define INDEXING_DEFAULTS_DIRAX (INDEXING_DIRAX | INDEXING_CHECK_PEAKS \ | INDEXING_CHECK_CELL_COMBINATIONS \ - | INDEXING_RETRY) + | INDEXING_RETRY | INDEXING_REFINE) #define INDEXING_DEFAULTS_ASDF (INDEXING_ASDF | INDEXING_CHECK_PEAKS \ | INDEXING_CHECK_CELL_COMBINATIONS \ - | INDEXING_RETRY) + | INDEXING_RETRY | INDEXING_REFINE) #define INDEXING_DEFAULTS_MOSFLM (INDEXING_MOSFLM | INDEXING_CHECK_PEAKS \ | INDEXING_CHECK_CELL_COMBINATIONS \ | INDEXING_USE_LATTICE_TYPE \ | INDEXING_USE_CELL_PARAMETERS \ - | INDEXING_RETRY) + | INDEXING_RETRY | INDEXING_REFINE) #define INDEXING_DEFAULTS_FELIX (INDEXING_FELIX \ | INDEXING_USE_LATTICE_TYPE \ | INDEXING_USE_CELL_PARAMETERS \ - | INDEXING_RETRY) + | INDEXING_RETRY | INDEXING_REFINE) /* Axis check is needed for XDS, because it likes to permute the axes */ #define INDEXING_DEFAULTS_XDS (INDEXING_XDS | INDEXING_USE_LATTICE_TYPE \ | INDEXING_USE_CELL_PARAMETERS \ | INDEXING_CHECK_CELL_AXES \ | INDEXING_CHECK_PEAKS \ - | INDEXING_RETRY) + | INDEXING_RETRY | INDEXING_REFINE) /** * IndexingMethod: @@ -89,6 +89,7 @@ * and try again. * @INDEXING_MULTI: If the indexer succeeds, delete the peaks explained by the * lattice and try again in the hope of finding another crystal. + * @INDEXING_REFINE: Perform "prediction refinement" after indexing. * * An enumeration of all the available indexing methods. The dummy value * @INDEXING_SIMULATION is used by partial_sim to indicate that no indexing was @@ -115,7 +116,8 @@ typedef enum { INDEXING_USE_LATTICE_TYPE = 2048, INDEXING_USE_CELL_PARAMETERS = 4096, INDEXING_RETRY = 8192, - INDEXING_MULTI = 16384 + INDEXING_MULTI = 16384, + INDEXING_REFINE = 32768, } IndexingMethod; @@ -123,6 +125,9 @@ typedef enum { * core of the indexing method */ #define INDEXING_METHOD_MASK (0xff) +/* Indexing flags which the indexing method does not need to know about */ +#define INDEXING_CONTROL_FLAGS (INDEXING_RETRY | INDEXING_MULTI | INDEXING_REFINE) + #ifdef __cplusplus extern "C" { #endif |