detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +02:00
Code Issues Actions Packages Releases Activity

Revert "trying to fix for 2D detector(eiger)"

Browse Source 
This reverts commit 0a471f54edffb54a9871bbc8ebb241c22775451c.
This commit is contained in:
Wang Xiaoqiang
2015-12-15 16:29:47 +01:00
parent 54c1765f34
commit 06e810169d
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -110,24 +110,21 @@ int slsDetectorUsers::getPositions(double *pos){
} }
int slsDetectorUsers::setDetectorSize(int x0, int y0, int nx, int ny){ int slsDetectorUsers::setDetectorSize(int x0, int y0, int nx, int ny){
int nmodx=nx/(myDetector->getChansPerMod(0)); int nmod=nx/(myDetector->getChansPerMod(0));
int nmody=ny/(myDetector->getChansPerMod(0)); cout << myDetector->getChansPerMod(0) << " " << nx << " " << nmod << endl;
myDetector->setNumberOfModules(nmodx, slsDetectorDefs::X); return myDetector->setNumberOfModules(nmod)*myDetector->getChansPerMod(0);}
myDetector->setNumberOfModules(nmody, slsDetectorDefs::Y);
return nmodx*myDetector->getChansPerMod(0);
}
int slsDetectorUsers::getDetectorSize(int &x0, int &y0, int &nx, int &ny){ int slsDetectorUsers::getDetectorSize(int &x0, int &y0, int &nx, int &ny){
y0=0; y0=0;
ny=myDetector->getTotalNumberOfChannels(slsDetectorDefs::Y); ny=1;
x0=0; x0=0;
nx=myDetector->getTotalNumberOfChannels(slsDetectorDefs::X); nx=myDetector->setNumberOfModules()*myDetector->getChansPerMod(0);
return nx; return nx;
} }
int slsDetectorUsers::getMaximumDetectorSize(int &nx, int &ny){ int slsDetectorUsers::getMaximumDetectorSize(int &nx, int &ny){
nx=myDetector->getMaxNumberOfChannels(slsDetectorDefs::X); ny=1;
ny=myDetector->getMaxNumberOfChannels(slsDetectorDefs::Y); nx=myDetector->getMaxNumberOfModules()*myDetector->getChansPerMod(0);
return nx; return nx;
} }