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

updated multi such that offsets are not updated if number of modules is just get

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@730 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-01-31 14:11:22 +00:00
parent fded64f5b1
commit 64d9223cb3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -353,7 +353,7 @@ void multiSlsDetector::updateOffsets(){
int offsetX=0,offsetY=0,numX,numY; int offsetX=0,offsetY=0,numX,numY;
int maxChanX = thisMultiDetector->maxNumberOfChannelsPerDetector[X]; int maxChanX = thisMultiDetector->maxNumberOfChannelsPerDetector[X];
int maxChanY = thisMultiDetector->maxNumberOfChannelsPerDetector[Y]; int maxChanY = thisMultiDetector->maxNumberOfChannelsPerDetector[Y];
cout << "Updating detector offsets" << endl; cout << "Updating multi detector offsets" << endl;
thisMultiDetector->numberOfChannel[X] = 0; thisMultiDetector->numberOfChannel[X] = 0;
thisMultiDetector->maxNumberOfChannel[X] = 0; thisMultiDetector->maxNumberOfChannel[X] = 0;
thisMultiDetector->numberOfChannel[Y] = 0; thisMultiDetector->numberOfChannel[Y] = 0;
@ -364,7 +364,7 @@ void multiSlsDetector::updateOffsets(){
thisMultiDetector->offsetX[i] = offsetX; thisMultiDetector->offsetX[i] = offsetX;
thisMultiDetector->offsetY[i] = offsetY; thisMultiDetector->offsetY[i] = offsetY;
cout << "Detector at position: " << i << " at offset X:" << offsetX << " and offset Y:" << offsetY << endl; cout << "Detector at position: " << i << " x offset:" << offsetX << " y offset:" << offsetY << endl;
numX = detectors[i]->getMaxNumberOfChannels(X); numX = detectors[i]->getMaxNumberOfChannels(X);
numY = detectors[i]->getMaxNumberOfChannels(Y); numY = detectors[i]->getMaxNumberOfChannels(Y);
@ -3554,7 +3554,8 @@ int multiSlsDetector::setNumberOfModules(int p, dimension d) {
} }
} }
updateOffsets(); if(p != -1)
updateOffsets();
return ret; return ret;
} }