Changeset 1483 for trunk/MagicSoft/Mars/mhist

Timestamp:

08/05/02 16:12:14 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MBinning.cc (modified) (5 diffs)
• MFillH.cc (modified) (1 diff)
• MH3.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mhist/MBinning.cc

@@ -36 +36 @@
 ClassImp(MBinning);
 
+static const TString gsDefName  = "MBinning";
+static const TString gsDefTitle = "Container describing the binning of an axis";
+
 // --------------------------------------------------------------------------
 //
@@ -46 +49 @@
     //   set the name and title of this object
     //
-    fName  = name  ? name  : "MBinning";
-    fTitle = title ? title : "Container describing the binning of an axis";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     SetEdges(10, 0, 1);
@@ -105 +108 @@
 void MBinning::StreamPrimitive(ofstream &out) const
 {
-    out << "   MBinning " << ToLower(fName) << "(\"";
-    out << fName << "\", \"" << fTitle << "\");" << endl;
+    out << "   MBinning " << GetUniqueName();
+    if (fName!=gsDefName)
+    {
+        out << "(\"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+        out <<")";
+    }
+    out << ";" << endl;
 
     if (IsDefault())
@@ -113 +123 @@
     if (IsLinear() || IsLogarithmic())
     {
-        out << "   " << ToLower(fName) << ".SetEdges";
+        out << "   " << GetUniqueName() << ".SetEdges";
         if (IsLogarithmic())
             out << "Log";
@@ -124 +134 @@
     for (int i=0; i<GetNumEdges(); i++)
         out << "      dummy[" << i << "]=" << GetEdges()[i] << ";" << endl;
-    out << "      " << ToLower(fName) << ".SetEdges(dummy);" << endl;
+    out << "      " << GetUniqueName() << ".SetEdges(dummy);" << endl;
     out << "   }" << endl;
 }

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -358 +358 @@
         fParContainer->SavePrimitive(out);
 
-    out << "   MFillH " << ToLower(fName) << "(";
+    out << "   MFillH " << GetUniqueName() << "(";
 
     if (fH)
-        out << "&" << ToLower(fH->GetName());
+        out << "&" << fH->GetUniqueName();
     else
         out << "\"" << fHName << "\"";
 
     if (fParContainer)
-        out << ", &" << ToLower(fParContainer->GetName());
+        out << ", &" << fParContainer->GetUniqueName();
     else
         if (!fParContainerName.IsNull())

trunk/MagicSoft/Mars/mhist/MH3.cc

@@ -78 +78 @@
 ClassImp(MH3);
 
+static const TString gsDefName  = "MH3";
+static const TString gsDefTitle = "Container for a %dD Mars Histogram";
+
 MH3::MH3() : fDimension(0), fHist(NULL)
 {
-    fName  = "MH3";
-    fTitle = "Container for a 1D Mars Histogram";
+    fName  = gsDefName;
+    fTitle = Form(gsDefTitle.Data(), 0);
 
     fData[0]  = fData[1]  = fData[2]  = NULL;
@@ -101 +104 @@
     fData[2] = NULL;
 
-    fName  = "MH3";
-    fTitle = "Container for a 1D Mars Histogram";
+    fName  = gsDefName;
+    fTitle = Form(gsDefTitle.Data(), 1);
 
     fHist->SetDirectory(NULL);
@@ -127 +130 @@
     fData[2] = NULL;
 
-    fName  = "MH3";
-    fTitle = "Container for a 2D Mars Histogram";
+    fName  = gsDefName;
+    fTitle = Form(gsDefTitle.Data(), 2);
 
     fHist->SetDirectory(NULL);
@@ -153 +156 @@
     fData[2] = new MDataChain(memberz);
 
-    fName  = "MH3";
-    fTitle = "Container for a 3D Mars Histogram";
+    fName  = gsDefName;
+    fTitle = Form(gsDefTitle.Data(), 3);
 
     fHist->SetDirectory(NULL);
@@ -386 +389 @@
 void MH3::StreamPrimitive(ofstream &out) const
 {
-    TString name = ToLower(fName);
+    TString name = GetUniqueName();
 
     out << "   MH3 " << name << "(\"";
@@ -397 +400 @@
     out << ");" << endl;
 
-    out << "   " << name << ".SetName(\"" << fName << "\");" << endl;
-    out << "   " << name << ".SetTitle(\"" << fTitle << "\");" << endl;
+    if (fName!=gsDefName)
+        out << "   " << name << ".SetName(\"" << fName << "\");" << endl;
+
+    if (fTitle!=Form(gsDefTitle.Data(), fDimension))
+        out << "   " << name << ".SetTitle(\"" << fTitle << "\");" << endl;
 
     switch (fDimension)