Changeset 3682 for trunk/MagicSoft/Mars/mfileio

Timestamp:

04/08/04 19:52:13 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MReadMarsFile.cc (modified) (1 diff)
• MReadMarsFile.h (modified) (1 diff)
• MReadTree.cc (modified) (1 diff)
• MReadTree.h (modified) (1 diff)
• MWriteRootFile.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -116 +116 @@
 // --------------------------------------------------------------------------
 //
+//  Sort the files by their file-names
+//
+void MReadMarsFile::SortFiles()
+{
+    fRun->SortFiles();
+    MReadTree::SortFiles();
+}
+
+// --------------------------------------------------------------------------
+//
 //  This overload MReadTree::Notify. Before the MReadTree Notify
 //  TObjects are called the RunHeaders of the next files are read.

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.h

@@ -24 +24 @@
     ~MReadMarsFile();
 
+    void SortFiles();
+
     Int_t AddFile(const char *fname, Int_t entries=-1);
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -358 +358 @@
 // --------------------------------------------------------------------------
 //
+//  Sort the files by their file-names
+//
+void MReadTree::SortFiles()
+{
+    fChain->GetListOfFiles()->Sort();
+}
+
+// --------------------------------------------------------------------------
+//
 //  This function is called if Branch choosing method should get enabled.
 //  Branch choosing means, that only the enabled branches are read into

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -48 +48 @@
     ~MReadTree();
 
+    virtual void SortFiles();
+
     void   DisableAutoScheme() { fAutoEnable = kFALSE; }
     void   EnableBranch(const char *name);

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -198 +198 @@
     // add the entry to the list.
     //
-    MRootFileBranch *entry = new MRootFileBranch(cname, tname, must);
+    MRootFileBranch *entry = new MRootFileBranch(AddSerialNumber(cname), tname, must);
     fBranches.AddLast(entry);
 
     if (tname && tname[0])
-        AddToBranchList(Form("%s.%s", cname, tname));
+        AddToBranchList(Form("%s.%s", AddSerialNumber(cname), tname));
 }