diff options
| author | Thomas White <taw@physics.org> | 2013-09-13 14:04:40 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-09-13 14:04:40 +0200 |
| commit | 5231a0f07fd5f72b88e2d9feb774de747f04536b (patch) | |
| tree | 6232d4245acdcd589a83ca278b21c78f8d37f098 | |
| parent | 73f6c63d1f14f2652bd50bf8a1e2dd5debbaaf3f (diff) | |
Add INDEXING_SIMULATION for streams made by partial_sim
| -rw-r--r-- | libcrystfel/src/index.c | 6 | ||||
| -rw-r--r-- | libcrystfel/src/index.h | 3 | ||||
| -rw-r--r-- | src/partial_sim.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 8307778d..951018e4 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -366,6 +366,10 @@ char *indexer_str(IndexingMethod indm) strcpy(str, "xds"); break; + case INDEXING_SIMULATION : + strcpy(str, "simulation"); + break; + default : ERROR("Unrecognised indexing method %i\n", indm & INDEXING_METHOD_MASK); @@ -374,6 +378,8 @@ char *indexer_str(IndexingMethod indm) } + if ( (indm & INDEXING_METHOD_MASK) == INDEXING_SIMULATION ) return str; + if ( indm & INDEXING_CHECK_CELL_COMBINATIONS ) { strcat(str, "-comb"); } else if ( indm & INDEXING_CHECK_CELL_AXES ) { diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h index 31ee4339..8961c8aa 100644 --- a/libcrystfel/src/index.h +++ b/libcrystfel/src/index.h @@ -88,7 +88,8 @@ typedef enum { INDEXING_MOSFLM = 2, INDEXING_REAX = 3, INDEXING_GRAINSPOTTER = 4, - INDEXING_XDS = 5, + INDEXING_XDS = 5, + INDEXING_SIMULATION = 6, /* Bits at the top of the IndexingMethod are flags which modify the * behaviour of the indexer. */ diff --git a/src/partial_sim.c b/src/partial_sim.c index 3369f2fd..f9b58bcd 100644 --- a/src/partial_sim.c +++ b/src/partial_sim.c @@ -593,7 +593,7 @@ int main(int argc, char *argv[]) image.copyme = NULL; image.crystals = NULL; image.n_crystals = 0; - image.indexed_by = INDEXING_NONE; + image.indexed_by = INDEXING_SIMULATION; image.num_peaks = 0; image.num_saturated_peaks = 0; |