Changeset 4826 for trunk/MagicSoft/Mars/mfileio

Timestamp:

09/01/04 18:06:06 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MWriteRootFile.cc (modified) (4 diffs)
• MWriteRootFile.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -233 +233 @@
         name += branch->GetName();
 
-        *fLog << " " << name.Strip(TString::kTrailing, '.') << ": \t" << branch->GetEntries() << " entries." << endl;
+        *fLog << " " << name.Strip(TString::kTrailing, '.') << ": \t" << (ULong_t)branch->GetEntries() << " entries." << endl;
     }
 
@@ -240 +240 @@
     while ((t=(TTree*)NextTree()))
         if (t->TestBit(kIsNewTree))
-            *fLog << " " << t->GetName() << ": \t" << t->GetEntries() << " entries." << endl;
+            *fLog << " " << t->GetName() << ": \t" << (ULong_t)t->GetEntries() << " entries." << endl;
     *fLog << endl;
 }
@@ -257 +257 @@
 void MWriteRootFile::AddContainer(const char *cname, const char *tname, Bool_t must)
 {
+    TIter Next(&fBranches);
+    TObject *o=0;
+    while ((o=Next()))
+        if (TString(o->GetName())==TString(tname) && TString(o->GetTitle())==TString(cname))
+        {
+            *fLog << "WARNING - Container '" << cname << "' in Tree '" << tname << "' already scheduled... ignored." << endl;
+            return;
+        }
+
     //
     // create a new entry in the list of branches to write and
@@ -281 +290 @@
                                   Bool_t must)
 {
+    TIter Next(&fBranches);
+    TObject *o=0;
+    while ((o=Next()))
+        if (TString(o->GetName())==TString(tname) &&
+            static_cast<MRootFileBranch*>(o)->GetContainer()==cont)
+        {
+            *fLog << "WARNING - Container " << cont << " in Tree '" << tname << "' already scheduled... ignored." << endl;
+            return;
+        }
+
     //
     // create a new entry in the list of branches to write and

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -23 +23 @@
 
     MParContainer *fContainer;
-    TString        fContName;
 
     Bool_t         fMust;
@@ -37 +36 @@
     {
         Init(NULL, kFALSE);
-        fContName = "";
+        fTitle = "";
     }
 
@@ -44 +43 @@
     {
         Init(tname, must);
-        fContName = cname;
+        fTitle = cname;
     }
 
     MRootFileBranch(MParContainer *cont, const char *tname=NULL, Bool_t must=kFALSE)
-        : fTree(NULL), fBranch(NULL), fContName(""), fMust(0)
+        : fTree(NULL), fBranch(NULL), fMust(0)
     {
         Init(tname, must);
+        fTitle = "";
         fContainer = cont;
     }
@@ -58 +58 @@
     void          *GetAddress()         { return &fContainer; }
     TBranch       *GetBranch() const    { return fBranch; }
-    const char    *GetContName() const  { return fContName; }
+    const char    *GetContName() const  { return fTitle; }
     Bool_t         MustHave() const     { return fMust; }