diff options
| author | Thomas White <taw@physics.org> | 2017-09-15 15:46:37 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-09-15 15:46:37 +0200 |
| commit | 5ca956f67456831501cf413259790eec6d6c6c1f (patch) | |
| tree | 7ae69fb902f78af2828d4bbd4609a934c0a09dc7 /libcrystfel/src/felix.c | |
| parent | f6de9f595620b5d4a1ecf3d8d6d4cde9b3c179e0 (diff) | |
| parent | ca0d7a9e1982b55ae3891d8dbe7f05a79ed3e7f1 (diff) | |
Merge branch 'tom/index'
Diffstat (limited to 'libcrystfel/src/felix.c')
| -rw-r--r-- | libcrystfel/src/felix.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libcrystfel/src/felix.c b/libcrystfel/src/felix.c index 6daf4408..4c12778b 100644 --- a/libcrystfel/src/felix.c +++ b/libcrystfel/src/felix.c @@ -222,16 +222,7 @@ static int read_felix(struct felix_private *gp, struct image *image, fclose(fh); - if ( gp->indm & INDEXING_CHECK_PEAKS ) { - if ( !peak_sanity_check(image, image->crystals, - image->n_crystals) ) - { - free_all_crystals(image); - return 0; - } - } - - return n_crystals; + return n_crystals; } @@ -672,9 +663,8 @@ void *felix_prepare(IndexingMethod *indm, UnitCell *cell, if ( gp == NULL ) return NULL; /* Flags that Felix knows about */ - *indm &= INDEXING_METHOD_MASK | INDEXING_CHECK_PEAKS - | INDEXING_USE_LATTICE_TYPE | INDEXING_USE_CELL_PARAMETERS - | INDEXING_CONTROL_FLAGS; + *indm &= INDEXING_METHOD_MASK + | INDEXING_USE_LATTICE_TYPE | INDEXING_USE_CELL_PARAMETERS; gp->cell = cell; gp->indm = *indm; |