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

client: multi added indices for detpos in function signature for required

Browse Source
This commit is contained in:
maliakal_d 2018-10-03 11:41:50 +02:00
parent 70ea4b48c3
commit fdcd633769
2 changed files with 151 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

File diff suppressed because it is too large Load Diff

25
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2151,9 +2151,6 @@ string slsDetectorCommand::cmdData(int narg, char *args[], int action, int detPo
return string("cannot set"); return string("cannot set");
} else if (action==HELP_ACTION) { } else if (action==HELP_ACTION) {
return helpData(HELP_ACTION); return helpData(HELP_ACTION);
} else if (detPos >= 0) {
cprintf(RED, "Error: Individual detectors not allowed for readout. Aborting.\n");
return string("unsuccessful");
} else { } else {
b=myDet->setThreadedProcessing(-1); b=myDet->setThreadedProcessing(-1);
myDet->setThreadedProcessing(0); myDet->setThreadedProcessing(0);
@ -2190,23 +2187,23 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action, int det
return helpStatus(action); return helpStatus(action);
if (cmd=="status") { if (cmd=="status") {
myDet->setOnline(ONLINE_FLAG); myDet->setOnline(detPos, ONLINE_FLAG);
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
//myDet->setThreadedProcessing(0); //myDet->setThreadedProcessing(0);
if (string(args[1])=="start") if (string(args[1])=="start")
myDet->startAcquisition(); myDet->startAcquisition(detPos);
else if (string(args[1])=="stop") { else if (string(args[1])=="stop") {
myDet->setReceiverOnline(ONLINE_FLAG);//restream stop myDet->setReceiverOnline(detPos, ONLINE_FLAG);//restream stop
myDet->stopAcquisition(); myDet->stopAcquisition(detPos);
} }
else if (string(args[1])=="trigger") { else if (string(args[1])=="trigger") {
myDet->sendSoftwareTrigger(); myDet->sendSoftwareTrigger(detPos);
} }
else else
return string("unknown action"); return string("unknown action");
} }
runStatus s=myDet->getRunStatus(); runStatus s=myDet->getRunStatus(detPos);
return myDet->runStatusType(s); return myDet->runStatusType(detPos, s);
} }
else if (cmd=="busy") { else if (cmd=="busy") {
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
@ -2249,8 +2246,8 @@ string slsDetectorCommand::cmdDataStream(int narg, char *args[], int action, int
int ival=-1; int ival=-1;
char ans[100]=""; char ans[100]="";
myDet->setOnline(ONLINE_FLAG); myDet->setOnline(detPos, ONLINE_FLAG);
myDet->setReceiverOnline(ONLINE_FLAG); myDet->setReceiverOnline(detPos, ONLINE_FLAG);
if (action==HELP_ACTION) if (action==HELP_ACTION)
return helpDataStream(HELP_ACTION); return helpDataStream(HELP_ACTION);
@ -2258,10 +2255,10 @@ string slsDetectorCommand::cmdDataStream(int narg, char *args[], int action, int
if (action==PUT_ACTION) { if (action==PUT_ACTION) {
if (!sscanf(args[1],"%d",&ival)) if (!sscanf(args[1],"%d",&ival))
return string ("cannot scan rx_datastream mode"); return string ("cannot scan rx_datastream mode");
myDet->enableDataStreamingFromReceiver(ival); myDet->enableDataStreamingFromReceiver(detPos, ival);
} }
sprintf(ans,"%d",myDet->enableDataStreamingFromReceiver()); sprintf(ans,"%d",myDet->enableDataStreamingFromReceiver(detPos));
return string(ans); return string(ans);
} }