From 64d9223cb397fe23cb1545c233b10c04181b0cf8 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 31 Jan 2014 14:11:22 +0000 Subject: [PATCH] updated multi such that offsets are not updated if number of modules is just get git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@730 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 5a632e2a8..185a85505 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -353,7 +353,7 @@ void multiSlsDetector::updateOffsets(){ int offsetX=0,offsetY=0,numX,numY; int maxChanX = thisMultiDetector->maxNumberOfChannelsPerDetector[X]; int maxChanY = thisMultiDetector->maxNumberOfChannelsPerDetector[Y]; - cout << "Updating detector offsets" << endl; + cout << "Updating multi detector offsets" << endl; thisMultiDetector->numberOfChannel[X] = 0; thisMultiDetector->maxNumberOfChannel[X] = 0; thisMultiDetector->numberOfChannel[Y] = 0; @@ -364,7 +364,7 @@ void multiSlsDetector::updateOffsets(){ thisMultiDetector->offsetX[i] = offsetX; 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); numY = detectors[i]->getMaxNumberOfChannels(Y); @@ -3554,7 +3554,8 @@ int multiSlsDetector::setNumberOfModules(int p, dimension d) { } } - updateOffsets(); + if(p != -1) + updateOffsets(); return ret; }