Changeset 2572

Timestamp:

11/26/03 16:10:09 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHPixVsTime.cc (modified) (4 diffs)
• mhist/MHPixVsTime.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -8 +8 @@
    * mhist/MHVsTime.[h,cc]:
      - implemented usage of Event number
+
+   * mhist/MHPixVsTime.[h,cc]:
+     - implemented usage of time (untested - may not work)
 
 

trunk/MagicSoft/Mars/mhist/MHPixVsTime.cc

@@ -43 +43 @@
 #include "MGeomCam.h"
 
+#include "MRawEvtHeader.h"
+#include "MTime.h"
+
 ClassImp(MHPixVsTime);
 
@@ -63 +66 @@
     TString t("Pixel Index #");
     t += idx;
-    t += " vs. time";
+    t += " vs ";
+    t += fUseEventTime ? "Time" : "Event Number";
 
     fGraph.SetName("MCamEvent");
@@ -104 +108 @@
     }
 
+    if (fUseEventTime)
+    {
+        fTime = (MTime*)plist->FindObject("MTime");
+        if (!fTime)
+        {
+            *fLog << err << "MTime not found... abort." << endl;
+            return kFALSE;
+        }
+    }
+    else
+    {
+        fHeader = (MRawEvtHeader*)plist->FindObject("MRawEvtHeader");
+        if (!fHeader)
+        {
+            *fLog << err << "MRawEvtHeader not found... abort." << endl;
+            return kFALSE;
+        }
+    }
+
     return kTRUE;
 }
@@ -125 +148 @@
         return kCONTINUE;
 
-    fGraph.SetPoint(fGraph.GetN(), fGraph.GetN(), val);
+    Double_t t = 0;
+    if (fUseEventTime)
+        t = (*fTime);
+    else
+        t = fHeader ? fHeader->GetDAQEvtNumber() : fGraph.GetN();
+
+    fGraph.SetPoint(fGraph.GetN(), t, val);
     return kTRUE;
 }

trunk/MagicSoft/Mars/mhist/MHPixVsTime.h

@@ -14 +14 @@
 class MGeomCam;
 
+class MRawEvtHeader;
+class MTime;
+
 class MHPixVsTime : public MH
 {
@@ -23 +26 @@
     MGeomCam  *fCam; //! the camera geometry
 
+    MRawEvtHeader *fHeader; //!
+    MTime         *fTime;   //!
+
     TString fNameEvt;
 
     Int_t fType;
     Int_t fTypeErr;
+
+    Bool_t fUseEventTime;
 
     Bool_t SetupFill(const MParList *pList);
@@ -42 +50 @@
     TGraph &GetGraph() { return fGraph; }
 
+    void SetUseEventTime(Bool_t use = kTRUE) { fUseEventTime = use; }
+
     void Draw(Option_t *o="");