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

back

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-18 14:05:05 +02:00
parent eec812f92c
commit a7e8ff1c42
3 changed files with 63 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -58,9 +58,6 @@ int slsDetectorUtils::acquire(int delflag){
if(!receiver){
setDetectorIndex(-1);
}else{
///*
receiverStoppedFlag = 0;
//*/
//put receiver read frequency to random if no gui
int ret = setReadReceiverFrequency(0);
if(ret>0 && (dataReady == NULL)){
@ -151,27 +148,16 @@ int slsDetectorUtils::acquire(int delflag){
if(receiver){
if(getReceiverStatus()!=IDLE)
stopReceiver();
if(setReceiverOnline()==OFFLINE_FLAG){
if(setReceiverOnline()==OFFLINE_FLAG)
*stoppedFlag=1;
///*
receiverStoppedFlag = 1;
//*/
}
//multi detectors shouldnt have different receiver read frequencies enabled/disabled
if(setReadReceiverFrequency(0) < 0){
std::cout << "Error: The receiver read frequency is invalid:" << setReadReceiverFrequency(0) << std::endl;
*stoppedFlag=1;
///*
receiverStoppedFlag = 1;
//*/
}
if(setReceiverOnline()==OFFLINE_FLAG){
if(setReceiverOnline()==OFFLINE_FLAG)
*stoppedFlag=1;
///*
receiverStoppedFlag = 1;
//*/
}
}
@ -304,9 +290,6 @@ int slsDetectorUtils::acquire(int delflag){
if(setReceiverOnline()==OFFLINE_FLAG){
stopReceiver();
*stoppedFlag=1;
///*
receiverStoppedFlag = 1;
//*/
pthread_mutex_unlock(&mg);
break;
}
@ -314,9 +297,6 @@ int slsDetectorUtils::acquire(int delflag){
if(startReceiver() == FAIL) {
stopReceiver();
*stoppedFlag=1;
///*
receiverStoppedFlag = 1;
//*/
pthread_mutex_unlock(&mg);
break;
}
@ -363,9 +343,6 @@ int slsDetectorUtils::acquire(int delflag){
pthread_mutex_lock(&mg);
//offline
if(setReceiverOnline()==OFFLINE_FLAG){
///*
receiverStoppedFlag = 1;
//*/
if ((getDetectorsType()==GOTTHARD) || (getDetectorsType()==MOENCH) || (getDetectorsType()==JUNGFRAU) ){
if((*correctionMask)&(1<<WRITE_FILE))
closeDataFile();
@ -374,9 +351,6 @@ int slsDetectorUtils::acquire(int delflag){
//online
else{
stopReceiver();
///*
receiverStoppedFlag = 1;
//*/
// cout<<"***********receiver stopped"<<endl;
}
pthread_mutex_unlock(&mg);