Changeset 4889 for trunk/MagicSoft/Mars/mhvstime

Timestamp:

09/08/04 18:49:00 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhvstime

Files:

• MHPixVsTime.cc (modified) (1 diff)
• MHSectorVsTime.cc (modified) (1 diff)
• MHVsTime.cc (modified) (8 diffs)
• MHVsTime.h (modified) (5 diffs)

trunk/MagicSoft/Mars/mhvstime/MHPixVsTime.cc

@@ -194 +194 @@
     {
         TAxis *axe = h->GetXaxis();
-        axe->SetTimeFormat("%H:%M:%S %F1995-01-01 00:00:00");
+        axe->SetTimeFormat("%H:%M:%S %F1995-01-01 00:00:00 GMT");
         axe->SetTimeDisplay(1);
         axe->SetLabelSize(0.033);

trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc

@@ -247 +247 @@
     {
         TAxis *axe = h->GetXaxis();
-        axe->SetTimeFormat("%H:%M:%S %F1995-01-01 00:00:00");
+        axe->SetTimeFormat("%H:%M:%S %F1995-01-01 00:00:00 GMT");
         axe->SetTimeDisplay(1);
         axe->SetLabelSize(0.025);

trunk/MagicSoft/Mars/mhvstime/MHVsTime.cc

@@ -49 +49 @@
 #include <TCanvas.h>
 
-#include <TGraph.h>
+#include <TGraphErrors.h>
 
 #include "MLog.h"
@@ -71 +71 @@
 // see MDataChain.
 //
-MHVsTime::MHVsTime(const char *rule)
-    : fGraph(NULL), fData(NULL), fScale(1), fMaxPts(-1), fUseEventNumber(0)
-{  
+MHVsTime::MHVsTime(const char *rule, const char *error)
+    : fGraph(NULL), fData(NULL), fError(0), fScale(1), fMaxPts(-1),
+    fNumEvents(1), fUseEventNumber(0)
+{
     fName  = gsDefName;
     fTitle = gsDefTitle;
@@ -80 +81 @@
         return;
 
-    fGraph = new TGraph;
     fData = new MDataChain(rule);
 
-    fGraph->SetMarkerStyle(kFullDotMedium);
+    if (error)
+        fError = new MDataChain(error);
+
+    fGraph = error ? new TGraphErrors : new TGraph;
+    fGraph->SetPoint(0, 0, 0); // Dummy point!
+    fGraph->SetEditable();     // Used as flag: First point? yes/no
 }
 
@@ -116 +121 @@
 Bool_t MHVsTime::SetupFill(const MParList *plist)
 {
-    // reset histogram (necessary if the same eventloop is run more than once) 
-    //fGraph->Reset();
-
-    if (fData && !fData->PreProcess(plist))
+    if (!fGraph || !fData)
+    {
+        *fLog << err << "ERROR - MHVsTime cannot be used with its default constructor!" << endl;
         return kFALSE;
-
-    if (fGraph)
-    {
-        delete fGraph;
-        fGraph = new TGraph;
-    }
+    }
+
+    if (!fData->PreProcess(plist))
+        return kFALSE;
+
+    if (fError && !fError->PreProcess(plist))
+        return kFALSE;
+
+    fGraph->Set(1);
+    fGraph->SetPoint(0, 0, 0); // Dummy point!
+    fGraph->SetEditable();     // Used as flag: First point? yes/no
 
     TString title(fData ? GetRule() : (TString)"Histogram");
@@ -183 +192 @@
         if (!*tm)
             return kTRUE;
+
+        // Do not fill events with equal time
+        if (*tm==fLast || *tm==MTime())
+            return kTRUE;
+
+        fLast = *tm;
+
         t = tm->GetAxisTime();
     }
 
-    const Double_t v = fData->GetValue()*fScale;
-
-    if (fMaxPts>0 && fGraph->GetN()>fMaxPts)
-        fGraph->RemovePoint(0);
-
-    fMean += v;
+    const Double_t v = fData->GetValue();
+    const Double_t e = fError ? fError->GetValue() : 0;
+
+    //*fLog << all << "ADD " << v << " " << e << endl;
+
+    fMean    += v;
+    fMeanErr += e;
     fN++;
 
     if (fN==fNumEvents)
     {
-        fGraph->SetPoint(fGraph->GetN(), t, fMean/fN);
+        if (fMaxPts>0 && fGraph->GetN()>fMaxPts || fGraph->IsEditable())
+        {
+            fGraph->RemovePoint(0);
+            fGraph->SetEditable(kFALSE);
+        }
+
+        fGraph->SetPoint(fGraph->GetN(), t, fMean/fN*fScale);
+
+        if (fError)
+            static_cast<TGraphErrors*>(fGraph)->SetPointError(fGraph->GetN()-1, 0, fMeanErr/fN*fScale);
+
         fMean = 0;
+        fMeanErr = 0;
         fN = 0;
     }
 
     return kTRUE;
+}
+
+void MHVsTime::Paint(Option_t *opt)
+{
+    // SetPoint deletes the histogram!
+    if (fUseEventNumber)
+        fGraph->GetHistogram()->SetXTitle("Event Number");
+    else
+    {
+        fGraph->GetHistogram()->SetXTitle("Time");
+        fGraph->GetHistogram()->GetXaxis()->SetLabelSize(0.033);
+        fGraph->GetHistogram()->GetXaxis()->SetTimeFormat("%H:%M:%S %F1995-01-01 00:00:00 GMT");
+        fGraph->GetHistogram()->GetXaxis()->SetTimeDisplay(1);
+    }
+
+    fGraph->GetHistogram()->SetMarkerStyle(kFullDotMedium);
+    fGraph->GetHistogram()->SetYTitle(fAxisTitle.IsNull() ? GetRule() : fAxisTitle);
+    if (fTitle!=gsDefTitle)
+        fGraph->GetHistogram()->SetTitle(fTitle);
+
+    if (TestBit(kIsLogy))
+        gPad->SetLogy();
+
+    // This is a workaround if the TGraph has only one point.
+    // Otherwise MStatusDisplay::Update hangs.
+    gPad->GetListOfPrimitives()->Remove(fGraph);
+    gPad->GetListOfPrimitives()->Add(fGraph, fGraph->GetN()<2 ? "A" : opt);
 }
 
@@ -212 +267 @@
 void MHVsTime::Draw(Option_t *opt)
 {
+    if (!fGraph)
+        return;
+
     if (fGraph->GetN()==0)
         return;
@@ -218 +276 @@
     pad->SetBorderMode(0);
 
-    AppendPad("");
-
     TString str(opt);
-
-    if (fUseEventNumber)
-        fGraph->GetHistogram()->SetXTitle("Event Number");
-    else
-    {
-        fGraph->GetHistogram()->SetXTitle("Time");
-        fGraph->GetHistogram()->GetXaxis()->SetTimeFormat("%H:%M:%S %F1995-01-01 00:00:00");
-        fGraph->GetHistogram()->GetXaxis()->SetTimeDisplay(1);
-        fGraph->GetHistogram()->GetXaxis()->SetLabelSize(0.033);
-    }
-    fGraph->GetHistogram()->SetYTitle(GetRule());
 
     if (!str.Contains("A"))
@@ -244 +289 @@
     }
 
+    AppendPad(str);
     fGraph->Draw(str);
-    if (fGraph->TestBit(kIsLogy))
-        pad->SetLogy();
-
-    pad->Modified();
-    pad->Update();
 }
 

trunk/MagicSoft/Mars/mhvstime/MHVsTime.h

@@ -4 +4 @@
 #ifndef MARS_MH
 #include "MH.h"
+#endif
+
+#ifndef MARS_MTime
+#include "MTime.h"
 #endif
 
@@ -15 +19 @@
     TGraph     *fGraph;     // Histogram to fill
     MDataChain *fData;      // Object from which the data is filled
+    MDataChain *fError;     // Object from which the error is filled
     Double_t    fScale;     // Scale for axis (eg unit)
     Int_t       fMaxPts;    // Maximum number of data points
 
     Int_t       fNumEvents; // Number of events to average
+
     Double_t    fMean;      //! Mean value
-    Int_t       fN;
+    Double_t    fMeanErr;   //! Mean error
+    Int_t       fN;         //! Number of entries in fMean
+    MTime       fLast;      //! For checks
 
+    TString     fAxisTitle;
 
     enum {
-        kIsLogy         = BIT(18),
-        kUseEventNumber = BIT(20)
+        kIsLogy = BIT(18)
     };
 
@@ -31 +39 @@
 
 public:
-    MHVsTime(const char *rule=NULL);
+    MHVsTime(const char *rule=NULL, const char *ruleerr=NULL);
     ~MHVsTime();
 
@@ -40 +48 @@
     void SetName(const char *name);
     void SetTitle(const char *title);
+
+    void SetLogy(Bool_t b=kTRUE) { b ? SetBit(kIsLogy) : ResetBit(kIsLogy); }
+    void SetAxisTitle(const char *y) { fAxisTitle=y; }
 
     Bool_t SetupFill(const MParList *pList);
@@ -59 +70 @@
 
     void Draw(Option_t *opt=NULL);
+    void Paint(Option_t *opt=NULL);
 
     MParContainer *New() const;