Changeset 10551 for trunk/FACT++/src

Timestamp:

05/04/11 09:51:19 (14 years ago)

Author:

tbretz

Message:

Fixed some treatment of 64bit values.

File:

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

trunk/FACT++/src/HeadersFTM.h

@@ -313 +313 @@
         StaticDataBoard fBoard[4][10];      // 4 crates * 10 boards
 
-        uint16_t fActiveFTU[4];
+        uint16_t fActiveFTU[4];             // 4 crates * 10 bits
 
         StaticData() { init(*this); }
@@ -332 +332 @@
         StaticDataBoard &operator[](int i) { return fBoard[i/10][i%10]; }
         const StaticDataBoard &operator[](int i) const { return fBoard[i/10][i%10]; }
+
+        void EnableFTU(int i)  { fActiveFTU[i/10] |=  (1<<(i%10)); }
+        void DisableFTU(int i) { fActiveFTU[i/10] &= ~(1<<(i%10)); }
+
+        void EnableAllFTU()  { for (int i=0; i<4; i++) fActiveFTU[i] = 0x3ff; }
+        void DisableAllFTU() { for (int i=0; i<4; i++) fActiveFTU[i] = 0;     }
 
     } __attribute__((__packed__));
@@ -377 +383 @@
         bool HasTimeMarker() const  { return fGeneralSettings & StaticData::kTimeMarker; }
 
-        bool IsActive(int i) const { return fActiveFTU&(1<<i); }
+        bool IsActive(int i) const { return fActiveFTU&(uint64_t(1)<<i); }
         bool IsEnabled(int i) const { return fEnable[i/16]&(1<<(i%16)); }
 
@@ -386 +392 @@
             fGeneralSettings(d.fGeneralSettings),
             fStatusLEDs(d.fStatusLEDs),
-            fActiveFTU(d.fActiveFTU[0] | (d.fActiveFTU[1]<<10) | (d.fActiveFTU[2]<<20) | (d.fActiveFTU[3]<<30)),
+            fActiveFTU( uint64_t(d.fActiveFTU[0])      |
+                       (uint64_t(d.fActiveFTU[1])<<10) |
+                       (uint64_t(d.fActiveFTU[2])<<20) |
+                       (uint64_t(d.fActiveFTU[3])<<30)),
             fTriggerInterval(d.fTriggerInterval*4+8),
             fTriggerSeqLP1((d.fTriggerSequence)&0x1f),