Changeset 14504 for trunk/FACT++/src

Timestamp:

10/22/12 20:47:49 (12 years ago)

Author:

tbretz

Message:

Allow to reset the new state.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -1957 +1957 @@
                 return FTM::State::kConfigError2;
             // ======================
-
-            // Check configuration again when a new static data block
-            // will be received
-            fCounterStat = fFTM.GetCounter(FTM::kStaticData);
-
             if (!fFtm.IsLocked())
             {
@@ -1967 +1962 @@
                  return FTM::State::kConfigError3;
             }
+            // ======================
+
+            // Check configuration again when a new static data block
+            // will be received
+            fCounterStat = fFTM.GetCounter(FTM::kStaticData);
 
             T::Info(" ==> TODO: Update run in database!");
@@ -2238 +2238 @@
             ("");
 
-        T::AddEvent("RESET_CONFIGURE", FTM::State::kConfiguring1, FTM::State::kConfiguring2, FTM::State::kConfigured, FTM::State::kConfigError1, FTM::State::kConfigError2)
+        T::AddEvent("RESET_CONFIGURE", FTM::State::kConfiguring1, FTM::State::kConfiguring2, FTM::State::kConfigured, FTM::State::kConfigError1, FTM::State::kConfigError2, FTM::State::kConfigError2)
             (bind(&StateMachineFTM::ResetConfig, this))
-            ("");
+            ("Reset states during a configuration or in case of configuration error");