Changeset 5603 for trunk

Timestamp:

12/15/04 14:59:24 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhbase/MH3.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -47 +47 @@
        this fixed the problem that searching for fPedestals was
        overwritten in MExtractTime
+
+   * macros/readrep.C:
+     - added the missing '.' dot to MTime in a comment
+
+   * mhbase/MH3.cc:
+     - draw profile by default not in blue but in the same color as the
+       histogram. Use 'BLUE' option to get the old behaviour
+     - fixed handling of 'same' option
+     - propagate title of axis to profile histogram
 
 

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -547 +547 @@
 //   PROFY: Draw a y-profile into the histogram (for 2D histograms only)
 //   ONLY:  Draw the profile histogram only (for 2D histograms only)
+//   BLUE:  Draw the profile in blue color instead of the histograms line color
 //
 // If the kIsLog?-Bit is set the axis is displayed lkogarithmically.
@@ -565 +566 @@
 
     Bool_t only = str.Contains("ONLY", TString::kIgnoreCase) && fDimension==2;
+    Bool_t same = str.Contains("SAME", TString::kIgnoreCase) && fDimension==2;
+    Bool_t blue = str.Contains("BLUE", TString::kIgnoreCase) && fDimension==2;
     // FIXME: We may have to remove all our own options from str!
     if (!only)
@@ -574 +577 @@
     {
         TProfile *p = ((TH2*)fHist)->ProfileX(fNameProfX, -1, 9999, "s");
-        p->SetLineColor(kBlue);
-        p->Draw(only?"":"same");
+        p->UseCurrentStyle();
+        p->SetLineColor(blue ? kBlue : fHist->GetLineColor());
+        p->Draw(only&&!same?"":"same");
         p->SetBit(kCanDelete);
         p->SetDirectory(NULL);
+        p->SetXTitle(fHist->GetXaxis()->GetTitle());
+        p->SetYTitle(fHist->GetYaxis()->GetTitle());
     }
     if (str.Contains("PROFY", TString::kIgnoreCase) && fDimension==2)
@@ -583 +589 @@
         TProfile *p = ((TH2*)fHist)->ProfileY(fNameProfY, -1, 9999, "s");
         p->UseCurrentStyle();
-        p->SetLineColor(kBlue);
-        p->Draw(only?"":"same");
+        p->SetLineColor(blue ? kBlue : fHist->GetLineColor());
+        p->Draw(only&&!same?"":"same");
         p->SetBit(kCanDelete);
         p->SetDirectory(NULL);
+        p->SetYTitle(fHist->GetXaxis()->GetTitle());
+        p->SetXTitle(fHist->GetYaxis()->GetTitle());
     }