Changeset 9325 for trunk/MagicSoft

Timestamp:

02/12/09 00:47:43 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mhist/MHEvent.cc (modified) (10 diffs)
• mhist/MHEvent.h (modified) (3 diffs)
• mhist/Makefile (modified) (2 diffs)
• mtrigger/MTriggerPattern.cc (modified) (1 diff)
• mtrigger/MTriggerPattern.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -36 +36 @@
      - added some getter
 
-   * mhist/MHEvent.cc:
+   * mhist/MHEvent.[h,cc]:
      - some improvements to output
+     - implemented display for trigger pattern
+
+   * mtrigger/MTriggerPattern.[h,cc]:
+     - added Copy-function
+
+   * mhist/Makefile:
+     - added -I../mtrigger
 
    * mmc/MMcEvtBasic.[h,cc]:

trunk/MagicSoft/Mars/NEWS

@@ -16 +16 @@
 
    * added support for Arehucas Version >= 200812140
+
+ ;mars
+
+   * The display now also displays the trigger pattern
 
  ;ceres

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -48 +48 @@
 #include <TStyle.h>
 #include <TCanvas.h>
+#include <TPaveText.h>
 
 #include "MLog.h"
@@ -59 +60 @@
 #include "MTaskList.h"
 #include "MParList.h"
+#include "MGeomCam.h"
 #include "MSignalCam.h"
 #include "MRawEvtHeader.h"
@@ -64 +66 @@
 #include "MRawEvtData.h"
 #include "MImgCleanStd.h"
+#include "MTriggerPattern.h"
 
 ClassImp(MHEvent);
@@ -77 +80 @@
     fTitle = "Single Event display task";
 
-    fClone = new MRawEvtData("MHEventData");
+    fClone   = new MRawEvtData("MHEventData");
+    fTrigCpy = new MTriggerPattern;
 }
 
@@ -88 +92 @@
 
     delete fClone;
+    delete fTrigCpy;
 }
 
@@ -97 +102 @@
     fMcEvt       = (MMcEvt*)plist->FindObject("MMcEvt");
     fTime        = (MTime*)plist->FindObject("MTime");
+    fTrigger     = (MTriggerPattern*)plist->FindObject("MTriggerPattern");
 
     fRawEvtData = (MRawEvtData*)plist->FindObject("MRawEvtData");
@@ -228 +234 @@
         return kERROR;
     }
+
+    if (fTrigger)
+        fTrigger->Copy(*fTrigCpy);
 
     if (fRawEvtData)
@@ -312 +321 @@
 }
 
-void MHEvent::Paint(Option_t *)
+void MHEvent::Paint(Option_t *o)
 {
     TVirtualPad *pad = gPad;
 
-    pad->GetPad(2)->cd(1);
-    if (gPad->FindObject("Proj"))
-    {
-        TH1 *h=fHist->Projection("Proj");
-        if (h->GetMaximum()>0)
-            gPad->SetLogy();
-    }
-
-    pad->GetPad(2)->cd(2);
-    if (gPad->FindObject("ProfRad"))
-        fHist->RadialProfile("ProfRad");
-
-    pad->GetPad(2)->cd(3);
-    if (gPad->FindObject("ProfAz"))
-        fHist->AzimuthProfile("ProfAz");
+    if (TString(o).IsNull())
+    {
+        pad->GetPad(2)->cd(1);
+        if (gPad->FindObject("Proj"))
+        {
+            TH1 *h=fHist->Projection("Proj");
+            if (h->GetMaximum()>0)
+                gPad->SetLogy();
+        }
+
+        pad->GetPad(2)->cd(2);
+        if (gPad->FindObject("ProfRad"))
+            fHist->RadialProfile("ProfRad");
+
+        pad->GetPad(2)->cd(3);
+        if (gPad->FindObject("ProfAz"))
+            fHist->AzimuthProfile("ProfAz");
+    }
+
+    if (TString(o)=="1")
+    {
+        const Double_t r = fHist->GetGeometry()->GetMaxRadius();
+        TPaveText s4(0.82*r, -r, 0.90*r, -0.92*r, "br");
+        TPaveText s3(0.74*r, -r, 0.82*r, -0.92*r, "br");
+        TPaveText s2(0.66*r, -r, 0.74*r, -0.92*r, "br");
+        TPaveText s1(0.58*r, -r, 0.66*r, -0.92*r, "br");
+        TPaveText s0(0.50*r, -r, 0.58*r, -0.92*r, "br");
+        s0.SetBorderSize(1);
+        s1.SetBorderSize(1);
+        s2.SetBorderSize(1);
+        s3.SetBorderSize(1);
+        s4.SetBorderSize(1);
+        s0.AddText("P");
+        s1.AddText("C");
+        s2.AddText("1");
+        s3.AddText("2");
+        s4.AddText("S");
+
+        const Byte_t pat = fTrigCpy->GetUnprescaled();
+
+        s0.SetFillColor(pat&MTriggerPattern::kPedestal    ? kBlue : kWhite);
+        s1.SetFillColor(pat&MTriggerPattern::kCalibration ? kBlue : kWhite);
+        s2.SetFillColor(pat&MTriggerPattern::kTriggerLvl1 ? kBlue : kWhite);
+        s3.SetFillColor(pat&MTriggerPattern::kTriggerLvl2 ? kBlue : kWhite);
+        s4.SetFillColor(pat&MTriggerPattern::kSumTrigger  ? kBlue : kWhite);
+
+        s0.Paint();
+        s1.Paint();
+        s2.Paint();
+        s3.Paint();
+        s4.Paint();
+    }
 }
 
