Changeset 4928 for trunk/MagicSoft

Timestamp:

09/10/04 16:48:25 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -60 +60 @@
    * mhist/Makefile, mhist/HistLinkDef.h:
      - added MHEffectiveOnTime
+
+   * mhbase/MH3.cc:
+     - fixed a bug in SetupFill which was introduced when I allowed
+       set the axis titles from the object title
 
 

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -103 +103 @@
 //
 MH3::MH3(const unsigned int dim)
-    : fDimension(dim>3?3:dim), fHist(NULL)
+    : fDimension(dim>3?3:dim), fHist(NULL),
+    fNameProfX(Form("ProfX_%p", this)),
+    fNameProfY(Form("ProfY_%p", this))
 {  
     switch (fDimension)
@@ -171 +173 @@
 //
 MH3::MH3(const char *memberx, const char *membery)
-    : fDimension(2)
+    : fDimension(2), fNameProfX(Form("ProjX_%p", this)), fNameProfY(Form("ProjY_%p", this))
 {
     fHist = new TH2F;
@@ -313 +315 @@
                 return kFALSE;
             }
-
         }
         if (fData[0] && !fData[0]->PreProcess(plist))
@@ -325 +326 @@
     }
 
-    fHist->SetName(fName);
-    fHist->SetDirectory(0);
-
-    if (fTitle!=gsDefTitle)
-    {
-        fHist->SetTitle(fTitle);
-        return kTRUE;
-    }
-
     TString title("Histogram for ");
     title += fName;
