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

solved detector organisation in client side

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-06-30 11:54:13 +02:00
parent 8202e4aa0a
commit c4e0f2967f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -380,18 +380,18 @@ void multiSlsDetector::updateOffsets(){
for (int i=1; i<thisMultiDetector->numberOfDetectors; i++) { for (int i=1; i<thisMultiDetector->numberOfDetectors; i++) {
if (detectors[i]) { if (detectors[i]) {
//incrementing in y direction //incrementing in y direction
if ((maxChanY == -1) || ((maxChanY > 0) && ((offsetY + numY) < maxChanY))){ if ((maxChanY == -1) || ((maxChanY > 0) && ((offsetY + detectors[i]->getMaxNumberOfChannels(Y)) <= maxChanY))){
offsetY += detectors[i]->getMaxNumberOfChannels(Y); offsetY += detectors[i]->getMaxNumberOfChannels(Y);
maxY += detectors[i]->getMaxNumberOfChannels(Y); maxY += detectors[i]->getMaxNumberOfChannels(Y);
numY += detectors[i]->getTotalNumberOfChannels(Y); numY += detectors[i]->getTotalNumberOfChannels(Y);
} }
//incrementing in y direction //incrementing in x direction
else{ else{
offsetY = 0; offsetY = 0;
numY = 0; numY = 0;
maxY = 0; maxY = 0;
thisMultiDetector->maxNumberOfChannel[Y] = 0; thisMultiDetector->maxNumberOfChannel[Y] = 0;
if ((maxChanX == -1) || ((maxChanX > 0) && (offsetX <= maxChanX))){ if ((maxChanX == -1) || ((maxChanX > 0) && ((offsetX + detectors[i]->getMaxNumberOfChannels(X)) <= maxChanX))){
offsetX += detectors[i]->getMaxNumberOfChannels(X); offsetX += detectors[i]->getMaxNumberOfChannels(X);
numX += detectors[i]->getTotalNumberOfChannels(X); numX += detectors[i]->getTotalNumberOfChannels(X);
maxX += detectors[i]->getMaxNumberOfChannels(X); maxX += detectors[i]->getMaxNumberOfChannels(X);