Changeset 10726 for trunk/FACT++/src

Timestamp:

05/17/11 16:03:28 (13 years ago)

Author:

tbretz

Message:

Some fixes about LPext and LPint; DimStaticData::fEnable must be 90 not 80.

File:

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

trunk/FACT++/src/HeadersFTM.h

@@ -165 +165 @@
             kTrigger    = 0x80,  ///< Physics trigger decision (PhysicTrigger)
             kPedestal   = 0x40,  ///< Pedestal trigger (artifical)
-            kLPext      = 0x20,  ///< Enable trigger decision after light pulse (CalibrationTrigger, LP1)
-            kLPint      = 0x10,  ///< Enable artificial trigger after light pulse (LP2)
+            kLPint      = 0x20,  ///< Enable artificial trigger after light pulse (LP2)
+            kLPext      = 0x10,  ///< Enable trigger decision after light pulse (CalibrationTrigger, LP1)
             kExt2       = 0x08,  ///< External trigger signal 2
             kExt1       = 0x04,  ///< External trigger signal 1
@@ -227 +227 @@
 
         void Enable(GeneralSettings type, bool enable)  {
-            if (enable) fGeneralSettings |= uint16_t(type); else fGeneralSettings &= ~uint16_t(type); }
+            if (enable)
+                fGeneralSettings |= uint16_t(type);
+            else
+                fGeneralSettings &= ~uint16_t(type); }
 
         bool IsEnabled(GeneralSettings type)  { return fGeneralSettings&uint16_t(type); }
 
         uint8_t GetSequencePed() const   { return (fTriggerSequence>>10)&0x1f; }
-        uint8_t GetSequenceLPext() const { return (fTriggerSequence>> 5)&0x1f; }
-        uint8_t GetSequenceLPint() const { return (fTriggerSequence)    &0x1f; }
+        uint8_t GetSequenceLPint() const { return (fTriggerSequence>> 5)&0x1f; }
+        uint8_t GetSequenceLPext() const { return (fTriggerSequence)    &0x1f; }
 
     } __attribute__((__packed__));
@@ -264 +267 @@
         uint16_t fClockConditioner[8];
         //60
-        uint16_t fEnable[80];  // 160*9bit = 180byte
+        uint16_t fEnable[90];  // 160*9bit = 180byte
         uint16_t fThreshold[160];
         uint16_t fMultiplicity[40];     // N out of 4
@@ -293 +296 @@
                        (uint64_t(d.fActiveFTU[3])<<30)),
             fTriggerInterval(d.fTriggerInterval),
-            fTriggerSeqLPint((d.fTriggerSequence)&0x1f),
-            fTriggerSeqLPext((d.fTriggerSequence>>5)&0x1f),
+            fTriggerSeqLPint((d.fTriggerSequence>>5)&0x1f),
+            fTriggerSeqLPext((d.fTriggerSequence)&0x1f),
             fTriggerSeqPed((d.fTriggerSequence>>10)&0x1f),
             fMultiplicityPhysics(d.fMultiplicityPhysics),
@@ -316 +319 @@
 
                 fMultiplicity[i] = d[i].fDAC[4];
-                fPrescaling[i] = d[i].fPrescaling;
+                fPrescaling[i] = d[i].fPrescaling+1;
             }
-            bitcpy(fEnable, 80, src, 160, 9);
+            bitcpy(fEnable, 90, src, 160, 9);
         }