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

merged raw data processing

Browse Source
This commit is contained in:
bergamaschi 2024-02-08 09:28:28 +01:00
parent e5bea401a0
commit cc233686f1
1 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp
View File

@ -174,12 +174,9 @@ int main(int argc, char *argv[]) {
int nped = 1000; int nped = 1000;
int cf = 0; int cf = 0;
<<<<<<< HEAD
int numberOfPackets=50;
=======
int numberOfPackets=nrows/8; int numberOfPackets=nrows/8;
>>>>>>> 5e9fd43d4924339ed9678bab5f262882d957df70
#ifdef RECT #ifdef RECT
cout << "Should be rectangular but now it will crash! No data structure defined!" << endl; cout << "Should be rectangular but now it will crash! No data structure defined!" << endl;
#endif #endif
@ -303,19 +300,7 @@ int main(int argc, char *argv[]) {
double *ped=new double[nx * ny];//, *ped1; double *ped=new double[nx * ny];//, *ped1;
int pos,pos1; int pos,pos1;
//return 0; //return 0;
<<<<<<< HEAD
if (pedfile) {
if (string(pedfile).find(".raw") != std::string::npos) {
pos1=string(pedfile).rfind("/");
strcpy(froot,pedfile+pos1);
pos=string(froot).find(".raw");
froot[pos]='\0';
}
cout << "PEDESTAL " << endl;
if (string(pedfile).find(".tif") == std::string::npos) {
sprintf(fname, "%s", pedfile);
=======
if (pedfile.find(".raw") != std::string::npos) { if (pedfile.find(".raw") != std::string::npos) {
pos1=pedfile.rfind("/"); pos1=pedfile.rfind("/");
strcpy(froot,pedfile.substr(pos1).c_str()); strcpy(froot,pedfile.substr(pos1).c_str());
@ -326,7 +311,7 @@ int main(int argc, char *argv[]) {
cout << "PEDESTAL " << endl; cout << "PEDESTAL " << endl;
if (pedfile.find(".tif") == std::string::npos) { if (pedfile.find(".tif") == std::string::npos) {
sprintf(fname, "%s", pedfile.c_str()); sprintf(fname, "%s", pedfile.c_str());
>>>>>>> 5e9fd43d4924339ed9678bab5f262882d957df70
cout << fname << endl; cout << fname << endl;
std::time(&end_time); std::time(&end_time);
//cout << "aaa" << std::ctime(&end_time) << endl; //cout << "aaa" << std::ctime(&end_time) << endl;
@ -338,22 +323,15 @@ int main(int argc, char *argv[]) {
if (filebin.is_open()) { if (filebin.is_open()) {
ff = -1; ff = -1;
while (decoder->readNextFrame(filebin, ff, np, buff)) { while (decoder->readNextFrame(filebin, ff, np, buff)) {
<<<<<<< HEAD
if (np <= numberOfPackets) {
mt->pushData(buff);
=======
if (np == numberOfPackets) { if (np == numberOfPackets) {
mt->pushData(buff); mt->pushData(buff);
>>>>>>> 5e9fd43d4924339ed9678bab5f262882d957df70
mt->nextThread(); mt->nextThread();
mt->popFree(buff); mt->popFree(buff);
ifr++; ifr++;
if (ifr % 100 == 0) if (ifr % 100 == 0)
<<<<<<< HEAD
cout << ifr << " " << ff << " " << np << endl;
=======
cout << ifr << " " << ff << " " << np << endl; cout << ifr << " " << ff << " " << np << endl;
>>>>>>> 5e9fd43d4924339ed9678bab5f262882d957df70
// break; // break;
} else { } else {
cout << ifr << " " << ff << " " << np << endl; cout << ifr << " " << ff << " " << np << endl;
@ -363,15 +341,10 @@ int main(int argc, char *argv[]) {
} }
filebin.close(); filebin.close();
while (mt->isBusy()) { while (mt->isBusy()) {
<<<<<<< HEAD
;
}
=======
; ;
>>>>>>> 5e9fd43d4924339ed9678bab5f262882d957df70
} }
sprintf(imgfname, "%s/%s_ped.tiff", outdir.c_str(),froot); sprintf(imgfname, "%s/%s_ped.tiff", outdir.c_str(),froot);
mt->writePedestal(imgfname); mt->writePedestal(imgfname);
@ -469,11 +442,8 @@ int main(int argc, char *argv[]) {
ff = -1; ff = -1;
ifr = 0; ifr = 0;
while (decoder->readNextFrame(filebin, ff, np, buff)) { while (decoder->readNextFrame(filebin, ff, np, buff)) {
<<<<<<< HEAD
if (np <= numberOfPackets) {
=======
if (np == numberOfPackets) { if (np == numberOfPackets) {
>>>>>>> 5e9fd43d4924339ed9678bab5f262882d957df70
// //push // //push
mt->pushData(buff); mt->pushData(buff);
// // //pop // // //pop
@ -500,11 +470,8 @@ int main(int argc, char *argv[]) {
} }
} else { } else {
cout << "bp " << ifr << " " << ff << " " << np << endl; cout << "bp " << ifr << " " << ff << " " << np << endl;
<<<<<<< HEAD
break;
=======
//break; //break;
>>>>>>> 5e9fd43d4924339ed9678bab5f262882d957df70
} }
ff = -1; ff = -1;
} }