Changeset 13746 for trunk

Timestamp:

05/16/12 09:06:27 (13 years ago)

Author:

tbretz

Message:

Added some more informal output, added teh fStatc again - I don't understand why I removed that.

File:

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

trunk/FACT++/src/ratecontrol.cc

@@ -59 +59 @@
     DimStampedInfo fFTM;
     DimStampedInfo fRates;
-//    DimStampedInfo fStatic;
+    DimStampedInfo fStatic;
     DimStampedInfo fRateScan;
 
@@ -371 +371 @@
 
         static vector<uint8_t> counter(160);
-/*
         if (curr==&fStatic)
         {
@@ -385 +384 @@
             return;
         }
-*/
+
         if (curr==&fRates)
         {
@@ -413 +412 @@
     {
         if (!fTriggerOn)
+        {
+            Info("Trigger not switched on... CALIBRATE command ignored.");
             return kStateGlobalThresholdSet;
+        }
 
         const int32_t val[2] = { -1, fThresholdReference };
@@ -424 +426 @@
         fEnabled      = true;
         fCounter      = 0;
+
+        ostringstream out;
+        out << "Rate calibration started at a threshold of " << fThresholdReference << " with a target rate of " << fTargetRate << " Hz";
+        Info(out);
 
         return kStateSettingGlobalThreshold;
@@ -491 +497 @@
             Out() << "V" << fStatusDim.second/100 << 'r' << fStatusDim.second%100 << endl;
 
-        PrintState(fStatusFTM,  "FTM_CONTROL");
+        PrintState(fStatusRS,  "RATE_SCAN");
+        PrintState(fStatusFTM, "FTM_CONTROL");
 
         return GetCurrentState();
@@ -550 +557 @@
         fFTM("FTM_CONTROL/STATE",       (void*)NULL, 0, this),
         fRates("FTM_CONTROL/TRIGGER_RATES", (void*)NULL, 0, this),
+        fStatic("FTM_CONTROL/STATIC_DATA", (void*)NULL, 0, this),
         fRateScan("RATE_SCAN/STATE", (void*)NULL, 0, this)/*,
-        fStatic("FTM_CONTROL/STATIC_DATA", (void*)NULL, 0, this)/*,
         fDimData("RATE_SCAN/DATA", "I:1;F:1;F:1;F:1;F:40;F:160", ""),
         fDimProc("RATE_SCAN/PROCESS_DATA", "I:1;I:1;I:1",