Changeset 1477 for trunk/MagicSoft/Mars/mfileio

Timestamp:

08/02/02 15:20:53 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

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

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -783 +783 @@
 // gui elements to a macro-file.
 //
-void MReadTree::SavePrimitive(ofstream &out, Option_t *o)
+void MReadTree::StreamPrimitive(ofstream &out) const
 {
     TString name = ToLower(fName);

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -36 +36 @@
 
     virtual void SetReadyToSave(Bool_t flag=kTRUE);
+    virtual void StreamPrimitive(ofstream &out) const;
 
     enum { kIsOwner = BIT(14) };
@@ -72 +73 @@
 
     virtual Bool_t Notify();
-    virtual void   SavePrimitive(ofstream &out, Option_t *o="");
 
     ClassDef(MReadTree, 1)      // Reads a tree from file(s)

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -403 +403 @@
 // gui elements to a macro-file.
 //
-void MWriteRootFile::SavePrimitive(ofstream &out, Option_t *o)
+void MWriteRootFile::StreamPrimitive(ofstream &out) const
 {
     out << "   MWriteRootFile " << ToLower(fName) << "(\"";
@@ -416 +416 @@
     while ((entry=(MRootFileBranch*)Next()))
     {
-        out << "   " << ToLower(fName) << ".AddContainer(\"";
-        out << entry->GetContName() << "\", \"";
-        out << entry->GetName() << "\", \"";
+        if  (entry->GetContainer())
+        {
+            entry->GetContainer()->SavePrimitive(out);
+            out << "&" << ToLower(entry->GetContainer()->GetName());
+        }
+        else
+            out << "\"" << entry->GetContName() << "\"";
+
+        out << ", \"" << entry->GetName() << "\", \"";
         out << entry->GetTitle() << "\");" << endl;
     }

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -19 +19 @@
     TBranch       *fBranch;     //!
 
-    MParContainer *fContainer;  //!
+    MParContainer *fContainer;
     TString        fContName;
 
@@ -74 +74 @@
     const char *GetFileName() const;
 
+    void StreamPrimitive(ofstream &out) const;
+
 public:
     MWriteRootFile();
@@ -92 +94 @@
 
     void Print(Option_t *t=NULL) const;
-    void SavePrimitive(ofstream &out, Option_t *o="");
 
     ClassDef(MWriteRootFile, 1) // Class to write one container to a root file