diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index 04e732017..13ac75e2d 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -40,6 +40,14 @@ slsDetectorUtils::slsDetectorUtils() { void slsDetectorUtils::acquire(int delflag){ + // setTotalProgress(); + //moved these 2 here for measurement change + progressIndex=0; + *stoppedFlag=0; + + int measurement = (int)setTimer(slsDetectorDefs::MEASUREMENTS_NUMBER,-1); + + for(int im=0;im0) - nc=timerValue[MEASUREMENTS_NUMBER]; + nm=timerValue[MEASUREMENTS_NUMBER]; if (*numberOfPositions>0) npos=*numberOfPositions;