diff --git a/slsDetectorCalibration/moenchExecutables/Makefile.zmq b/slsDetectorCalibration/moenchExecutables/Makefile.zmq index 2db6dbdda..e4dd3e653 100644 --- a/slsDetectorCalibration/moenchExecutables/Makefile.zmq +++ b/slsDetectorCalibration/moenchExecutables/Makefile.zmq @@ -1,5 +1,5 @@ -INCDIR= -I. -I../dataStructures ../tiffIO.cpp -I../ -I../interpolations/ -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ +INCDIR= -I. -I../dataStructures ../tiffIO.cpp -I../ -I../interpolations/ -I../../slsDetectorSoftware/commonFiles/ -I../../slsReceiverSoftware/include/ LDFLAG= -L/usr/lib64/ -lpthread -lm -lstdc++ -lzmq -pthread -lrt -ltiff -O3 -g -std=c++11 -Wall #-L../../bin -lhdf5 -L. diff --git a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp index 6653dc4a1..7e5270d4b 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp @@ -1,5 +1,5 @@ #define WRITE_QUAD -#define DEVELOPER +#define MOENCH_BRANCH #define C_GHOST 0.0004 @@ -260,7 +260,10 @@ int main(int argc, char *argv[]) { // header variables uint64_t acqIndex = -1; uint64_t frameIndex = -1; - //uint32_t subFrameIndex = -1; +#ifdef MOENCH_BRANCH + uint32_t subFrameIndex = -1; + int* flippedData = 0; +#endif uint64_t fileindex = -1; string filename = ""; // char* image = new char[size]; @@ -292,7 +295,6 @@ int main(int argc, char *argv[]) { uint16_t roundRNumber = 0; uint8_t detType = 0; uint8_t version = 0; - // int* flippedData = 0; char* additionalJsonHeader = 0; int32_t threshold=0;