-
-    switch (fDimension)
-    {
-    case 1:
-        fHist->SetTitle(title+" (1D)");
+    title += Form(" (%dD)", fDimension);
+
+    fHist->SetName(fName);
+    fHist->SetTitle(fTitle==gsDefTitle ? title : fTitle);
+    fHist->SetDirectory(0);
+
+    switch (fDimension)
+    {
+    case 1:
         SetBinning(fHist, binsx);
         return kTRUE;
     case 2:
-        fHist->SetTitle(title+" (2D)");
         SetBinning((TH2*)fHist, binsx, binsy);
         return kTRUE;
     case 3:
-        fHist->SetTitle(title+" (3D)");
         SetBinning((TH3*)fHist, binsx, binsy, binsz);
         return kTRUE;
@@ -479 +473 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Draw clone of histogram. So that the object can be deleted
+void MH3::Paint(Option_t *o)
+{
+    TString str(o);
+
+    // FIXME: Do it in Paint()
+    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;
+}
+
+// --------------------------------------------------------------------------
+//
+// Creates a new canvas and draws the histogram into it.
 //
 // Possible options are:
@@ -491 +533 @@
 // eg this is set when applying a logarithmic MBinning
 //
-// and the histogram is still visible in the canvas.
-// The cloned object are deleted together with the canvas if the canvas is
-// destroyed. If you want to handle destroying the canvas you can get a
-// pointer to it from this function
-//
-/*
-TObject *MH3::DrawClone(Option_t *opt) const
-{
+// Be careful: The histogram belongs to this object and won't get deleted
+// together with the canvas.
+//
+void MH3::Draw(Option_t *opt)
+{
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
+    pad->SetBorderMode(0);
+
+    fHist->SetFillStyle(4000);
+
     TString str(opt);
-
-    TVirtualPad *c = gPad;
-    if (!str.Contains("nonew", TString::kIgnoreCase))
-    {
-        c = MH::MakeDefCanvas(fHist);
-
-        //
-        // This is necessary to get the expected bahviour of DrawClone
-        //
-        gROOT->SetSelectedPad(NULL);
-    }
-
-    if (str.Contains("COL", TString::kIgnoreCase))
-        SetColors();
+    str = str.Strip(TString::kBoth);
 
     Bool_t only = str.Contains("ONLY", TString::kIgnoreCase) && fDimension==2;
+    // FIXME: We may have to remove all our own options from str!
     if (!only)
-        fHist->DrawCopy(opt);
+        fHist->Draw(str);
 
     if (str.Contains("PROFX", TString::kIgnoreCase) && fDimension==2)
     {
-        TProfile *p = ((TH2*)fHist)->ProfileX("_pfx", -1, 9999, "s");
+        TProfile *p = ((TH2*)fHist)->ProfileX(fNameProfX, -1, 9999, "s");
         p->SetLineColor(kBlue);
         p->Draw(only?"":"same");
@@ -529 +561 @@
     if (str.Contains("PROFY", TString::kIgnoreCase) && fDimension==2)
     {
-        TProfile *p = ((TH2*)fHist)->ProfileY("_pfy", -1, 9999, "s");
-        p->SetLineColor(kBlue);
-        p->Draw(only?"":"same");
-        p->SetBit(kCanDelete);
-        p->SetDirectory(NULL);
-    }
-
-    if (fHist->TestBit(kIsLogx)) c->SetLogx();
-    if (fHist->TestBit(kIsLogy)) c->SetLogy();
-    if (fHist->TestBit(kIsLogz)) c->SetLogz();
-
-    c->Modified();
-    c->Update();
-
-    return c;
-}
-*/
-
-/*
-void MH3::Paint(Option_t *opt)
-{
-    if (fHist->TestBit(kIsLogx)) pad->SetLogx();
-    if (fHist->TestBit(kIsLogy)) pad->SetLogy();
-    if (fHist->TestBit(kIsLogz)) pad->SetLogz();
-}
-*/
-
-void MH3::Paint(Option_t *o)
-{
-    TString str(o);
-
-    // FIXME: Do it in Paint()
-    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("_pfx")))
-    {
-        // Get projection for range
-        TProfile *p = ((TH2*)fHist)->ProfileX("_pfx", -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("_pfy")))
-    {
-        // Get projection for range
-        TProfile *p = ((TH2*)fHist)->ProfileY("_pfy", -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;
-}
-
-// --------------------------------------------------------------------------
-//
-// Creates a new canvas and draws the histogram into it.
-//
-// Possible options are:
-//   PROFX: Draw a x-profile into the histogram (for 2D histograms only)
-//   PROFY: Draw a y-profile into the histogram (for 2D histograms only)
-//   ONLY:  Draw the profile histogram only (for 2D histograms only)
-//
-// If the kIsLog?-Bit is set the axis is displayed lkogarithmically.
-// eg this is set when applying a logarithmic MBinning
-//
-// Be careful: The histogram belongs to this object and won't get deleted
-// together with the canvas.
-//
-void MH3::Draw(Option_t *opt)
-{
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
-    pad->SetBorderMode(0);
-
-    fHist->SetFillStyle(4000);
-
-    TString str(opt);
-    str = str.Strip(TString::kBoth);
-
-
-    Bool_t only = str.Contains("ONLY", TString::kIgnoreCase) && fDimension==2;
-    // FIXME: We may have to remove all our own options from str!
-    if (!only)
-        fHist->Draw(str);
-
-    if (str.Contains("PROFX", TString::kIgnoreCase) && fDimension==2)
-    {
-        TProfile *p = ((TH2*)fHist)->ProfileX("_pfx", -1, 9999, "s");
-        p->SetLineColor(kBlue);
-        p->Draw(only?"":"same");
-        p->SetBit(kCanDelete);
-        p->SetDirectory(NULL);
-    }
-    if (str.Contains("PROFY", TString::kIgnoreCase) && fDimension==2)
-    {
-        TProfile *p = ((TH2*)fHist)->ProfileY("_pfy", -1, 9999, "s");
+        TProfile *p = ((TH2*)fHist)->ProfileY(fNameProfY, -1, 9999, "s");
         p->SetLineColor(kBlue);
         p->Draw(only?"":"same");