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

changes for external gui

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-23 16:31:32 +02:00
parent 2116070f02
commit f4e2b819d2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4540,7 +4540,7 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){
if (connectData() == OK){ if (connectData() == OK){
ret=thisReceiver->sendIntArray(fnum2,retval,args,mess); ret=thisReceiver->sendIntArray(fnum2,retval,args,mess);
disconnectData(); disconnectData();
} }else cprintf(RED,"could not connect\n");
if((args[1] != retval)|| (ret==FAIL)){ if((args[1] != retval)|| (ret==FAIL)){
ret = FAIL; ret = FAIL;
cout << "ERROR: " << timername << " in receiver set incorrectly to " << retval << " instead of " << args[1] << endl; cout << "ERROR: " << timername << " in receiver set incorrectly to " << retval << " instead of " << args[1] << endl;

6
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -2295,7 +2295,9 @@ string slsDetectorCommand::cmdAcquire(int narg, char *args[], int action) {
myDet->setOnline(ONLINE_FLAG); myDet->setOnline(ONLINE_FLAG);
if (myDet->setReceiverOnline(ONLINE_FLAG) == ONLINE_FLAG) {
myDet->setReceiverOnline(ONLINE_FLAG);
/*if (myDet->setReceiverOnline(ONLINE_FLAG) == ONLINE_FLAG) {
// command line: must be off, if receiver on or there was -1, then // command line: must be off, if receiver on or there was -1, then
if (myDet->enableDataStreamingFromReceiver(-1) != 0){ if (myDet->enableDataStreamingFromReceiver(-1) != 0){
//switch it off, if error //switch it off, if error
@ -2303,7 +2305,7 @@ string slsDetectorCommand::cmdAcquire(int narg, char *args[], int action) {
return string("could not disable data streaming in receiver\n"); return string("could not disable data streaming in receiver\n");
} }
} }
} }*/
if(myDet->acquire() == FAIL) if(myDet->acquire() == FAIL)
return string("acquire unsuccessful"); return string("acquire unsuccessful");