Changeset 9302 for trunk/MagicSoft/Mars/mhbase

Timestamp:

02/07/09 20:40:28 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MFillH.cc (modified) (2 diffs)
• MH.cc (modified) (4 diffs)
• MH3.cc (modified) (7 diffs)
• MH3.h (modified) (1 diff)
• MHn.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -93 +93 @@
 #include "MLogManip.h"
 
+#include "MString.h"
+
 #include "MH.h"
 #include "MHArray.h"
@@ -599 +601 @@
     if (fDisplay && fDisplay->HasCanvas(fCanvas))
     {
-        const TString opt(Form("nonew %s", fDrawOption.Data()));
+        const TString opt(MString::Format("nonew %s", fDrawOption.Data()));
         fCanvas->cd();
         // Remove the old class to prevent clashes calling

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.42 2008-12-21 18:09:49 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.43 2009-02-07 20:40:12 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -74 +74 @@
 #include "MLogManip.h"
 
+#include "MString.h"
+
 #include "MParList.h"
 #include "MParContainer.h"
@@ -156 +158 @@
 
     if (list->FindObject(name))
-        name += Form(" <%d>", list->GetSize()+1);
+        name += MString::Format(" <%d>", list->GetSize()+1);
 
     if (!usescreenfactor)
@@ -1507 +1509 @@
 {
     *fLog << " " << setw(7) << n << " (";
-    *fLog << Form("%5.1f", 100.*n/GetNumExecutions());
+    *fLog << MString::Format("%5.1f", 100.*n/GetNumExecutions());
     *fLog << "%) Evts skipped: " << str << endl;
 }

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -166 +166 @@
 #include "MLog.h"
 #include "MLogManip.h"
+
+#include "MString.h"
 
 #include "MParList.h"
@@ -643 +645 @@
         if (gPad)
         {
-            const TString pfx(Form("%sProfX", fHist->GetName()));
-            const TString pfy(Form("%sProfY", fHist->GetName()));
+            const TString pfx(MString::Format("%sProfX", fHist->GetName()));
+            const TString pfy(MString::Format("%sProfY", fHist->GetName()));
 
             TProfile *p = 0;
             if ((p=dynamic_cast<TProfile*>(gPad->FindObject(pfx))))
-                p->SetName(Form("%sProfX", name));
+                p->SetName(MString::Format("%sProfX", name));
             if ((p=dynamic_cast<TProfile*>(gPad->FindObject(pfy))))
-                p->SetName(Form("%sProfY", name));
+                p->SetName(MString::Format("%sProfY", name));
         }
 
@@ -851 +853 @@
         MH::SetPalette("pretty");
 
-    const TString pfx(Form("%sProfX", fHist->GetName()));
+    const TString pfx(MString::Format("%sProfX", fHist->GetName()));
     if ((p=dynamic_cast<TProfile*>(gPad->FindObject(pfx))))
     {
@@ -859 +861 @@
     }
 
-    const TString pfy(Form("%sProfY", fHist->GetName()));
+    const TString pfy(MString::Format("%sProfY", fHist->GetName()));
     if ((p=dynamic_cast<TProfile*>(gPad->FindObject(pfy))))
     {
@@ -969 +971 @@
     if (profx)
     {
-        const TString pfx(Form("%sProfX", fHist->GetName()));
+        const TString pfx(MString::Format("%sProfX", fHist->GetName()));
 
         if (same && (p=dynamic_cast<TProfile*>(gPad->FindObject(pfx))))
@@ -985 +987 @@
     if (profy)
     {
-        const TString pfy(Form("%sProfY", fHist->GetName()));
+        const TString pfy(MString::Format("%sProfY", fHist->GetName()));
 
         if (same && (p=dynamic_cast<TProfile*>(gPad->FindObject(pfy))))
@@ -1298 +1300 @@
     delete arr;
 }
+
+void MH3::RecursiveRemove(TObject *obj)
+{
+    if (obj==fHist)
+        fHist = 0;
+}

trunk/MagicSoft/Mars/mhbase/MH3.h

@@ -158 +158 @@
     void Paint(Option_t *opt="");
 
+    void RecursiveRemove(TObject *obj);
+
     ClassDef(MH3, 4) // Generalized 1/2/3D-histogram for Mars variables
 };

trunk/MagicSoft/Mars/mhbase/MHn.cc

@@ -136 +136 @@
 
 #include "MH3.h"
+#include "MString.h"
 
 ClassImp(MHn);
@@ -170 +171 @@
         if (name==fHist[i]->GetName())
         {
-            name += Form("_%d", fNum);
+            name += MString::Format("_%d", fNum);
             break;
         }