Changeset 19360

Timestamp:

11/07/18 21:15:01 (6 years ago)

Author:

tbretz

Message:

Implemented the display of the hillas ellipse.

Location:

trunk/Mars/mhist

Files:

• MHEvent.cc (modified) (8 diffs)
• MHEvent.h (modified) (4 diffs)

trunk/Mars/mhist/MHEvent.cc

@@ -48 +48 @@
 #include <TStyle.h>
 #include <TCanvas.h>
+#include <TEllipse.h>
 #include <TPaveText.h>
 
@@ -56 +57 @@
 #include "MMcTrig.hxx"
 
+#include "MHillas.h"
 #include "MHCamera.h"
 #include "MParList.h"
@@ -74 +76 @@
 // --------------------------------------------------------------------------
 //
-MHEvent::MHEvent(EventType_t type) : fHist(NULL), fType(type),
-    fMinimum(-1111), fMaximum(-1111)
+MHEvent::MHEvent(EventType_t type) : fHist(NULL),
+    fType(type), fMinimum(-1111), fMaximum(-1111)
 {
     fName = "MHEvent";
@@ -82 +84 @@
     fClone   = new MRawEvtData("MHEventData");
     fTrigCpy = new MTriggerPattern;
+    fEllipse = new TEllipse;
 }
 
@@ -93 +96 @@
     delete fClone;
     delete fTrigCpy;
+    delete fEllipse;
 }
 
@@ -103 +107 @@
     fTime        = (MTime*)plist->FindObject("MTime");
     fTrigger     = (MTriggerPattern*)plist->FindObject("MTriggerPattern");
+    fHillas      = (MHillas*)plist->FindObject("MHillas");
 
     fRawEvtData = (MRawEvtData*)plist->FindObject("MRawEvtData");
@@ -250 +255 @@
     if (fRawEvtData)
         fRawEvtData->Copy(*fClone);
+
+    if (fHillas && fEllipse)
+    {
+        TEllipse(fHillas->GetMeanX(),  fHillas->GetMeanY(),
+                 fHillas->GetLength(), fHillas->GetWidth(),
+                 0, 360, fHillas->GetDelta()*TMath::RadToDeg()).Copy(*fEllipse);
+        fEllipse->SetLineWidth(2);
+        fEllipse->SetFillStyle(1);
+    }
 
     switch (fType)
@@ -417 +431 @@
     gPad->SetBorderMode(0);
     fHist->Draw();
+    if (fEllipse && fHillas)
+        fEllipse->Draw();
 
     AppendPad("1");

trunk/Mars/mhist/MHEvent.h

@@ -5 +5 @@
 #include "MH.h"
 #endif
+
+class TEllipse;
 
 class MHCamera;
@@ -14 +16 @@
 class MMcEvt;
 class MMcTrig;
+class MHillas;
 class MSignalCam;
 class MImgCleanStd;
@@ -42 +45 @@
     MImgCleanStd     *fImgCleanStd;   //!
     MTriggerPattern  *fTrigger;       //!
+    MHillas          *fHillas;        //!
 
     MRawEvtData      *fClone;         //->
@@ -47 +51 @@
 
     MHCamera *fHist;
+    TEllipse *fEllipse;
 
     EventType_t fType;