Changeset 1483 for trunk/MagicSoft/Mars/mbase/MParContainer.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MParContainer.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -37 +37 @@
 #include "MParContainer.h"
 
+#include <ctype.h>       // isdigit
 #include <fstream.h>     // ofstream, AsciiWrite
 
@@ -139 +140 @@
 // --------------------------------------------------------------------------
 //
+//  Return a unique name for this container. It is created from
+//  the container name and the unique Id. (This is mostly used
+//  in the StreamPrimitive member functions)
+//
+const TString MParContainer::GetUniqueName() const
+{
+    TString ret = ToLower(fName);
+
+    if (isdigit(ret[ret.Length()-1]))
+        ret+="_";
+
+    ret+=GetUniqueID();
+
+    return ret;
+}
+
+// --------------------------------------------------------------------------
+//
 //  List MParContainer name and title.
 //
@@ -359 +378 @@
 void MParContainer::SavePrimitive(ofstream &out, Option_t *o)
 {
+    static UInt_t uid = 0;
+
     if (IsSavedAsPrimitive())
         return;
 
+    SetUniqueID(uid++/*gRandom->Uniform(kMaxInt)*/);
     StreamPrimitive(out);
     SetBit(kIsSavedAsPrimitive);
@@ -373 +395 @@
 {
     out << "   // Using MParContainer::StreamPrimitive" << endl;
-    out << "   " << ClassName() << " " << ToLower(fName) << "(\"";
+    out << "   " << ClassName() << " " << GetUniqueName() << "(\"";
     out << fName << "\", \"" << fTitle << "\");" << endl;
 }