Changeset 2130 for trunk/MagicSoft/Mars/mfileio

Timestamp:

05/21/03 16:06:50 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MReadTree.cc (modified) (2 diffs)
• MWriteRootFile.cc (modified) (1 diff)
• MWriteRootFile.h (modified) (1 diff)

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -261 +261 @@
 
     if (strrchr(fname, '?') || strrchr(fname, '*'))
-        *fLog << warn << "WARNING: You may encounter crashes closing the files..." << endl;
+    {
+        *fLog << warn;
+        *fLog<< "WARNING: Using widcards with older root versions:" << endl;
+        *fLog << "  You may encounter crashes closing the files..." << endl;
+    }
     else
     {
@@ -678 +682 @@
 
     //
-    // Do a consistency check for all branches
-    //
-//    if (!CheckBranchSize())
-//        return kFALSE;
-
-    //
     // If auto enabling scheme isn't disabled, do auto enabling
     //

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -148 +148 @@
     }
 
+    TObject *obj;
+    TIter NextBranch(&fBranches);
+    while ((obj=NextBranch()))
+    {
+        MRootFileBranch *b = (MRootFileBranch*)obj;
+
+        if (b->GetTree()->TestBit(kIsNewTree))
+            continue;
+
+        TBranch *branch = b->GetBranch();
+
+        TString name = b->GetTree()->GetName();
+        name += '.';
+        name += branch->GetName();
+
+        *fLog << " " << name.Strip(TString::kTrailing, '.') << ": \t" << branch->GetEntries() << " entries." << endl;
+    }
+
     TTree *t = NULL;
-    TIter Next(&fTrees);
-    while ((t=(TTree*)Next()))
-        *fLog << " " << t->GetName() << ": \t" << t->GetEntries() << " entries." << endl;
+    TIter NextTree(&fTrees);
+    while ((t=(TTree*)NextTree()))
+        if (t->TestBit(kIsNewTree))
+            *fLog << " " << t->GetName() << ": \t" << t->GetEntries() << " entries." << endl;
     *fLog << endl;
 }

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -82 +82 @@
     enum {
         kFillTree  = BIT(14),
-        kIsNewTree = BIT(15)
+        // TBranch::kAutoDelete = BIT(15)
+        kIsNewTree = BIT(16)
     };