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

Merge branch 'release' into jungfrauv1.0

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-02-03 15:05:50 +01:00
parent bef8d413d6 316ecf1b50
commit 6cc22a350d
9 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@@ -155,10 +155,6 @@ int slsDetectorUtils::acquire(int delflag){
*stoppedFlag=1;
}
//resets frames caught in receiver
resetFramesCaught();
if(setReceiverOnline()==OFFLINE_FLAG)
*stoppedFlag=1;
}
@@ -181,6 +177,11 @@ int slsDetectorUtils::acquire(int delflag){
cout << " starting measurement "<< im << " of " << nm << endl;
#endif
//resets frames caught in receiver
if(receiver){
resetFramesCaught();
}
//cout << "data thread started " << endl;