Changeset 10726


Ignore:
Timestamp:
May 17, 2011, 4:03:28 PM (8 years ago)
Author:
tbretz
Message:
Some fixes about LPext and LPint; DimStaticData::fEnable must be 90 not 80.
File:
1 edited

Legend:

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

    r10719 r10726  
    165165            kTrigger    = 0x80,  ///< Physics trigger decision (PhysicTrigger)
    166166            kPedestal   = 0x40,  ///< Pedestal trigger (artifical)
    167             kLPext      = 0x20,  ///< Enable trigger decision after light pulse (CalibrationTrigger, LP1)
    168             kLPint      = 0x10,  ///< Enable artificial trigger after light pulse (LP2)
     167            kLPint      = 0x20,  ///< Enable artificial trigger after light pulse (LP2)
     168            kLPext      = 0x10,  ///< Enable trigger decision after light pulse (CalibrationTrigger, LP1)
    169169            kExt2       = 0x08,  ///< External trigger signal 2
    170170            kExt1       = 0x04,  ///< External trigger signal 1
     
    227227
    228228        void Enable(GeneralSettings type, bool enable)  {
    229             if (enable) fGeneralSettings |= uint16_t(type); else fGeneralSettings &= ~uint16_t(type); }
     229            if (enable)
     230                fGeneralSettings |= uint16_t(type);
     231            else
     232                fGeneralSettings &= ~uint16_t(type); }
    230233
    231234        bool IsEnabled(GeneralSettings type)  { return fGeneralSettings&uint16_t(type); }
    232235
    233236        uint8_t GetSequencePed() const   { return (fTriggerSequence>>10)&0x1f; }
    234         uint8_t GetSequenceLPext() const { return (fTriggerSequence>> 5)&0x1f; }
    235         uint8_t GetSequenceLPint() const { return (fTriggerSequence)    &0x1f; }
     237        uint8_t GetSequenceLPint() const { return (fTriggerSequence>> 5)&0x1f; }
     238        uint8_t GetSequenceLPext() const { return (fTriggerSequence)    &0x1f; }
    236239
    237240    } __attribute__((__packed__));
     
    264267        uint16_t fClockConditioner[8];
    265268        //60
    266         uint16_t fEnable[80];  // 160*9bit = 180byte
     269        uint16_t fEnable[90];  // 160*9bit = 180byte
    267270        uint16_t fThreshold[160];
    268271        uint16_t fMultiplicity[40];     // N out of 4
     
    293296                       (uint64_t(d.fActiveFTU[3])<<30)),
    294297            fTriggerInterval(d.fTriggerInterval),
    295             fTriggerSeqLPint((d.fTriggerSequence)&0x1f),
    296             fTriggerSeqLPext((d.fTriggerSequence>>5)&0x1f),
     298            fTriggerSeqLPint((d.fTriggerSequence>>5)&0x1f),
     299            fTriggerSeqLPext((d.fTriggerSequence)&0x1f),
    297300            fTriggerSeqPed((d.fTriggerSequence>>10)&0x1f),
    298301            fMultiplicityPhysics(d.fMultiplicityPhysics),
     
    316319
    317320                fMultiplicity[i] = d[i].fDAC[4];
    318                 fPrescaling[i] = d[i].fPrescaling;
     321                fPrescaling[i] = d[i].fPrescaling+1;
    319322            }
    320             bitcpy(fEnable, 80, src, 160, 9);
     323            bitcpy(fEnable, 90, src, 160, 9);
    321324        }
    322325
Note: See TracChangeset for help on using the changeset viewer.