aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/index.c11
-rw-r--r--libcrystfel/src/index.h1
-rw-r--r--libcrystfel/src/indexers/pinkindexer.c11
-rw-r--r--libcrystfel/src/indexers/pinkindexer.h4
4 files changed, 13 insertions, 14 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c
index c06dda26..62df3cd6 100644
--- a/libcrystfel/src/index.c
+++ b/libcrystfel/src/index.c
@@ -234,7 +234,6 @@ static char *friendly_indexer_name(IndexingMethod m)
static void *prepare_method(IndexingMethod *m, UnitCell *cell,
- const DataTemplate *dtempl,
double wavelength_estimate,
struct xgandalf_options *xgandalf_opts,
struct pinkIndexer_options* pinkIndexer_opts,
@@ -285,7 +284,7 @@ static void *prepare_method(IndexingMethod *m, UnitCell *cell,
case INDEXING_PINKINDEXER :
priv = pinkIndexer_prepare(m, cell, pinkIndexer_opts,
- dtempl, wavelength_estimate);
+ wavelength_estimate);
break;
default :
@@ -357,9 +356,10 @@ IndexingMethod *parse_indexing_methods(const char *method_list,
/* 'tols' is in frac (not %) and radians */
-IndexingPrivate *setup_indexing(const char *method_list, UnitCell *cell,
- const DataTemplate *dtempl,
- float *tols, IndexingFlags flags,
+IndexingPrivate *setup_indexing(const char *method_list,
+ UnitCell *cell,
+ float *tols,
+ IndexingFlags flags,
double wavelength_estimate,
struct taketwo_options *ttopts,
struct xgandalf_options *xgandalf_opts,
@@ -429,7 +429,6 @@ IndexingPrivate *setup_indexing(const char *method_list, UnitCell *cell,
int j;
ipriv->engine_private[i] = prepare_method(&methods[i], cell,
- dtempl,
wavelength_estimate,
xgandalf_opts,
pinkIndexer_opts,
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h
index 708c04a4..24beb408 100644
--- a/libcrystfel/src/index.h
+++ b/libcrystfel/src/index.h
@@ -165,7 +165,6 @@ extern void default_method_options(TakeTwoOptions **ttopts,
extern IndexingPrivate *setup_indexing(const char *methods,
UnitCell *cell,
- const DataTemplate *dtempl,
float *ltl,
IndexingFlags flags,
double wavelength_estimate,
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);