Changeset 11794 for trunk

Timestamp:

08/05/11 15:09:30 (13 years ago)

Author:

tbretz

Message:

Fixed the division by fPrescaling when calculating the rates.

File:

• trunk/FACT++/src/HeadersFTM.h (modified) (2 diffs)

trunk/FACT++/src/HeadersFTM.h

@@ -580 +580 @@
             {
                 if ((d[i].fOverflow>>4)&1)
-                    fBoardRate[i] = float(UINT32_MAX+1)*2/s[i].fPrescaling;
+                    fBoardRate[i] = float(UINT32_MAX+1)*2/(s[i].fPrescaling+1);
                 else
-                    fBoardRate[i] = float(d[i].fRateTotal)*2/s[i].fPrescaling;
+                    fBoardRate[i] = float(d[i].fRateTotal)*2/(s[i].fPrescaling+1);
 
                 // FIXME: Include fCrcError in calculation
@@ -588 +588 @@
                 for (int j=0; j<4; j++)
                     if ((d[i].fOverflow>>j)&1)
-                        fPatchRate[i*4+j] = float(UINT32_MAX+1)*2/s[i].fPrescaling;
+                        fPatchRate[i*4+j] = float(UINT32_MAX+1)*2/(s[i].fPrescaling+1);
                     else
-                        fPatchRate[i*4+j] = float(d[i].fRatePatch[j])*2/s[i].fPrescaling;
+                        fPatchRate[i*4+j] = float(d[i].fRatePatch[j])*2/(s[i].fPrescaling+1);
             }
         }