Changeset 3568 for trunk/MagicSoft/Mars/mfileio

Timestamp:

03/22/04 09:25:49 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MCT1ReadAscii.cc (modified) (2 diffs)
• MCT1ReadPreProc.cc (modified) (3 diffs)
• MReadRflFile.cc (modified) (2 diffs)
• MReadTree.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc

@@ -38 +38 @@
 //                                                                         //
 /////////////////////////////////////////////////////////////////////////////
-
 #include "MCT1ReadAscii.h"
 
+#include <errno.h>
 #include <fstream>
 
@@ -132 +132 @@
     const char *expname = gSystem->ExpandPathName(name);
     fIn = new ifstream(expname);
+
+    const Bool_t noexist = !(*fIn);
+    if (noexist)
+    {
+        *fLog << err << "Cannot open file " << expname << ": ";
+        *fLog << strerror(errno) << endl;
+    }
+    else
+        *fLog << inf << "Open file: '" << name << "'" << endl;
+
     delete [] expname;
-
-    const Bool_t noexist = !(*fIn);
-
-    if (noexist)
-        *fLog << dbginf << "Cannot open file '" << name << "'" << endl;
-    else
-        *fLog << "Open file: '" << name << "'" << endl;
 
     //

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -47 +47 @@
 #include "MCT1ReadPreProc.h"
 
+#include <errno.h>
 #include <fstream>
 
 #include <TList.h>
 #include <TSystem.h>
+#include <TRandom3.h>
 
 #define LINUX
@@ -81 +83 @@
 #include "MBinning.h"
 
-#include "TRandom3.h"
 #include "MParameters.h"
 
@@ -590 +591 @@
 
     fIn = new ifstream(fname);
+    if (!*fIn)
+    {
+        *fLog << err << "Cannot open file " << fname << ": ";
+        *fLog << strerror(errno) << endl;
+        return kFALSE;
+    }
 
     *fLog << inf << "-----------------------------------------------------------------------" << endl;

trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc

@@ -32 +32 @@
 #include "MReadRflFile.h"
 
+#include <errno.h>
 #include <fstream>
 
@@ -315 +316 @@
     if (!*fIn)
     {
-        cout << "Error openeng file " << name << "." << endl;
+        *fLog << err << "Cannot open file " << name << ": ";
+        *fLog << strerror(errno) << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -549 +549 @@
     if (TestBit(kChainWasChanged))
     {
-        *fLog << inf << "Scanning chain... " << flush;
+        *fLog << inf << "Scanning chain " << fChain->GetName() << "... " << flush;
         fNumEntries = (UInt_t)fChain->GetEntries();
         *fLog << fNumEntries << " events found." << endl;