Changeset 7033 for trunk/MagicSoft/Mars/manalysis/MEventRateCalc.cc

Timestamp:

05/13/05 19:26:28 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MEventRateCalc.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/manalysis/MEventRateCalc.cc

@@ -172 +172 @@
     const UInt_t cnt = n1<n2 ? n : n1-n2;
 
-    if (cnt<n/10)
-        return kTRUE;
-
-
-    // Calculate the rate
-    const Double_t rate = (Double_t)cnt/(fTimes[n1%n]-fTimes[n2%n]);
-
     // Store the time difference between two consecutive events
     fTimeDiff->SetVal(exec==0 ? -1 : fTimes[n1%n] - fTimes[(n1+n-1)%n]);
@@ -185 +178 @@
     // Make sure, that the beginning of data-takeing (open
     // a new file) doesn't effect the rate too much
-    if (exec<fNumFirstEvent+n)
-    {
-        fRate->SetRate(-1, 0);
+    if (cnt<n/10)
         return kTRUE;
-    }
+
+    // Calculate the rate
+    const Double_t rate = (Double_t)cnt/(fTimes[n1%n]-fTimes[n2%n]);
 
     // Store the rate
@@ -195 +188 @@
     fRate->SetReadyToSave();
 
-    Double_t diff = fTimes[n1%n]- fTimes[n2%n];
-    Double_t time = fTimes[n2%n]+ (cnt-n/10.)/(n-n/10.)*diff/2;
+    // Calculate and store the corresponding time
+    const Double_t diff = fTimes[n1%n] - fTimes[n2%n];
+    const Double_t time = fTimes[n2%n] + (cnt-n/10.)/(n-n/10.)*diff/2;
 
     fTimeRate->SetMean(time, time);
-
-    //if (cnt>1000)
-    //*fLog << all << *fTimeRate << " " << *fTime << " " << diff << " " << cnt << " " << n << " " << (float)(cnt-n/2)/n << endl;
-
+    fTimeRate->SetReadyToSave();
+
+   /*
     // Store the corresponding time
     if (exec==fNumFirstEvent+n)
@@ -208 +201 @@
     else
         fTimeRate->SetMean(fTimes[n1%n], fTimes[n2%n]);
+        */
 
     return kTRUE;