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

minor fixes

Browse Source
This commit is contained in:
Erik Frojdh
2019-05-03 14:39:22 +02:00
parent aaa7576f7d
commit 92b447c83a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -800,9 +800,9 @@ int multiSlsDetector::writeConfigurationFile(const std::string &fname) {
++iline; ++iline;
// single detector configuration // single detector configuration
for (size_t idet = 0; idet < detectors.size(); ++idet) { for (auto & detector : detectors) {
outfile << std::endl; outfile << std::endl;
ret1 = detectors[idet]->writeConfigurationFile(outfile, this); ret1 = detector->writeConfigurationFile(outfile, this);
if (ret1 == FAIL) { if (ret1 == FAIL) {
ret = FAIL; ret = FAIL;
} }
@ -3066,7 +3066,7 @@ int multiSlsDetector::getFramesCaughtByReceiver(int detPos) {
auto r = parallelCall(&slsDetector::getFramesCaughtByReceiver); auto r = parallelCall(&slsDetector::getFramesCaughtByReceiver);
// prevent divide by all or do not take avg when -1 for "did not connect" // prevent divide by all or do not take avg when -1 for "did not connect"
if ((!detectors.size()) || (sls::anyEqualTo(r, -1))) { if ((detectors.empty()) || (sls::anyEqualTo(r, -1))) {
return -1; return -1;
} }
@ -3084,7 +3084,7 @@ int multiSlsDetector::getReceiverCurrentFrameIndex(int detPos) {
auto r = parallelCall(&slsDetector::getReceiverCurrentFrameIndex); auto r = parallelCall(&slsDetector::getReceiverCurrentFrameIndex);
// prevent divide by all or do not take avg when -1 for "did not connect" // prevent divide by all or do not take avg when -1 for "did not connect"
if ((!detectors.size()) || (sls::anyEqualTo(r, -1))) { if ((detectors.empty()) || (sls::anyEqualTo(r, -1))) {
return -1; return -1;
} }
@ -3156,7 +3156,7 @@ void multiSlsDetector::readFrameFromReceiver() {
if (getDetectorTypeAsEnum() == EIGER) { if (getDetectorTypeAsEnum() == EIGER) {
eiger = true; eiger = true;
nX *= 2; nX *= 2;
gappixelsenable = detectors[0]->enableGapPixels(-1) >= 1 ? true : false; gappixelsenable = detectors[0]->enableGapPixels(-1) > 0;
} }
if (getNumberofUDPInterfaces() == 2) { if (getNumberofUDPInterfaces() == 2) {
nY *= 2; nY *= 2;