From 0c89b0986f6daec33ea93c1339ea0f9a470850e8 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Tue, 16 Oct 2012 13:51:28 +0000 Subject: [PATCH] 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 --- .../slsDetector/slsDetectorCommand.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 49c6c1fcb..aaa9850a3 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -883,24 +883,8 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) { myDet->setOnline(ONLINE_FLAG); if (action==PUT_ACTION) { //myDet->setThreadedProcessing(0); - 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"); - } - } + if (string(args[1])=="start") myDet->startAcquisition(); - } else if (string(args[1])=="stop") myDet->stopAcquisition(); else