Strip out the "prepare_filename" rubbish

12 files changed, 17 insertions, 25 deletions

diff --git a/libcrystfel/src/dirax.c b/libcrystfel/src/dirax.c
index 55e65fd1..ac12b57d 100644
--- a/libcrystfel/src/dirax.c
+++ b/libcrystfel/src/dirax.c
@@ -629,7 +629,7 @@ int run_dirax(struct image *image, IndexingPrivate *ipriv)
 
 
 IndexingPrivate *dirax_prepare(IndexingMethod *indm, UnitCell *cell,
-                               const char *filename, struct detector *det,
+                               struct detector *det,
                                struct beam_params *beam, float *ltl)
 {
 	struct dirax_private *dp;
diff --git a/libcrystfel/src/dirax.h b/libcrystfel/src/dirax.h
index 6be8451a..1ac2f456 100644
--- a/libcrystfel/src/dirax.h
+++ b/libcrystfel/src/dirax.h
@@ -38,8 +38,7 @@
 extern int run_dirax(struct image *image, IndexingPrivate *ipriv);
 
 extern IndexingPrivate *dirax_prepare(IndexingMethod *indm,
-                                      UnitCell *cell, const char *filename,
-                                      struct detector *det,
+                                      UnitCell *cell, struct detector *det,
                                       struct beam_params *beam, float *ltl);
 
 extern void dirax_cleanup(IndexingPrivate *pp);
diff --git a/libcrystfel/src/grainspotter.c b/libcrystfel/src/grainspotter.c
index 79cf1078..cebfb160 100644
--- a/libcrystfel/src/grainspotter.c
+++ b/libcrystfel/src/grainspotter.c
@@ -468,7 +468,6 @@ int grainspotter_index(struct image *image, IndexingPrivate *ipriv)
 
 
 IndexingPrivate *grainspotter_prepare(IndexingMethod *indm, UnitCell *cell,
-                                      const char *filename,
                                       struct detector *det,
                                       struct beam_params *beam, float *ltl)
 {
diff --git a/libcrystfel/src/grainspotter.h b/libcrystfel/src/grainspotter.h
index 720fc486..2e308a1c 100644
--- a/libcrystfel/src/grainspotter.h
+++ b/libcrystfel/src/grainspotter.h
@@ -37,7 +37,6 @@
 
 extern IndexingPrivate *grainspotter_prepare(IndexingMethod *indm,
                                              UnitCell *cell,
-                                             const char *filename,
                                              struct detector *det,
                                              struct beam_params *beam,
                                              float *ltl);
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c
index c1897d1f..68b4c38e 100644
--- a/libcrystfel/src/index.c
+++ b/libcrystfel/src/index.c
@@ -56,7 +56,7 @@
 
 
 IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell,
-                                   const char *filename, struct detector *det,
+                                   struct detector *det,
                                    struct beam_params *beam, float *ltl)
 {
 	int n;
@@ -77,29 +77,27 @@ IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell,
 		switch ( indm[n] & INDEXING_METHOD_MASK ) {
 
 			case INDEXING_DIRAX :
-			iprivs[n] = dirax_prepare(&indm[n], cell, filename,
+			iprivs[n] = dirax_prepare(&indm[n], cell,
 			                          det, beam, ltl);
 			break;
 
 			case INDEXING_MOSFLM :
-			iprivs[n] = mosflm_prepare(&indm[n], cell, filename,
+			iprivs[n] = mosflm_prepare(&indm[n], cell,
 			                           det, beam, ltl);
 			break;
 
 			case INDEXING_XDS :
-                        iprivs[n] = xds_prepare(&indm[n], cell, filename,
-			                        det, beam, ltl);
+                        iprivs[n] = xds_prepare(&indm[n], cell, det, beam, ltl);
 			break;
 
 			case INDEXING_REAX :
-			iprivs[n] = reax_prepare(&indm[n], cell, filename,
+			iprivs[n] = reax_prepare(&indm[n], cell,
 			                         det, beam, ltl);
 			break;
 
 			case INDEXING_GRAINSPOTTER :
 			iprivs[n] = grainspotter_prepare(&indm[n], cell,
-			                                 filename, det, beam,
-			                                 ltl);
+			                                 det, beam, ltl);
 			break;
 
 			default :
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h
index e36e531c..2d3a500b 100644
--- a/libcrystfel/src/index.h
+++ b/libcrystfel/src/index.h
@@ -128,7 +128,6 @@ extern char *indexer_str(IndexingMethod indm);
 #include "image.h"
 
 extern IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell,
-                                          const char *filename,
                                           struct detector *det,
                                           struct beam_params *beam, float *ltl);
 
diff --git a/libcrystfel/src/mosflm.c b/libcrystfel/src/mosflm.c
index fbd14e37..95b868bc 100644
--- a/libcrystfel/src/mosflm.c
+++ b/libcrystfel/src/mosflm.c
@@ -831,8 +831,8 @@ int run_mosflm(struct image *image, IndexingPrivate *ipriv)
 
 
 IndexingPrivate *mosflm_prepare(IndexingMethod *indm, UnitCell *cell,
-                               const char *filename, struct detector *det,
-                               struct beam_params *beam, float *ltl)
+                                struct detector *det, struct beam_params *beam,
+                                float *ltl)
 {
 	struct mosflm_private *mp;
 	int need_cell = 0;
diff --git a/libcrystfel/src/mosflm.h b/libcrystfel/src/mosflm.h
index a87232b6..1288b131 100644
--- a/libcrystfel/src/mosflm.h
+++ b/libcrystfel/src/mosflm.h
@@ -41,7 +41,6 @@
 extern int run_mosflm(struct image *image, IndexingPrivate *ipriv);
 
 extern IndexingPrivate *mosflm_prepare(IndexingMethod *indm, UnitCell *cell,
-                                       const char *filename,
                                        struct detector *det,
                                        struct beam_params *beam, float *ltl);
 
diff --git a/libcrystfel/src/reax.c b/libcrystfel/src/reax.c
index 110d8701..1ff61a59 100644
--- a/libcrystfel/src/reax.c
+++ b/libcrystfel/src/reax.c
@@ -1096,8 +1096,8 @@ int reax_index(IndexingPrivate *pp, struct image *image)
 
 
 IndexingPrivate *reax_prepare(IndexingMethod *indm, UnitCell *cell,
-                              const char *filename, struct detector *det,
-                              struct beam_params *beam, float *ltl)
+                              struct detector *det, struct beam_params *beam,
+                              float *ltl)
 {
 	struct reax_private *p;
 	int samp;
diff --git a/libcrystfel/src/reax.h b/libcrystfel/src/reax.h
index 1c10a96a..4720709e 100644
--- a/libcrystfel/src/reax.h
+++ b/libcrystfel/src/reax.h
@@ -41,7 +41,7 @@
 #ifdef HAVE_FFTW
 
 extern IndexingPrivate *reax_prepare(IndexingMethod *indm, UnitCell *cell,
-                                     const char *filename, struct detector *det,
+                                     struct detector *det,
                                      struct beam_params *beam, float *ltl);
 
 extern void reax_cleanup(IndexingPrivate *pp);
@@ -51,7 +51,7 @@ extern int reax_index(IndexingPrivate *pp, struct image *image);
 #else /* HAVE_FFTW */
 
 static IndexingPrivate *reax_prepare(IndexingMethod *indm, UnitCell *cell,
-                                     const char *filename, struct detector *det,
+                                     struct detector *det,
                                      struct beam_params *beam, float *ltl)
 {
 	return NULL;
diff --git a/libcrystfel/src/xds.c b/libcrystfel/src/xds.c
index 0683e0ad..6162394c 100644
--- a/libcrystfel/src/xds.c
+++ b/libcrystfel/src/xds.c
@@ -618,9 +618,8 @@ int run_xds(struct image *image, IndexingPrivate *priv)
 
 
 IndexingPrivate *xds_prepare(IndexingMethod *indm, UnitCell *cell,
-                             const char *filename,
-                             struct detector *det,
-                             struct beam_params *beam, float *ltl)
+                             struct detector *det, struct beam_params *beam,
+                             float *ltl)
 {
 	struct xds_private *xp;
 
diff --git a/libcrystfel/src/xds.h b/libcrystfel/src/xds.h
index 7dd7c6a8..dd0c3298 100644
--- a/libcrystfel/src/xds.h
+++ b/libcrystfel/src/xds.h
@@ -42,7 +42,7 @@
 extern int run_xds(struct image *image, IndexingPrivate *ipriv);
 
 extern IndexingPrivate *xds_prepare(IndexingMethod *indm, UnitCell *cell,
-                                    const char *filename, struct detector *det,
+                                    struct detector *det,
                                     struct beam_params *beam, float *ltl);
 
 extern void xds_cleanup(IndexingPrivate *pp);