diff --git a/examples/moench03_T1.config b/examples/moench03_T1.config index 39a6bc0d1..3708c1ab6 100644 --- a/examples/moench03_T1.config +++ b/examples/moench03_T1.config @@ -3,7 +3,7 @@ ### edit with hostname or IP address of your detector ############################################ #hostname bchip181+ -hostname bchip296 +hostname bchip076 ############################################# ### 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 ############################################ 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 ############################################ zmqip 129.129.202.57 -zmqport 8001 +zmqport 9005 @@ -50,8 +50,8 @@ fpath /mnt/moench_data/scratch1/ fwrite 0 -rx_jsonpara frameMode pedestal -rx_jsonpara detectorMode analog +rx_jsonpara frameMode newPedestal +rx_jsonpara detectorMode counting rx_discardpolicy discardpartial diff --git a/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp b/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp index cfcddf347..e91e75b59 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp @@ -356,6 +356,8 @@ int main(int argc, char *argv[]) { sprintf(ffname, "%s/%s_f%05d.tiff", outdir, fformat, ifile); sprintf(imgfname, (const char*)ffname, irun); + while (mt->isBusy()) + ; mt->writeImage(imgfname, thr1); mt->clearImage(); ifile++; @@ -381,6 +383,8 @@ int main(int argc, char *argv[]) { sprintf(imgfname, (const char*)ffname, irun); } cout << "Writing tiff to " << imgfname << " " << thr1 << endl; + while (mt->isBusy()) + ; mt->writeImage(imgfname, thr1); mt->clearImage(); if (of) {