From d6c4ec184a0b5589c337f601e8fcb0a75fabba93 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 15 Dec 2015 14:25:53 +0100 Subject: [PATCH] should show progress for each measurement, not collectively --- slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index a4223a6d0..09ddb6fae 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -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;