detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 07:17:13 +02:00
Code Issues Actions Packages Releases Activity

moenchZmqProcess and Makefile adjusted to work with this branch

Browse Source
This commit is contained in:
bergamaschi
2019-09-26 11:42:10 +02:00
parent 2c09d394a6
commit d0c5c2a6e5
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorCalibration/moenchExecutables/Makefile.zmq
View File

@ -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 LDFLAG= -L/usr/lib64/ -lpthread -lm -lstdc++ -lzmq -pthread -lrt -ltiff -O3 -g -std=c++11 -Wall
#-L../../bin -lhdf5 -L. #-L../../bin -lhdf5 -L.

8
slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
View File

@ -1,5 +1,5 @@
#define WRITE_QUAD #define WRITE_QUAD
#define DEVELOPER #define MOENCH_BRANCH
#define C_GHOST 0.0004 #define C_GHOST 0.0004
@ -260,7 +260,10 @@ int main(int argc, char *argv[]) {
// header variables // header variables
uint64_t acqIndex = -1; uint64_t acqIndex = -1;
uint64_t frameIndex = -1; uint64_t frameIndex = -1;
//uint32_t subFrameIndex = -1; #ifdef MOENCH_BRANCH
uint32_t subFrameIndex = -1;
int* flippedData = 0;
#endif
uint64_t fileindex = -1; uint64_t fileindex = -1;
string filename = ""; string filename = "";
// char* image = new char[size]; // char* image = new char[size];
@ -292,7 +295,6 @@ int main(int argc, char *argv[]) {
uint16_t roundRNumber = 0; uint16_t roundRNumber = 0;
uint8_t detType = 0; uint8_t detType = 0;
uint8_t version = 0; uint8_t version = 0;
// int* flippedData = 0;
char* additionalJsonHeader = 0; char* additionalJsonHeader = 0;
int32_t threshold=0; int32_t threshold=0;