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 crashing of moench03RawDataProcess when nframes>0 (#810)

Browse Source
This commit is contained in:
anberga 2023-09-27 09:22:40 +02:00 committed by GitHub
parent 45414149fe
commit e7cd90db78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/moench03_T1.config
View File

@ -3,7 +3,7 @@
### edit with hostname or IP address of your detector ### edit with hostname or IP address of your detector
############################################ ############################################
#hostname bchip181+ #hostname bchip181+
hostname bchip296 hostname bchip076
############################################# #############################################
### edit with hostname or 1Gbs IP address of your server ### edit with hostname or 1Gbs IP address of your server
@ -25,12 +25,12 @@ udp_dstport 32777
### edit with 10 Gbs IP of your server ### edit with 10 Gbs IP of your server
############################################ ############################################
rx_zmqip 10.1.2.102 rx_zmqip 10.1.2.102
rx_zmqport 8003 rx_zmqport 9003
############################################# #############################################
### edit with 1 Gbs IP of PC where you will run the GUI ### edit with 1 Gbs IP of PC where you will run the GUI
############################################ ############################################
zmqip 129.129.202.57 zmqip 129.129.202.57
zmqport 8001 zmqport 9005
@ -50,8 +50,8 @@ fpath /mnt/moench_data/scratch1/
fwrite 0 fwrite 0
rx_jsonpara frameMode pedestal rx_jsonpara frameMode newPedestal
rx_jsonpara detectorMode analog rx_jsonpara detectorMode counting
rx_discardpolicy discardpartial rx_discardpolicy discardpartial

4
slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp
View File

@ -356,6 +356,8 @@ int main(int argc, char *argv[]) {
sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat, sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat,
ifile); ifile);
sprintf(imgfname, (const char*)ffname, irun); sprintf(imgfname, (const char*)ffname, irun);
while (mt->isBusy())
;
mt->writeImage(imgfname, thr1); mt->writeImage(imgfname, thr1);
mt->clearImage(); mt->clearImage();
ifile++; ifile++;
@ -381,6 +383,8 @@ int main(int argc, char *argv[]) {
sprintf(imgfname, (const char*)ffname, irun); sprintf(imgfname, (const char*)ffname, irun);
} }
cout << "Writing tiff to " << imgfname << " " << thr1 << endl; cout << "Writing tiff to " << imgfname << " " << thr1 << endl;
while (mt->isBusy())
;
mt->writeImage(imgfname, thr1); mt->writeImage(imgfname, thr1);
mt->clearImage(); mt->clearImage();
if (of) { if (of) {