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

Merge branch 'developer' into jf_h5reader

Browse Source
This commit is contained in:
hinger_v
2024-10-11 17:15:33 +02:00
parent f0fc547c6f 270ee48148
commit f3a3fb09bf
201 changed files with 62621 additions and 30645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp
View File

@ -175,13 +175,12 @@ int main(int argc, char *argv[]) {
int cf = 0;
int numberOfPackets=nrows/8;
#ifdef RECT
cout << "Should be rectangular but now it will crash! No data structure defined!" << endl;
#endif
#ifndef MOENCH04
moench03v2Data *decoder = new moench03v2Data(100);
moench03v2Data *decoder = new moench03v2Data(nrows/2);
cout << "MOENCH03!" << endl;
#endif
@ -299,6 +298,7 @@ int main(int argc, char *argv[]) {
double *ped=new double[nx * ny];//, *ped1;
int pos,pos1;
//return 0;
if (pedfile.find(".raw") != std::string::npos) {
pos1=pedfile.rfind("/");
strcpy(froot,pedfile.substr(pos1).c_str());
@ -336,9 +336,8 @@ int main(int argc, char *argv[]) {
}
filebin.close();
while (mt->isBusy()) {
;
}
;
}
sprintf(imgfname, "%s/%s_ped.tiff", outdir.c_str(),froot);
mt->writePedestal(imgfname);
@ -463,7 +462,6 @@ int main(int argc, char *argv[]) {
}
} else {
cout << "bp " << ifr << " " << ff << " " << np << endl;
//break;
}
ff = -1;
}

7
slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
View File

@ -296,12 +296,11 @@ int main(int argc, char *argv[]) {
if (send) {
// receive socket
try {
zmqsocket2 = new sls::ZmqSocket(portnum2, socketip2.c_str());
zmqsocket2 = new sls::ZmqSocket(portnum2);
} catch (...) {
cprintf(RED,
"Error: Could not create Zmq sending socket on port %d and "
"ip %s\n",
portnum2, socketip2.c_str());
"Error: Could not create Zmq sending socket on port %d\n",
portnum2);
// delete zmqsocket2;
// zmqsocket2=NULL;
// delete zmqsocket;