From ec88d571270b78eee36aa1d2f75bea9b0fbd5170 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Tue, 18 Mar 2014 16:10:41 +0000 Subject: [PATCH] the basic functions connected to eiger class git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@793 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsReceiver/slsReceiverFunctionList.cpp | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp index 009d8b8ba..1f4efa918 100644 --- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp +++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp @@ -266,7 +266,10 @@ char* slsReceiverFunctionList::setFilePath(char c[]){ char* slsReceiverFunctionList::getFileName(){ - return fileName; + if(myDetectorType == EIGER) + receiver->getFileName(); + else + return fileName; } char* slsReceiverFunctionList::setFileName(char c[]){ @@ -327,7 +330,10 @@ int slsReceiverFunctionList::setEnableFileWrite(int i){ /*other parameters*/ slsDetectorDefs::runStatus slsReceiverFunctionList::getStatus(){ - return status; + if(myDetectorType == EIGER) + return receiver->getStatus(); + else + return status; } @@ -1057,6 +1063,11 @@ void slsReceiverFunctionList::closeFile(int ithr){ int slsReceiverFunctionList::startReceiver(char message[]){ + + if(myDetectorType == EIGER) + return receiver->startReceiver(message); + + //#ifdef VERBOSE cout << "Starting Receiver" << endl; //#endif @@ -1117,6 +1128,11 @@ int slsReceiverFunctionList::startReceiver(char message[]){ int slsReceiverFunctionList::stopReceiver(){ + + if(myDetectorType == EIGER) + return receiver->stopReceiver(); + + //#ifdef VERBOSE cout << "Stopping Receiver" << endl; //#endif