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

some updates to the moench data processing

Browse Source
This commit is contained in:
bergamaschi
2022-06-13 16:50:30 +02:00
parent 25b5b02302
commit 9ecafbf8d5
5 changed files with 68 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
View File

@ -88,7 +88,7 @@ int main(int argc, char *argv[]) {
char *socketip2 = 0;
uint32_t portnum2 = 0;
zmqHeader zHeader, outHeader;
sls::zmqHeader zHeader, outHeader;
zHeader.jsonversion = SLS_DETECTOR_JSON_HEADER_VERSION;
outHeader.jsonversion = SLS_DETECTOR_JSON_HEADER_VERSION;
@ -219,14 +219,14 @@ int main(int argc, char *argv[]) {
mt->StartThreads();
mt->popFree(buff);
ZmqSocket *zmqsocket = NULL;
sls::ZmqSocket *zmqsocket = NULL;
#ifdef NEWZMQ
// receive socket
try {
#endif
zmqsocket = new ZmqSocket(socketip, portnum);
zmqsocket = new sls::ZmqSocket(socketip, portnum);
#ifdef NEWZMQ
} catch (...) {
@ -256,14 +256,14 @@ int main(int argc, char *argv[]) {
printf("Zmq Client at %s\n", zmqsocket->GetZmqServerAddress().c_str());
// send socket
ZmqSocket *zmqsocket2 = 0;
sls::ZmqSocket *zmqsocket2 = 0;
// cout << "zmq2 " << endl;
if (send) {
#ifdef NEWZMQ
// receive socket
try {
#endif
zmqsocket2 = new ZmqSocket(portnum2, socketip2);
zmqsocket2 = new sls::ZmqSocket(portnum2, socketip2);
#ifdef NEWZMQ
} catch (...) {