From 15e8c0d9f133103f5ee6652aa143dbf7beb337ed Mon Sep 17 00:00:00 2001 From: anberga <34126852+anberga@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:32:20 +0200 Subject: [PATCH] Moench mess from developer (#953) * new moench data structure for offline processing --- .../moenchExecutables/moenchRawDataProcess.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp b/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp index 69620e7f4..40af40c09 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp @@ -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; }