detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 17:19:20 +01:00
Code Issues Actions Packages Releases Activity

solved bug on the number of chans of multiSlsDetector

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@697 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2013-11-21 15:57:57 +00:00
parent 3b3e4eb8c3
commit 1ed2ba63b5
13 changed files with 125 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -560,7 +560,7 @@ int slsDetector::initializeDetectorSize(detectorType type) {
}
thisDetector->nChans=thisDetector->nChan[X]*thisDetector->nChan[Y];
thisDetector->nChips=thisDetector->nChip[X]*thisDetector->nChip[Y];
thisDetector->nModsMax=thisDetector->nModMax[0]*thisDetector->nModMax[1];
thisDetector->nModsMax=thisDetector->nModMax[X]*thisDetector->nModMax[Y];
/** number of modules is initally the maximum number of modules */
thisDetector->nMod[X]=thisDetector->nModMax[X];
thisDetector->nMod[Y]=thisDetector->nModMax[Y];
@@ -666,6 +666,9 @@ int slsDetector::initializeDetectorSize(detectorType type) {
thisDetector->chanoff=thisDetector->chipoff+sizeof(int)*thisDetector->nChips*thisDetector->nModsMax;
//update?!?!?!?
}
@@ -1524,7 +1527,10 @@ int slsDetector::getMaxNumberOfModules(dimension d){
return retval;
} else {
thisDetector->nModMax[d]=retval;
thisDetector->nModsMax=thisDetector->nModMax[0]*thisDetector->nModMax[1];
thisDetector->nModsMax=thisDetector->nModMax[X]*thisDetector->nModMax[Y];
}
return thisDetector->nModMax[d];
};

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@@ -685,7 +685,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
*/
int getMaxNumberOfModules(dimension d=X); //
/**
set/get the use of an external signal
\param pol meaning of the signal \sa externalSignalFlag

1
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@@ -1651,6 +1651,7 @@ string slsDetectorCommand::cmdFlatField(int narg, char *args[], int action){
sval=string(args[1]);
else
sval="none";
// cout << myDet->getMaxNumberOfChannels() << endl;
double corr[ myDet->getMaxNumberOfChannels()], ecorr[myDet->getMaxNumberOfChannels()];
if (myDet->getFlatFieldCorrection(corr,ecorr)) {
if (sval!="none") {

9
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@@ -80,12 +80,13 @@ void slsDetectorUtils::acquire(int delflag){
}
if (getActionMode(angCalLog))
if (getActionMode(angCalLog)) {
aclog=new angCalLogClass(this);
if (getActionMode(enCalLog))
}
if (getActionMode(enCalLog)) {
eclog=new enCalLogClass(this);
}