diff options
| author | Thomas White <taw@physics.org> | 2019-04-30 14:43:06 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2019-09-12 16:35:52 +0200 |
| commit | 117779c5fd9321b4a262f144798f081321a65a38 (patch) | |
| tree | ade953b50ab0ed84527040d7af49a228cb7d6549 /libcrystfel/src/index.c | |
| parent | 10f9432595f5425ff2f8605ea181f7c643ab81ab (diff) | |
Avoid duplication of beam and detector parameters for pinkIndexer
Diffstat (limited to 'libcrystfel/src/index.c')
| -rw-r--r-- | libcrystfel/src/index.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 80a773ab..d48a6634 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -238,6 +238,7 @@ static char *friendly_indexer_name(IndexingMethod m) static void *prepare_method(IndexingMethod *m, UnitCell *cell, + struct detector *det, struct beam_params *beam, struct xgandalf_options *xgandalf_opts, struct pinkIndexer_options* pinkIndexer_opts, struct felix_options *felix_opts) @@ -285,7 +286,8 @@ static void *prepare_method(IndexingMethod *m, UnitCell *cell, break; case INDEXING_PINKINDEXER : - priv = pinkIndexer_prepare(m, cell, pinkIndexer_opts); + priv = pinkIndexer_prepare(m, cell, pinkIndexer_opts, + det, beam); break; default : @@ -316,8 +318,8 @@ static void *prepare_method(IndexingMethod *m, UnitCell *cell, IndexingPrivate *setup_indexing(const char *method_list, UnitCell *cell, - struct detector *det, float *tols, - IndexingFlags flags, + struct detector *det, struct beam_params *beam, + float *tols, IndexingFlags flags, struct taketwo_options *ttopts, struct xgandalf_options *xgandalf_opts, struct pinkIndexer_options *pinkIndexer_opts, @@ -415,7 +417,9 @@ IndexingPrivate *setup_indexing(const char *method_list, UnitCell *cell, int j; ipriv->engine_private[i] = prepare_method(&methods[i], cell, - xgandalf_opts, pinkIndexer_opts, + det, beam, + xgandalf_opts, + pinkIndexer_opts, felix_opts); if ( ipriv->engine_private[i] == NULL ) return NULL; |