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

getdata from commandline was getting stuck:fixed,eiger server remembers frame and exptime period cuz getstatus doesn work for now, request images, added setting image number in eigerserver, packetsize fixed in eigerserver

Browse Source
This commit is contained in:
Maliakal Dhanya
2014-06-16 17:00:21 +02:00
parent 73ba765647
commit cf52d85f73
8 changed files with 67 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -999,7 +999,9 @@ string slsDetectorCommand::cmdData(int narg, char *args[], int action) {
myDet->setThreadedProcessing(0);
myDet->setOnline(ONLINE_FLAG);
myDet->readAll();
myDet->processData(1);
//processdata in receiver is useful only for gui purposes
if(myDet->setReceiverOnline()==OFFLINE_FLAG)
myDet->processData(1);
myDet->setThreadedProcessing(b);
return string("");
}
@ -1031,7 +1033,9 @@ string slsDetectorCommand::cmdFrame(int narg, char *args[], int action) {
myDet->setThreadedProcessing(0);
myDet->setOnline(ONLINE_FLAG);
myDet->readFrame();
myDet->processData(1);
//processdata in receiver is useful only for gui purposes
if(myDet->setReceiverOnline()==OFFLINE_FLAG)
myDet->processData(1);
myDet->setThreadedProcessing(b);
return string("ok");
}
@ -4012,10 +4016,11 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
else if(!strcasecmp(args[1],"stop")){
myDet->startReceiverReadout();
runStatus s = myDet->getReceiverStatus();
while((s != RUN_FINISHED)&&(s != IDLE))
while(s != RUN_FINISHED){
usleep(50000);
if(s != IDLE)
myDet->stopReceiver();
s = myDet->getReceiverStatus();
}
myDet->stopReceiver();
}
else
return helpReceiver(narg, args, action);