Changeset 12287


Ignore:
Timestamp:
10/26/11 23:20:03 (13 years ago)
Author:
tbretz
Message:
Adapted format string for TRIGGER_RATES
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/ftmctrl.cc

    r12177 r12287  
    11891189
    11901190    uint64_t fTimeStamp;
     1191    uint64_t fTimeStampOn;
    11911192    uint32_t fTriggerCounter;
    11921193
     
    12341235        fDimDynamicData.Update(data);
    12351236
    1236         float rate = -1;
     1237        float    rate = -1;
     1238        uint64_t tdiff = 0;
     1239        uint64_t odiff = 0;
    12371240        if (fHeader.fTimeStamp>=fTimeStamp && fHeader.fTriggerCounter>=fTriggerCounter)
    12381241        {
    1239             const uint64_t tdiff = fHeader.fTimeStamp     -fTimeStamp;
     1242            tdiff = fHeader.fTimeStamp          -fTimeStamp;
     1243            odiff = fDynamicData.fOnTimeCounter -fTimeStampOn;
     1244
    12401245            const uint32_t cdiff = fHeader.fTriggerCounter-fTriggerCounter;
    1241 
    12421246            rate = tdiff==0 ? 0 : 1000000*float(cdiff)/tdiff;
    12431247        }
    12441248
    12451249        fTimeStamp      = fHeader.fTimeStamp;
     1250        fTimeStampOn    = fDynamicData.fOnTimeCounter;
    12461251        fTriggerCounter = fHeader.fTriggerCounter;
    12471252
    1248         const FTM::DimTriggerRates rates(fHeader, fDynamicData, fStaticData, rate);
     1253        const FTM::DimTriggerRates rates(fHeader, fDynamicData, fStaticData,
     1254                                         rate, tdiff*1e-7, odiff*1e-7);
     1255
    12491256        fDimTriggerRates.Update(rates);
    12501257    }
     
    12791286        ConnectionFTM(ioservice, imp),
    12801287        fDimPassport      ("FTM_CONTROL/PASSPORT",        "X:1;S:1", ""),
    1281         fDimTriggerRates  ("FTM_CONTROL/TRIGGER_RATES",   "X:2;I:1;F:1;F:40;F:160", ""),
     1288        fDimTriggerRates  ("FTM_CONTROL/TRIGGER_RATES",   "X:2;I:1;F:1;F:40;F:160;F:1;F:1", ""),
    12821289        fDimError         ("FTM_CONTROL/ERROR",           "X:1;S:1;S:28", ""),
    12831290        fDimFtuList       ("FTM_CONTROL/FTU_LIST",        "X:1;X:1;S:1;C:4;X:40;C:40;C:40",  ""),
Note: See TracChangeset for help on using the changeset viewer.