Changeset 2414 for trunk/MagicSoft/Mars/mimage

Timestamp:

10/20/03 18:33:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MHHillas.cc (modified) (2 diffs)
• MHHillas.h (modified) (1 diff)
• MHHillasExt.cc (modified) (1 diff)
• MHHillasSrc.cc (modified) (1 diff)
• MHHillasSrc.h (modified) (1 diff)
• MHNewImagePar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -278 +278 @@
     gStyle->SetPalette(50, c);
 }
-
+/*
 // --------------------------------------------------------------------------
 //
@@ -323 +323 @@
     pad->Update();
 }
+*/
+
+// --------------------------------------------------------------------------
+//
+// Creates a new canvas and draws the four histograms into it.
+// Be careful: The histograms belongs to this object and won't get deleted
+// together with the canvas.
+//
+void MHHillas::DrawTS(TVirtualPad *p, Option_t *)
+{
+    TVirtualPad *pad = p ? p : MakeDefCanvas(this);
+    pad->SetBorderMode(0);
+
+    MParContainer::DrawTS(pad);
+
+    pad->Divide(2,3);
+
+    p = pad->GetPad(1);
+    p->SetBorderMode(0);
+    MH::DrawSame(*fWidth, *fLength, "Width'n'Length", p);
+
+    p = pad->GetPad(2);
+    p->SetBorderMode(0);
+    MParContainer::DrawTS(fDistC, p);
+
+    p = pad->GetPad(3);
+    p->SetBorderMode(0);
+    p->SetLogx();
+    MParContainer::DrawTS(fSize, p);
+
+    p = pad->GetPad(4);
+    p->SetBorderMode(0);
+    p->SetPad(0.51, 0.01, 0.99, 0.65);
+    SetColors();
+    MParContainer::DrawTS(fCenter, p, "colz");
+
+    p = pad->GetPad(5);
+    p->SetBorderMode(0);
+    MParContainer::DrawTS(fDelta, p);
+
+    delete pad->GetPad(6);
+
+    pad->Modified();
+    pad->Update();
+}
+
 
 TH1 *MHHillas::GetHistByName(const TString name)

trunk/MagicSoft/Mars/mimage/MHHillas.h

@@ -51 +51 @@
     TH2F *GetHistCenter() { return fCenter; }
 
-    void Draw(Option_t *opt=NULL);
+    //void Draw(Option_t *opt=NULL);
+    void DrawTS(TVirtualPad *pad=NULL, Option_t *opt=NULL);
 
     //Int_t DistancetoPrimitive(Int_t px, Int_t py) { return 0; }

trunk/MagicSoft/Mars/mimage/MHHillasExt.cc

@@ -242 +242 @@
     pad->cd(1);
     gPad->SetBorderMode(0);
-    MH::Draw(fHM3Long, fHM3Trans, "3^{rd} Moments");
+    MH::DrawSame(fHM3Long, fHM3Trans, "3^{rd} Moments");
 
     pad->cd(2);

trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc

@@ -198 +198 @@
 // together with the canvas.
 //
-void MHHillasSrc::Draw(Option_t *)
-{
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
+void MHHillasSrc::DrawTS(TVirtualPad *p, Option_t *)
+{
+    TVirtualPad *pad = p ? p : MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
-    AppendPad("");
+    //
+    // Add this object to the given pad
+    //
+    MParContainer::DrawTS(pad);
 
     // FIXME: Display Source position
 
+    //
+    // Fill the pad with histograms
+    //
     pad->Divide(2, 2);
 
-    pad->cd(1);
-    gPad->SetBorderMode(0);
-    fAlpha->Draw();
-
-    pad->cd(2);
-    gPad->SetBorderMode(0);
-    fDist->Draw();
-
-    pad->cd(4);
-    gPad->SetBorderMode(0);
-    //gPad->SetLogy();
-    fCosDA->Draw();
+    p = pad->GetPad(1);
+    p->SetBorderMode(0);
+    MParContainer::DrawTS(fAlpha, p);
+
+    p = pad->GetPad(2);
+    p->SetBorderMode(0);
+    MParContainer::DrawTS(fDist, p);
+
+    delete pad->GetPad(3);
+
+    p = pad->GetPad(4);
+    p->SetBorderMode(0);
+    MParContainer::DrawTS(fCosDA, p);
 
     pad->Modified();

trunk/MagicSoft/Mars/mimage/MHHillasSrc.h

@@ -35 +35 @@
     TH1F *GetHistCosDeltaAlpha() { return fCosDA; }
 
-    void Draw(Option_t *opt=NULL);
+    //void Draw(Option_t *opt=NULL);
+    void DrawTS(TVirtualPad *pad=NULL, Option_t *opt=NULL);
     void Paint(Option_t *opt);
 

trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

@@ -191 +191 @@
     TAxis &x = *fHistLeakage1.GetXaxis();
     x.SetRangeUser(0.0, x.GetXmax());
-    MH::Draw(fHistLeakage1, fHistLeakage2, "Leakage1 and Leakage2");
+    MH::DrawSame(fHistLeakage1, fHistLeakage2, "Leakage1 and Leakage2");
 
     pad->cd(2);
     gPad->SetBorderMode(0);
-    MH::Draw(fHistCorePix, fHistUsedPix, "Number of core/used Pixels");
+    MH::DrawSame(fHistCorePix, fHistUsedPix, "Number of core/used Pixels");
 
     pad->cd(3);
     gPad->SetBorderMode(0);
-    MH::Draw(fHistConc1, fHistConc, "Concentrations");
+    MH::DrawSame(fHistConc1, fHistConc, "Concentrations");
 
     pad->cd(4);