Changeset 14991

Timestamp:

03/07/13 09:56:09 (13 years ago)

Author:

tbretz

Message:

Added calibration start and calibration end time to RATE_CONTROL/THRESHOLD and send QoS to signal what kind of result we have.

Location:

trunk/FACT++/src

Files:

• HeadersRateControl.h (modified) (1 diff)
• ratecontrol.cc (modified) (5 diffs)

trunk/FACT++/src/HeadersRateControl.h

@@ -18 +18 @@
             kInProgress,
         };
-    }
+    };
+
+    struct DimThreshold
+    {
+        uint16_t threshold;
+        double   begin;
+        double   end;
+    }  __attribute__((__packed__));
 }
 

trunk/FACT++/src/ratecontrol.cc

@@ -52 +52 @@
 
     uint64_t fCounter;
+
+    Time fCalibrationTimeStart;
 
     bool CheckEventSize(const EventImp &evt, size_t size)
@@ -283 +285 @@
         {
             fThresholds.assign(160, fThresholdMin);
-            fDimThreshold.Update(fThresholdMin);
+
+            const RateControl::DimThreshold data = { fThresholdMin, fCalibrationTimeStart.Mjd(), Time().Mjd() };
+            fDimThreshold.setQuality(0);
+            fDimThreshold.Update(data);
+
+            ostringstream out;
+            out << setprecision(3);
+            out << "Measured rate " << fTriggerRate << "Hz below target rate " << fTargetRate << "... mininum threshold set to " << fThresholdMin;
+            Info(out);
+
             return RateControl::State::kGlobalThresholdSet;
         }
@@ -294 +305 @@
         if (diff<=fThresholdMin)
         {
-            fDimThreshold.Update(fThresholdMin);
+            const RateControl::DimThreshold data = { fThresholdMin, fCalibrationTimeStart.Mjd(), Time().Mjd() };
+            fDimThreshold.setQuality(1);
+            fDimThreshold.Update(data);
+
+            ostringstream out;
+            out << setprecision(3);
+            out << "Next step would be 0... mininum threshold set to " << fThresholdMin;
+            Info(out);
+
             return RateControl::State::kGlobalThresholdSet;
         }
@@ -368 +387 @@
         fTriggerRate  = -1;
         fCounter      = 0;
+
+        fCalibrationTimeStart = Time();
 
         ostringstream out;
@@ -455 +476 @@
         fDimFTM("FTM_CONTROL"),
         fDimRS("RATE_SCAN"),
-        fDimThreshold("RATE_CONTROL/THRESHOLD", "S:1", "Resulting threshold after calibration|threshold[dac]:Resulting threshold from calibration")
+
+        fDimThreshold("RATE_CONTROL/THRESHOLD", "S:1;D:1;D:1",
+                      "Resulting threshold after calibration"
+                      "|threshold[dac]:Resulting threshold from calibration"
+                      "|begin[mjd]:Start time of calibration"
+                      "|end[mjd]:End time of calibration")
     {
         // ba::io_service::work is a kind of keep_alive for the loop.