aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2023-07-26 16:31:12 +0200
committerThomas White <taw@physics.org>2023-07-28 13:22:05 +0200
commita20567dda656dff6502de1d2d65548b2b21c40ba (patch)
treebf135e743546359bb68847488f327ea596b1627c /libcrystfel/src
parent9677bc525b41a133ca611b60a383dab58b0ea5f9 (diff)
Unconditionally compile crystfel-mille.c
We need mille_label() for align_detector, even if we don't have Millepede. Some of this complexity can be removed later by re-implementing "mille()". The build system and wrapper code is already longer than a pure C implementation would be.
Diffstat (limited to 'libcrystfel/src')
-rw-r--r--libcrystfel/src/crystfel-mille.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libcrystfel/src/crystfel-mille.c b/libcrystfel/src/crystfel-mille.c
index 3b7d059e..3acb412a 100644
--- a/libcrystfel/src/crystfel-mille.c
+++ b/libcrystfel/src/crystfel-mille.c
@@ -37,7 +37,9 @@
#include "predict-refine.h"
#include "profile.h"
+#ifdef HAVE_MILLEPEDE
#include <mille_c_wrap.h>
+#endif /* HAVE_MILLEPEDE */
int mille_label(int group_serial, enum gparam param)
@@ -54,6 +56,8 @@ int mille_label(int group_serial, enum gparam param)
}
+#ifdef HAVE_MILLEPEDE
+
void write_mille(Mille *mille, int n, UnitCell *cell,
struct reflpeak *rps, struct image *image,
gsl_matrix **Minvs)
@@ -177,3 +181,5 @@ void crystfel_mille_write_record(Mille *m)
{
mille_write_record(m);
}
+
+#endif /* HAVE_MILLEPEDE */