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

getRunStatus becomes purely virtual in slsDetector and returns already the runStatus type variable

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@14 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2010-04-19 14:46:34 +00:00
parent 26765a30b7
commit 2dd7b2c67b
5 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2231,7 +2231,7 @@ int slsDetector::startReadOut(){
int slsDetector::getRunStatus(){
/*int slsDetector::getRunStatus(){
int fnum=F_GET_RUN_STATUS;
int retval;
int ret=FAIL;
@ -2257,6 +2257,7 @@ int slsDetector::getRunStatus(){
};
*/
int* slsDetector::readFrame(){
@ -2598,7 +2599,7 @@ int64_t slsDetector::getTimeLeft(timerIndex index){
std::cout<< "Detector returned error: " << mess << std::endl;
} else {
controlSocket->ReceiveDataOnly(&retval,sizeof(retval));
thisDetector->timerValue[index]=retval;
// thisDetector->timerValue[index]=retval;
}
controlSocket->Disconnect();
}

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -896,7 +896,7 @@ typedef struct sharedSlsDetector {
get run status
\returns status mask
*/
int getRunStatus();
virtual runStatus getRunStatus()=0;
/**
start detector acquisition and read all data putting them a data queue