Changeset 2571 for trunk

Timestamp:

11/26/03 16:05:06 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHVsTime.cc (modified) (6 diffs)
• mhist/MHVsTime.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2003/11/26: Thomas Bretz
+
+   * mhist/MHVsTime.[h,cc]:
+     - implemented usage of Event number
+
+
+
  2003/11/25: Thomas Bretz
  

trunk/MagicSoft/Mars/mhist/MHVsTime.cc

@@ -47 +47 @@
 #include "MParList.h"
 #include "MDataChain.h"
+#include "MRawEvtHeader.h"
 
 ClassImp(MHVsTime);
@@ -53 +54 @@
 
 static const TString gsDefName  = "MHVsTime";
-static const TString gsDefTitle = "Container for a graph vs time";
+static const TString gsDefTitle = "Container for a graph vs time/evtnumber";
 
 // --------------------------------------------------------------------------
@@ -116 +117 @@
 
     TString title(fData ? GetRule() : (TString)"Histogram");
-    title += " vs Time";
+    title += " vs ";
+    title += fUseEventNumber ? "Event Number" : "Time";
 
     fGraph->SetNameTitle(fName, title);
@@ -149 +151 @@
 Bool_t MHVsTime::Fill(const MParContainer *par, const Stat_t w)
 {
-    const MTime *t = dynamic_cast<const MTime*>(par);
-    if (!t)
-    {
-        *fLog << err << dbginf << "No MTime found..." << endl;
-        return kFALSE;
+    Double_t t = 0;
+    if (fUseEventNumber)
+    {
+        const MRawEvtHeader *h = dynamic_cast<const MRawEvtHeader*>(par);
+        t = h ? h->GetDAQEvtNumber() : fGraph->GetN();
+    }
+    else
+    {
+        const MTime *tm = dynamic_cast<const MTime*>(par);
+        if (!tm)
+        {
+            *fLog << err << dbginf << "No MTime found..." << endl;
+            return kFALSE;
+        }
+        const Double_t T = (*tm);///3600;
+        t = T>12*3600?T-24*3600:T;
     }
 
     const Double_t v = fData->GetValue()*fScale;
-    const Double_t T = (*t);///3600;
-
-    fGraph->SetPoint(fGraph->GetN(), T>12*3600?T-24*3600:T, v);
+
+    fGraph->SetPoint(fGraph->GetN(), t, v);
 
     return kTRUE;
@@ -191 +203 @@
     TString str(opt);
 
-    fGraph->GetHistogram()->SetXTitle("Time");
+    if (fUseEventNumber)
+        fGraph->GetHistogram()->SetXTitle("Event Number");
+    else
+    {
+        fGraph->GetHistogram()->SetXTitle("Time");
+        fGraph->GetHistogram()->GetXaxis()->SetTimeFormat("%H:%M:%S");
+        fGraph->GetHistogram()->GetXaxis()->SetTimeDisplay(1);
+        fGraph->GetHistogram()->GetXaxis()->SetLabelSize(0.033);
+    }
     fGraph->GetHistogram()->SetYTitle(GetRule());
-    fGraph->GetHistogram()->GetXaxis()->SetTimeFormat("%H:%M:%S");
-    fGraph->GetHistogram()->GetXaxis()->SetTimeDisplay(1);
-    fGraph->GetHistogram()->GetXaxis()->SetLabelSize(0.033);
     fGraph->Draw("AP");
     if (fGraph->TestBit(kIsLogy))
@@ -213 +230 @@
     MHVsTime *h=new MHVsTime(fData ? (const char*)GetRule() : NULL);
     h->SetScale(fScale);
+    if (fUseEventNumber)
+        h->SetUseEventNumber();
     return h;
 }

trunk/MagicSoft/Mars/mhist/MHVsTime.h

@@ -18 +18 @@
 
     enum {
-        kIsLogy = BIT(18)
+        kIsLogy = BIT(18),
+        kUseEventNumber = BIT(20)
     };
+
+    Bool_t fUseEventNumber;
 
 public:
@@ -46 +49 @@
     TGraph *GetGraph() { return fGraph; }
 
+    void SetUseEventNumber(Bool_t use = kTRUE) { fUseEventNumber = use; }
 
     void Draw(Option_t *opt=NULL);