Changeset 6455 for trunk/MagicSoft/Mars

Timestamp:

02/14/05 11:29:41 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MEventRateCalc.cc (modified) (4 diffs)
• manalysis/MEventRateCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -38 +38 @@
    * mjobs/MDataSet.[h,cc]: 
      - added
+
+   * manalysis/MEventRateCalc.[h,cc]:
+     - added a fix which make sure, that the rate is not influenced
+       too much by the start of data taking
+     - fixed setting of mean time corresponding to rate-interval
 
 

trunk/MagicSoft/Mars/manalysis/MEventRateCalc.cc

@@ -141 +141 @@
 }
 
+Bool_t MEventRateCalc::ReInit(MParList *pList)
+{
+    fNumFirstEvent = GetNumExecutions();
+    return kTRUE;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -151 +157 @@
     const ULong_t exec = GetNumExecutions()-1;
 
+    //*fLog << all << fNumFirstEvent << " " << exec << endl;
+
     // Calculate the rate
     const UInt_t n = fTimes.GetSize();
@@ -171 +179 @@
     fTimeDiff->SetReadyToSave();
 
+    // 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);
+        return kTRUE;
+    }
+
     // Store the rate
     fRate->SetRate(exec>1?rate:0, cnt);
@@ -176 +192 @@
 
     // Store the corresponding time
-    fTimeRate->SetMean(fTimes[n1%n], fTimes[n2%n]);
+    if (exec==fNumFirstEvent+n)
+        fTimeRate->SetMean(fTimes[n2%n], fTimes[n2%n]);
+    else
+        fTimeRate->SetMean(fTimes[n1%n], fTimes[n2%n]);
 
     return kTRUE;

trunk/MagicSoft/Mars/manalysis/MEventRateCalc.h

@@ -39 +39 @@
     TArrayD  fTimes;         //! internal array to store the last n event times
 
-    Int_t PreProcess(MParList *pList);
-    Int_t Process();
+    Int_t fNumFirstEvent;    //! Number of first event in file
+
+    Bool_t ReInit(MParList *pList);
+    Int_t  PreProcess(MParList *pList);
+    Int_t  Process();
 
     void  StreamPrimitive(ofstream &out) const;