Changeset 6907 for trunk/MagicSoft/Mars/mimage

Timestamp:

04/04/05 10:18:01 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MHHillasExt.cc (modified) (2 diffs)
• MHHillasSrc.cc (modified) (4 diffs)
• MHImagePar.cc (modified) (1 diff)
• MHNewImagePar.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mimage/MHHillasExt.cc

@@ -244 +244 @@
 // together with the canvas.
 //
-void MHHillasExt::Draw(Option_t *)
+void MHHillasExt::Draw(Option_t *o)
 {
     TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
@@ -251 +251 @@
     AppendPad("");
 
-    pad->Divide(2, 2);
+    // FIXME: If same-option given make two independant y-axis!
+    const TString opt(o);
+    const Bool_t same = opt.Contains("same");
+
+    if (!same)
+        pad->Divide(2,2);
+    else
+    {
+        fHM3Long.SetLineColor(kMagenta);
+        fHM3Trans.SetLineColor(kCyan);
+
+        fHAsym.SetLineColor(kBlue);
+        fHMaxDist.SetLineColor(kBlue);
+    }
 
     pad->cd(1);
     gPad->SetBorderMode(0);
-    MH::DrawSame(fHM3Long, fHM3Trans, "3^{rd} Moments");
+    MH::DrawSame(fHM3Long, fHM3Trans, "3^{rd} Moments", same);
 
     pad->cd(3);
     gPad->SetBorderMode(0);
-    fHAsym.Draw();
+    fHAsym.Draw(same?"same":"");
 
     pad->cd(2);
     gPad->SetBorderMode(0);
-    fHMaxDist.Draw();
+    fHMaxDist.Draw(same?"same":"");
 
     delete pad->GetPad(4);

trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc

@@ -71 +71 @@
     //
     fAlpha    = new TH1F("Alpha",    "Alpha of Ellipse",                 90,   -90,  90);
-    fDist     = new TH1F("Dist",     "Dist of Ellipse",                 100,     0, 445);
+    fDist     = new TH1F("Dist",     "Dist of Ellipse",                  70,     0, 623);
     fCosDA    = new TH1F("CosDA",    "cos(Delta,Alpha) of Ellipse",     101,    -1,   1);
     fDCA      = new TH1F("DCA",      "Distance of closest aproach",     101,  -500, 500);
@@ -214 +214 @@
 // together with the canvas.
 //
-void MHHillasSrc::Draw(Option_t *)
+void MHHillasSrc::Draw(Option_t *o)
 {
     TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
@@ -223 +223 @@
     // FIXME: Display Source position
 
-    pad->Divide(2, 2);
+    // FIXME: If same-option given make two independant y-axis!
+    const TString opt(o);
+    const Bool_t same = opt.Contains("same");
+
+    if (!same)
+        pad->Divide(2,2);
+    else
+    {
+        fAlpha->SetLineColor(kGreen);
+        fDist->SetLineColor(kGreen);
+        fDCA->SetLineColor(kGreen);
+        fCosDA->SetLineColor(kGreen);
+        fDCADelta->SetLineColor(kGreen);
+    }
 
     pad->cd(1);
     gPad->SetBorderMode(0);
-    fAlpha->Draw();
+    fAlpha->Draw(same?"same":"");
 
     pad->cd(2);
     gPad->SetBorderMode(0);
-    fDist->Draw();
+    fDist->Draw(same?"same":"");
 
     pad->cd(3);
     gPad->SetBorderMode(0);
-    fDCA->Draw();
+    fDCA->Draw(same?"same":"");
 
     pad->cd(4);
@@ -241 +254 @@
 
     TVirtualPad *p = gPad;
-    p->Divide(1,2);
+    if (!same)
+        p->Divide(1,2);
     p->cd(1);
     gPad->SetBorderMode(0);
-    fCosDA->Draw();
+    fCosDA->Draw(same?"same":"");
 
     p->cd(2);
     gPad->SetBorderMode(0);
-    fDCADelta->Draw();
+    fDCADelta->Draw(same?"same":"");
 }
 

trunk/MagicSoft/Mars/mimage/MHImagePar.cc

@@ -231 +231 @@
         pad->Divide(2,2);
     else
+    {
+        fHistSatHi.SetLineColor(kMagenta);
+        fHistSatLo.SetLineColor(kCyan);
+
+        fHistSizeMainIsland.SetLineColor(kMagenta);
+        fHistSizeSubIslands.SetLineColor(kCyan);
+
         fHistIslands.SetLineColor(kGreen);
-
+        fHistNumSP.SetLineColor(kGreen);
+        fHistSizeSP.SetLineColor(kGreen);
+    }
+
+    pad->cd(1);
+    gPad->SetBorderMode(0);
+    MH::DrawSame(fHistSatHi, fHistSatLo, "Saturating Pixels", same);
+    fHistSatHi.SetMinimum();    // switch off to allow log-scale
+    fHistSatLo.SetMinimum();    // switch off to allow log-scale
+    fHistSatLo.SetMaximum(0.1); // dummy value to allow log-scale
+
+    pad->cd(4);
+    gPad->SetBorderMode(0);
+    MH::DrawSame(fHistSizeMainIsland, fHistSizeSubIslands, "Sizes...", same);
+    fHistSizeMainIsland.SetMinimum();    // switch off to allow log-scale
+    fHistSizeSubIslands.SetMinimum();    // switch off to allow log-scale
+    fHistSizeSubIslands.SetMaximum(0.1); // dummy value to allow log-scale
+
+    pad->cd(2);
+    gPad->SetBorderMode(0);
     if (!same)
+        pad->GetPad(2)->Divide(1,2,1e-10,1e-10);
+    if (pad->GetPad(2))
     {
-        pad->cd(1);
+        pad->GetPad(2)->cd(1);
         gPad->SetBorderMode(0);
-        MH::DrawSame(fHistSatHi, fHistSatLo, "Saturating Pixels");
-        fHistSatHi.SetMinimum();    // switch off to allow log-scale
-        fHistSatLo.SetMinimum();    // switch off to allow log-scale
-        fHistSatLo.SetMaximum(0.1); // dummy value to allow log-scale
-
-        pad->cd(4);
+        fHistNumSP.Draw(same?"same":"");
+        pad->GetPad(2)->cd(2);
         gPad->SetBorderMode(0);
-        MH::DrawSame(fHistSizeMainIsland, fHistSizeSubIslands, "Sizes...");
-        fHistSizeMainIsland.SetMinimum();    // switch off to allow log-scale
-        fHistSizeSubIslands.SetMinimum();    // switch off to allow log-scale
-        fHistSizeSubIslands.SetMaximum(0.1); // dummy value to allow log-scale
+        fHistSizeSP.Draw(same?"same":"");
     }
-
-    pad->cd(2);
-    gPad->SetBorderMode(0);
-    pad->GetPad(2)->Divide(1,2,1e-10,1e-10);
-    pad->GetPad(2)->cd(1);
-    gPad->SetBorderMode(0);
-    fHistNumSP.Draw(same?"same":"");
-    pad->GetPad(2)->cd(2);
-    gPad->SetBorderMode(0);
-    fHistSizeSP.Draw(same?"same":"");
 
     pad->cd(3);

trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

@@ -284 +284 @@
 void MHNewImagePar::Paint(Option_t *o)
 {
-    if (TString(o)==(TString)"log" && fHistLeakage1.GetMaximum()>0)
-        gPad->SetLogy();
+    if (fHistLeakage1.GetMaximum()>0 && gPad->GetPad(1))
+        gPad->GetPad(1)->SetLogy();
 }
 
@@ -294 +294 @@
 // together with the canvas.
 //
-void MHNewImagePar::Draw(Option_t *)
+void MHNewImagePar::Draw(Option_t *o)
 {
     TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
@@ -301 +301 @@
     AppendPad("");
 
-    pad->Divide(2,2);
+    // FIXME: If same-option given make two independant y-axis!
+    const TString opt(o);
+    const Bool_t same = opt.Contains("same");
+
+    if (!same)
+        pad->Divide(2,2);
+    else
+    {
+        fHistLeakage1.SetLineColor(kMagenta);
+        fHistLeakage1.SetLineColor(kCyan);
+
+        fHistCorePix.SetLineColor(kMagenta);
+        fHistUsedPix.SetLineColor(kCyan);
+
+        fHistConc1.SetLineColor(kMagenta);
+        fHistConc.SetLineColor(kCyan);
+
+        fHistCoreArea.SetLineColor(kMagenta);
+        fHistUsedArea.SetLineColor(kCyan);
+    }
 
     pad->cd(1);
@@ -307 +326 @@
     TAxis &x = *fHistLeakage1.GetXaxis();
     x.SetRangeUser(0.0, x.GetXmax());
-    MH::DrawSame(fHistLeakage1, fHistLeakage2, "Leakage1 and Leakage2");
+    MH::DrawSame(fHistLeakage1, fHistLeakage2, "Leakage1 and Leakage2", same);
     fHistLeakage1.SetMinimum();
     fHistLeakage2.SetMinimum();
     fHistLeakage2.SetMaximum(0.1);   // dummy value to allow log-scale
-    AppendPad("log");
 
     pad->cd(2);
     gPad->SetBorderMode(0);
-    MH::DrawSame(fHistCorePix, fHistUsedPix, "Number of core/used Pixels");
+    MH::DrawSame(fHistCorePix, fHistUsedPix, "Number of core/used Pixels", same);
 
     pad->cd(3);
     gPad->SetBorderMode(0);
-    MH::DrawSame(fHistConc1, fHistConc, "Concentrations");
+    MH::DrawSame(fHistConc1, fHistConc, "Concentrations", same);
 
     pad->cd(4);
     gPad->SetBorderMode(0);
-    MH::DrawSame(fHistCoreArea, fHistUsedArea, "Area of core/used Pixels");
+    MH::DrawSame(fHistCoreArea, fHistUsedArea, "Area of core/used Pixels", same);
 }