detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 09:37:59 +02:00
Code Issues Actions Packages Releases Activity

Resolve merge conflict in jungfrauExecutables

Browse Source
This commit is contained in:
hinger_v
2023-03-17 16:43:08 +01:00
parent 1bd813d620 fc24558314
commit 1bdf83e101
180 changed files with 9124 additions and 7547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
View File

@ -222,6 +222,7 @@ int main(int argc, char *argv[]) {
multiThreadedCountingDetector *mt =
new multiThreadedCountingDetector(filter, nthreads, fifosize);
mt->setClusterSize(csize,csize);
#ifndef ANALOG
mt->setDetectorMode(ePhotonCounting);
cout << "Counting!" << endl;