diff options
| author | Thomas White <taw@physics.org> | 2016-01-15 19:44:46 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2016-01-15 19:44:46 +0100 |
| commit | 552233f3cd960c1d6d707f9d49c3df9bb5ee8526 (patch) | |
| tree | 935783d241f982aa636d4f7342ddd7bfcfdf73bb | |
| parent | 351226f9df1f274729bbe486b70c2caa2e6756bc (diff) | |
Set indexing -nomulti as the default, and add a warning
| -rw-r--r-- | libcrystfel/src/index.c | 2 | ||||
| -rw-r--r-- | libcrystfel/src/index.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 79fa4c3f..2c6780dd 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -377,6 +377,8 @@ static int finished_retry(IndexingMethod indm, int r, struct image *image) * another lattice */ Crystal *cr; cr = image->crystals[image->n_crystals-1]; + STATUS("WARNING: Multi-lattice indexing does not work" + " well in this version.\n"); return delete_explained_peaks(image, cr); } else { return 1; diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h index 855af70d..fc2477da 100644 --- a/libcrystfel/src/index.h +++ b/libcrystfel/src/index.h @@ -41,19 +41,18 @@ #define INDEXING_DEFAULTS_DIRAX (INDEXING_DIRAX | INDEXING_CHECK_PEAKS \ | INDEXING_CHECK_CELL_COMBINATIONS \ - | INDEXING_RETRY | INDEXING_MULTI) + | INDEXING_RETRY) #define INDEXING_DEFAULTS_ASDF (INDEXING_ASDF | INDEXING_CHECK_PEAKS \ | INDEXING_CHECK_CELL_COMBINATIONS \ - | INDEXING_RETRY | INDEXING_MULTI) + | INDEXING_RETRY) #define INDEXING_DEFAULTS_MOSFLM (INDEXING_MOSFLM | INDEXING_CHECK_PEAKS \ | INDEXING_CHECK_CELL_COMBINATIONS \ | INDEXING_USE_LATTICE_TYPE \ | INDEXING_USE_CELL_PARAMETERS \ - | INDEXING_RETRY | INDEXING_MULTI) + | INDEXING_RETRY) -/* Note: no INDEXING_MULTI because Felix is already multi-crystal */ #define INDEXING_DEFAULTS_FELIX (INDEXING_FELIX \ | INDEXING_USE_LATTICE_TYPE \ | INDEXING_USE_CELL_PARAMETERS \ @@ -64,7 +63,7 @@ | INDEXING_USE_CELL_PARAMETERS \ | INDEXING_CHECK_CELL_AXES \ | INDEXING_CHECK_PEAKS \ - | INDEXING_RETRY | INDEXING_MULTI) + | INDEXING_RETRY) /** * IndexingMethod: |