Changeset 10745

Timestamp:

05/19/11 08:52:00 (14 years ago)

Author:

tbretz

Message:

Renamed kTimeMarker to kClockConditioner; fixed Enable/DisablePixel

File:

• trunk/FACT++/src/HeadersFTM.h (modified) (5 diffs)

trunk/FACT++/src/HeadersFTM.h

@@ -157 +157 @@
             kMaxSequence        = 0x1f,
             kMaxDAC             = 0xfff,
+            kMaxAddr            = 0xfff,
             kMaxPixelIdx        = 1439,
             kMaskSettings       = 0xf,
@@ -171 +172 @@
             kExt1       = 0x04,  ///< External trigger signal 1
             kVeto       = 0x02,  ///< Veto trigger decision / artifical triggers
-            // -===> ClockCond
-            kTimeMarker = 0x01,  ///< Select clock conditioner frequency (1) / time marker (0) as output
+            kClockConditioner = 0x01,  ///< Select clock conditioner frequency (1) / time marker (0) as output
         };
 
@@ -238 +238 @@
         void EnablePixel(int idx, bool enable)
         {
-            const int board =  idx%40;
-            const int patch = (idx/40)/9;
-            const int pixel = (idx/40)%9;
+            const int pixel = idx%9;
+            const int patch = (idx/9)%4;
+            const int board = (idx/9)/4;
 
             uint16_t &pix = fBoard[board/10][board%10].fEnable[patch];
@@ -248 +248 @@
             else
                 pix &= ~(1<<pixel);
+        }
+
+        bool Enabled(uint16_t idx)
+        {
+            const int pixel = idx%9;
+            const int patch = (idx/9)%4;
+            const int board = (idx/9)/4;
+
+            return (fBoard[board/10][board%10].fEnable[patch]>>pixel)&1;
         }
 
@@ -296 +305 @@
         bool HasExt1() const        { return fGeneralSettings & StaticData::kExt1; }
         bool HasVeto() const        { return fGeneralSettings & StaticData::kVeto; }
-        bool HasTimeMarker() const  { return fGeneralSettings & StaticData::kTimeMarker; }
+        bool HasClockConditioner() const { return fGeneralSettings & StaticData::kClockConditioner; }
 
         bool IsActive(int i) const { return fActiveFTU&(uint64_t(1)<<i); }