Changeset 12287
- Timestamp:
- 10/26/11 23:20:03 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/ftmctrl.cc
r12177 r12287 1189 1189 1190 1190 uint64_t fTimeStamp; 1191 uint64_t fTimeStampOn; 1191 1192 uint32_t fTriggerCounter; 1192 1193 … … 1234 1235 fDimDynamicData.Update(data); 1235 1236 1236 float rate = -1; 1237 float rate = -1; 1238 uint64_t tdiff = 0; 1239 uint64_t odiff = 0; 1237 1240 if (fHeader.fTimeStamp>=fTimeStamp && fHeader.fTriggerCounter>=fTriggerCounter) 1238 1241 { 1239 const uint64_t tdiff = fHeader.fTimeStamp -fTimeStamp; 1242 tdiff = fHeader.fTimeStamp -fTimeStamp; 1243 odiff = fDynamicData.fOnTimeCounter -fTimeStampOn; 1244 1240 1245 const uint32_t cdiff = fHeader.fTriggerCounter-fTriggerCounter; 1241 1242 1246 rate = tdiff==0 ? 0 : 1000000*float(cdiff)/tdiff; 1243 1247 } 1244 1248 1245 1249 fTimeStamp = fHeader.fTimeStamp; 1250 fTimeStampOn = fDynamicData.fOnTimeCounter; 1246 1251 fTriggerCounter = fHeader.fTriggerCounter; 1247 1252 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 1249 1256 fDimTriggerRates.Update(rates); 1250 1257 } … … 1279 1286 ConnectionFTM(ioservice, imp), 1280 1287 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", ""), 1282 1289 fDimError ("FTM_CONTROL/ERROR", "X:1;S:1;S:28", ""), 1283 1290 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.