Changeset 12332 for trunk

Timestamp:

10/30/11 22:34:59 (13 years ago)

Author:

tbretz

Message:

Replaced kTakingData by kTriggerOn

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -33 +33 @@
         kIdle,
         kConfigured,  // Returned if idle and fBufStaticData==fStaticData
-        kTakingData,
+        kTriggerOn,
     };
 
@@ -1155 +1155 @@
         case FTM::kFtmRunning:
         case FTM::kFtmCalib:
-            return kTakingData;
+            return kTriggerOn;
 
         case FTM::kFtmIdle:
@@ -1904 +1904 @@
             case ConnectionFTM::kIdle:         return FTM::kIdle;
             case ConnectionFTM::kConfigured:   return FTM::kIdle;
-            case ConnectionFTM::kTakingData:   return FTM::kTakingData;
+            case ConnectionFTM::kTriggerOn:    return FTM::kTriggerOn;
             default:
                 throw runtime_error("StateMachienFTM - Execute() - Inavlid state.");
@@ -1911 +1911 @@
 
         if (T::GetCurrentState()==FTM::kConfigured &&
-            fFTM.GetState()==ConnectionFTM::kTakingData)
-            return FTM::kTakingData;
+            fFTM.GetState()==ConnectionFTM::kTriggerOn)
+            return FTM::kTriggerOn;
 
         return T::GetCurrentState();
@@ -1947 +1947 @@
                         "Received answer identical with target configuration.");
 
-        T::AddStateName(FTM::kTakingData, "TriggerOn",
-                        "Ethernet connection to FTM established, FTM is in taking data state (trigger switched on).");
+        T::AddStateName(FTM::kTriggerOn, "TriggerOn",
+                        "Ethernet connection to FTM established, FTM trigger output to FADs enabled.");
 
         T::AddStateName(FTM::kConfigError1, "ErrorInConfig1", "");
@@ -1985 +1985 @@
             ("start a run (start distributing triggers)");
 
-        T::AddEvent("STOP_RUN", FTM::kTakingData)
+        T::AddEvent("STOP_RUN", FTM::kTriggerOn)
             (Wrapper(bind(&ConnectionFTM::CmdStopRun, &fFTM)))
             ("stop a run (stop distributing triggers)");
@@ -1998 +1998 @@
              "|status[bool]:disable or enable that the FTM sends rate reports (yes/no)");
 
-        T::AddEvent("SET_THRESHOLD", "I:2", FTM::kIdle, FTM::kTakingData)
+        T::AddEvent("SET_THRESHOLD", "I:2", FTM::kIdle, FTM::kTriggerOn)
             (bind(&StateMachineFTM::SetThreshold, this, placeholders::_1))
             ("Set the comparator threshold"
@@ -2004 +2004 @@
              "|Threshold[counts]:Threshold to be set in binary counts");
 
-        T::AddEvent("SET_N_OUT_OF_4", "I:2", FTM::kIdle, FTM::kTakingData)
+        T::AddEvent("SET_N_OUT_OF_4", "I:2", FTM::kIdle, FTM::kTriggerOn)
             (bind(&StateMachineFTM::SetNoutof4, this, placeholders::_1))
             ("Set the comparator threshold"
@@ -2020 +2020 @@
              "|Enable[bool]:Whether FTU should be enabled or disabled (yes/no)");
 
-        T::AddEvent("DISABLE_PIXEL", "S:1", FTM::kIdle, FTM::kTakingData)
+        T::AddEvent("DISABLE_PIXEL", "S:1", FTM::kIdle, FTM::kTriggerOn)
             (bind(&StateMachineFTM::EnablePixel, this, placeholders::_1, false))
             ("(-1 or all)");
 
-        T::AddEvent("ENABLE_PIXEL", "S:1", FTM::kIdle, FTM::kTakingData)
+        T::AddEvent("ENABLE_PIXEL", "S:1", FTM::kIdle, FTM::kTriggerOn)
             (bind(&StateMachineFTM::EnablePixel, this, placeholders::_1, true))
             ("(-1 or all)");
@@ -2155 +2155 @@
         // A new configure will first stop the FTM this means
         // we can allow it in idle _and_ taking data
-        T::AddEvent("CONFIGURE", "C", FTM::kIdle, FTM::kConfiguring1, FTM::kConfiguring2, FTM::kConfigured, FTM::kTakingData)
+        T::AddEvent("CONFIGURE", "C", FTM::kIdle, FTM::kConfiguring1, FTM::kConfiguring2, FTM::kConfigured, FTM::kTriggerOn)
             (bind(&StateMachineFTM::ConfigureFTM, this, placeholders::_1))
             ("");