detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 17:58:05 +01:00
Code Issues Actions Packages Releases Activity

switching off gui, and acqire should work

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-07 10:21:22 +02:00
parent b1dde586e1
commit dc16d52d49
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -5552,7 +5552,7 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
} }
} }
}
int ret=-100, ret1; int ret=-100, ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) { for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) { if (detectors[idet]) {
@@ -5566,9 +5566,10 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
} }
} }
} if (ret < 0)
cprintf(BLUE,"threadStarted:%d\n",threadStarted); return -1;
return threadStarted; else
return (ret & threadStarted);
} }
int multiSlsDetector::enableReceiverCompression(int i){ int multiSlsDetector::enableReceiverCompression(int i){

2
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@@ -73,7 +73,7 @@ int slsDetectorUtils::acquire(int delflag){
enableDataStreamingFromReceiver(0); //no call back but streaming enabled, then dont stream. enableDataStreamingFromReceiver(0); //no call back but streaming enabled, then dont stream.
} }
}else{ }else{
if(*threadedProcessing && (!ret)){ if(*threadedProcessing && (!ret || ret == -1)){
cout << "Enabling Data Streaming from Receiver" << endl; cout << "Enabling Data Streaming from Receiver" << endl;
enableDataStreamingFromReceiver(1); //call back exists, threaded but streaming disabled, then stream. enableDataStreamingFromReceiver(1); //call back exists, threaded but streaming disabled, then stream.
} }