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

Merge branch 'developer' into zmqhandler

Browse Source
This commit is contained in:
maliakal_d 2018-04-04 14:57:24 +02:00
commit 72b71f3fcd
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4563,6 +4563,17 @@ int64_t multiSlsDetector::getId(idMode mode, int imod) {
} }
} }
ret = -100; int64_t ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet)
if (detectors[idet]){
ret1=detectors[idet]->getId(mode, imod);
if(ret==-100)
ret=ret1;
else if (ret!=ret1)
ret=-1;
}
return ret;
return -1; return -1;
} }