Changeset 15055 for trunk/FACT++/src

Timestamp:

03/13/13 14:24:49 (12 years ago)

Author:

tbretz

Message:

Removed the code dealing with the clock conditioner. There is now easy way to check that during configuration. This check has to be done continously somewhere else.

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/HeadersFTM.h

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

trunk/FACT++/src/ftmctrl.cc

@@ -1165 +1165 @@
     }
 
-    bool IsLocked() const { return fHeader.fState&FTM::kFtmLocked; }
+    // If fState==2, the clock conditioner will always be reported as unlocked
+    //bool IsLocked() const { return fHeader.fState&FTM::kFtmLocked; }
 
     int GetCounter(FTM::Types type) { return fCounter[type]; }
@@ -1957 +1958 @@
                 return FTM::State::kConfigError2;
             // ======================
+            // There is no simple way to check if the clock
+            // conditioner is locked. Every message send to request a static
+            // data block may end up in the same buffer at the FTM, thus
+            // the result will be that it is in state Configuring, which
+            // will always return the clock conditioner to be unlocked.
             /*
             if (!fFTM.IsLocked())
@@ -1969 +1975 @@
             fCounterStat = fFTM.GetCounter(FTM::kStaticData);
 
-            T::Info(" ==> TODO: Update run in database!");
             T::Message("Sending new configuration was successfull.");
 
@@ -1977 +1982 @@
         case FTM::State::kConfigError1:
         case FTM::State::kConfigError2:
-        case FTM::State::kConfigError3:
+        //case FTM::State::kConfigError3:
             break;
 
@@ -1991 +1996 @@
         }
 
-        // FIXME: Do we have to check the state of the clock conditioner here?
-
-        if (T::GetCurrentState()==FTM::State::kConfigured &&
+        /*
+        if (T::GetCurrentState()==FTM::State::kConfigured)
             fFTM.GetState()==ConnectionFTM::kTriggerOn)
         {
@@ -2004 +2008 @@
             return FTM::State::kTriggerOn;
         }
-
+        */
         return T::GetCurrentState();
     }
@@ -2043 +2047 @@
         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");
+        //T::AddStateName(FTM::State::kConfigError3, "ClockCondError", "Clock conditioner not locked");
 
         // FTM Commands