diff options
| author | Thomas White <taw@physics.org> | 2016-10-17 17:29:16 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2016-10-17 17:37:10 +0200 |
| commit | 22951c51e383e8a2f1a01d8bca60e4da9732633c (patch) | |
| tree | 8a7f092115f473e06e53dfa5e307b7320c5c603e /libcrystfel/src/index.h | |
| parent | cc55abcff6e91d57e8226fa8a4265b667c20ceb0 (diff) | |
Initial TakeTwo import
Only changes from Helen's code so far:
1. Stripping trailing spaces
2. Tweaking includes (<> -> "")
3. Adding initial CrystFEL hooks at the bottom of taketwo.c
4. Moving definition of struct SpotVec to taketwo.c
5. Removing prototype for run_taketwo from taketwo.h (comment moved to .c)
6. Authorship/copyright boilerplate
Diffstat (limited to 'libcrystfel/src/index.h')
| -rw-r--r-- | libcrystfel/src/index.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h index 2fb5a13d..6ac9792a 100644 --- a/libcrystfel/src/index.h +++ b/libcrystfel/src/index.h @@ -58,6 +58,10 @@ | INDEXING_USE_CELL_PARAMETERS \ | INDEXING_RETRY | INDEXING_REFINE) +#define INDEXING_DEFAULTS_TAKETWO (INDEXING_TAKETWO \ + | INDEXING_USE_CELL_PARAMETERS \ + | 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 \ @@ -75,6 +79,7 @@ * @INDEXING_SIMULATION: Dummy value * @INDEXING_DEBUG: Results injector for debugging * @INDEXING_ASDF: Use in-built "asdf" indexer + * @INDEXING_TAKETWO: Use in-built "taketwo" indexer * @INDEXING_CHECK_CELL_COMBINATIONS: Check linear combinations of unit cell * axes for agreement with given cell. * @INDEXING_CHECK_CELL_AXES: Check unit cell axes for agreement with given @@ -107,6 +112,7 @@ typedef enum { INDEXING_SIMULATION = 6, INDEXING_DEBUG = 7, INDEXING_ASDF = 8, + INDEXING_TAKETWO = 9, /* Bits at the top of the IndexingMethod are flags which modify the * behaviour of the indexer. */ |