Changeset 12428 for trunk/FACT++

Timestamp:

11/06/11 18:09:30 (13 years ago)

Author:

tbretz

Message:

Added the controlling of the rate control.

File:

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

trunk/FACT++/src/mcp.cc

@@ -65 +65 @@
     pair<Time, int> fStatusFAD;
     pair<Time, int> fStatusLog;
+    pair<Time, int> fStatusRC;
 
     DimStampedInfo fDim;
@@ -70 +71 @@
     DimStampedInfo fFAD;
     DimStampedInfo fLog;
+    DimStampedInfo fRC;
 
     pair<Time, int> GetNewState(DimStampedInfo &info) const
@@ -104 +106 @@
         {
             fStatusLog = GetNewState(fLog);
+            return;
+        }
+
+        if (curr==&fRC)
+        {
+            fStatusRC = GetNewState(fRC);
             return;
         }
@@ -163 +171 @@
         PrintState(fStatusFAD, "FAD_CONTROL");
         PrintState(fStatusLog, "DATA_LOGGER");
+        PrintState(fStatusRC,  "RATE_CONTROL");
 
         return GetCurrentState();
@@ -308 +317 @@
                     return GetCurrentState();
 
+                Message("Starting Rate Control");
+                Dim::SendCommand("RATE_CONTROL/START_DATA_TAKING");
+
                 Message("Starting FAD");
                 ConfigureFAD();
@@ -316 +328 @@
             {
                 if (fStatusFTM.second != FTM::kConfigured ||
-                    fStatusFAD.second != FAD::kConfigured)
+                    fStatusFAD.second != FAD::kConfigured ||
+                    fStatusRC.second  < 7)
                     return GetCurrentState();
 
@@ -364 +377 @@
         fFTM("FTM_CONTROL/STATE",      (void*)NULL, 0, this),
         fFAD("FAD_CONTROL/STATE",      (void*)NULL, 0, this),
-        fLog("DATA_LOGGER/STATE",      (void*)NULL, 0, this)
+        fLog("DATA_LOGGER/STATE",      (void*)NULL, 0, this),
+        fRC("RATE_CONTROL/STATE",      (void*)NULL, 0, this)
     {
         // ba::io_service::work is a kind of keep_alive for the loop.