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

some jctb changes

Browse Source
This commit is contained in:
bergamaschi
2015-06-12 13:00:13 +02:00
parent bd3466b04f
commit de0f35afb3
8 changed files with 253 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -896,8 +896,8 @@ slsDetectorDefs::sls_detector_module* slsDetector::createModule(detectorType t)
na=1;
break;
case JUNGFRAUCTB:
nch=32;
nm=1;
nch=1//32;
nm=32;
nc=1;
nd=8; // dacs+adcs
na=1;
@ -1560,7 +1560,6 @@ int slsDetector::setNumberOfModules(int n, dimension d){
int slsDetector::getMaxNumberOfModules(dimension d){
int retval;

3
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -684,6 +684,9 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
*/
int setNumberOfModules(int n=GET_FLAG, dimension d=X); // if n=GET_FLAG returns the number of installed modules
/*
returns the instrinsic size of the detector (maxmodx, maxmody, nchans, nchips, ndacs
enum numberOf {

26
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -402,6 +402,10 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
i++;
descrToFuncMap[i].m_pFuncName="roimask"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdDetectorSize;
i++;
/* flags */
@ -2904,13 +2908,17 @@ string slsDetectorCommand::cmdDetectorSize(int narg, char *args[], int action) {
if (action==PUT_ACTION) {
if (cmd=="maxmod")
return string("cannot put!");
else if (cmd=="roimask"){
if (!sscanf(args[1],"%d",&val))
return string("could not scan ")+string(args[0])+string(" ")+string(args[1]);
}
else if (!sscanf(args[1],"%d",&val))
return string("could not scan ")+string(args[0])+string(" ")+string(args[1]);
return string("could not scan ")+string(args[0])+string(" ")+string(args[1]);
if (cmd=="roi"){
//debug number of arguments
if ((val<0) || (narg!=((val*4)+2)) )
return helpDetectorSize(narg,args,action);
//debug number of arguments
if ((val<0) || (narg!=((val*4)+2)) )
return helpDetectorSize(narg,args,action);
ROI allroi[val];
pos=2;
for(i=0;i<val;i++){
@ -2929,9 +2937,10 @@ string slsDetectorCommand::cmdDetectorSize(int narg, char *args[], int action) {
if ((narg > 2) && (sscanf(args[2],"%d",&val)) && (val>0))
myDet->setMaxNumberOfChannelsPerDetector(Y,val);
}
}
if (cmd=="nmod") {
if (cmd=="nmod" || cmd=="roimask") {
ret=myDet->setNumberOfModules(val);
} else if (cmd=="maxmod") {
ret=myDet->getMaxNumberOfModules();
@ -2949,8 +2958,11 @@ string slsDetectorCommand::cmdDetectorSize(int narg, char *args[], int action) {
else
return string("unknown detector size ")+cmd;
sprintf(ans,"%d",ret);
if (cmd=="roimask")
sprintf(ans,"%x",ret);
else
sprintf(ans,"%d",ret);
return string(ans);
}