mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-09 03:20:42 +02:00
changed setctrbit command to resmat
This commit is contained in:
parent
1e3f9e8ead
commit
5d3c427f11
@ -163,7 +163,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
|
|||||||
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter;
|
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter;
|
||||||
i++;
|
i++;
|
||||||
|
|
||||||
descrToFuncMap[i].m_pFuncName="setctrbit"; //
|
descrToFuncMap[i].m_pFuncName="resmat"; //
|
||||||
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter;
|
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdCounter;
|
||||||
i++;
|
i++;
|
||||||
|
|
||||||
@ -2247,10 +2247,10 @@ string slsDetectorCommand::cmdCounter(int narg, char *args[], int action){
|
|||||||
retval=myDet->resetCounterBlock(ival);
|
retval=myDet->resetCounterBlock(ival);
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (string(args[0])==string("setctrbit")){
|
else if (string(args[0])==string("resmat")){
|
||||||
if (action==PUT_ACTION){
|
if (action==PUT_ACTION){
|
||||||
if (!sscanf(args[1],"%d",&ival))
|
if (!sscanf(args[1],"%d",&ival))
|
||||||
return string("Could not scan resetctrbit input ")+string(args[1]);
|
return string("Could not scan resmat input ")+string(args[1]);
|
||||||
if(ival>=0)
|
if(ival>=0)
|
||||||
sprintf(answer,"%d",myDet->setCounterBit(ival));
|
sprintf(answer,"%d",myDet->setCounterBit(ival));
|
||||||
}else
|
}else
|
||||||
@ -2271,12 +2271,12 @@ string slsDetectorCommand::helpCounter(int narg, char *args[], int action){
|
|||||||
if (action==PUT_ACTION || action==HELP_ACTION){
|
if (action==PUT_ACTION || action==HELP_ACTION){
|
||||||
os << "readctr \t Cannot put"<< std::endl;
|
os << "readctr \t Cannot put"<< std::endl;
|
||||||
os << "resetctr i \t resets counter in detector, restarts acquisition if i=1"<< std::endl;
|
os << "resetctr i \t resets counter in detector, restarts acquisition if i=1"<< std::endl;
|
||||||
os << "setctrbit i \t sets/resets counter bit in detector"<< std::endl;
|
os << "resmat i \t sets/resets counter bit in detector"<< std::endl;
|
||||||
}
|
}
|
||||||
if (action==GET_ACTION || action==HELP_ACTION){
|
if (action==GET_ACTION || action==HELP_ACTION){
|
||||||
os << "readctr i fname\t reads counter in detector to file fname, restarts acquisition if i=1"<< std::endl;
|
os << "readctr i fname\t reads counter in detector to file fname, restarts acquisition if i=1"<< std::endl;
|
||||||
os << "resetctr \t Cannot get"<< std::endl;
|
os << "resetctr \t Cannot get"<< std::endl;
|
||||||
os << "setctrbit i \t gets the counter bit in detector"<< std::endl;
|
os << "resmat i \t gets the counter bit in detector"<< std::endl;
|
||||||
}
|
}
|
||||||
return os.str();
|
return os.str();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user