Changeset 10554 for trunk/FACT++

Timestamp:

05/04/11 10:20:17 (14 years ago)

Author:

tbretz

Message:

Fixed a 64bit issue for DimFtuList::IsActive; added ToggleFTU

File:

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

trunk/FACT++/src/HeadersFTM.h

@@ -336 +336 @@
         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;     }
+        void EnableAllFTU()    { for (int i=0; i<4; i++) fActiveFTU[i] = 0x3ff; }
+        void DisableAllFTU()   { for (int i=0; i<4; i++) fActiveFTU[i] = 0;     }
+
+        void ToggleFTU(int i)  { fActiveFTU[i/10] ^= (1<<(i%10)); }
 
     } __attribute__((__packed__));
@@ -591 +593 @@
         DimFtuList(const Header &h, const FtuList &d) :
             fTimeStamp(h.fTimeStamp),
-            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)),
             fNumBoards(d.fNumBoards)
         {
@@ -605 +610 @@
         }
 
-        bool IsActive(int i) const { return fActiveFTU&(1<<i); }
+        bool IsActive(int i) const { return fActiveFTU&(uint64_t(1)<<i); }
 
     } __attribute__((__packed__));