Changeset 2296 for trunk/MagicSoft/Mars/mfileio

Timestamp:

07/29/03 13:18:57 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MCT1ReadPreProc.cc (modified) (4 diffs)
• MCT1ReadPreProc.h (modified) (1 diff)
• MRead.cc (modified) (2 diffs)
• MRead.h (modified) (2 diffs)
• MReadRflFile.cc (modified) (2 diffs)
• MReadRflFile.h (modified) (1 diff)
• MReadTree.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -125 +125 @@
 // Add this file as the last entry in the chain
 //
-void MCT1ReadPreProc::AddFile(const char *txt)
+Int_t MCT1ReadPreProc::AddFile(const char *txt, int)
 {
     const char *name = gSystem->ExpandPathName(txt);
@@ -135 +135 @@
     {
         *fLog << warn << "WARNING - Problem reading header... ignored." << endl;
-        return;
+        return 0;
     }
 
@@ -142 +142 @@
     {
         *fLog << warn << "WARNING - File contains no data... ignored." << endl;
-        return;
+        return 0;
     }
 
@@ -150 +150 @@
 
     fFileNames->AddLast(new TNamed(txt, ""));
+    return 1;
 }
 

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -92 +92 @@
     ~MCT1ReadPreProc();
 
-    void AddFile(const char *fname);
+    Int_t AddFile(const char *fname, int i=0);
 
     UInt_t GetEntries() { return fEntries; }

trunk/MagicSoft/Mars/mfileio/MRead.cc

@@ -39 +39 @@
 #include "MLog.h"
 #include "MLogManip.h"
+
+#include "MDirIter.h"
 
 ClassImp(MRead);
@@ -98 +100 @@
     return i!=0;
 }
+
+Int_t MRead::AddFiles(MDirIter &next)
+{
+    Int_t rc=0;
+    TString n;
+    while (!(n=next()).IsNull())
+    {
+        const Int_t num = AddFile(n);
+        if (num>0)
+            rc += num;
+    }
+    return rc;
+}
+

trunk/MagicSoft/Mars/mfileio/MRead.h

@@ -7 +7 @@
 
 class MFilter;
+class MDirIter;
 
 class MRead : public MTask
@@ -22 +23 @@
     MFilter *GetSelector() { return fSelector; }
 
-    Int_t AddFile(const char *fname, Int_t entries=-1) { return -1; }
+    virtual Int_t AddFile(const char *fname, Int_t entries=-1) { return -1; }
+    Int_t AddFiles(MDirIter &next);
 
     Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);

trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc

@@ -399 +399 @@
 // Add this file as the last entry in the chain
 //
-void MReadRflFile::AddFile(const char *txt)
+Int_t MReadRflFile::AddFile(const char *txt, int)
 {
     const char *name = gSystem->ExpandPathName(txt);
@@ -424 +424 @@
 */
     fFileNames->AddLast(new TNamed(txt, ""));
+    return 1;
 }
 

trunk/MagicSoft/Mars/mfileio/MReadRflFile.h

@@ -48 +48 @@
     ~MReadRflFile();
 
-    void AddFile(const char *fname);
+    Int_t AddFile(const char *fname, int i=0);
 
     Bool_t Rewind() { fNumFile=0; return kTRUE; }

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -121 +121 @@
 
     if (fname)
-        if (fChain->Add(fname)>0)
-            SetBit(kChainWasChanged);
+        AddFile(fname);
+//        if (fChain->Add(fname)>0)
+//            SetBit(kChainWasChanged);
 }
 
@@ -586 +587 @@
     if (!GetEntries())
     {
-        *fLog << warn << dbginf << "No entries found in file(s)" << endl;
+        *fLog << warn << GetDescriptor() << ": No entries found in file(s)" << endl;
         return kFALSE;
     }