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

merge conflict resolved

Browse Source
This commit is contained in:
maliakal_d
2018-10-30 14:31:20 +01:00
parent dfa8cf7381 ab2eb607c8
commit 70a1b87603
17 changed files with 4688 additions and 4958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -120,7 +120,7 @@ private:
/** threaded processing flag
* (i.e. if data are processed in a separate thread) */
int threadedProcessing;
// int threadedProcessing;
/** number of rois defined */
int nROI;