Changeset 9576 for trunk/MagicSoft/Mars/mfileio

Timestamp:

04/22/10 11:43:42 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

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

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -1001 +1001 @@
         case MChain::kFatalError:
             *fLog << err << GetDescriptor() << " - ERROR: Notify() failed." << endl;
-            return kTRUE;
+            return kERROR;
         case MChain::kCannotAccessFile:
             *fLog << err << GetDescriptor() << " - ERROR: TChain::LoadTree is unable to access requested file." << endl;

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -716 +716 @@
             if (!b->GetBranch()->Fill())
             {
-                *fLog << err << "ERROR - Zero bytes written to branch '" << b->GetBranch()->GetName() << "'... abort." << endl;
+                *fLog << err << "ERROR - MWriteRootFile: Zero bytes written to branch '" << b->GetBranch()->GetName() << "'... abort." << endl;
                 return kFALSE;
             }
@@ -730 +730 @@
     {
         TTree *t = (TTree*)fTrees[idx];
+        if (!t)
+        {
+            *fLog << err << "ERROR - MWriteRootFile: The Tree with index " << idx << endl;
+            *fLog << " in fTrees is NULL. This should never happen. Please send" << endl;
+            *fLog << " a bug report." << endl;
+            return kFALSE;
+        }
 
         //
@@ -746 +753 @@
         if (!t->Fill())
         {
-            *fLog << err << "ERROR - Zero bytes written to tree '" << t->GetName() << "'... abort." << endl;
+            *fLog << err << "ERROR - MWriteRootFiole: Zero bytes written to tree '" << t->GetName() << "'... abort." << endl;
             return kFALSE;
         }