Changeset 9041 for trunk/MagicSoft/Mars/mfileio

Timestamp:

07/25/08 15:17:20 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MReadFiles.cc (modified) (1 diff)
• MReadScanFile.cc (modified) (3 diffs)
• MReadScanFile.h (modified) (1 diff)
• MReadTree.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mfileio/MReadFiles.cc

@@ -260 +260 @@
         *fLog << inf2 << num << " files added to list." << endl;
 
+    if (num==0)
+        *fLog << warn << "WARNING - No files found at " << txt << endl;
+
     return num;
 }

trunk/MagicSoft/Mars/mfileio/MReadScanFile.cc

@@ -177 +177 @@
 Bool_t MReadScanFile::AnalyzeHeader(MParList &plist)
 {
+    fList.Clear("nodelete");
+
     fLength = -1;
     if (!ReadDelimiter())
@@ -191 +193 @@
     }
  */
+ 
     TObjArray *arr = line.Tokenize('*');
 
@@ -215 +218 @@
 }
 
+Int_t MReadScanFile::PostProcess()
+{
+    fList.Clear("nodelete");
+    return kTRUE;
+}
+
 UInt_t MReadScanFile::GetEntries()
 {

trunk/MagicSoft/Mars/mfileio/MReadScanFile.h

@@ -21 +21 @@
     Bool_t ReadHeader();
     Int_t  ReadEvent();
+    Int_t  PostProcess();
 
 public:

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -295 +295 @@
 Bool_t MReadTree::Notify()
 {
+    cout << "--notify1--" << endl;
+
     //
     // Do a consistency check for all branches
@@ -300 +302 @@
     if (!CheckBranchSize())
         return kFALSE;
+
+    cout << "--notify2--" << endl;
 
     *fLog << inf << GetDescriptor() << ": Next file #" << GetFileIndex();
@@ -342 +346 @@
         }
 
+    cout << "--done--" << endl;
+
     return kTRUE;
 }
@@ -390 +396 @@
     }
     else
-        *fLog << warn << "WARNING: '" << newname << "' not added to " << GetDescriptor() << endl;
+        *fLog << warn << GetDescriptor() << ": WARNING - No files found at " << newname << endl;
 
     return numfiles;
@@ -994 +1000 @@
 
     if (fChain)
+    {
+//        cout << "LE: " << (int)fChain->GetLastError() << endl;
+
         switch (fChain->GetLastError())
         {
         case MChain::kFatalError:
             *fLog << err << GetDescriptor() << " - ERROR: Notify() failed." << endl;
-            return kERROR;
+            return kTRUE;
         case MChain::kCannotAccessFile:
             *fLog << err << GetDescriptor() << " - ERROR: TChain::LoadTree is unable to access requested file." << endl;
@@ -1010 +1019 @@
             return kTRUE;
         }
+    }
 
     return rc;
@@ -1180 +1190 @@
 // --------------------------------------------------------------------------
 //
-//  This schedules a TObject which Notify(9 function is called in case
+//  This schedules a TObject which Notify() function is called in case
 //  of MReadTree (TChain) switches from one file in the chain to another
 //  one.