@@ -352 +398 @@
     gPad->SetBorderMode(0);
     fHist->Draw();
+
+    AppendPad("1");
 
     pad->cd(2);
@@ -383 +431 @@
     h->Draw();
 }
+

trunk/MagicSoft/Mars/mhist/MHEvent.h

@@ -16 +16 @@
 class MSignalCam;
 class MImgCleanStd;
+class MTriggerPattern;
 
 class MHEvent : public MH
@@ -30 +31 @@
 
 private:
-    MRawEvtData   *fRawEvtData;    //!
-    MRawRunHeader *fRawRunHeader;  //!
-    MRawEvtHeader *fRawEvtHeader;  //!
+    MRawEvtData      *fRawEvtData;    //!
+    MRawRunHeader    *fRawRunHeader;  //!
+    MRawEvtHeader    *fRawEvtHeader;  //!
 
-    MTime         *fTime;          //!
-    MMcEvt        *fMcEvt;         //!
-    MMcTrig       *fMcTrig;        //!
-    MSignalCam    *fCerPhotEvt;    //!
-    MImgCleanStd  *fImgCleanStd;   //!
+    MTime            *fTime;          //!
+    MMcEvt           *fMcEvt;         //!
+    MMcTrig          *fMcTrig;        //!
+    MSignalCam       *fCerPhotEvt;    //!
+    MImgCleanStd     *fImgCleanStd;   //!
+    MTriggerPattern  *fTrigger;       //!
 
-    MRawEvtData   *fClone;         //->
+    MRawEvtData      *fClone;         //->
+    MTriggerPattern  *fTrigCpy;       //->
 
     MHCamera *fHist;
@@ -66 +69 @@
     void Draw(Option_t *o="");
     void Paint(Option_t *o="");
- 
+
     ClassDef(MHEvent, 1)
 };

trunk/MagicSoft/Mars/mhist/Makefile

@@ -22 +22 @@
            -I../mgui -I../mgeom -I../mdata -I../mfilter -I../mimage \
            -I../mpointing -I../mmc  -I../mastro -I../msignal        \
-           -I../mbadpixels -I../mcalib -I../mreport
+           -I../mbadpixels -I../mcalib -I../mreport -I../mtrigger
 
 SRCFILES = MHEvent.cc \
@@ -32 +32 @@
            MHCamera.cc \
            MHRate.cc \
-           MHWeather.cc
+           MHWeather.cc \
+           MHQuality.cc
 
 #           MHFadcPix.cc \

trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.cc

@@ -151 +151 @@
 }
 
+void MTriggerPattern::Copy(TObject &obj) const
+{
+    static_cast<MTriggerPattern&>(obj).fPrescaled=fPrescaled;
+    static_cast<MTriggerPattern&>(obj).fUnprescaled=fUnprescaled;
+}
+
 void MTriggerPattern::Print(Option_t *) const
 {

trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.h

@@ -30 +30 @@
 
     void Print(Option_t *) const;
+    void Copy(TObject &obj) const { static_cast<MTriggerPattern&>(obj).fPrescaled=fPrescaled; static_cast<MTriggerPattern&>(obj).fUnprescaled=fUnprescaled; }
 
     void Reset() { fPrescaled=0; fUnprescaled=0; }