Changeset 5692 for trunk/MagicSoft/Mars/mfileio

Timestamp:

01/03/05 12:02:16 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MReadTree.cc (modified) (31 diffs)
• MReadTree.h (modified) (4 diffs)
• MWriteRootFile.cc (modified) (17 diffs)

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2005
 !
 !
@@ -24 +24 @@
 
 /////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-// MReadTree                                                               //
-//                                                                         //
-// This tasks opens all branches in a specified tree and creates the       //
-// corresponding parameter containers if not already existing in the       //
-// parameter list.                                                         //
-//                                                                         //
-// The Process function reads one events from the tree. To go through the  //
-// events of one tree make sure that the event number is increased from    //
-// outside. It makes also possible to go back by decreasing the number.    //
-//                                                                         //
-// If you don't want to start reading the first event you have to call     //
-// MReadTree::SetEventNum after instantiating your MReadTree-object.       //
-//                                                                         //
-// To make reading much faster (up to a factor of 10 to 20) you can        //
-// ensure that only the data you are really processing is enabled by       //
-// calling MReadTree::UseLeaf.                                             //
-//                                                                         //
-// If the chain switches from one file to another file all                 //
-// TObject::Notify() functions are called of TObject objects which were    //
-// added to the Notifier list view MReadTree::AddNotify. If MReadTree      //
-// is the owner (viw MReadTree::SetOwner) all this objects are deleted     //
-// by the destructor of MReadTree                                          //
-//                                                                         //
+//
+// MReadTree
+//
+// This tasks opens all branches in a specified tree and creates the
+// corresponding parameter containers if not already existing in the
+// parameter list.
+//
+// The Process function reads one events from the tree. To go through the
+// events of one tree make sure that the event number is increased from
+// outside. It makes also possible to go back by decreasing the number.
+//
+// If you don't want to start reading the first event you have to call
+// MReadTree::SetEventNum after instantiating your MReadTree-object.
+//
+// To make reading much faster (up to a factor of 10 to 20) you can
+// ensure that only the data you are really processing is enabled by
+// calling MReadTree::UseLeaf.
+//
+// If the chain switches from one file to another file all
+// TObject::Notify() functions are called of TObject objects which were
+// added to the Notifier list view MReadTree::AddNotify. If MReadTree
+// is the owner (viw MReadTree::SetOwner) all this objects are deleted
+// by the destructor of MReadTree
+//
+//
+// ToDo:
+// -----
+//  - Auto Scheme and Branch choosing doesn't work for memory trees
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MReadTree.h"
@@ -73 +78 @@
 // --------------------------------------------------------------------------
 //
-//  Default constructor. Don't use it.
-//
-MReadTree::MReadTree()
+//  Default constructor. Use this constructor (ONLY) if you want to
+//  access a memory tree (a TTree not stored in a file) created by
+//  MWriteRootFile or manually.
+//
+MReadTree::MReadTree(TTree *tree)
     : fNumEntry(0), fNumEntries(0), fBranchChoosing(kFALSE), fAutoEnable(kTRUE)
 {
@@ -81 +88 @@
     fTitle = "Task to loop over all events in one single tree";
 
-    fVetoList = NULL;
-    fNotify = NULL;
+    fVetoList = new TList;
+    fVetoList->SetOwner();
+
+    fNotify = new TList;
 
     fChain = NULL;
+
+    fTree = tree;
+    SetBit(kChainWasChanged);
+
+    if (fTree)
+        fAutoEnable = kFALSE;
+    /*
+    if (!fTree)
+        return;
+
+    TIter Next(fTree->GetListOfBranches());
+    TBranch *b=0;
+    while ((b=(TBranch*)Next()))
+        b->ResetAddress();
+    */
 }
 
@@ -114 +138 @@
     //
     fChain = new MChain(tname);
+    fTree = fChain;
 
     // root 3.02:
@@ -122 +147 @@
     if (fname)
         AddFile(fname);
-//        if (fChain->Add(fname)>0)
-//            SetBit(kChainWasChanged);
 }
 
@@ -137 +160 @@
     // creates a memory leak!
     //
