detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

Fixed file cluster closing and cprintf warning in moenchZmqProcess

Browse Source
This commit is contained in:
bergamaschi 2020-08-18 10:56:21 +02:00
parent 1d8f9a5aed
commit afabc9a503
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
View File

@ -241,7 +241,7 @@ int main(int argc, char *argv[]) {
#endif #endif
if (zmqsocket->Connect()) { if (zmqsocket->Connect()) {
cprintf(RED, "Error: Could not connect to socket %s\n", cprintf(RED, "Error: Could not connect to socket %s\n",
zmqsocket->GetZmqServerAddress()); (zmqsocket->GetZmqServerAddress()).c_str());
delete zmqsocket; delete zmqsocket;
return EXIT_FAILURE; return EXIT_FAILURE;
} else } else
@ -281,12 +281,12 @@ int main(int argc, char *argv[]) {
#endif #endif
if (zmqsocket2->Connect()) { if (zmqsocket2->Connect()) {
cprintf(RED, "BBB Error: Could not connect to socket %s\n", cprintf(RED, "BBB Error: Could not connect to socket %s\n",
zmqsocket2->GetZmqServerAddress()); zmqsocket2->GetZmqServerAddress().c_str());
// delete zmqsocket2; // delete zmqsocket2;
send = false; send = false;
// return EXIT_FAILURE; // return EXIT_FAILURE;
} else } else
printf("Zmq Client at %s\n", zmqsocket2->GetZmqServerAddress()); printf("Zmq Client at %s\n", zmqsocket2->GetZmqServerAddress().c_str());
} }
@ -388,6 +388,7 @@ int main(int argc, char *argv[]) {
while (mt->isBusy()) {;}//wait until all data are processed from the queues while (mt->isBusy()) {;}//wait until all data are processed from the queues
if (of) { if (of) {
mt->setFilePointer(NULL);
fclose(of); fclose(of);
of=NULL; of=NULL;
} }

2
slsDetectorCalibration/singlePhotonDetector.h
View File

@ -602,6 +602,7 @@ int *getClusters(char *data, int *ph=NULL) {
*/ */
static void writeClusters(FILE *f, single_photon_hit *cl, int nph, int fn=0){ static void writeClusters(FILE *f, single_photon_hit *cl, int nph, int fn=0){
if (f) {
if (nph>0) { if (nph>0) {
#ifndef OLDFORMAT #ifndef OLDFORMAT
if (fwrite((void*)&fn, 1, sizeof(int), f)) if (fwrite((void*)&fn, 1, sizeof(int), f))
@ -609,6 +610,7 @@ int *getClusters(char *data, int *ph=NULL) {
#endif #endif
for (int i=0; i<nph; i++) (cl+i)->write(f); for (int i=0; i<nph; i++) (cl+i)->write(f);
} }
}
}; };