Changeset 10727 for trunk

Timestamp:

05/17/11 16:05:30 (14 years ago)

Author:

tbretz

Message:

Some fixes about LPext and LPint; DimStaticData::fEnable is now 90 not 80.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -685 +685 @@
             return false;
 
-
         bool ident = true;
         for (int i=0; i<40; i++)
@@ -795 +794 @@
         const uint16_t oldseq = fStaticData.fTriggerSequence;
 
+        if (d[0]>FTM::StaticData::kMaxSequence ||
+            d[1]>FTM::StaticData::kMaxSequence ||
+            d[2]>FTM::StaticData::kMaxSequence)
+            return false;
+
         fStaticData.Enable(FTM::StaticData::kPedestal, d[0]>0);
         fStaticData.Enable(FTM::StaticData::kLPext,    d[1]>0);
         fStaticData.Enable(FTM::StaticData::kLPint,    d[2]>0);
 
-        if (d[0]>FTM::StaticData::kMaxSequence ||
-            d[1]>FTM::StaticData::kMaxSequence ||
-            d[2]>FTM::StaticData::kMaxSequence)
-            return false;
-
         fStaticData.fTriggerSequence =
-            (uint16_t(d[0])<<10) | (uint16_t(d[1])<<5) | uint16_t(d[2]);
+            (uint16_t(d[0])<<10) | (uint16_t(d[2])<<5) | uint16_t(d[1]);
 
         if (oldseq!=fStaticData.fTriggerSequence || oldset!=fStaticData.fGeneralSettings)
@@ -974 +973 @@
         fDimError         ("FTM_CONTROL/ERROR",           "X:1;S:1;S:28", ""),
         fDimFtuList       ("FTM_CONTROL/FTU_LIST",        "X:1;X:1;S:1;C:4;X:40;C:40;C:40",  ""),
-        fDimStaticData    ("FTM_CONTROL/STATIC_DATA",     "X:1;S:1;S:1;X:1;S:1;S:3;S:1;S:1;S:1;S:1;S:1;S:1;I:1;S:8;S:80;S:160;S:40;S:40", ""),
+        fDimStaticData    ("FTM_CONTROL/STATIC_DATA",     "X:1;S:1;S:1;X:1;S:1;S:3;S:1;S:1;S:1;S:1;S:1;S:1;I:1;S:8;S:90;S:160;S:40;S:40", ""),
         fDimDynamicData   ("FTM_CONTROL/DYNAMIC_DATA",    "X:1;X:1;F:4;I:160;I:40;S:40;S:40", ""),
         fDimCounter       ("FTM_CONTROL/COUNTER",         "I:6", "")
@@ -1234 +1233 @@
             return T::kSM_FatalError;
 
-        if (!fFTM.SetPrescaling(evt.GetInt()))
+        if (!fFTM.SetPrescaling(evt.GetInt()-1))
             T::Warn("SetPrescaling -  Value out of range.");
 
@@ -1581 +1580 @@
 
         fFTM.StartConnect();
-    }
-
-        /// Just for test purpose, do not touch
-    int Test(const Event &evt)
-    {
-        const Converter conv(T::Out(), evt.GetFormat(), false);
-        T::Out() << kBlue << evt.GetName();
-        T::Out() << " " << conv.GetString(evt.GetData(), evt.GetSize());
-        T::Out() << endl;
-
-        return T::GetCurrentState();
     }