Changeset 1880 for trunk/MagicSoft/Mars/mfileio

Timestamp:

03/31/03 10:37:56 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

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

trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc

@@ -96 +96 @@
 // Add this file as the last entry in the chain
 //
-void MCT1ReadAscii::AddFile(const char *txt)
+Int_t MCT1ReadAscii::AddFile(const char *txt, Int_t)
 {
     TNamed *name = new TNamed(txt, "");
     fFileNames->AddLast(name);
+    return 1;
 }
 
@@ -299 +300 @@
     return kTRUE;
 }
-

trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.h

@@ -30 +30 @@
     ~MCT1ReadAscii();
 
-    void AddFile(const char *fname);
+    Int_t AddFile(const char *fname, Int_t dummy=-1);
 
     Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

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

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -77 +77 @@
     ~MCT1ReadPreProc();
 
-    void AddFile(const char *fname);
+    Int_t AddFile(const char *fname, Int_t dummy=-1);
 
     UInt_t GetEntries() { return fEntries; }

trunk/MagicSoft/Mars/mfileio/MRead.cc

@@ -39 +39 @@
 ClassImp(MRead);
 
+// --------------------------------------------------------------------------
+//
+// Read the setup from a TEnv:
+//   File0, File1, File2, ..., File10, ..., File100, ...
+//
+// Searching stops if the first key isn't found in the TEnv
+//
+// Enclosing quotation marks (") are removed
+//
+// Number of entries at the moment not supported
+//
+Bool_t MRead::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    //
+    // Don't allow 'global' setup of files
+    //
+    if (prefix.IsNull())
+        return kFALSE;
+
+    //
+    // Search (beginning with 0) all keys
+    //
+    for (int i=0;; i++)
+    {
+        TString idx = "File";
+        idx += i;
+
+        // Output if print set to kTRUE
+        IsEnvDefined(env, prefix, idx, print);
+
+        // Try to get the file name
+        TString name = GetEnvValue(env, prefix, idx, "");
+        if (name.IsNull())
+            return kTRUE;
+
+        if (name.BeginsWith("\"") && name.EndsWith("\""))
+        {
+            name.Remove(name.Last('\"'), 1);
+            name.Remove(name.First('\"'), 1);
+        }
+
+        AddFile(name);
+    }
+
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mfileio/MRead.h

@@ -21 +21 @@
     MFilter *GetSelector() { return fSelector; }
 
+    Int_t AddFile(const char *fname, Int_t entries=-1) { return -1; }
+
+    Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+
     ClassDef(MRead, 0)  // Base class for a reading task
 };