detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 07:20:01 +02:00
Code Issues Actions Packages Releases Activity

resolved the recovering from receiver start error , but still does not acknowledge error in gui

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-03-10 13:24:00 +01:00
parent e86e9361b6
commit 0a1aaec708
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -7525,9 +7525,12 @@ int slsDetector::startReceiver(){
setErrorMask((getErrorMask())|(COULDNOT_START_RECEIVER)); setErrorMask((getErrorMask())|(COULDNOT_START_RECEIVER));
} }
} }
//let detector prepare anyway even if receiver didnt work //let detector prepare anyway even if receiver didnt work (for those not using the receiver)
if((thisDetector->myDetectorType != JUNGFRAU)) if((thisDetector->myDetectorType != JUNGFRAU)) {
ret=detectorSendToReceiver(true); int ret1 = detectorSendToReceiver(true);
if (ret != FAIL)
ret = ret1;
}
return ret; return ret;
} }

8
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -226,9 +226,6 @@ int slsDetectorUtils::acquire(int delflag){
for (int ip=0; ip<np; ip++) { for (int ip=0; ip<np; ip++) {
//let processing thread listen to these packets
sem_post(&sem_newRTAcquisition);
// cout << "positions " << endl; // cout << "positions " << endl;
if (*stoppedFlag==0) { if (*stoppedFlag==0) {
if (getNumberOfPositions()>0) { if (getNumberOfPositions()>0) {
@ -297,12 +294,17 @@ int slsDetectorUtils::acquire(int delflag){
setFileName(fileIO::getFileName()); setFileName(fileIO::getFileName());
//start receiver //start receiver
if(startReceiver() == FAIL) { if(startReceiver() == FAIL) {
cout << "Start receiver failed " << endl;
stopReceiver(); stopReceiver();
*stoppedFlag=1; *stoppedFlag=1;
pthread_mutex_unlock(&mg); pthread_mutex_unlock(&mg);
break; break;
} }
pthread_mutex_unlock(&mg); pthread_mutex_unlock(&mg);
//let processing thread listen to these packets
sem_post(&sem_newRTAcquisition);
} }
#ifdef VERBOSE #ifdef VERBOSE
cout << "Acquiring " << endl; cout << "Acquiring " << endl;