Changeset 2779 for trunk/MagicSoft/Mars

Timestamp:

01/13/04 09:33:30 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -1 @@
-Please  do  not write behind the end of line tag so that it is  possible
-to   send  a   Changelog   file  to  a  line  printer  directly.  Thanks.
-
-
-                                                 -*-*- END OF LINE -*-*-
-
 Please  do  not write behind the end of line tag so that it is  possible
 to   send  a   Changelog   file  to  a  line  printer  directly.  Thanks.
@@ -13 +7 @@
  2004/01/13: Wolfgang Wittek
 
-   * macros/ONOFFAnalysis.C
-            ONAnalysis.C
+   * macros/ONOFFAnalysis.C, macros/ONAnalysis.C:
      - change macro to handle also MC events with finite sigmabar
 
-   * manalysis/MPadOn.[h,cc]
+   * manalysis/MPadOn.[h,cc]:
      - deleted, is replaced by MPad
 
-   * manalysis/MPadOnOFF.[h,cc]
+   * manalysis/MPadOnOFF.[h,cc]:
      - deleted, is replaced by MPad
 
-   * manalysis/MPad.[h,cc]
+   * manalysis/MPad.[h,cc]:
      - new class, replacing MPadON and MPadONOFF
      - handle also MC events with finite sigmabar
 
-   * manalysis/Makefile
-               AnalysisLinkDef.h
+   * manalysis/Makefile, manalysis/AnalysisLinkDef.h:
      - replace MPadON and MPadONOFF by MPad
-
-
-
- 2003/12/23: Wolfgang Wittek
 
 
@@ -47 +35 @@
    * Changelog:
      - removed entries of 2003
+
+   * mfilter/MFGeomag.cc:
+     - simplified open/close of input files
+
+   * manalysis/MEventRate.[h,cc], manalysis/MEventRateCalc.cc:
+     - added some comments
+     - added new member function GetError
 
 
@@ -168 +163 @@
      - added new fType in te enumeration to handle the arrival time
        histos
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

trunk/MagicSoft/Mars/manalysis/MEventRate.cc

@@ -27 +27 @@
 // MEventRate
 //
-// Storage Container for the event rate
+// Storage Container for the event rate.
+//
+//    rate = Number of events / time in which the events were recorded
+//       r = N / t
+//       s = t / N  = 1 / r    mean time interval between consecutive events
+//
+//    for an exponential distribution of the time differences d between
+//    consecutive events:
+//
+//       s = <d>
+//       sigma(d)     = <d> = s
+//       delta(s)     = sigma(d) /sqrt(N) = s / sqrt(N)
+//       delta(s) / s = 1 / sqrt(N)
+//
+//       delta(r) / r = delta(s) / s = 1 / sqrt(N)
 //
 /////////////////////////////////////////////////////////////////////////////

trunk/MagicSoft/Mars/manalysis/MEventRate.h

@@ -17 +17 @@
     void SetRate(Double_t r, UInt_t n) { fRate = r; fNumEvents = n; }
     Double_t GetRate() const { return fRate; }
+    Double_t GetError() const { return TMath::Sqrt(1./fNumEvents); }
     UInt_t GetNumEvents() const { return fNumEvents; }
 

trunk/MagicSoft/Mars/manalysis/MEventRateCalc.cc

@@ -30 +30 @@
 //
 //  The algorithm is explained in Process()
+//
+//
+//    rate = Number of events / time in which the events were recorded
+//       r = N / t
+//       s = t / N  = 1 / r    mean time interval between consecutive events
+//
+//    for an exponential distribution of the time differences d between
+//    consecutive events:
+//
+//       s = <d>
+//       sigma(d)     = <d> = s
+//       delta(s)     = sigma(d) /sqrt(N) = s / sqrt(N)
+//       delta(s) / s = 1 / sqrt(N)
+//
+//       delta(r) / r = delta(s) / s = 1 / sqrt(N)
+//
 //
 //  Input Containers:

trunk/MagicSoft/Mars/mfilter/MFGeomag.cc

@@ -86 +86 @@
     Float_t thet  [2*1152];
 
-    ifstream geomagp;
-
     TString filename = gSystem->Getenv("MARSSYS");
     filename += "/mfilter/gcplus.txt";
 
-    geomagp.open(filename);
+    ifstream geomagp(filename);
+
     if (!geomagp) {
         *fLog << err <<" ERROR gcplus.txt file not found by Geomag"<<endl;
@@ -105 +104 @@
     *fLog << Form ("FRigMin=%8f  fRigMax=%8f  fProb=%8f",
                    fRigMin[0], fRigMax[0], fProb[0]) << endl;
-    geomagp.close();
-    geomagp.clear();
-
-    ifstream geomagm;
 
     filename = gSystem->Getenv("MARSSYS");
     filename += "/mfilter/gcminus.txt";
 
-    geomagm.open(filename);
+    ifstream geomagm(filename);
     if (!geomagm) {
         *fLog << err <<" ERROR gcminus.txt file not found by Geomag"<<endl;
@@ -126 +121 @@
     *fLog << Form ("fRigMin=%8f  fRigMax=%8f  fProb=%8f",
                    fRigMin[1152], fRigMax[1152], fProb[1152]) << endl;
-    geomagm.close();
-    geomagm.clear();
+
     //
     if (fMcEvt)
@@ -133 +127 @@
 
     fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt");
-    if (fMcEvt)
-        return kTRUE;
-
-    *fLog << err << dbginf << "  [MMcEvt] not found... aborting." << endl;
-    return kFALSE;
+    if (!fMcEvt)
+    {
+        *fLog << err << dbginf << "  [MMcEvt] not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
 }
 // --------------------------------------------------------------------------