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

trying to fix for 2D detector(eiger)

Browse Source
This commit is contained in:
Wang Xiaoqiang 2015-12-08 13:26:17 +01:00
parent 8ae1e812e6
commit 4fc8065ef5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

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