Changeset 5300 for trunk/MagicSoft/Mars/mhbase/MH3.cc

Timestamp:

10/21/04 09:03:53 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhbase/MH3.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -478 +478 @@
 
     // FIXME: Do it in Paint()
-    if (str.Contains("COL", TString::kIgnoreCase))
+    /*
+     if (str.Contains("COL", TString::kIgnoreCase))
+    {
         SetColors();
-
-    if (fHist->TestBit(kIsLogx) && fHist->GetEntries()>0) gPad->SetLogx();
-    if (fHist->TestBit(kIsLogy) && fHist->GetEntries()>0) gPad->SetLogy();
-    if (fHist->TestBit(kIsLogz) && fHist->GetEntries()>0) gPad->SetLogz();
-
-    // Set pretty color palette
-    gStyle->SetPalette(1, 0);
-
-    TVirtualPad *padsave = gPad;
-
-    TProfile* h0;
-    if ((h0 = (TProfile*)gPad->FindObject(fNameProfX)))
-    {
-        // Get projection for range
-        TProfile *p = ((TH2*)fHist)->ProfileX(fNameProfX, -1, 9999, "s");
-
-        // Move contents from projection to h3
-        h0->Reset();
-        h0->Add(p);
-        delete p;
-
-        // Set Minimum as minimum value Greater Than 0
-        //h0->SetMinimum(GetMinimumGT(*h0));
-    }
-    if ((h0 = (TProfile*)gPad->FindObject(fNameProfY)))
-    {
-        // Get projection for range
-        TProfile *p = ((TH2*)fHist)->ProfileY(fNameProfY, -1, 9999, "s");
-
-        // Move contents from projection to h3
-        h0->Reset();
-        h0->Add(p);
-        delete p;
-
-        // Set Minimum as minimum value Greater Than 0
-        //h0->SetMinimum(GetMinimumGT(*h0));
-    }
-
-    gPad = padsave;
+        return;
+    }
+    */
+
+    if (str.Contains("log", TString::kIgnoreCase))
+    {
+        if (fHist->TestBit(kIsLogx) && fHist->GetEntries()>0) gPad->SetLogx();
+        if (fHist->TestBit(kIsLogy) && fHist->GetEntries()>0) gPad->SetLogy();
+        if (fHist->TestBit(kIsLogz) && fHist->GetEntries()>0) gPad->SetLogz();
+    }
+
+    if (str.Contains("upd", TString::kIgnoreCase))
+    {
+
+        // Set pretty color palette
+        // gStyle->SetPalette(1, 0);
+
+        TProfile* h0;
+        if ((h0 = (TProfile*)gPad->FindObject(fNameProfX)))
+            ((TH2*)fHist)->ProfileX(fNameProfX, -1, 9999, "s");
+        if ((h0 = (TProfile*)gPad->FindObject(fNameProfY)))
+            ((TH2*)fHist)->ProfileY(fNameProfY, -1, 9999, "s");
+    }
 }
 
@@ -550 +536 @@
     if (!only)
         fHist->Draw(str);
+
+    AppendPad("upd");
 
     if (str.Contains("PROFX", TString::kIgnoreCase) && fDimension==2)
@@ -562 +550 @@
     {
         TProfile *p = ((TH2*)fHist)->ProfileY(fNameProfY, -1, 9999, "s");
+        p->UseCurrentStyle();
         p->SetLineColor(kBlue);
         p->Draw(only?"":"same");
@@ -568 +557 @@
     }
 
-    AppendPad("");
+    AppendPad("log");
 }