aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcrystfel/src/asdf.c13
-rw-r--r--libcrystfel/src/index.h3
2 files changed, 2 insertions, 14 deletions
diff --git a/libcrystfel/src/asdf.c b/libcrystfel/src/asdf.c
index 22fe3320..e65007c5 100644
--- a/libcrystfel/src/asdf.c
+++ b/libcrystfel/src/asdf.c
@@ -1171,18 +1171,7 @@ void *asdf_prepare(IndexingMethod *indm, UnitCell *cell,
struct asdf_private *dp;
/* Flags that asdf knows about */
- *indm &= INDEXING_METHOD_MASK
- | INDEXING_USE_CELL_PARAMETERS | INDEXING_USE_LATTICE_TYPE;
-
- if ( ((*indm & INDEXING_USE_LATTICE_TYPE)
- && !(*indm & INDEXING_USE_CELL_PARAMETERS))
- || ((*indm & INDEXING_USE_CELL_PARAMETERS)
- && !(*indm & INDEXING_USE_LATTICE_TYPE)) )
- {
- ERROR("Invalid asdf options: "
- "try asdf-nolatt-nocell or asdf-latt-cell.\n");
- return NULL;
- }
+ *indm &= INDEXING_METHOD_MASK | INDEXING_USE_CELL_PARAMETERS;
dp = malloc(sizeof(struct asdf_private));
if ( dp == NULL ) return NULL;
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h
index 516a9368..ac386390 100644
--- a/libcrystfel/src/index.h
+++ b/libcrystfel/src/index.h
@@ -41,8 +41,7 @@
#define INDEXING_DEFAULTS_DIRAX (INDEXING_DIRAX)
-#define INDEXING_DEFAULTS_ASDF (INDEXING_ASDF | INDEXING_USE_LATTICE_TYPE \
- | INDEXING_USE_CELL_PARAMETERS)
+#define INDEXING_DEFAULTS_ASDF (INDEXING_ASDF | INDEXING_USE_CELL_PARAMETERS)
#define INDEXING_DEFAULTS_MOSFLM (INDEXING_MOSFLM | INDEXING_USE_LATTICE_TYPE \
| INDEXING_USE_CELL_PARAMETERS)