diff options
| author | Thomas White <taw@physics.org> | 2017-10-27 16:13:49 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-10-27 16:13:49 +0200 |
| commit | 29d60af9d37a9d2cf67d7e0b77354d4fd518679a (patch) | |
| tree | 506e4e8ef6d3e881db2790d5904813d8b9657d5e /libcrystfel/src/index.c | |
| parent | 45038c42847476ce1aee5b09c47fb330a0108cd6 (diff) | |
| parent | 3caab16fad2ebd2fcc2f245a6cb4a62fad46f806 (diff) | |
Merge branch 'tom/simpler_felix'
Diffstat (limited to 'libcrystfel/src/index.c')
| -rw-r--r-- | libcrystfel/src/index.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index cdc0e305..62f22c13 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -197,7 +197,7 @@ static char *friendly_indexer_name(IndexingMethod m) static void *prepare_method(IndexingMethod *m, UnitCell *cell, - const char *options) + struct felix_options *felix_opts) { char *str; IndexingMethod in = *m; @@ -230,7 +230,7 @@ static void *prepare_method(IndexingMethod *m, UnitCell *cell, break; case INDEXING_FELIX : - priv = felix_prepare(m, cell, options); + priv = felix_prepare(m, cell, felix_opts); break; case INDEXING_TAKETWO : @@ -266,8 +266,9 @@ static void *prepare_method(IndexingMethod *m, UnitCell *cell, IndexingPrivate *setup_indexing(const char *method_list, UnitCell *cell, struct detector *det, float *ltl, - IndexingFlags flags, const char *options, - struct taketwo_options *ttopts) + IndexingFlags flags, + struct taketwo_options *ttopts, + struct felix_options *felix_opts) { int i, n; char **method_strings; @@ -363,7 +364,7 @@ IndexingPrivate *setup_indexing(const char *method_list, UnitCell *cell, int j; ipriv->engine_private[i] = prepare_method(&methods[i], cell, - options); + felix_opts); if ( ipriv->engine_private[i] == NULL ) return NULL; |