Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5460)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5461)
@@ -20,4 +20,12 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/11/23: Raquel de los Reyes
+
+   * mbase/MRunIter.[h,cc]
+     - changed the format of the read file to allow the processing of
+       standard F0/F1 (pedestal/calibration) files.
+     - Included a Set function.
+
 
  2004/11/22: Markus Gaug
Index: trunk/MagicSoft/Mars/mbase/MRunIter.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MRunIter.cc	(revision 5460)
+++ trunk/MagicSoft/Mars/mbase/MRunIter.cc	(revision 5461)
@@ -55,5 +55,12 @@
     // Changes to read the DAQ numbering format. Changes takes place
     // between runs 35487 and 00035488 (2004_08_30)
-    const char *fmt = run>35487 ? "*_%08d_*_%s" : "*_%05d_*_%s";
+    const char *fmt;
+    if(fIsStandardFile)
+      {
+        fmt = "%05d-%s";
+        fIsRawFile = kFALSE;
+      }
+    else
+      fmt = run>35487 ? "*_%08d_*_%s" : "*_%05d_*_%s";
 
     MDirIter Next;
Index: trunk/MagicSoft/Mars/mbase/MRunIter.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MRunIter.h	(revision 5460)
+++ trunk/MagicSoft/Mars/mbase/MRunIter.h	(revision 5461)
@@ -17,4 +17,5 @@
 
     Bool_t fIsRawFile;
+    Bool_t fIsStandardFile;
 
     void AddRunNumber(UInt_t run)
@@ -44,4 +45,5 @@
 
     void SetRawFile(Bool_t filetype) { fIsRawFile = filetype; }
+    void SetStandardFile(Bool_t filetype) { fIsStandardFile = filetype; }
 
     Int_t AddRun(UInt_t run, const char *path=0);