Changeset 3144 for trunk/MagicSoft/Mars/mfileio

Timestamp:

02/13/04 18:02:54 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MReadReports.cc (modified) (3 diffs)
• MReadTree.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mfileio/MReadReports.cc ¶

@@ -198 +198 @@
     while ((tree=(MReadTree*)NextT()))
     {
-        if (((TChain*)tree->fChain)->GetListOfFiles()->GetEntries()==0)
+        if (!((TChain*)tree->fChain)->GetFile())
         {
-            *fLog << warn << "No files for Tree " << tree->GetName() << "... skipped." << endl;
+            *fLog << warn << "No files or no tree '" << tree->GetName() << "'... skipped." << endl;
+            fTrees->RemoveFromList(tree);
             continue;
         }
@@ -240 +241 @@
     }
 
+    if (i==0)
+    {
+        *fLog << err << "Files do not contain any valid tree... abort." << endl;
+        return kFALSE;
+    }
+
     fPosEntry.Set(i);
 
@@ -338 +345 @@
         }
 
+        *fLog << dbg << "Removing chain " << chain->GetName() << " from list." << endl;
+
         delete *GetTime(chain);
         delete  GetTime(chain);

trunk/MagicSoft/Mars/mfileio/MReadTree.cc ¶

@@ -597 +597 @@
 
     //
+    // check for files and for the tree!
+    //
+    if (!fChain->GetFile())
+    {
+        *fLog << err << GetDescriptor() << ": No file or no tree with name " << fChain->GetName() << " in file." << endl;
+        return kFALSE;
+    }
+
+    //
     // get number of events in this tree
     //
     if (!GetEntries())
     {
-        *fLog << warn << GetDescriptor() << ": No entries found in file(s)" << endl;
+        *fLog << err << GetDescriptor() << ": No entries found in file(s)" << endl;
         return kFALSE;
     }