mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-06 01:50:40 +02:00
status start should not look for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@296 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
parent
4e3fc179fa
commit
0c89b0986f
@ -883,24 +883,8 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) {
|
|||||||
myDet->setOnline(ONLINE_FLAG);
|
myDet->setOnline(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")
|
||||||
//receiver
|
|
||||||
if(myDet->setReceiverOnline()==ONLINE_FLAG){
|
|
||||||
if(myDet->setReceiverOnline(ONLINE_FLAG)!=ONLINE_FLAG)
|
|
||||||
return string("can not connect to receiver");
|
|
||||||
if(myDet->getReceiverStatus()!=RUNNING){
|
|
||||||
//update receiver index
|
|
||||||
if(myDet->setReceiverFileIndex(myDet->getFileIndex())==-1)
|
|
||||||
return string("could not set receiver file index");
|
|
||||||
//start receiver
|
|
||||||
myDet->startReceiver();
|
|
||||||
usleep(2000000);
|
|
||||||
if(myDet->getReceiverStatus()!=RUNNING)
|
|
||||||
return string("could not start receiver");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
myDet->startAcquisition();
|
myDet->startAcquisition();
|
||||||
}
|
|
||||||
else if (string(args[1])=="stop")
|
else if (string(args[1])=="stop")
|
||||||
myDet->stopAcquisition();
|
myDet->stopAcquisition();
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user