Changeset 12654 for trunk/FACT++/src

Timestamp:

11/27/11 10:33:59 (13 years ago)

Author:

tbretz

Message:

Changing the step size didn't work with the previous implementation.

File:

• trunk/FACT++/src/ratescan.cc (modified) (10 diffs)

trunk/FACT++/src/ratescan.cc

@@ -68 +68 @@
     DimDescribedService fDimProc;
 
-    int fCounter;
     int fSeconds;
-
     int fSecondsMax;
+
+    int fThreshold;
     int fThresholdMin;
     int fThresholdMax;
@@ -154 +154 @@
                 return;
 
-            if (fCounter<0/* || fStatusFTM.second!=FTM::kTakingData*/)
+            if (fThreshold<0/* || fStatusFTM.second!=FTM::kTakingData*/)
                 return;
 
@@ -176 +176 @@
             {
                 Message("Rate scan stopped due zero trigger rate.");
-                fCounter = -1;
+                fThreshold = -1;
                 return;
             }
@@ -208 +208 @@
 
             const double   time = sdata.fElapsedTime*fSeconds;
-            const uint32_t th   = fThresholdMin+fCounter*fThresholdStep;
+            const uint32_t th   = fThreshold;
 
             float data[2+3+1+40+160];
@@ -237 +237 @@
             fDimData.Update();
 
-            fCounter++;
+            fThreshold += fThresholdStep;
 
             if (fSeconds>=fSecondsMax)
             {
                 Message("Rate scan stopped due to timeout.");
-                fCounter=-1;
+                fThreshold=-1;
                 return;
             }
 
-            if (fThresholdMin+fCounter*fThresholdStep>fThresholdMax)
+            if (fThreshold>fThresholdMax)
             {
                 Message("Rate scan finished.");
-                fCounter = -1;
-
-                //DimClient::sendCommandNB("FTM_CONTROL/STOP_TRIGGER", NULL, 0);
+                fThreshold = -1;
                 return;
             }
@@ -257 +255 @@
             fSeconds = -2;  // FIXME: In principle one missed report is enough
 
-            const int32_t cmd[2] = { -1, fThresholdMin+fCounter*fThresholdStep };
+            const int32_t cmd[2] = { -1, fThreshold };
             DimClient::sendCommandNB(fCommand.c_str(), (void*)cmd, 8);
         }
@@ -324 +322 @@
         //Dim::SendCommand("FTM_CONTROL/STOP_TRIGGER");
 
-        fCounter = 0;
+        fThreshold = fThresholdMin;
         fSeconds = -2;
 
@@ -338 +336 @@
     int StopRateScan()
     {
-        fCounter = -1;
+        fThreshold = -1;
         Message("Rate scan manually stopped.");
 
@@ -431 +429 @@
         // At least one subsystem is not connected
         //        if (fStatusFTM.second>=FTM::kConnected)
-        return fCounter<0 ? kStateConnected : kStateInProgress;
+        return fThreshold<0 ? kStateConnected : kStateInProgress;
     }
 
@@ -447 +445 @@
                  "|max[DAC]:Value at which scan will end"
                  "|step[DAC]:Step size for scan"),
-        fCounter(-1), fReference(kCamera), fReferenceIdx(0)
+        fThreshold(-1), fReference(kCamera), fReferenceIdx(0)
     {
         // ba::io_service::work is a kind of keep_alive for the loop.