Changeset 3966 for trunk

Timestamp:

05/04/04 18:28:59 (22 years ago)

Author:

reyes

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MRunIter.cc (modified) (1 diff)
• mbase/MRunIter.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/05/04: Raquel de los Reyes
+ 
+   * mbase/MRunIter.[h,cc]
+     - Added a flag and a set function to read .raw files. 
+       The default option is set to read .root files.
+
  2004/05/04: Javier Rico
  
@@ -24 +30 @@
      - when calibrating using kNONE, weight by the pixel area
         
-
  2004/05/04: Thomas Bretz
  

trunk/MagicSoft/Mars/mbase/MRunIter.cc

@@ -52 +52 @@
         p = ".";
 
-    MDirIter Next(p, Form("*_%05d_*_*.root", run), -1);
+    MDirIter Next(p, Form("*_%05d_*_%s", run,fIsRawFile?"*.raw":"*.root"), -1);
 
     const TString name(Next());

trunk/MagicSoft/Mars/mbase/MRunIter.h

@@ -15 +15 @@
     TString fPath;
     TArrayI fRuns;
+
+    Bool_t fIsRawFile;
+
+    void SetRawFile(Bool_t filetype) { fIsRawFile = filetype; }
 
     void AddRunNumber(UInt_t run)
@@ -39 +43 @@
 
 public:
-    MRunIter(const char *path=0) : fPath(path) { }
+    MRunIter(const char *path=0) : fPath(path), fIsRawFile(0) { }
 
     Int_t AddRun(UInt_t run, const char *path=0);