From 439c2b1de8e1bd4fc3a3a47231389a4e12e27926 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Mon, 29 Oct 2012 17:01:59 +0000 Subject: [PATCH] got rid of client telling detector that receiver is down each time it doesnt work git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@325 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/slsDetector/slsDetector.cpp | 6 ------ slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index e9c5b1754..1c4eeb598 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -1062,9 +1062,6 @@ int slsDetector::setTCPSocket(string const name, int const control_port, int con std::cout<< "offline!" << std::endl; #endif } - //default receiver off. if it was on by default, client doesnt know - if(thisDetector->onlineFlag==ONLINE_FLAG) - detectorSendToReceiver(false); return retval; }; @@ -5302,9 +5299,6 @@ int slsDetector::setReceiverOnline(int off) { } } } - //To ensure detector knows, if receiver suddenly went down - if((prev==ONLINE_FLAG)&&(thisDetector->receiverOnlineFlag==OFFLINE_FLAG)) - detectorSendToReceiver(false); return thisDetector->receiverOnlineFlag; } diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 6b8d4a396..ec7ce3af9 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -790,6 +790,7 @@ string slsDetectorCommand::cmdAcquire(int narg, char *args[], int action) { if(receiver) myDet->stopReceiver(); + return string(""); }