From d92a6649ee1f9ed4cfbc035c427bc1e9d171b55a Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Mon, 10 Sep 2012 17:55:26 +0000
Subject: [PATCH] updated number of measurements to reflect in acquire

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@248 951219d9-93cf-4727-9268-0efd64621fa3
---
 .../slsDetector/slsDetectorUtils.cpp          | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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;im<measurement;im++) {
 
   angCalLogClass *aclog=NULL;
   enCalLogClass *eclog=NULL;
@@ -73,12 +81,6 @@ void  slsDetectorUtils::acquire(int delflag){
   
   
 
- // setTotalProgress();
-  progressIndex=0;
-  *stoppedFlag=0;
-
-
-
   
   pthread_mutex_lock(&mp);
   resetFinalDataQueue();
@@ -326,10 +328,14 @@ void  slsDetectorUtils::acquire(int delflag){
      delete eclog;
 
 
+
    if (acquisition_finished) {
      acquisition_finished(getCurrentProgress(),getDetectorStatus(),acqFinished_p);
    }
 
+  }
+
+
 }
 
 
@@ -349,7 +355,7 @@ int slsDetectorUtils::setTotalProgress() {
 	nc=timerValue[CYCLES_NUMBER];
 
   if (timerValue[MEASUREMENTS_NUMBER]>0)
-	nc=timerValue[MEASUREMENTS_NUMBER];
+	nm=timerValue[MEASUREMENTS_NUMBER];
 
   if (*numberOfPositions>0)
 	npos=*numberOfPositions;