diff options
| author | Thomas White <taw@physics.org> | 2018-05-24 10:32:11 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-05-24 15:21:18 +0200 |
| commit | fce9cd58362d09366c8a1c474017ef3e63f0b3aa (patch) | |
| tree | b57b8e3c264fa072e3438188675adcfdc3d1d33e /libcrystfel | |
| parent | 4f087e3954699ba96d2915af8d82fa10ebd53280 (diff) | |
Move FDIP includes to top, and remove unnecessary ones
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/peaks.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c index d656050e..14371271 100644 --- a/libcrystfel/src/peaks.c +++ b/libcrystfel/src/peaks.c @@ -46,6 +46,12 @@ #include <pthread.h> #include <fenv.h> +#ifdef HAVE_FDIP +#include "fastDiffractionImageProcessing/adaptions/crystfel/peakFinder9.h" +#include "fastDiffractionImageProcessing/adaptions/crystfel/mask.h" +#include "fastDiffractionImageProcessing/peakList.h" +#endif + #include "image.h" #include "utils.h" #include "peaks.h" @@ -564,16 +570,8 @@ int search_peaks_peakfinder8(struct image *image, int max_n_peaks, } -//#define HAVE_FDIP #ifdef HAVE_FDIP -#include "fastDiffractionImageProcessing/adaptions/crystfel/peakFinder9.h" -#include "fastDiffractionImageProcessing/adaptions/crystfel/mask.h" -#include "fastDiffractionImageProcessing/peakList.h" - -#include "fastDiffractionImageProcessing/peakFinder9.h" //debug, only for eclipse -#include "fastDiffractionImageProcessing/detectorRawFormat.h" //debug, only for eclipse - int search_peaks_peakfinder9(struct image *image, float sig_fac_biggest_pix, float sig_fac_peak_pix, float sig_fac_whole_peak, float min_sig, float min_peak_over_neighbour, |