Changeset 5145 for trunk/MagicSoft

Timestamp:

09/29/04 15:58:40 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHEvent.cc (modified) (2 diffs)
• mhist/MHEvent.h (modified) (1 diff)
• mmain/MEventDisplay.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/09/29: Thomas Bretz
+
+   * mhist/MHEvent.[h,cc]:
+     - enhanced display
+
+   * mmain/MEventDisplay.cc:
+     - adapted to changes in MEventDisplay
+
+
 
  2004/09/28: Thomas Bretz

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -284 +284 @@
 }
 
+void MHEvent::Paint(Option_t *)
+{
+    TVirtualPad *pad = gPad;
+
+    pad->GetPad(2)->cd(1);
+    if (gPad->FindObject(Form("Proj_%p", this)))
+    {
+        TH1 *h=fHist->Projection(Form("Proj_%p", this));
+        if (h->GetMaximum()>0)
+            gPad->SetLogy();
+    }
+
+    pad->GetPad(2)->cd(2);
+    if (gPad->FindObject(Form("ProfR_%p", this)))
+        fHist->RadialProfile(Form("ProfR_%p", this));
+
+    pad->GetPad(2)->cd(3);
+    if (gPad->FindObject(Form("ProfA_%p", this)))
+        fHist->AzimuthProfile(Form("ProfA_%p", this));
+}
+
 void MHEvent::Draw(Option_t *)
 {
@@ -292 +313 @@
     }
 
-    if (!gPad)
-        MakeDefCanvas(this);
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
+    pad->SetBorderMode(0);
+
+    AppendPad();
+
+    pad->Divide(2,1);
+
+    pad->cd(1);
+    gPad->SetPad(0.01, 0.01, 0.75, 0.99);
+    gPad->SetBorderMode(0);
     fHist->Draw();
-}
+
+    pad->cd(2);
+    gPad->SetPad(0.75, 0.01, 0.99, 0.99);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,3);
+
+    pad = gPad;
+
+    pad->cd(1);
+    gPad->SetBorderMode(0);
+
+    TH1 *h = fHist->Projection(Form("Proj_%p", this), 50);
+    h->SetTitle("Projection");
+    h->SetBit(kCanDelete);
+    h->Draw();
+
+    pad->cd(2);
+    gPad->SetBorderMode(0);
+
+    h = (TH1*)fHist->RadialProfile(Form("ProfR_%p", this), 20);
+    h->SetTitle("Radial Profile");
+    h->SetBit(kCanDelete|TH1::kNoStats);
+    h->Draw();
+
+    pad->cd(3);
+    gPad->SetBorderMode(0);
+    h = (TH1*)fHist->AzimuthProfile(Form("ProfA_%p", this), 30);
+    h->SetTitle("Azimuth Profile");
+    h->SetBit(kCanDelete|TH1::kNoStats);
+    h->Draw();
+}

trunk/MagicSoft/Mars/mhist/MHEvent.h

@@ -54 +54 @@
 
     void Draw(Option_t *o="");
+    void Paint(Option_t *o="");
  
     ClassDef(MHEvent, 1)

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -631 +631 @@
     {
         TCanvas *c = GetCanvas(i);
-        c->cd(1);
+        c->GetPad(1)->cd(1);
         hillas1->Draw();
         hillas2->Draw();
@@ -712 +712 @@
                 if (!o)
                     break;
-                fCanvas->SetName(Form("%p;%p;PixelContent", o->GetHist(), c->GetPad(1)));
+                fCanvas->SetName(Form("%p;%p;PixelContent", o->GetHist(), c->GetPad(1)->GetPad(1)));
             }
             break;