From 4fc8065ef51eba2374094a94e27e81685da69f12 Mon Sep 17 00:00:00 2001 From: Wang Xiaoqiang Date: Tue, 8 Dec 2015 13:26:17 +0100 Subject: [PATCH] trying to fix for 2D detector(eiger) --- .../slsDetector/slsDetectorUsers.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp index 9cd9e9936..2f7adade5 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp @@ -110,21 +110,24 @@ int slsDetectorUsers::getPositions(double *pos){ } int slsDetectorUsers::setDetectorSize(int x0, int y0, int nx, int ny){ - int nmod=nx/(myDetector->getChansPerMod(0)); - cout << myDetector->getChansPerMod(0) << " " << nx << " " << nmod << endl; - return myDetector->setNumberOfModules(nmod)*myDetector->getChansPerMod(0);} + int nmodx=nx/(myDetector->getChansPerMod(0)); + int nmody=ny/(myDetector->getChansPerMod(0)); + myDetector->setNumberOfModules(nmodx, slsDetectorDefs::X); + myDetector->setNumberOfModules(nmody, slsDetectorDefs::Y); + return nmodx*myDetector->getChansPerMod(0); +} int slsDetectorUsers::getDetectorSize(int &x0, int &y0, int &nx, int &ny){ y0=0; - ny=1; + ny=myDetector->getTotalNumberOfChannels(slsDetectorDefs::Y); x0=0; - nx=myDetector->setNumberOfModules()*myDetector->getChansPerMod(0); + nx=myDetector->getTotalNumberOfChannels(slsDetectorDefs::X); return nx; } int slsDetectorUsers::getMaximumDetectorSize(int &nx, int &ny){ - ny=1; - nx=myDetector->getMaxNumberOfModules()*myDetector->getChansPerMod(0); + nx=myDetector->getMaxNumberOfChannels(slsDetectorDefs::X); + ny=myDetector->getMaxNumberOfChannels(slsDetectorDefs::Y); return nx; }