Changeset 14956 for trunk/FACT++/src

Timestamp:

02/25/13 11:51:40 (12 years ago)

Author:

tbretz

Message:

The locking of the clock conditioner cannot be checked during configuration because the first report after configuration always states that it is not locked. However, if the trigger is switched on, it can be checked continously.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -1957 +1957 @@
                 return FTM::State::kConfigError2;
             // ======================
+            /*
             if (!fFTM.IsLocked())
             {
                  T::Warn("Configuration successfull, but clock conditioner not locked.");
                  return FTM::State::kConfigError3;
-            }
+            }*/
             // ======================
 
@@ -1977 +1978 @@
         case FTM::State::kConfigError2:
         case FTM::State::kConfigError3:
-            return T::GetCurrentState();
+            break;
 
         default:
@@ -1994 +1995 @@
         if (T::GetCurrentState()==FTM::State::kConfigured &&
             fFTM.GetState()==ConnectionFTM::kTriggerOn)
+        {
+            if (!fFTM.IsLocked())
+            {
+                T::Warn("Configuration successfull, but clock conditioner not locked.");
+                return FTM::State::kConfigError3;
+            }
+
             return FTM::State::kTriggerOn;
+        }
 
         return T::GetCurrentState();