Changeset 6978 for trunk/MagicSoft/Mars/mhbase

Timestamp:

04/25/05 15:37:35 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

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

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -543 +543 @@
      */
 
-    TVirtualPad *save = gPad;
-    if (fCanvas)
-        fCanvas->cd();
+//    TVirtualPad *save = gPad;
+//    if (fCanvas)
+//        fCanvas->cd();
 
     const Bool_t rc = fH->Fill(fParContainer, fWeight?fWeight->GetVal():1);
     fH->SetNumExecutions(GetNumExecutions()+1);
 
-    if (save && fCanvas)
-        save->cd();
+//    if (save && fCanvas)
+//        save->cd();
     return rc;
 } 

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -117 +117 @@
 // a pointer to a root histogram from the MH-derived class.
 //
-TH1 *MH::GetHistByName(const TString name)
+TH1 *MH::GetHistByName(const TString name) const
 {
     *fLog << warn << GetDescriptor() << ": GetHistByName not overloaded! Can't be used!" << endl;

trunk/MagicSoft/Mars/mhbase/MH.h

@@ -49 +49 @@
     virtual TString GetDataMember() const { return ""; }
 
-    virtual TH1 *GetHistByName(const TString name);
+    virtual TH1 *GetHistByName(const TString name) const;
 
     static TCanvas *MakeDefCanvas(TString name="", const char *title="",

trunk/MagicSoft/Mars/mhbase/MH3.h

@@ -72 +72 @@
     const TH1 &GetHist() const { return *fHist; }
 
-    TH1 *GetHistByName(const TString name="") { return fHist; }
+    TH1 *GetHistByName(const TString name="") const { return fHist; }
+    TObject *FindObject(const TObject *obj) const { return 0; }
+    TObject *FindObject(const char *name) const
+    {
+        return (TObject*)GetHistByName(name);
+    }
 
     void SetColors() const;