Changeset 10574 for trunk/FACT++/src

Timestamp:

05/04/11 15:26:57 (14 years ago)

Author:

tbretz

Message:

Renamed LP1/LP2 to Lpint/LPext

File:

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

trunk/FACT++/src/HeadersFTM.h

@@ -288 +288 @@
             kTrigger    = 0x80,
             kPedestal   = 0x40,
-            kLP2        = 0x20,
-            kLP1        = 0x10,
+            kLPext      = 0x20,
+            kLPint      = 0x10,
             kExt2       = 0x08,
             kExt1       = 0x04,
@@ -354 +354 @@
         uint16_t fTriggerInterval;         // only 10 bit used
         //22
-        uint16_t fTriggerSeqLP1;           // only 5bits used
-        uint16_t fTriggerSeqLP2;           // only 5bits used
+        uint16_t fTriggerSeqLPint;         // only 5bits used
+        uint16_t fTriggerSeqLPext;         // only 5bits used
         uint16_t fTriggerSeqPed;           // only 5bits used
         //28
@@ -378 +378 @@
         bool HasTrigger() const     { return fGeneralSettings & StaticData::kTrigger; }
         bool HasPedestal() const    { return fGeneralSettings & StaticData::kPedestal; }
-        bool HasLP2() const         { return fGeneralSettings & StaticData::kLP2; }
-        bool HasLP1() const         { return fGeneralSettings & StaticData::kLP1; }
+        bool HasLPext() const       { return fGeneralSettings & StaticData::kLPext; }
+        bool HasLPint() const       { return fGeneralSettings & StaticData::kLPint; }
         bool HasExt2() const        { return fGeneralSettings & StaticData::kExt2; }
         bool HasExt1() const        { return fGeneralSettings & StaticData::kExt1; }
@@ -399 +399 @@
                        (uint64_t(d.fActiveFTU[3])<<30)),
             fTriggerInterval(d.fTriggerInterval*4+8),
-            fTriggerSeqLP1((d.fTriggerSequence)&0x1f),
-            fTriggerSeqLP2((d.fTriggerSequence>>5)&0x1f),
+            fTriggerSeqLPint((d.fTriggerSequence)&0x1f),
+            fTriggerSeqLPext((d.fTriggerSequence>>5)&0x1f),
             fTriggerSeqPed((d.fTriggerSequence>>10)&0x1f),
             fCoincidencePhysics(d.fCoincidencePhysics),