From 29c62b172149c9afd3e59bb48e89b2d763a0c4f6 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 17 Jul 2015 13:55:02 +0200 Subject: [PATCH] offsets corrected for 1.5m --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index cfe381cce..0f7bae2af 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -380,7 +380,7 @@ void multiSlsDetector::updateOffsets(){ for (int i=1; inumberOfDetectors; i++) { if (detectors[i]) { //incrementing in y direction - if ((maxChanY == -1) || ((maxChanY > 0) && ((offsetY + detectors[i]->getMaxNumberOfChannels(Y)) <= maxChanY))){ + if ((maxChanY == -1) || ((maxChanY > 0) && ((offsetY + detectors[i]->getMaxNumberOfChannels(Y)) < maxChanY))){ offsetY += detectors[i]->getMaxNumberOfChannels(Y); maxY += detectors[i]->getMaxNumberOfChannels(Y); numY += detectors[i]->getTotalNumberOfChannels(Y); @@ -391,7 +391,7 @@ void multiSlsDetector::updateOffsets(){ numY = 0; maxY = 0; thisMultiDetector->maxNumberOfChannel[Y] = 0; - if ((maxChanX == -1) || ((maxChanX > 0) && ((offsetX + detectors[i]->getMaxNumberOfChannels(X)) <= maxChanX))){ + if ((maxChanX == -1) || ((maxChanX > 0) && ((offsetX + detectors[i]->getMaxNumberOfChannels(X)) < maxChanX))){ offsetX += detectors[i]->getMaxNumberOfChannels(X); numX += detectors[i]->getTotalNumberOfChannels(X); maxX += detectors[i]->getMaxNumberOfChannels(X);