From 665547b5ad276a7fa9f9e3c20cf531aa1f32f247 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 10 Mar 2021 14:35:39 +0100 Subject: setup_indexing: Remove dtempl There is absolutely nothing useful that an indexing algorithm can do with the opaque DataTemplate object. --- libcrystfel/src/indexers/pinkindexer.c | 11 ++++++----- libcrystfel/src/indexers/pinkindexer.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'libcrystfel/src/indexers') diff --git a/libcrystfel/src/indexers/pinkindexer.c b/libcrystfel/src/indexers/pinkindexer.c index ae4e5642..69905c35 100644 --- a/libcrystfel/src/indexers/pinkindexer.c +++ b/libcrystfel/src/indexers/pinkindexer.c @@ -194,9 +194,9 @@ static int want_center_adjustment(struct pinkIndexer_options *pinkIndexer_opts) } -void *pinkIndexer_prepare(IndexingMethod *indm, UnitCell *cell, +void *pinkIndexer_prepare(IndexingMethod *indm, + UnitCell *cell, struct pinkIndexer_options *pinkIndexer_opts, - const DataTemplate *dtempl, double wavelength_estimate) { float beamEenergy_eV; @@ -408,9 +408,10 @@ int run_pinkIndexer(struct image *image, void *ipriv) return 0; } -extern void *pinkIndexer_prepare(IndexingMethod *indm, UnitCell *cell, - struct pinkIndexer_options *pinkIndexer_opts, - const DataTemplate *dtempl) +extern void *pinkIndexer_prepare(IndexingMethod *indm, + UnitCell *cell, + struct pinkIndexer_options *pinkIndexer_opts, + double wavelength_estimate) { ERROR("This copy of CrystFEL was compiled without PINKINDEXER support.\n"); ERROR("To use PINKINDEXER indexing, recompile with PINKINDEXER.\n"); diff --git a/libcrystfel/src/indexers/pinkindexer.h b/libcrystfel/src/indexers/pinkindexer.h index fc2714c8..12230225 100644 --- a/libcrystfel/src/indexers/pinkindexer.h +++ b/libcrystfel/src/indexers/pinkindexer.h @@ -39,9 +39,9 @@ extern int pinkIndexer_default_options(PinkIndexerOptions **opts_ptr); extern int run_pinkIndexer(struct image *image, void *ipriv); -extern void *pinkIndexer_prepare(IndexingMethod *indm, UnitCell *cell, +extern void *pinkIndexer_prepare(IndexingMethod *indm, + UnitCell *cell, struct pinkIndexer_options *pinkIndexer_opts, - const DataTemplate *dtempl, double wavelength_estimate); extern void pinkIndexer_cleanup(void *pp); -- cgit v1.2.3