Changeset 15185 for trunk/FACT++/src/ftmctrl.cc

Timestamp:

03/29/13 21:28:30 (12 years ago)

Author:

tbretz

Message:

Keep the rate of the first report afte a state change at -1 to signal that the value would be unreliable and to have a handle when the values were resetted. The same is done for the ftm time reference, because it is not available. The on-time however is correct... we keep that.

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (2 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -1268 +1268 @@
         const uint8_t state = fHeader.fState & FTM::States::kFtmStates;
 
-        if (state == fPrevState && fHeader.fTriggerCounter>=fTriggerCounter &&
-            fDynamicData.fOnTimeCounter>=fTimeStampOn)
+        const bool first = state!=fPrevState ||
+            fHeader.fTriggerCounter<fTriggerCounter ||
+            fDynamicData.fOnTimeCounter<fTimeStampOn;
+
+        if (!first)
         {
             odiff -= fTimeStampOn;
@@ -1287 +1290 @@
 
         const FTM::DimTriggerRates rates(fHeader, fDynamicData, fStaticData,
-                                         rate, tdiff*1e-6, odiff*1e-6);
+                                         first ? -1 : rate, first ? -1 : tdiff*1e-6, odiff*1e-6);
 
         fDimTriggerRates.setQuality(fHeader.fState);