diff options
| author | Thomas White <taw@physics.org> | 2013-02-18 09:36:31 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-02-18 09:36:31 +0100 |
| commit | 2a33b77d38b6d322e456fa1e2cefcbe50620dc39 (patch) | |
| tree | 96c64406f834be9e8423c1565b5dd88a47e682f1 /libcrystfel/src/index.h | |
| parent | bca26df2b4ad88b56752d62a19b289946f262f94 (diff) | |
| parent | 76d3f48ddf33cc82dc2aaa52c43463dd8bb9cc70 (diff) | |
Merge branch 'tom/grainspotter' into tom/multicrystal
Conflicts:
libcrystfel/Makefile.am
libcrystfel/src/index.c
libcrystfel/src/index.h
Diffstat (limited to 'libcrystfel/src/index.h')
| -rw-r--r-- | libcrystfel/src/index.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h index 7d6656d5..a47ee9a0 100644 --- a/libcrystfel/src/index.h +++ b/libcrystfel/src/index.h @@ -65,12 +65,14 @@ **/ typedef enum { + INDEXING_NONE = 0, /* The core indexing methods themselves */ INDEXING_DIRAX = 1, INDEXING_MOSFLM = 2, INDEXING_REAX = 3, + INDEXING_GRAINSPOTTER = 4, /* Bits at the top of the IndexingMethod are flags which modify the * behaviour of the indexer, at the moment just by adding checks. */ |