Changeset 12505 for trunk

Timestamp:

11/13/11 15:42:36 (13 years ago)

Author:

tbretz

Message:

Do not change rates if a ratescan is in progress.

File:

• trunk/FACT++/src/ratecontrol.cc (modified) (5 diffs)

trunk/FACT++/src/ratecontrol.cc

@@ -50 +50 @@
     pair<Time, int> fStatusDim;
     pair<Time, int> fStatusFTM;
+    pair<Time, int> fStatusRS;
 
     DimStampedInfo fDim;
@@ -55 +56 @@
     DimStampedInfo fRates;
     DimStampedInfo fStatic;
+    DimStampedInfo fRateScan;
 
 //    DimDescribedService fDimData;
@@ -348 +350 @@
             return;
         }
+        if (curr==&fRateScan)
+        {
+            fStatusRS = GetNewState(fRateScan);
+            fStatusRS.second = curr->getSize()==4 ? curr->getInt() : 0;
+            return;
+        }
 
         static vector<uint8_t> counter(160);
@@ -371 +379 @@
 
             if (!fTriggerOn && !fEnabled)
+                return;
+
+            if (fStatusRS.second==5)
                 return;
 
@@ -515 +526 @@
         // At least one subsystem is not connected
         //        if (fStatusFTM.second>=FTM::kConnected)
-        return fTriggerOn && fEnabled ? kStateInProgress : kStateConnected;
+        return fTriggerOn && fEnabled && fStatusRS.second!=5 ? kStateInProgress : kStateConnected;
     }