Changeset 2098 for trunk/MagicSoft/Mars/mhist

Timestamp:

05/08/03 18:00:03 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MH.cc (modified) (4 diffs)
• MH.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -630 +630 @@
     // Draw second histogram
     //
-    ((TH1&)hist2).DrawCopy("sames");
+    TH1 *h2 = ((TH1&)hist2).DrawCopy("sames");
     gPad->Update();
 
@@ -642 +642 @@
                               s2.GetY1NDC()-0.01
                              );
-    l.AddEntry((TH1*)&hist1, hist1.GetTitle());
-    l.AddEntry((TH1*)&hist2, hist2.GetTitle());
+    l.AddEntry(h1, h1->GetTitle());
+    l.AddEntry(h2, h2->GetTitle());
     l.SetTextSize(s2.GetTextSize());
     l.SetTextFont(s2.GetTextFont());
@@ -749 +749 @@
 // --------------------------------------------------------------------------
 //
+// Encapsulate the TObject::Clone such, that a cloned TH1 (or derived)
+// object is not added to the current directory, when cloned.
+//
+TObject *MH::Clone(const char *name) const
+{
+    Bool_t store = TH1::AddDirectoryStatus();
+    TH1::AddDirectory(kFALSE);
+
+    TObject *o = MParContainer::Clone(name);
+
+    TH1::AddDirectory(store);
+
+    return o;
+}
+
+// --------------------------------------------------------------------------
+//
 // If the opt string contains 'nonew' or gPad is not given a new canvas
 // with size w/h is created. Otherwise the object is cloned and drawn
@@ -763 +780 @@
     gROOT->SetSelectedPad(NULL);
 
-    Bool_t store = TH1::AddDirectoryStatus();
-    TH1::AddDirectory(kFALSE);
-
     TObject *o = MParContainer::DrawClone(opt);
     o->SetBit(kCanDelete);
-
-    TH1::AddDirectory(store);
-
     return o;
 }

trunk/MagicSoft/Mars/mhist/MH.h

@@ -61 +61 @@
     static void Draw(TH1 &hist1, TH1 &hist2, const TString title);
 
+    TObject *Clone(const char *name="") const;
+
     void Draw(Option_t *o="") { MParContainer::Draw(o); }
     TObject *DrawClone(Option_t *opt, Int_t w, Int_t h) const;