Changeset 4887 for trunk/MagicSoft/Mars/manalysis

Timestamp:

09/07/04 18:31:53 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• AnalysisLinkDef.h (modified) (1 diff)
• MEventRateCalc.cc (modified) (5 diffs)
• MEventRateCalc.h (modified) (3 diffs)
• MParameters.cc (modified) (3 diffs)
• MParameters.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -40 +40 @@
 #pragma link C++ class MParameterI+;
 #pragma link C++ class MParameterD+;
+#pragma link C++ class MParameterDerr+;
 //#pragma link C++ class MParameters+;
 

trunk/MagicSoft/Mars/manalysis/MEventRateCalc.cc

@@ -88 +88 @@
 const TString MEventRateCalc::gsNameEventRate = "MEventRate";
 const TString MEventRateCalc::gsNameTimeDiff  = "MTimeDiff";
+const TString MEventRateCalc::gsNameTimeRate  = "MTimeRate";
 
 const Int_t MEventRateCalc::gsNumEvents = 1000;
@@ -96 +97 @@
 //
 MEventRateCalc::MEventRateCalc(const char *name, const char *title)
-    : fNameTime(gsNameTime), fNameEventRate(gsNameEventRate),
-    fNameTimeDiff(gsNameTimeDiff), fTimes(gsNumEvents)
+    : fNameEventRate(gsNameEventRate), fNameTime(gsNameTime),
+    fNameTimeRate(gsNameTimeRate), fNameTimeDiff(gsNameTimeDiff),
+    fTimes(gsNumEvents)
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -118 +120 @@
     if (!fTime)
     {
-        *fLog << err << "MTime not found... aborting." << endl;
+        *fLog << err << AddSerialNumber(fNameTime) << " [MTime] not found... aborting." << endl;
         return kFALSE;
     }
@@ -124 +126 @@
     fRate = (MEventRate*)pList->FindCreateObj("MEventRate", AddSerialNumber(fNameEventRate));
     if (!fRate)
+        return kFALSE;
+
+    fTimeRate = (MTime*)pList->FindCreateObj("MTime", AddSerialNumber(fNameTimeRate));
+    if (!fTimeRate)
         return kFALSE;
 
@@ -145 +151 @@
     const ULong_t exec = GetNumExecutions()-1;
 
+    // Calculate the rate
     const UInt_t n = fTimes.GetSize();
 
+    // Get the positon in the ring-buffer
     const UInt_t n1 = exec;
     const UInt_t n2 = exec>=n ? exec+1 : 0;
 
+    // Store the current event time
     fTimes[n1%n] = *fTime;
 
+    // Get the number of events
     const UInt_t cnt = n1<n2 ? n : n1-n2;
 
+    // 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]);
+    fTimeDiff->SetReadyToSave();
+
+    // Store the rate
     fRate->SetRate(exec>1?rate:0, cnt);
     fRate->SetReadyToSave();
 
-    fTimeDiff->SetVal(exec==0 ? -1 : fTimes[n1%n] - fTimes[(n1+n-1)%n]);
-    fTimeDiff->SetReadyToSave();
+    // Store the corresponding time
+    fTimeRate->SetMean(fTimes[n1%n], fTimes[n2%n]);
 
     return kTRUE;

trunk/MagicSoft/Mars/manalysis/MEventRateCalc.h

@@ -19 +19 @@
     static const TString gsDefTitle;      //! Default title of container
 
+    static const TString gsNameEventRate; //! default name of rate container
     static const TString gsNameTime;      //! Default name of time container
-    static const TString gsNameEventRate; //! default name of rate container
     static const TString gsNameTimeDiff;  //! default name of time-diff container
+    static const TString gsNameTimeRate;  //! default name of time-rate container
 
     static const Int_t gsNumEvents;       //! Default number of events
@@ -27 +28 @@
 
     MTime       *fTime;       //! pointer to event time
+    MTime       *fTimeRate;   //! pointer to time of event rate
     MEventRate  *fRate;       //! pointer to rate storage container
     MParameterD *fTimeDiff;   //! Difference of time between two consecutive events
 
+    TString fNameEventRate;  // name of event rate container
     TString fNameTime;       // name of time container
-    TString fNameEventRate;  // name of event rate container
+    TString fNameTimeRate;   // name of event rate time container
     TString fNameTimeDiff;   // name of time-diff container
 
     TArrayD  fTimes;         //! internal array to store the last n event times
-
 
     Int_t PreProcess(MParList *pList);
@@ -48 +50 @@
     void SetNumEvents(ULong_t num) { fTimes.Set(num); }
 
+    void SetNameEventRate(const char *name) { fNameEventRate = name; }
     void SetNameTime(const char *name)      { fNameTime = name; }
-    void SetNameEventRate(const char *name) { fNameEventRate = name; }
     void SetNameTimeDiff(const char *name)  { fNameTimeDiff = name; }
+    void SetNameTimeRate(const char *name)  { fNameTimeRate = name; }
 
     ClassDef(MEventRateCalc, 1)// Task to calculate event rates

trunk/MagicSoft/Mars/manalysis/MParameters.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz 03/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -42 +42 @@
 ClassImp(MParameterD);
 ClassImp(MParameterI);
+ClassImp(MParameterDerr);
 //ClassImp(MParameter);
 
@@ -60 +61 @@
 // Default constructor.
 //
+MParameterDerr::MParameterDerr(const char *name, const char *title)
+{
+    fName  = name  ? name  : "MParameterDerr";
+    fTitle = title ? title : "Storgare container for general parameters (double) and its error";
+}
+
+// --------------------------------------------------------------------------
+//
+// Default constructor.
+//
 MParameterI::MParameterI(const char *name, const char *title)
 {

trunk/MagicSoft/Mars/manalysis/MParameters.h

@@ -18 +18 @@
 
     ClassDef(MParameterD, 1) // Container to hold a generalized parameters (double)
+};
+
+class MParameterDerr : public MParContainer
+{
+private:
+    Double_t fVal;
+    Double_t fErr;
+
+public:
+    MParameterDerr(const char *name=NULL, const char *title=NULL);
+
+    void SetVal(Double_t v, Double_t e) { fVal = v; fErr = e; }
+    Double_t GetVal() const { return fVal; }
+    Double_t GetErr() const { return fErr; }
+
+    ClassDef(MParameterDerr, 1) // Container to hold a generalized parameters (double) and its Error
 };