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

merged

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-02 14:36:21 +01:00
parent 92305a9f7a fa0580ccac
commit 55c35b6669
11 changed files with 239 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -268,6 +268,7 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
getNMods();
getMaxMods();
threadStarted = false;
threadpool = 0;
if(createThreadPool() == FAIL)
exit(-1);
@ -4938,6 +4939,7 @@ int multiSlsDetector::getFramesCaughtByReceiver() {
return ret;
}
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++)
if (detectors[i]){
ret1+=detectors[i]->getFramesCaughtByReceiver();