diff options
| author | Thomas White <taw@physics.org> | 2023-07-26 16:31:12 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-07-28 13:22:05 +0200 |
| commit | a20567dda656dff6502de1d2d65548b2b21c40ba (patch) | |
| tree | bf135e743546359bb68847488f327ea596b1627c /libcrystfel | |
| parent | 9677bc525b41a133ca611b60a383dab58b0ea5f9 (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')
| -rw-r--r-- | libcrystfel/meson.build | 5 | ||||
| -rw-r--r-- | libcrystfel/src/crystfel-mille.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build index 82937f48..81156b61 100644 --- a/libcrystfel/meson.build +++ b/libcrystfel/meson.build @@ -145,6 +145,7 @@ libcrystfel_sources = ['src/image.c', 'src/detgeom.c', 'src/fom.c', 'src/profile.c', + 'src/crystfel-mille.c', 'src/image-cbf.c', 'src/image-hdf5.c', 'src/image-msgpack.c', @@ -161,10 +162,6 @@ libcrystfel_sources = ['src/image.c', symop_lex_ch, symop_parse_ch] -if millepededep.found() - libcrystfel_sources += 'src/crystfel-mille.c' -endif - configure_file(input: 'libcrystfel-config.h.meson.in', output: 'libcrystfel-config.h', configuration: conf_data) 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 */ |