diff options
| author | Thomas White <taw@physics.org> | 2013-02-18 14:51:36 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-02-18 14:51:36 +0100 |
| commit | 31ec28ea0258bbb2272afa4346b55b183a43410c (patch) | |
| tree | e5c3df47166401b9a80384a2f5f137d674f5bef9 /libcrystfel/src/index.h | |
| parent | a0f4c1506f1d7c1ad942bcccd30d3aaf0cd75bd4 (diff) | |
| parent | 3732cd6e08e4b0e6b6eaafc01290bc2c23e9ec66 (diff) | |
Merge branch 'cornelius/xds' 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, 1 insertions, 1 deletions
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h index 3c91486b..d550468b 100644 --- a/libcrystfel/src/index.h +++ b/libcrystfel/src/index.h @@ -69,7 +69,6 @@ **/ typedef enum { - INDEXING_NONE = 0, /* The core indexing methods themselves */ @@ -77,6 +76,7 @@ typedef enum { INDEXING_MOSFLM = 2, INDEXING_REAX = 3, INDEXING_GRAINSPOTTER = 4, + INDEXING_XDS = 5, /* Bits at the top of the IndexingMethod are flags which modify the * behaviour of the indexer. */ |