Changeset 13718 for trunk/FACT++

Timestamp:

05/14/12 14:39:02 (13 years ago)

Author:

tbretz

Message:

Implemented blocking which makes sure that if only a single channel's threshold is set it is not set twice without break. Due to a firmware bug the FTU would stop counting otherwise and we always get the same rate.

File:

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

trunk/FACT++/src/ratecontrol.cc

@@ -48 +48 @@
     bool fTriggerOn;
 
+    vector<bool> fBlock;
+
     DimServiceInfoList fNetwork;
 
@@ -154 +156 @@
         const uint32_t val[2] = { idx,  diff };
         DimClient::sendCommandNB("FTM_CONTROL/SET_THRESHOLD", (void*)val, 8);
+
+        fBlock[idx] = true;
     }
 
@@ -214 +218 @@
             }
 
+            vector<bool> block(160);
+
             for (int j=0; j<4; j++)
             {
+                if (fBlock[i*4+j])
+                {
+                    fBlock[i*4+j] = false;
+                    continue;
+                }
+
                 // For the noise pixel correct down to median+3*deviation
                 if (maxi==j)
@@ -532 +544 @@
 public:
     StateMachineRateControl(ostream &out=cout) : StateMachineDim(out, "RATE_CONTROL"),
-        fTriggerOn(false),
+        fTriggerOn(false), fBlock(160),
         fStatusDim(make_pair(Time(), -2)),
         fStatusFTM(make_pair(Time(), -2)),