diff options
| author | Thomas White <taw@physics.org> | 2017-10-12 16:25:37 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-10-12 17:02:41 +0200 |
| commit | 91c1f0798262d033a4c8caf0decabd85d2e244b1 (patch) | |
| tree | 78824d2074fbe3347190b53fceab9eb00ab784e9 /libcrystfel/src/index.c | |
| parent | c0ce8fb481a89225a99c3ab27571ed22709d4ac2 (diff) | |
indexamajig: Simplify Felix options
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 8ac04368..03bd6ae3 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; @@ -359,7 +360,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; |