Changeset 14503 for trunk/FACT++/src

Timestamp:

10/22/12 20:43:00 (12 years ago)

Author:

tbretz

Message:

Added a third configuration error state which checks if the clock conditioner was locked.

Location:

trunk/FACT++/src

Files:

• HeadersFTM.h (modified) (1 diff)
• ftmctrl.cc (modified) (5 diffs)

trunk/FACT++/src/HeadersFTM.h

@@ -46 +46 @@
             kConfigError1 = 0x101,
             kConfigError2 = 0x102,
+            kConfigError3 = 0x103,
         };
     }

trunk/FACT++/src/ftmctrl.cc

@@ -1164 +1164 @@
         throw runtime_error("ConnectionFTM::GetState - Impossible code reached.");
     }
+
+    bool IsLocked() const { return fHeader.fState&FTM::kFtmLocked; }
 
     int GetCounter(FTM::Types type) { return fCounter[type]; }
@@ -1917 +1919 @@
         }
 
+        // FIXME: Add timeouts and go to error state
+        //        so that a configuration error can be handled
         switch (T::GetCurrentState())
         {
@@ -1957 +1961 @@
             // will be received
             fCounterStat = fFTM.GetCounter(FTM::kStaticData);
+
+            if (!fFtm.IsLocked())
+            {
+                 T::Warn("Configuration successfull, but clock conditioner not locked.");
+                 return FTM::State::kConfigError3;
+            }
 
             T::Info(" ==> TODO: Update run in database!");
@@ -1975 +1985 @@
         }
 
+        // FIXME: Do we have to check the state of the clock conditioner here?
+
         if (T::GetCurrentState()==FTM::State::kConfigured &&
             fFTM.GetState()==ConnectionFTM::kTriggerOn)
@@ -2015 +2027 @@
                         "Ethernet connection to FTM established, FTM trigger output to FADs enabled.");
 
-        T::AddStateName(FTM::State::kConfigError1, "ErrorInConfig1", "");
-        T::AddStateName(FTM::State::kConfigError2, "ErrorInConfig2", "");
+        T::AddStateName(FTM::State::kConfigError1, "ErrorInConfig1", "Unexpected state received from FTM");
+        T::AddStateName(FTM::State::kConfigError2, "ErrorInConfig2", "Unexpected state received from FTM");
+        T::AddStateName(FTM::State::kConfigError3, "ClockCondError", "Clock conditioner not locked");
 
         // FTM Commands