Changeset 6907 for trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc (modified) (4 diffs)

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);
 }