Changeset 8929 for trunk/MagicSoft/Mars/mhflux

Timestamp:

06/08/08 13:55:36 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MHEffectiveOnTime.cc (modified) (7 diffs)
• MHEffectiveOnTime.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc

@@ -19 +19 @@
 !   Author(s): Wolfgang Wittek, 1/2002 <mailto:wittek@mppmu.mpg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -70 +70 @@
 //  Input Container:
 //    MPointingPos
+//    MRawRunHeader
+//    MTime
 //
 //  Output Container:
@@ -81 +83 @@
 //   +  UInt_t fNumEvents;
 //   -  Int_t fNumEvents;
+//
+//  Class version 3:
+//  ----------------
+//   +  Double_t fTotalTime;
 //
 //
@@ -276 +282 @@
 #include "MParameters.h"
 #include "MPointingPos.h"
+#include "MRawRunHeader.h"
 
 #include "MBinning.h"
@@ -293 +300 @@
 MHEffectiveOnTime::MHEffectiveOnTime(const char *name, const char *title)
     : fPointPos(0), fTime(0), fParam(0), fIsFinalized(kFALSE), 
-    fNumEvents(200*60), fFirstBin(3)
+    fNumEvents(200*60), fFirstBin(3), fTotalTime(-1)
     //fNumEvents(2*60), fFirstBin(1)
 {
@@ -469 +476 @@
        SetBinning(&fH2DeltaT, binsdtime, binstheta);
 
+   fTotalTime = 0;
+
    return kTRUE;
+}
+
+Bool_t MHEffectiveOnTime::ReInit(MParList *pList)
+{
+    MRawRunHeader *header = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+    if (header)
+    {
+        *fLog << err << "MRawRunHeader not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fTotalTime += header->GetRunLength();
+
+    return kTRUE;
 }
 
@@ -771 +794 @@
     text.SetTextSize(0.04);
 
-    text.SetText(0.45, 0.94, Form("T_{eff} = %.1fs \\pm %.1fs", val, error));
-    text.Paint();
-
-    if (range<0)
-        return;
-
-    text.SetText(0.66, 0.94, Form("T_{axe} = %.1fs", range));
+    TString txt = Form("T_{eff} = %.1fs \\pm %.1fs", val, error);
+    if (range>0)
+        txt += Form("     T_{axe} = %.1fs", range);
+    if (fTotalTime>0)
+        txt += Form("     T_{max} = %.1fs", fTotalTime);
+
+    text.SetText(0.35, 0.94, txt);
     text.Paint();
 }

trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.h

@@ -50 +50 @@
     UInt_t fFirstBin;    // For bin for fit
 
+    Double_t fTotalTime; //[s] Total time accumulated from run-header
+
+    // MHEffectiveOnTime
     Bool_t FitH(TH1D *h, Double_t *res, Bool_t paint=kFALSE) const;
     void FitThetaBins();
@@ -60 +63 @@
     void PrintStatistics();
 
+    // MH
     Bool_t SetupFill(const MParList *pList);
+    Bool_t ReInit(MParList *pList);
     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     Bool_t Finalize();
 
+    // MParContainer
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
@@ -69 +75 @@
     MHEffectiveOnTime(const char *name=NULL, const char *title=NULL);
 
+    // Setter
     void SetNumEvents(Int_t i) { fNumEvents=i; }
     void SetFirstBin(Int_t i)  { fFirstBin=i;  }
+
+    // Getter
+    Double_t GetTotalTime() const { return fTotalTime; }
 
     const TH1D &GetHEffOnTheta() const { return fHThetaEffOn; }
@@ -77 +87 @@
     const TH2D &GetH2DeltaT() const { return fH2DeltaT; }
 
+    // TObject
     void Draw(Option_t *option="");
     void Paint(Option_t *opt="");
 
-    ClassDef(MHEffectiveOnTime, 2) // Histogram to determin effective On-Time vs Time and Zenith Angle
+    ClassDef(MHEffectiveOnTime, 3) // Histogram to determin effective On-Time vs Time and Zenith Angle
 };