Changeset 5994 for trunk/MagicSoft/Mars/mhbase

Timestamp:

01/25/05 14:47:59 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MFillH.cc (modified) (2 diffs)
• MH.cc (modified) (1 diff)
• MH.h (modified) (1 diff)
• MH3.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -358 +358 @@
 // if fDisplay is set and the MH-class overwrites the Draw function
 //
+// If the draw-option contains 'same' (case insensitive) a tab with the
+// same name as the one which would be created is searched and the
+// MH is drawn to this canvas. If it is not found a new tab is created.
+//
 Bool_t MFillH::DrawToDisplay()
 {
@@ -371 +375 @@
         return kTRUE;
 
-    fCanvas = &fDisplay->AddTab(fNameTab.IsNull() ? fH->GetName() : fNameTab.Data());
+    const TString tabname = fNameTab.IsNull() ? fH->GetName() : fNameTab.Data();
+
+    fCanvas = 0;
+    if (fDrawOption.Contains("same", TString::kIgnoreCase))
+        fCanvas = fDisplay->GetCanvas(tabname);
+    if (!fCanvas)
+        fCanvas = &fDisplay->AddTab(tabname);
+
+    fCanvas->cd();
     fH->Draw(fDrawOption);
 

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -795 +795 @@
 // Also layout the two statistic boxes and a legend.
 //
-void MH::DrawSame(TH1 &hist1, TH1 &hist2, const TString title)
+void MH::DrawSame(TH1 &hist1, TH1 &hist2, const TString title, Bool_t same)
 {
     //
     // Draw first histogram
     //
-    hist1.Draw();
+    hist1.Draw(same?"same":"");
     gPad->SetBorderMode(0);
     gPad->Update();

trunk/MagicSoft/Mars/mhbase/MH.h

@@ -85 +85 @@
 
     static void DrawSameCopy(const TH1 &hist1, const TH1 &hist2, const TString title);
-    static void DrawSame(TH1 &hist1, TH1 &hist2, const TString title);
+    static void DrawSame(TH1 &hist1, TH1 &hist2, const TString title, Bool_t same=kFALSE);
 
     TObject *Clone(const char *name="") const;

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -103 +103 @@
 //
 MH3::MH3(const unsigned int dim)
-    : fDimension(dim>3?3:dim), fHist(NULL)/*,
-    fNameProfX(Form("ProfX_%p", this)),
-    fNameProfY(Form("ProfY_%p", this))*/
+    : fDimension(dim>3?3:dim), fHist(NULL)
 {  
     switch (fDimension)
@@ -205 +203 @@
 //
 MH3::MH3(const char *memberx, const char *membery)
-    : fDimension(2)/*, fNameProfX(Form("ProjX_%p", this)), fNameProfY(Form("ProjY_%p", this))*/
+    : fDimension(2)
 {
     fHist = new TH2F;
@@ -539 +537 @@
 
     TString str(o);
-    str = str.Strip(TString::kBoth);
-
-    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;
+    str.ToLower();
+
+    const Bool_t only  = str.Contains("only")  && fDimension==2;
+    const Bool_t same  = str.Contains("same")  && fDimension==2;
+    const Bool_t blue  = str.Contains("blue")  && fDimension==2;
+    const Bool_t profx = str.Contains("profx") && fDimension==2;
+    const Bool_t profy = str.Contains("profy") && fDimension==2;
+    // Do NOT replace 'same'-option
+    str.ReplaceAll("only",  "");
+    str.ReplaceAll("blue",  "");
+    str.ReplaceAll("profx", "");
+    str.ReplaceAll("profy", "");
 
     // FIXME: We may have to remove all our own options from str!
@@ -549 +554 @@
         fHist->Draw(str);
 
-    if (str.Contains("PROFX", TString::kIgnoreCase) && fDimension==2)
+    if (profx)
     {
         TProfile *p = ((TH2*)fHist)->ProfileX("ProfX", -1, 9999, "s");
@@ -563 +568 @@
         }
     }
-    if (str.Contains("PROFY", TString::kIgnoreCase) && fDimension==2)
+    if (profy)
     {
         TProfile *p = ((TH2*)fHist)->ProfileY("ProfY", -1, 9999, "s");