Changeset 7841 for trunk/MagicSoft/Mars/mimage

Timestamp:

08/03/06 18:48:57 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MHHillas.cc (modified) (4 diffs)
• MHHillas.h (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -271 +271 @@
 // --------------------------------------------------------------------------
 //
-// Setup a inversed deep blue sea palette for the fCenter histogram.
-//
-void MHHillas::SetColors() const
-{
-    gStyle->SetPalette(51, NULL);
-    Int_t c[50];
-    for (int i=0; i<50; i++)
-        c[49-i] = gStyle->GetColorPalette(i);
-    gStyle->SetPalette(50, c);
-}
-
-// --------------------------------------------------------------------------
-//
 // Creates a new canvas and draws the four histograms into it.
 // Be careful: The histograms belongs to this object and won't get deleted
@@ -344 +331 @@
     fSize->Draw(same?"same":"");
 
-    //if (!same)
-    {
-        pad->cd(4);
-        gPad->SetBorderMode(0);
-        gPad->SetPad(0.51, 0.01, 0.99, 0.65);
-        if (same)
+    pad->cd(4);
+    gPad->SetBorderMode(0);
+    gPad->SetPad(0.51, 0.01, 0.99, 0.65);
+    if (same)
+    {
+        TH2 *h=dynamic_cast<TH2*>(gPad->FindObject("Center"));
+        if (h)
         {
-            /*
-            TH1 *h = dynamic_cast<TH1*>(gPad->FindObject("Center"));
-            if (h)
-            {
-                h->SetDrawOption("");
-                h->SetMarkerColor(kBlack);
-            }*/
-            RemoveFromPad("CenterSame");
-            fCenter->SetMarkerColor(kGreen);
-            fCenter->Draw("same");
+            h->SetDrawOption("");
+            h->SetMarkerColor(kBlack);
         }
-        else
-        {
-            //SetColors();
-            fCenter->Draw(/*"colz"*/);
-        }
-        if (fGeomCam)
-        {
-            MHCamera *cam = new MHCamera(*fGeomCam);
-            cam->Draw("same");
-            cam->SetBit(kCanDelete);
-        }
+
+        RemoveFromPad("CenterSame");
+        fCenter->SetMarkerColor(kGreen);
+        fCenter->Draw("same");
+    }
+    else
+        fCenter->Draw("colz");
+
+    if (fGeomCam)
+    {
+        MHCamera *cam = new MHCamera(*fGeomCam);
+        cam->Draw("same");
+        cam->SetBit(kCanDelete);
     }
 
@@ -383 +365 @@
     if (gPad && !same)
         delete gPad;
-
-    //pad->Modified();
-    //pad->Update();
 }
 
@@ -408 +387 @@
 void MHHillas::Paint(Option_t *opt)
 {
-    SetColors();
+    MH::SetPalette("pretty");
     MH::Paint();
 }

trunk/MagicSoft/Mars/mimage/MHHillas.h

@@ -23 +23 @@
     TH1F *fSize;    //-> Sum of used pixels
     TH2F *fCenter;  //-> Center
-
-    void SetColors() const;
 
     MGeomCam *fGeomCam; //! Camera geometry for plots (for the moment this is a feature for a loop only!)