Changeset 11372

Timestamp:

07/13/11 14:51:35 (13 years ago)

Author:

tbretz

Message:

Some little changes to the output; use Vec<> instead of Get<vector<string>> fo rthe configuration

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (6 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -1597 +1597 @@
         if (fTargetConfig==fConfigs.end())
         {
-            T::Error("Configuration '"+name+"' not found.");
+            T::Error("ConfigureFTM - Run-type '"+name+"' not found.");
             return T::GetCurrentState();
         }
@@ -1609 +1609 @@
     }
 
-    int ResetConfig(const EventImp &)
+    int ResetConfig()
     {
         return fFTM.GetState();
@@ -1900 +1900 @@
 
         T::AddEvent("RESET_CONFIGURE", FTM::kConfiguring1, FTM::kConfiguring2, FTM::kConfigured, FTM::kConfigError1, FTM::kConfigError2)
-            (boost::bind(&StateMachineFTM::ResetConfig, this, _1))
+            (boost::bind(&StateMachineFTM::ResetConfig, this))
             ("");
 
@@ -1994 +1994 @@
 
         // ---------- Setup clock conditioner frequencies ----------
-        const vector<uint16_t> freq = conf.Get<vector<uint16_t>>("clock-conditioner.frequency");
+        const vector<uint16_t> freq = conf.Vec<uint16_t>("clock-conditioner.frequency");
         if (freq.size()==0)
             T::Warn("No frequencies for the clock-conditioner defined.");
-
-        T::Message("Defining clock conditioner frequencies");
+        else
+            T::Message("Defining clock conditioner frequencies");
         for (vector<uint16_t>::const_iterator it=freq.begin();
              it!=freq.end(); it++)
@@ -2040 +2040 @@
 
         // ---------- Setup run types ---------
-        const vector<string> types = conf.Get<vector<string>>("run-type");
+        const vector<string> types = conf.Vec<string>("run-type");
         if (types.size()==0)
             T::Warn("No run-types defined.");
-
-        T::Message("Defining run-types");
+        else
+            T::Message("Defining run-types");
         for (vector<string>::const_iterator it=types.begin();
              it!=types.end(); it++)
         {
+            T::Message(" -> "+ *it);
+
             if (fConfigs.count(*it)>0)
             {
@@ -2161 +2163 @@
             // kMaxDAC = 0xfff,
         }
+
+        // FIXME: Add a check about unsused configurations
 
         // ---------- FOR TESTING PURPOSE ---------