diff --git a/slsDetectorCalibration/moenchExecutables/CMakeLists.txt b/slsDetectorCalibration/moenchExecutables/CMakeLists.txt index 2faa1d852..d2bb41dd3 100644 --- a/slsDetectorCalibration/moenchExecutables/CMakeLists.txt +++ b/slsDetectorCalibration/moenchExecutables/CMakeLists.txt @@ -48,8 +48,9 @@ add_executable(moench03Interpolation moench03Interpolation.cpp) #no compile defs list(APPEND MOENCH_EXECUTABLES moench03Interpolation) -add_executable(moench03NoInterpolation moench03NoInterpolation.cpp) +add_executable(moench03NoInterpolation moench03Interpolation.cpp) #no compile defs +target_compile_definitions(moench03NoInterpolation PRIVATE NOINTERPOLATION) list(APPEND MOENCH_EXECUTABLES moench03NoInterpolation) @@ -87,4 +88,4 @@ foreach(exe ${MOENCH_EXECUTABLES}) endforeach(exe ${MOENCH_EXECUTABLES}) -install(TARGETS ${MOENCH_EXECUTABLES} DESTINATION bin) \ No newline at end of file +install(TARGETS ${MOENCH_EXECUTABLES} DESTINATION bin) diff --git a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp index d1bd1c4ad..cbbe32746 100644 --- a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp +++ b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp @@ -126,11 +126,11 @@ int main(int argc, char *argv[]) { int quad; #ifndef FF + double int_x, int_y; + int *img; #ifndef NOINTERPOLATION char fname[10000]; int ok; - double int_x, int_y; - int *img; cout << "read ff " << argv[2] << endl; sprintf(fname, "%s", argv[2]); interp->readFlatField(fname);