Changeset 5461 for trunk/MagicSoft/Mars

Timestamp:

11/23/04 14:31:26 (20 years ago)

Author:

reyes

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- 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

trunk/MagicSoft/Mars/mbase/MRunIter.cc

@@ -55 +55 @@
     // 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;

trunk/MagicSoft/Mars/mbase/MRunIter.h

@@ -17 +17 @@
 
     Bool_t fIsRawFile;
+    Bool_t fIsStandardFile;
 
     void AddRunNumber(UInt_t run)
@@ -44 +45 @@
 
     void SetRawFile(Bool_t filetype) { fIsRawFile = filetype; }
+    void SetStandardFile(Bool_t filetype) { fIsStandardFile = filetype; }
 
     Int_t AddRun(UInt_t run, const char *path=0);