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

updated nchip to be defined in x and y directions

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@543 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-05-06 16:45:50 +00:00
parent f0e30926fe
commit 3ac133db98
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -493,6 +493,8 @@ int slsDetector::initializeDetectorSize(detectorType type) {
thisDetector->nChan[X]=128; thisDetector->nChan[X]=128;
thisDetector->nChan[Y]=1; thisDetector->nChan[Y]=1;
thisDetector->nChips=10; thisDetector->nChips=10;
thisDetector->nChip[X]=10;
thisDetector->nChip[Y]=1;
thisDetector->nDacs=6; thisDetector->nDacs=6;
thisDetector->nAdcs=0; thisDetector->nAdcs=0;
thisDetector->nModMax[X]=24; thisDetector->nModMax[X]=24;
@ -508,6 +510,8 @@ int slsDetector::initializeDetectorSize(detectorType type) {
thisDetector->nChan[X]=128; thisDetector->nChan[X]=128;
thisDetector->nChan[Y]=1; thisDetector->nChan[Y]=1;
thisDetector->nChips=12; thisDetector->nChips=12;
thisDetector->nChip[X]=12;
thisDetector->nChip[Y]=1;
thisDetector->nDacs=6; thisDetector->nDacs=6;
thisDetector->nAdcs=0; thisDetector->nAdcs=0;
thisDetector->nModMax[X]=6; thisDetector->nModMax[X]=6;
@ -519,6 +523,8 @@ int slsDetector::initializeDetectorSize(detectorType type) {
thisDetector->nChan[X]=128; thisDetector->nChan[X]=128;
thisDetector->nChan[Y]=1; thisDetector->nChan[Y]=1;
thisDetector->nChips=10; thisDetector->nChips=10;
thisDetector->nChip[X]=10;
thisDetector->nChip[Y]=1;
thisDetector->nDacs=8; thisDetector->nDacs=8;
thisDetector->nAdcs=5; thisDetector->nAdcs=5;
thisDetector->nModMax[X]=1; thisDetector->nModMax[X]=1;
@ -530,6 +536,8 @@ int slsDetector::initializeDetectorSize(detectorType type) {
thisDetector->nChan[X]=160; thisDetector->nChan[X]=160;
thisDetector->nChan[Y]=160; thisDetector->nChan[Y]=160;
thisDetector->nChips=1; thisDetector->nChips=1;
thisDetector->nChip[X]=1;
thisDetector->nChip[Y]=1;
thisDetector->nDacs=8; thisDetector->nDacs=8;
thisDetector->nAdcs=1; thisDetector->nAdcs=1;
thisDetector->nModMax[X]=1; thisDetector->nModMax[X]=1;
@ -541,6 +549,8 @@ int slsDetector::initializeDetectorSize(detectorType type) {
thisDetector->nChan[X]=0; thisDetector->nChan[X]=0;
thisDetector->nChan[Y]=0; thisDetector->nChan[Y]=0;
thisDetector->nChips=0; thisDetector->nChips=0;
thisDetector->nChip[X]=0;
thisDetector->nChip[Y]=0;
thisDetector->nDacs=0; thisDetector->nDacs=0;
thisDetector->nAdcs=0; thisDetector->nAdcs=0;
thisDetector->nModMax[X]=0; thisDetector->nModMax[X]=0;

11
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -120,6 +120,8 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int nChan[2]; int nChan[2];
/** number of chips per module*/ /** number of chips per module*/
int nChips; int nChips;
/** number of chips per module in one direction */
int nChip[2];
/** number of dacs per module*/ /** number of dacs per module*/
int nDacs; int nDacs;
/** number of adcs per module */ /** number of adcs per module */
@ -572,6 +574,9 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/** Returns the number of chips per module (without connecting to the detector) */ /** Returns the number of chips per module (without connecting to the detector) */
int getNChips(){return thisDetector->nChips;}; // int getNChips(){return thisDetector->nChips;}; //
/** Returns the number of chips per module (without connecting to the detector) */
int getNChips(dimension d){return thisDetector->nChip[d];}; //
/** Returns the number of modules (without connecting to the detector) */ /** Returns the number of modules (without connecting to the detector) */
int getNMods(){return thisDetector->nMods;}; // int getNMods(){return thisDetector->nMods;}; //
@ -580,7 +585,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int getChansPerMod(int imod=0){return thisDetector->nChans*thisDetector->nChips;}; int getChansPerMod(int imod=0){return thisDetector->nChans*thisDetector->nChips;};
int getChansPerMod( dimension d,int imod=0){return thisDetector->nChan[d]*thisDetector->nChips;}; int getChansPerMod( dimension d,int imod=0){return thisDetector->nChan[d]*thisDetector->nChip[d];};
/** Returns the max number of modules in direction d (without connecting to the detector) */ /** Returns the max number of modules in direction d (without connecting to the detector) */
int getNMaxMod(dimension d){return thisDetector->nModMax[d];}; // int getNMaxMod(dimension d){return thisDetector->nModMax[d];}; //
@ -591,11 +596,11 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int getTotalNumberOfChannels(){return thisDetector->nChans*thisDetector->nChips*thisDetector->nMods;}; int getTotalNumberOfChannels(){return thisDetector->nChans*thisDetector->nChips*thisDetector->nMods;};
int getTotalNumberOfChannels(dimension d){return thisDetector->nChan[d]*thisDetector->nChips*thisDetector->nMod[d];}; int getTotalNumberOfChannels(dimension d){return thisDetector->nChan[d]*thisDetector->nChip[d]*thisDetector->nMod[d];};
int getMaxNumberOfChannels(){return thisDetector->nChans*thisDetector->nChips*thisDetector->nModsMax;}; int getMaxNumberOfChannels(){return thisDetector->nChans*thisDetector->nChips*thisDetector->nModsMax;};
int getMaxNumberOfChannels(dimension d){return thisDetector->nChan[d]*thisDetector->nChips*thisDetector->nModMax[d];}; int getMaxNumberOfChannels(dimension d){return thisDetector->nChan[d]*thisDetector->nChip[d]*thisDetector->nModMax[d];};
/** Returns number of rois */ /** Returns number of rois */
int getNRoi(){return thisDetector->nROI;}; int getNRoi(){return thisDetector->nROI;};