Changeset 7001 for trunk/MagicSoft/Mars/mhist

Timestamp:

05/09/05 10:15:41 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamera.cc (modified) (14 diffs)
• MHCamera.h (modified) (3 diffs)
• MHGamma.cc (deleted)
• MHGamma.h (deleted)
• MHOnSubtraction.cc (deleted)
• MHOnSubtraction.h (deleted)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -107 +107 @@
     TVirtualPad *save = gPad;
     gPad = 0;
+    /*
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
     SetPalette(1, 0);
-#else
+#endif
+    */
+/*
+#if ROOT_VERSION_CODE < ROOT_VERSION(4,04,00)
     SetPrettyPalette();
+#elese
     // WORAROUND - FIXME: Calling it many times becomes slower and slower
-    //SetInvDeepBlueSeaPalette();
+    SetInvDeepBlueSeaPalette();
 #endif
+*/
     gPad = save;
 }
@@ -121 +127 @@
 //  Default Constructor. To be used by the root system ONLY.
 //
-MHCamera::MHCamera() : TH1D(), fGeomCam(NULL), fColors(kItemsLegend), fAbberation(0)
+MHCamera::MHCamera() : TH1D(), fGeomCam(NULL), fAbberation(0)
 {
     Init();
@@ -133 +139 @@
 //
 MHCamera::MHCamera(const MGeomCam &geom, const char *name, const char *title)
-: fGeomCam(NULL), fColors(kItemsLegend), fAbberation(0)
+: fGeomCam(NULL), fAbberation(0)
 {
     //fGeomCam = (MGeomCam*)geom.Clone();
@@ -463 +469 @@
 //                 GeMinimum() ((val-min)/(max-min))
 //   'proj'        Display the y-projection of the histogram
+//   'pal0'        Use Pretty palette
+//   'pal1'        Use Deep Blue Sea palette
+//   'pal2'        Use Inverse Depp Blue Sea palette
 //   'same'        Draw trandparent pixels on top of an existing pad. This
 //                 makes it possible to draw the camera image on top of an
@@ -970 +979 @@
     {
         opt.ReplaceAll("hist", "");
+        opt.ReplaceAll("box", "");
+        opt.ReplaceAll("pixelindex", "");
+        opt.ReplaceAll("sectorindex", "");
+        opt.ReplaceAll("content", "");
+        opt.ReplaceAll("proj", "");
+        opt.ReplaceAll("pal0", "");
+        opt.ReplaceAll("pal1", "");
+        opt.ReplaceAll("pal2", "");
         TH1D::Paint(opt);
         return;
@@ -1007 +1024 @@
     }
 
+    const Bool_t pal1 = opt.Contains("pal1");
+    const Bool_t pal2 = opt.Contains("pal2");
+
+    if (!pal1 && !pal2)
+        SetPrettyPalette();
+
+    if (pal1)
+        SetDeepBlueSeaPalette();
+
+    if (pal2)
+        SetInvDeepBlueSeaPalette();
+
     // Update Contents of the pixels and paint legend
     Update(gPad->GetLogy(), hasbox, hascol, hassame);
@@ -1021 +1050 @@
 }
 
+void MHCamera::SetDrawOption(Option_t *option)
+{
+    // This is a workaround. For some reason MHCamera is
+    // stored in a TObjLink instead of a TObjOptLink
+    if (!option || !gPad)
+        return;
+
+    TListIter next(gPad->GetListOfPrimitives());
+    delete gPad->FindObject("Tframe");
+    TObject *obj;
+    while ((obj = next()))
+        if (obj == this && (TString)next.GetOption()!=(TString)option)
+        {
+            gPad->GetListOfPrimitives()->Remove(this);
+            gPad->GetListOfPrimitives()->AddFirst(this, option);
+            return;
+        }
+}
+
 // ------------------------------------------------------------------------
 //
@@ -1053 +1101 @@
     else
         gStyle->SetPalette(ncolors, colors);
-
-    fColors.Set(kItemsLegend);
-    for (int i=0; i<kItemsLegend; i++)
-        fColors[i] = gStyle->GetColorPalette(i);
 }
 
@@ -1068 +1112 @@
 void MHCamera::SetPrettyPalette()
 {
-    if (!TString(GetDrawOption()).Contains("hist", TString::kIgnoreCase))
+    TString opt(GetDrawOption());
+
+    if (!opt.Contains("hist", TString::kIgnoreCase))
         SetPalette(1, 0);
+
+    opt.ReplaceAll("pal1", "");
+    opt.ReplaceAll("pal2", "");
+
+    SetDrawOption(opt);
 }
 
@@ -1080 +1131 @@
 void MHCamera::SetDeepBlueSeaPalette()
 {
-    if (!TString(GetDrawOption()).Contains("hist", TString::kIgnoreCase))
+    TString opt(GetDrawOption());
+
+    if (!opt.Contains("hist", TString::kIgnoreCase))
         SetPalette(51, 0);
+
+    opt.ReplaceAll("pal1", "");
+    opt.ReplaceAll("pal2", "");
+    opt += "pal1";
+
+    SetDrawOption(opt);
 }
 
@@ -1092 +1151 @@
 void MHCamera::SetInvDeepBlueSeaPalette()
 {
-    if (!TString(GetDrawOption()).Contains("hist", TString::kIgnoreCase))
+    TString opt(GetDrawOption());
+
+    if (!opt.Contains("hist", TString::kIgnoreCase))
         SetPalette(52, 0);
+
+    opt.ReplaceAll("pal1", "");
+    opt.ReplaceAll("pal2", "");
+    opt += "pal2";
+
+    SetDrawOption(opt);
 }
 
@@ -1515 +1582 @@
 
     if (val >= max)
-        return fColors[maxcolidx];
+        return gStyle->GetColorPalette(maxcolidx);
 
     if (val <= min)
-        return fColors[0];
+        return gStyle->GetColorPalette(0);
 
     //
@@ -1530 +1597 @@
 
     const Int_t colidx = (Int_t)(ratio*maxcolidx + .5);
-    return fColors[colidx];
+    return gStyle->GetColorPalette(colidx);
 }
 
@@ -1612 +1679 @@
     for (Int_t i=0; i<kItemsLegend; i++)
     {
-        newbox.SetFillColor(fColors[i]);
+        newbox.SetFillColor(gStyle->GetColorPalette(i));
         newbox.PaintBox(range, H*(i*h-1)-offset, range+w, H*((i+1)*h-1)-offset);
     }

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -48 +48 @@
     TArrayI        fBinEntries;  // number of entries per bin
 
-    TArrayI        fColors;      //! Color conversion table
     TList         *fNotify;      //!
 
@@ -214 +213 @@
     char    *GetObjectInfo(Int_t px, Int_t py) const;
     void     ExecuteEvent(Int_t event, Int_t px, Int_t py);
+    void     SetDrawOption(Option_t *option); //*MENU*
 
     void     SetPalette(Int_t ncolors, Int_t *colors);
@@ -222 +222 @@
 
     void     SetAutoScale() { fMinimum = fMaximum = -1111; } // *MENU*
-    void     DisplayAsHistogram() { SetDrawOption("histEP"); } // *MENU*
-    void     DisplayAsCamera() { SetDrawOption(""); } // *MENU*
 
     void     SetFreezed(Bool_t f=kTRUE) { f ? SetBit(kFreezed) : ResetBit(kFreezed); } // *TOGGLE* *GETTER=IsFreezed