Changeset 10574


Ignore:
Timestamp:
May 4, 2011, 3:26:57 PM (8 years ago)
Author:
tbretz
Message:
Renamed LP1/LP2 to Lpint/LPext
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/HeadersFTM.h

    r10558 r10574  
    288288            kTrigger    = 0x80,
    289289            kPedestal   = 0x40,
    290             kLP      = 0x20,
    291             kLP      = 0x10,
     290            kLPext      = 0x20,
     291            kLPint      = 0x10,
    292292            kExt2       = 0x08,
    293293            kExt1       = 0x04,
     
    354354        uint16_t fTriggerInterval;         // only 10 bit used
    355355        //22
    356         uint16_t fTriggerSeqLP1;           // only 5bits used
    357         uint16_t fTriggerSeqLP2;           // only 5bits used
     356        uint16_t fTriggerSeqLPint;         // only 5bits used
     357        uint16_t fTriggerSeqLPext;         // only 5bits used
    358358        uint16_t fTriggerSeqPed;           // only 5bits used
    359359        //28
     
    378378        bool HasTrigger() const     { return fGeneralSettings & StaticData::kTrigger; }
    379379        bool HasPedestal() const    { return fGeneralSettings & StaticData::kPedestal; }
    380         bool HasLP2() const         { return fGeneralSettings & StaticData::kLP2; }
    381         bool HasLP1() const         { return fGeneralSettings & StaticData::kLP1; }
     380        bool HasLPext() const       { return fGeneralSettings & StaticData::kLPext; }
     381        bool HasLPint() const       { return fGeneralSettings & StaticData::kLPint; }
    382382        bool HasExt2() const        { return fGeneralSettings & StaticData::kExt2; }
    383383        bool HasExt1() const        { return fGeneralSettings & StaticData::kExt1; }
     
    399399                       (uint64_t(d.fActiveFTU[3])<<30)),
    400400            fTriggerInterval(d.fTriggerInterval*4+8),
    401             fTriggerSeqLP1((d.fTriggerSequence)&0x1f),
    402             fTriggerSeqLP2((d.fTriggerSequence>>5)&0x1f),
     401            fTriggerSeqLPint((d.fTriggerSequence)&0x1f),
     402            fTriggerSeqLPext((d.fTriggerSequence>>5)&0x1f),
    403403            fTriggerSeqPed((d.fTriggerSequence>>10)&0x1f),
    404404            fCoincidencePhysics(d.fCoincidencePhysics),
Note: See TracChangeset for help on using the changeset viewer.