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

switched

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-18 12:33:47 +02:00
parent de5037ae2b
commit eec812f92c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5212,7 +5212,6 @@ void multiSlsDetector::startReceivingDataThread(){
//end of socket ("end") //end of socket ("end")
if (len < 1024*256 ) { if (len < 1024*256 ) {
/* /*
}
if(!len) cprintf(RED,"Received no data in socket for %d\n", ithread); if(!len) cprintf(RED,"Received no data in socket for %d\n", ithread);
//#ifdef VERYVERBOSE //#ifdef VERYVERBOSE
cprintf(RED,"End of socket for %d\n", ithread); cprintf(RED,"End of socket for %d\n", ithread);

14
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -154,7 +154,7 @@ int slsDetectorUtils::acquire(int delflag){
if(setReceiverOnline()==OFFLINE_FLAG){ if(setReceiverOnline()==OFFLINE_FLAG){
*stoppedFlag=1; *stoppedFlag=1;
///* ///*
receiverStoppedFlag = 0; receiverStoppedFlag = 1;
//*/ //*/
} }
//multi detectors shouldnt have different receiver read frequencies enabled/disabled //multi detectors shouldnt have different receiver read frequencies enabled/disabled
@ -162,14 +162,14 @@ int slsDetectorUtils::acquire(int delflag){
std::cout << "Error: The receiver read frequency is invalid:" << setReadReceiverFrequency(0) << std::endl; std::cout << "Error: The receiver read frequency is invalid:" << setReadReceiverFrequency(0) << std::endl;
*stoppedFlag=1; *stoppedFlag=1;
///* ///*
receiverStoppedFlag = 0; receiverStoppedFlag = 1;
//*/ //*/
} }
if(setReceiverOnline()==OFFLINE_FLAG){ if(setReceiverOnline()==OFFLINE_FLAG){
*stoppedFlag=1; *stoppedFlag=1;
///* ///*
receiverStoppedFlag = 0; receiverStoppedFlag = 1;
//*/ //*/
} }
} }
@ -305,7 +305,7 @@ int slsDetectorUtils::acquire(int delflag){
stopReceiver(); stopReceiver();
*stoppedFlag=1; *stoppedFlag=1;
///* ///*
receiverStoppedFlag = 0; receiverStoppedFlag = 1;
//*/ //*/
pthread_mutex_unlock(&mg); pthread_mutex_unlock(&mg);
break; break;
@ -315,7 +315,7 @@ int slsDetectorUtils::acquire(int delflag){
stopReceiver(); stopReceiver();
*stoppedFlag=1; *stoppedFlag=1;
///* ///*
receiverStoppedFlag = 0; receiverStoppedFlag = 1;
//*/ //*/
pthread_mutex_unlock(&mg); pthread_mutex_unlock(&mg);
break; break;
@ -364,7 +364,7 @@ int slsDetectorUtils::acquire(int delflag){
//offline //offline
if(setReceiverOnline()==OFFLINE_FLAG){ if(setReceiverOnline()==OFFLINE_FLAG){
///* ///*
receiverStoppedFlag = 0; receiverStoppedFlag = 1;
//*/ //*/
if ((getDetectorsType()==GOTTHARD) || (getDetectorsType()==MOENCH) || (getDetectorsType()==JUNGFRAU) ){ if ((getDetectorsType()==GOTTHARD) || (getDetectorsType()==MOENCH) || (getDetectorsType()==JUNGFRAU) ){
if((*correctionMask)&(1<<WRITE_FILE)) if((*correctionMask)&(1<<WRITE_FILE))
@ -375,7 +375,7 @@ int slsDetectorUtils::acquire(int delflag){
else{ else{
stopReceiver(); stopReceiver();
///* ///*
receiverStoppedFlag = 0; receiverStoppedFlag = 1;
//*/ //*/
// cout<<"***********receiver stopped"<<endl; // cout<<"***********receiver stopped"<<endl;
} }