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

Corrected mistake for compiling moench04 with digital bits

Browse Source
This commit is contained in:
bergamaschi
2022-10-25 09:55:11 +02:00
parent 2696b95014
commit 4f21ad5122
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorCalibration/moenchExecutables/CMakeLists.txt
View File

@ -35,7 +35,7 @@ target_compile_definitions(moench04RawDataProcess PRIVATE MOENCH04)
list(APPEND MOENCH_EXECUTABLES moench04RawDataProcess)
add_executable(moench04RawDataProcessDGS moenchRawDataProcess.cpp)
target_compile_definitions(moench04RawDataProcess PRIVATE MOENCH04_DGS MOENCH04)
target_compile_definitions(moench04RawDataProcessDGS PRIVATE MOENCH04_DGS MOENCH04)
list(APPEND MOENCH_EXECUTABLES moench04RawDataProcessDGS)
#interpolation stuff

10
slsDetectorCalibration/moenchExecutables/moenchRawDataProcess.cpp
View File

@ -74,7 +74,7 @@ int main(int argc, char *argv[]) {
#ifdef MOENCH04
#ifndef MOENCH04_DGS
moench04CtbZmq10GbData *decoder = new moench04CtbZmq10GbData();
moench04CtbZmq10GbData *decoder = new moench04CtbZmq10GbData(5000,0);
cout << "MOENCH04!" << endl;
#endif
@ -349,7 +349,7 @@ int main(int argc, char *argv[]) {
mt->popFree(buff);
ifr++;
if (ifr % 100 == 0)
if (ifr % 100 == 0)
cout << ifr << " " << ff << endl;
if (nframes > 0) {
if (ifr % nframes == 0) {
@ -361,8 +361,10 @@ int main(int argc, char *argv[]) {
ifile++;
}
}
} else
cout << ifr << " " << ff << " " << np << endl;
} else {
cout << "bp " << ifr << " " << ff << " " << np << endl;
//break;
}
ff = -1;
}
cout << "--" << endl;