Changeset 1502

Timestamp:

08/16/02 08:58:34 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MFillH.cc (modified) (4 diffs)
• mhist/MHHillas.cc (modified) (6 diffs)
• mhist/MHHillasExt.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/08/16: Thomas Bretz
+
+   * mhist/MFillH.cc:
+     - if not title is given create a default title from the names
+
+   * mhist/MHHillas.cc, mhist/MHHillasExt.cc:
+     - added legends. (still work to be done with the stat boxes)
+
+
 
  2002/08/14: Thomas Bretz

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -130 +130 @@
     fHName = hist;
     fParContainerName = par;
+
+    if (title)
+        return;
+
+    fTitle = "Fill " + fHName;
+    if (!par)
+        return;
+
+    fTitle += " from " + fParContainerName;
 }
 
@@ -163 +172 @@
     fParContainer = par;
     fParContainerName = par->GetName();
+
+    if (!title)
+        fTitle = "Fill " + fHName + " from " + par->GetDescriptor();
 }
 
@@ -181 +193 @@
     fHName = hist->GetName();
     fParContainerName = par;
+
+    if (title)
+        return;
+
+    fTitle = (TString)"Fill " + hist->GetDescriptor();
+    if (!par)
+        return;
+
+    fTitle += " from " + fParContainerName;
 }
 
@@ -200 +221 @@
     fParContainer = par;
     fParContainerName = par->GetName();
+
+    if (!title)
+        fTitle = (TString)"Fill " + hist->GetDescriptor() + " from " + par->GetDescriptor();
 }
 

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -41 +41 @@
 #include <TStyle.h>
 #include <TCanvas.h>
+#include <TLegend.h>
 
 #include "MLog.h"
@@ -73 +74 @@
     fUsedPix = new TH1F("UsedPix", "Number of used pixels",           150,   0, 150);
     fCorePix = new TH1F("CorePix", "Number of core pixels",           150,   0, 150);
+
+    fLength->SetLineColor(kBlue);
+    fCorePix->SetLineColor(kRed);
+    fUsedPix->SetLineColor(kGreen);
 
     fLength->SetDirectory(NULL);
@@ -290 +295 @@
 
     c->cd(1);
-    fWidth->DrawCopy();
-    fLength->SetLineColor(kBlue);
-    fLength->DrawCopy("same");
+
+    TObject *obj;
+    TLegend *l = new TLegend(0.75, 0.8, 0.9, 0.9);
+    obj = fWidth->DrawCopy();
+    ((TH1*)obj)->SetTitle(" Width / Length ");
+    l->AddEntry(obj, "Width");
+    obj = fLength->DrawCopy("same");
+    l->AddEntry(obj,  "Length");
+    l->SetBit(kCanDelete);
+    l->Draw();
 
     c->cd(2);
@@ -299 +311 @@
 
     c->cd(3);
-    fCorePix->SetLineColor(kRed);
-    fCorePix->DrawCopy();
-    fUsedPix->SetLineColor(kGreen);
-    fUsedPix->DrawCopy("same");
+    l = new TLegend(0.70, 0.8, 0.9, 0.9);
+    obj = fCorePix->DrawCopy();
+    ((TH1*)obj)->SetTitle(" Number of core/used Pixels ");
+    l->AddEntry(obj, "# Core Pixels");
+    obj = fUsedPix->DrawCopy("same");
+    l->AddEntry(obj,  "# Used Pixels");
+    l->SetBit(kCanDelete);
+    l->Draw();
 
     c->cd(4);
@@ -335 +351 @@
     gPad->cd(1);
     fWidth->Draw();
-    fLength->SetLineColor(kBlue);
     fLength->Draw("same");
 
@@ -343 +358 @@
 
     gPad->cd(3);
-    fCorePix->SetLineColor(kRed);
     fCorePix->Draw();
-    fUsedPix->SetLineColor(kGreen);
     fUsedPix->Draw("same");
 

trunk/MagicSoft/Mars/mhist/MHHillasExt.cc

@@ -37 +37 @@
 #include <TH1.h>
 #include <TPad.h>
+#include <TLegend.h>
 #include <TCanvas.h>
 
@@ -259 +260 @@
     gROOT->SetSelectedPad(NULL);
 
-
     c.cd(1);
-    ((TH1F)fHConc1).DrawCopy();
-    ((TH1F)fHConc).DrawCopy("same");
+    TObject *obj;
+    TLegend *l = new TLegend(0.75, 0.8, 0.9, 0.9);
+    obj = ((TH1F)fHConc1).DrawCopy();
+    ((TH1*)obj)->SetTitle(" Concentrations ");
+    l->AddEntry(obj, "Conc1");
+    obj = ((TH1F)fHConc).DrawCopy("same");
+    l->AddEntry(obj,  "Conc2");
+    l->SetBit(kCanDelete);
+    l->Draw();
 
     c.cd(2);
@@ -293 +300 @@
 
     gPad->cd(1);
-    fHConc1.SetLineColor(kBlue);
     fHConc1.Draw();
     fHConc.Draw("same");
 
+    TLegend *l = new TLegend(0.75, 0.8, 0.9, 0.9);
+    l->AddEntry((TH1*)&fHConc1, "Conc 1");
+    l->AddEntry((TH1*)&fHConc,  "Conc");
+    l->SetBit(kCanDelete);
+    l->Draw();
+
     gPad->cd(2);
     fHAsym.Draw();