Changeset 2002 for trunk/MagicSoft/Mars/mfileio

Timestamp:

04/24/03 11:58:54 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MWriteRootFile.cc (modified) (7 diffs)
• MWriteRootFile.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -208 +208 @@
 Bool_t MWriteRootFile::GetContainer(MParList *pList)
 {
+    //
+    // loop over all branches which are 'marked' as branches to get written.
+    //
     MRootFileBranch *entry;
 
-    //
-    // loop over all branches which are 'marked' as branches to get written.
-    //
     TIter Next(&fBranches);
     while ((entry=(MRootFileBranch*)Next()))
@@ -274 +274 @@
             fTrees.AddLast(tree);
 
+            //
+            // If the tree does not already exist in the file mark this
+            // tree as a branch created by MWriteRootFile
+            //
+            entry->SetBit(kIsNewTree);
+
             gDirectory = save;
 
@@ -280 +286 @@
 
         //
+        // In case the file is opened as 'UPDATE' the tree may still not
+        // be in the list. Because it neither was created previously,
+        // nor this time, so the corresponding entries is marked as a
+        // single branch to be filled. --> Add it to the list of trees.
+        //
+        if (!fTrees.FindObject(tree))
+            fTrees.AddLast(tree);
+
+        //
         // Now we have a valid tree. Search the list of trees for this tree
-        // (either it is already there, or we created and add it previously)
         // Add a pointer to the entry in the tree list to this branch-entry
         //
-        TObject *obj;
-        TIter NextTree(&fTrees);
-        while ((obj=NextTree()))
-        {
-            if (obj == tree)
-                entry->SetTree((TTree*)obj);
-        }
+        entry->SetTree(tree);
 
         //
@@ -315 +323 @@
         branch = tree->Branch(branchname, cont->ClassName(), entry->GetAddress());
 
-        *fLog << "Created Branch " << cname << " of " << cont->ClassName() << "." << endl;
-
         //
         // If the branch couldn't be created we have a problem.
@@ -325 +331 @@
             return kFALSE;
         }
+
+        //
+        // Tell the entry also which branch belongs to it (this is necessary
+        // for branches belonging to already existing tree, UPDATE-mode)
+        //
+        entry->SetBranch(branch);
+        *fLog << "Created Branch " << cname << " of " << cont->ClassName() << "." << endl;
     }
     return kTRUE;
@@ -333 +346 @@
 // Checks all given containers (branch entries) for the write flag.
 // If the write flag is set the corresponding Tree is marked to get filled.
-// All Trees which are marked to be filled are filled with the corresponding
+// All Trees which are marked to be filled are filled with all their
 // branches.
+// In case of a file opened in 'UPDATE' mode, single branches can be
+// filled, too. WARNING - for the moment there is no check whether
+// you filled the correct number of events into the branch, so that
+// each of the other branches in the tree has the correct corresponding
+// number of new entries in the new branch!
 // Be carefull: If only one container (corresponding to a branch) of a tree
 // has the write flag, all containers in this tree are filled!
@@ -362 +380 @@
         // the corresponding tree entry.
         //
-        b->GetTree()->SetBit(kFillTree);
+        if (b->TestBit(kIsNewTree))
+            b->GetTree()->SetBit(kFillTree);
+        else
+            b->GetBranch()->Fill();
     }
 

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -57 +57 @@
     void SetContainer(MParContainer *cont) { fContainer = cont; }
     void SetTree(TTree *tree)              { fTree = tree; }
+    void SetBranch(TBranch *branch)        { fBranch = branch; }
 
     ClassDef(MRootFileBranch, 1) // Storage container for MWriteRootFile to store TBranch informations
@@ -69 +70 @@
     TObjArray fTrees;     //!
 
+    //UInt_t fNumEvents; //! Number of events written in a run
+
     void        CheckAndWrite() const;
     Bool_t      IsFileOpen() const;
@@ -75 +78 @@
 
     void StreamPrimitive(ofstream &out) const;
+    //Bool_t ReInit(MParList *pList);
+
+    enum {
+        kIsNewTree = BIT(15)
+    };
 
 public: