From fce9cd58362d09366c8a1c474017ef3e63f0b3aa Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 24 May 2018 10:32:11 +0200 Subject: Move FDIP includes to top, and remove unnecessary ones --- libcrystfel/src/peaks.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'libcrystfel') 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 #include +#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, -- cgit v1.2.3