Changeset 8226

Timestamp:

12/12/06 13:30:36 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MReadMarsFile.cc (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (1 diff)
• mfileio/MReadTree.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
      - fixed a bug in SetupRuns introduced yesterday which made the
        setup fail if SetupRuns were called more than once.
+
+   * mfileio/MReadTree.[h,cc]:
+     - added function returning the number of files in the chain
+
+   * mfileio/MReadMarsFile.cc:
+     - added a check which correlates the number of entries in
+       RunHeaders with the number of files
 
 

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -255 +255 @@
     }
 
+    // Check if really one file conatains one RunHeader
+    // (FIXME: Do the check more properly)
     if (fRun->GetEntries() < fRun->GetNumFiles())
     {

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -1152 +1152 @@
 // --------------------------------------------------------------------------
 //
+// Get number of files in chain. (-1 is returned if chain is not
+// initialized.
+//
+Int_t MReadTree::GetNumFiles() const
+{
+    if (!fChain)
+        return -1;
+
+    return fChain->GetListOfFiles()->GetEntries();
+}
+
+// --------------------------------------------------------------------------
+//
 //  Return the number of the file in the chain, -1 in case of an error
 //

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -77 +77 @@
     TString GetFullFileName() const;
     Int_t   GetFileIndex() const;
+    Int_t   GetNumFiles() const;
 
     virtual void AddNotify(TObject *obj);