Changeset 11483 for trunk/FACT++/src/mcp.cc

Timestamp:

07/20/11 10:27:17 (13 years ago)

Author:

tbretz

Message:

Added a registry for wildcarded options to detect unaccessed options; for this EvalConfiguration(const Configuration&) has been changed to EvalOptions(Configuration&)

File:

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

trunk/FACT++/src/mcp.cc

@@ -179 +179 @@
     int Reset(const EventImp &evt)
     {
+        fRunType = "";
         return kStateIdle;
         /*
@@ -200 +201 @@
     }
 
+    string fRunType;
+
     int StartRun(const EventImp &evt)
     {
+        Message("Starting configuration '"+evt.GetString()+"' for new run.");
+        fRunType = evt.GetString();
         return kStateConfiguring1;
     }
@@ -225 +230 @@
                 if (fStatusLog.second!=30/*kSM_WaitForRun*/)
                     Dim::SendCommand("DATA_LOGGER/WAIT_FOR_RUN_NUMBER");
-                Dim::SendCommand("FTM_CONTROL/CONFIGURE", "data");
+                Dim::SendCommand("FTM_CONTROL/CONFIGURE", fRunType);
                 return kStateConfiguring2;
             }
@@ -236 +241 @@
                     return GetCurrentState();
 
-                Dim::SendCommand("FAD_CONTROL/CONFIGURE", "data");
+                Dim::SendCommand("FAD_CONTROL/CONFIGURE", fRunType);
                 return kStateConfiguring3;
             }
@@ -248 +253 @@
                 Message("START DATA TAKING");
                 Fatal("Distribute run-number to start datalogger!");
-                Fatal("fadctrl should go out of Configured after first event received!");
-                Fatal("Must configure if FTM should be started or not?");
+                //Fatal("Must configure if FTM should be started or not?");
                 Dim::SendCommand("FTM_CONTROL/START_RUN");
                 return kStateConfigured;
@@ -329 +333 @@
 
 
-        AddEvent("START", kStateIdle)
+        AddEvent("START", "C", kStateIdle)
             (bind(&StateMachineMCP::StartRun, this, placeholders::_1))
             ("");
@@ -352 +356 @@
     }
 
-    int EvalConfiguration(const Configuration &conf)
+    int EvalOptions(Configuration &conf)
     {
         //SetEndpoint(conf.Get<string>("addr"));
@@ -401 +405 @@
 
 template<class T>
-int RunShell(const Configuration &conf)
+int RunShell(Configuration &conf)
 {
     return Main<T, StateMachineMCP>(conf);