From f0e30926fe716f774923bcb71686a3cbc584e6c9 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Mon, 6 May 2013 16:23:13 +0000 Subject: [PATCH] fixed part of mythen module 6 problem: offsets should be updated after set nmod, still need to fix numchips in one direction git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@542 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/gotthardDetectorServer/server_funcs.c | 4 ++-- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 2 ++ slsDetectorSoftware/slsDetector/slsDetector.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index 7d64efc2c..7869e7418 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -1957,12 +1957,12 @@ while(read_frame(file_des)==OK) { #ifdef VERBOSE printf("frame read\n"); -#endif +#endif ; } #ifdef VERBOSE printf("Frames finished\n"); -#endif +#endif return OK; diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index d0db08852..42fe9b2e9 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3533,6 +3533,8 @@ int multiSlsDetector::setNumberOfModules(int p, dimension d) { thisMultiDetector->numberOfChannels+=detectors[idet]->getTotalNumberOfChannels(); } } + + updateOffsets(); return ret; } diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h index 0001ccc40..8c99e1283 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.h +++ b/slsDetectorSoftware/slsDetector/slsDetector.h @@ -591,7 +591,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion { int getTotalNumberOfChannels(){return thisDetector->nChans*thisDetector->nChips*thisDetector->nMods;}; - int getTotalNumberOfChannels(dimension d){return thisDetector->nChan[d]*thisDetector->nChips*thisDetector->nMod[X];}; + int getTotalNumberOfChannels(dimension d){return thisDetector->nChan[d]*thisDetector->nChips*thisDetector->nMod[d];}; int getMaxNumberOfChannels(){return thisDetector->nChans*thisDetector->nChips*thisDetector->nModsMax;};