-    TIter Next(fChain->GetStatus());
-
-    TChainElement *element = NULL;
-    while ((element=(TChainElement*)Next()))
-        if (element->GetBaddress())
-            delete (MParContainer**)element->GetBaddress();
-
-    //
-    // Delete the chain and the veto list
-    //
+    if (fChain) // FIXME: MEMORY LEAK for fTree!=0
+    {
+        TIter Next(fChain->GetStatus());
+
+        TChainElement *element = NULL;
+        while ((element=(TChainElement*)Next()))
+            if (element->GetBaddress())
+                delete (MParContainer**)element->GetBaddress();
+
+        //
+        // Delete the chain and the veto list
+        //
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,03,00)
-    if (fChain->GetFile())
-        delete fChain->GetFile();
+        if (fChain->GetFile())
+            delete fChain->GetFile();
 #endif
-    delete fChain;
+        delete fChain;
+    }
+
+    /* This is AND MUST be done in PostProcess. See there for more details
+    else
+    {
+        TIter Next(fTree->GetListOfBranches());
+
+        TBranch *element = NULL;
+        while ((element=(TBranch*)Next()))
+            if (element->GetAddress())
+                delete (MParContainer**)element->GetAddress();
+        }
+    */
 
     delete fNotify;
@@ -179 +217 @@
 Bool_t MReadTree::CheckBranchSize()
 {
-    TArrayI entries(fChain->GetStatus()->GetSize());
+    //if (!fChain) // >FIXME: fTree!=0
+    //    return kTRUE;
+
+    TArrayI entries(fChain ? fChain->GetStatus()->GetSize() : fTree->GetListOfBranches()->GetSize());
     Int_t num=0;
 
     // Loop over all branches which have a corresponding container
-    TIter Next(fChain->GetStatus());
-
-    TChainElement *element = NULL;
-    while ((element=(TChainElement*)Next()))
-    {
-        // Get branch name and find pointer to corresponding branch
-        const TString name = element->GetName();
-        const TBranch *b = fChain->FindBranch(name);
-
-        // Skip element without corresponding branches (like "*")
-        if (!b)
-            continue;
-
-        entries[num++] = (Int_t)b->GetEntries();
+    /*
+    if (fChain)
+    {
+        TIter Next(fChain->GetStatus());
+
+        TChainElement *element = NULL;
+        while ((element=(TChainElement*)Next()))
+        {
+            // Get branch name and find pointer to corresponding branch
+            const TString name = element->GetName();
+            const TBranch *b = fChain->FindBranch(name);
+
+            // Skip element without corresponding branches (like "*")
+            if (!b)
+                continue;
+
+            entries[num++] = (Int_t)b->GetEntries();
+        }
+    }
+    else */
+    {
+        TIter Next(fTree->GetListOfBranches());
+
+        TBranch *element = NULL;
+        while ((element=(TBranch*)Next()))
+            entries[num++] = (Int_t)element->GetEntries();
     }
 
@@ -209 +262 @@
             *fLog << "  Due to several circumstances (such at a bug in MReadTree or wrong" << endl;
             *fLog << "  usage of the file UPDATE mode) you may have produced a file in which" << endl;
-            *fLog << "  at least two branches in the same tree (" << fChain->GetName() << ") have different" << endl;
+            *fLog << "  at least two branches in the same tree (" << fTree->GetName() << ") have different" << endl;
             *fLog << "  number of entries. Sorry, but this file (" << GetFileName() << ")" << endl;
             *fLog << "  is unusable." << endl;
@@ -278 +331 @@
 Int_t MReadTree::AddFile(const char *fname, Int_t entries)
 {
+    if (!fChain)
+    {
+        *fLog << err << "MReadTree::AddFile - ERROR: You cannot add a file, because MReadTree" << endl;
+        *fLog <<        "                            handles a memory based tree or its default" << endl;
+        *fLog <<        "                            constructor was called." << endl;
+        return 0;
+    }
+
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,03,01)
     //
@@ -353 +414 @@
 Int_t MReadTree::AddFiles(const MReadTree &read)
 {
+    if (!fChain)
+    {
+        *fLog << err << "MReadTree::AddFiles - ERROR: You cannot add a file, because MReadTree" << endl;
+        *fLog <<        "                             handles a memory based tree or its default" << endl;
+        *fLog <<        "                             constructor was called." << endl;
+        return 0;
+    }
+
     const Int_t rc = fChain->Add(read.fChain);
 
@@ -376 +445 @@
 void MReadTree::SortFiles()
 {
-    fChain->GetListOfFiles()->Sort();
+    if (fChain)
+        fChain->GetListOfFiles()->Sort();
 }
 
@@ -392 +462 @@
 
     *fLog << inf << GetDescriptor() << ": Branch choosing enabled (only enabled branches are read)." << endl;
-    fChain->SetBranchStatus("*", kFALSE);
+    fTree->SetBranchStatus("*", kFALSE); // *CHANGED-fChain-to-fTree*
     fBranchChoosing = kTRUE;
 }
@@ -405 +475 @@
 void MReadTree::EnableBranch(const char *name)
 {
+    if (!fChain)
+    {
+        *fLog << warn << "MReadTree::EnableBranch - WARNING: EnableBranch doesn't work with memory based trees... ignored." << endl;
+        return;
+    }
+
     if (fChain->GetListOfFiles()->GetEntries()==0)
     {
@@ -424 +500 @@
 void MReadTree::SetBranchStatus(const char *name, Bool_t status)
 {
-    fChain->SetBranchStatus(name, status);
+    fTree->SetBranchStatus(name, status); // *CHANGED-fChain-to-fTree*
 
     *fLog << inf << (status ? "Enabled" : "Disabled");
@@ -449 +525 @@
         bn.Remove(bn.Length()-1);
 
-    if (fChain->GetBranch(bn))
+    if (fTree->GetBranch(bn)) // *CHANGED-fChain-to-fTree*
         SetBranchStatus(name, status);
 
@@ -461 +537 @@
         return;
 
-    if (fChain->GetBranch(dot+1))
+    if (fTree->GetBranch(dot+1)) // *CHANGED-fChain-to-fTree*
         SetBranchStatus(dot+1, status);
 }
@@ -575 +651 @@
     if (TestBit(kChainWasChanged))
     {
-        *fLog << inf << "Scanning chain " << fChain->GetName() << "... " << flush;
-        fNumEntries = (UInt_t)fChain->GetEntries();
+        // *CHANGED-fChain-to-fTree*
+        *fLog << inf << "Scanning chain " << fTree->GetName() << "... " << flush;
+        fNumEntries = (UInt_t)fTree->GetEntries();
         *fLog << fNumEntries << " events found." << endl;
         ResetBit(kChainWasChanged);
@@ -624 +701 @@
     // tasks are not preprocessed.
     //
-    fChain->SetNotify(NULL);
+    fTree->SetNotify(NULL); //*CHANGED-fChain-to-fTree*
 
     //
@@ -633 +710 @@
     // it crashes. ResetTree makes sure, that the tree number is -1
     //
-    fChain->ResetTree();
+    if (fChain) // *CHANGED-fChain-to-fTree*
+        fChain->ResetTree();
     // Maybe this would be enough, but the above might be safer...
     //if (fChain->GetTreeNumber()==0)
@@ -641 +719 @@
     // check for files and for the tree!
     //
-    if (!fChain->GetFile())
+    if (fChain && !fChain->GetFile()) // *CHANGED-fChain-to-fTree*
     {
         *fLog << err << GetDescriptor() << ": No file or no tree with name " << fChain->GetName() << " in file." << endl;
@@ -665 +743 @@
     // create the Iterator to loop over all branches
     //
-    TIter Next(fChain->GetListOfBranches());
+    TIter Next(fTree->GetListOfBranches()); // *CHANGED-fChain-to-fTree*
     TBranch *branch=NULL;
 
@@ -728 +806 @@
         // If we created one already, delete it.
         //
-        TChainElement *element = (TChainElement*)fChain->GetStatus()->FindObject(bname);
-        if (element)
-            delete (MParContainer**)element->GetBaddress();
+        // *CHANGED-fChain-to-fTree*
+        if (fChain)
+        {
+            TChainElement *element = (TChainElement*)fChain->GetStatus()->FindObject(bname);
+            if (element)
+                delete (MParContainer**)element->GetBaddress();
+        }
+        /* This can't be done here for memory trees - see
+           PostProcess for more details.
+        else
+        {
+            TBranch *branch = (TBranch*)fTree->GetBranch(bname);
+            if (branch)
+            {
+                *fLog << bname << " " << (void*)branch->GetAddress() << " " << pcont << endl;
+                delete (MParContainer**)branch->GetAddress();
+            }
+        }
+        */
 
         //
@@ -736 +830 @@
         // the actual branch should be stored - enable branch.
         //
-        fChain->SetBranchAddress(bname, pcont);
+        fTree->SetBranchAddress(bname, pcont); // *CHANGED-fChain-to-fTree*
 
         *fLog << inf << "Master branch address '" << bname << "' [";
@@ -762 +856 @@
     // PreProcess-function.
     //
-    fChain->ResetTree();
-    fChain->SetNotify(this);
-
-    return GetSelector() ? GetSelector()->CallPreProcess(pList) : kTRUE;
+    if (fChain)
+        fChain->ResetTree(); // *CHANGED-fChain-to-fTree*
+
+    fTree->SetNotify(this); // *CHANGED-fChain-to-fTree*
+
+    const Int_t rc = GetSelector() ? GetSelector()->CallPreProcess(pList) : kTRUE;
+    if (rc!=kTRUE || fChain)
+        return rc;
+
+    return Notify();
 }
 
@@ -775 +875 @@
 void MReadTree::SetReadyToSave(Bool_t flag)
 {
+    if (!fChain)
+        return;
+
     TIter Next(fChain->GetStatus());
 
@@ -870 +973 @@
     }
 
-    const Bool_t rc = fChain->GetEntry(fNumEntry++) != 0;
+    const Bool_t rc = fTree->GetEntry(fNumEntry++) != 0; // *CHANGED-fChain-to-fTree*
 
     if (fTaskList)
-        fTaskList->SetStreamId(fChain->GetName());
+        fTaskList->SetStreamId(fTree->GetName()); // *CHANGED-fChain-to-fTree*
 
     if (rc)
@@ -887 +990 @@
 Int_t MReadTree::PostProcess()
 {
+    // In the case of a memory tree I don't know how we can
+    // make a decision in PreProcess between a self allocated
+    // memory address or a pending address set long before.
+    // So we delete the stuff in PostProcess and not the destructor
+    // (which might seg faullt if PreProcess has never been called)
+    if (!fChain)
+    {
+        TIter Next(fTree->GetListOfBranches());
+        TBranch *b=0;
+        while ((b=(TBranch*)Next()))
+        {
+            if (b->GetAddress())
+            {
+                delete b->GetAddress();
+                b->ResetAddress();
+            }
+        }
+    }
+
     return GetSelector() ? GetSelector()->CallPostProcess() : kTRUE;
 }
@@ -896 +1018 @@
 Bool_t MReadTree::GetEvent()
 {
-    Bool_t rc = fChain->GetEntry(fNumEntry) != 0;
+    Bool_t rc = fTree->GetEntry(fNumEntry) != 0; // *CHANGED-fChain-to-fTree*
 
     if (rc)
@@ -981 +1103 @@
 TString MReadTree::GetFileName() const
 {
-    const TFile *file = fChain->GetFile();
+    const TFile *file = fChain ? fChain->GetFile() : fTree->GetCurrentFile();
 
     if (!file)
@@ -997 +1119 @@
 Int_t MReadTree::GetFileIndex() const
 {
-    return fChain->GetTreeNumber();
+    return fChain ? fChain->GetTreeNumber() : 0;
     /*
     const TString filename = fChain->GetFile()->GetName();

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -8 +8 @@
 class MChain;
 class TBranch;
+class TTree;
 class MTaskList;
 
@@ -15 +16 @@
 
 private:
-    MChain *fChain;            // Pointer to tree
+    MChain *fChain;            // Pointer to tree==fTree (only if fTree inherits from MChain)
+    TTree  *fTree;             // Pointer to tree
 
     UInt_t  fNumEntry;         // Number of actual entry in chain
@@ -23 +25 @@
     Bool_t  fAutoEnable;       // Flag for auto enabeling scheme
 
-    TList  *fVetoList;         // List of Branches which are not allowed to get enabled
-    TList  *fNotify;           // List of TObjects to notify when switching files
+    TList  *fVetoList;         //-> List of Branches which are not allowed to get enabled
+    TList  *fNotify;           //-> List of TObjects to notify when switching files
 
     MTaskList *fTaskList;      // Tasklist to set StreamId
@@ -47 +49 @@
 
 public:
-    MReadTree();
+    MReadTree(TTree *tree=0);
     MReadTree(const char *treename, const char *filename=NULL, const char *name=NULL, const char *title=NULL);
     ~MReadTree();

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 6/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2005
 !
 !
@@ -37 +37 @@
 // ReInit()) For more details se the corresponding constructor.
 //
+// Memory based trees
+// ------------------
+// It is possible to store the data into memory (TTrees) instead of
+// writing the data into a file. To do this either call the default
+// constructor or specify 'memory' as option in the constructor.
+//
+// Afterwards the tree can be found using gROOT->FindObject("treename")
+//
+// Currently(!) the tree is not deleted at all! Please make sure to
+// delete it if it is not used anymore - otherwise you could wast a LOT
+// of memory. Please consider that this behaviour might change in the
+// future.
+//
+// Such trees are usefull if you want to use more basic root-tools
+// like TMultiLayerPerceptron or TEventList.
+//
+// If you want to process such memory based Trees using Mars make sure,
+// that you don't need data from the RunHeader tree because you can
+// only use MReadTree but not MReadMarsFile with such a tree.
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MWriteRootFile.h"
@@ -72 +92 @@
 
     //
-    // Believing the root user guide, TTree instanced are owned by the
+    // Believing the root user guide, TTree instances are owned by the
     // directory (file) in which they are. This means we don't have to
     // care about their destruction.
@@ -87 +107 @@
 {
     Init();
-
-    //
-    // Set the Arrays the owner of its entries. This means, that the
-    // destructor of the arrays will delete all its entries.
-    //
-    fBranches.SetOwner();
 }
 
@@ -133 +147 @@
 //
 MWriteRootFile::MWriteRootFile(const char *fname,
-                               const Option_t *opt,
+                               const Option_t *option,
                                const char *ftitle,
                                const Int_t comp,
                                const char *name,
-                               const char *title)
+                               const char *title) : fOut(NULL)
 {
     Init(name, title);
+
+    TString opt(option);
+    opt.ToLower();
+
+    //
+    // Check if we are writing to memory
+    //
+    if (opt.Contains("memory"))
+    {
+        fSplitRule = fname;
+        return;
+    }
 
     //
@@ -172 +198 @@
     Print();
 
-    //
-    // If the file is still open (no error) write the keys. This is necessary
-    // for appearance of the all trees and branches.
-    //
-    if (IsFileOpen())
-        fOut->Write();
-
-    //
-    // Delete the file. This'll also close the file (if open)
-    //
-    delete fOut;
-    fOut = 0;
+    if (fOut)
+    {
+        //
+        // If the file is still open (no error) write the keys. This is necessary
+        // for appearance of the all trees and branches.
+        //
+        if (IsFileOpen())
+            fOut->Write();
+
+        //
+        // Delete the file. This'll also close the file (if open)
+        //
+        delete fOut;
+        fOut = 0;
+    }
 
     //
@@ -257 +286 @@
 void MWriteRootFile::AddContainer(const char *cname, const char *tname, Bool_t must)
 {
+    if (!fOut && !tname)
+        tname = fSplitRule;
+
     TIter Next(&fBranches);
     TObject *o=0;
@@ -262 +294 @@
         if (TString(o->GetName())==TString(tname) && TString(o->GetTitle())==TString(cname))
         {
+            *fLog << warn;
             *fLog << "WARNING - Container '" << cname << "' in Tree '" << tname << "' already scheduled... ignored." << endl;
             return;
@@ -290 +323 @@
                                   Bool_t must)
 {
+    if (!fOut && !tname)
+        tname = fSplitRule;
+
     TIter Next(&fBranches);
     TObject *o=0;
@@ -296 +332 @@
             static_cast<MRootFileBranch*>(o)->GetContainer()==cont)
         {
+            *fLog << warn;
             *fLog << "WARNING - Container " << cont << " in Tree '" << tname << "' already scheduled... ignored." << endl;
             return;
@@ -378 +415 @@
 
         //
-        // Check if the tree is already existing (part of the file)
-        //
-        TTree *tree = (TTree*)fOut->Get(tname);
+        // Check if the tree is already existing (part of the file or memory)
+        //
+        TTree *tree = fOut ? (TTree*)fOut->Get(tname) : dynamic_cast<TTree*>(gROOT->FindObject(tname));
+        if (!fOut && tree)
+        {
+            if (tree->GetCurrentFile())
+            {
+                *fLog << err;
+                *fLog << "ERROR - You are trying to write data into a memory stored root tree," << endl;
+                *fLog << "        because you either called the default constructor  or  have" << endl;
+                *fLog << "        instantiated MWriteRootFile using the write option 'memory'." << endl;
+                *fLog << "        This  tree   '" << tname << "'   is  already  existing  in" << endl;
+                *fLog << "        memory  (gROOT->FindObject)  and is already belonging  to a" << endl;
+                *fLog << "        file (" << tree->GetCurrentFile()->GetName() << ")." << endl;
+                *fLog << "        This can  - for example -  happen if you are reading from a" << endl;
+                *fLog << "        tree with the same name.  The easiest solution in this case" << endl;
+                *fLog << "        is to change the name of the tree you want to write to." << endl;
+                *fLog << endl;
+                return kFALSE;
+            }
+            *fLog << inf << "Tree '" << tname << "' found already in Memory... using." << endl;
+        }
+
         if (!tree)
         {
@@ -389 +446 @@
             //
             TDirectory *save = gDirectory;
-            fOut->cd();
-
-            tree = new TTree(tname, ttitle);
+            if (fOut)
+                fOut->cd();
+            else
+                gROOT->cd();
+
+            tree = new TTree(tname, ttitle, fOut ? 99 : 1);
             fTrees.AddLast(tree);
 
@@ -567 +627 @@
 
     //
+    // If we are writing into memory we don't split into seperate files
+    //
+    if (!fOut)
+        return kTRUE;
+
+    //
     // For more information see TTree:ChangeFile()
     //
@@ -774 +840 @@
 // --------------------------------------------------------------------------
 //
-// return open state of the root file.
+// return open state of the root file. If the file is 'memory' kTRUE is
+// returned.
 //
 Bool_t MWriteRootFile::IsFileOpen() const
 {
+    if (!fOut)
+        return kTRUE;
+
     const char *n = fOut->GetName();
     return n==0 || *n==0 ? kTRUE : fOut->IsOpen();
@@ -784 +854 @@
 // --------------------------------------------------------------------------
 //
-// return name of the root-file
+// return name of the root-file. If the file is "memory" "<memory>" is
+// returned.
 //
 const char *MWriteRootFile::GetFileName() const
 {
+    if (!fOut)
+        return "<memory>";
+
     const char *n = fOut->GetName();
     return n==0 || *n==0 ? "<dummy>" : n;
@@ -794 +868 @@
 // --------------------------------------------------------------------------
 //
-// cd into file. See TFile::cd()
+// cd into file. See TFile::cd(). If the file is "memory" kTRUE is returned.
 //
 Bool_t MWriteRootFile::cd(const char *path)
 {
-    return fOut->cd(path);
+    return fOut ? fOut->cd(path) : kTRUE;
 }
 
@@ -809 +883 @@
 void MWriteRootFile::StreamPrimitive(ofstream &out) const
 {
-    out << "   MWriteRootFile " << GetUniqueName() << "(\"";
-    out << fOut->GetName() << "\", \"";
-    out << fOut->GetOption() << "\", \"";
-    out << fOut->GetTitle() << "\", ";
-    out << fOut->GetCompressionLevel();
-
-    if (fName!=gsDefName || fTitle!=gsDefTitle)
-    {
-        out << ", \"" << fName << "\"";
-        if (fTitle!=gsDefTitle)
-            out << ", \"" << fTitle << "\"";
-    }
-    out << ");" << endl;
-
+    out << "   MWriteRootFile " << GetUniqueName();
+    if (fOut)
+    {
+        out << "(\"";
+        out << fOut->GetName() << "\", \"";
+        out << fOut->GetOption() << "\", \"";
+        out << fOut->GetTitle() << "\", ";
+        out << fOut->GetCompressionLevel();
+        out << ")";
+    }
+    out << ";" << endl;
+
+    if (fName!=gsDefName)
+        out << "   " << GetUniqueName() << ".SetName(\"" << fName << "\");" << endl;
+    if (fTitle!=gsDefTitle)
+        out << "   " << GetUniqueName() << ".SetTitle(\"" << fTitle << "\");" << endl;
 
     MRootFileBranch *entry;