Changeset 5141 for trunk/MagicSoft

Timestamp:

09/28/04 10:50:04 (20 years ago)

Author:

reyes

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/09/28: Raquel de los Reyes
+
+   * mbase/MRunIter.cc
+     - Changes in the AddRun function to read the old and the new DAQ 
+       numbering format. Changes took place between runs 35487 and 
+       00035488 (2004_08_30)
+
  2004/09/27: Abelardo Moralejo
 

trunk/MagicSoft/Mars/mbase/MRunIter.cc

@@ -52 +52 @@
         p = ".";
 
-    MDirIter Next(p, Form("*_%05d_*_%s", run,fIsRawFile?"*.raw":"*.root"), -1);
+    // R. DeLosReyes and T. Bretz
+    // Changes to read the DAQ numbering format. Changes takes place 
+    // between runs 35487 and 00035488 (2004_08_30)
+
+      MDirIter Next;
+      if(run<=35487)
+        Next.AddDirectory(p, Form("*_%05d_*_%s", run,fIsRawFile?"*.raw":"*.root"), -1);
+      else
+        Next.AddDirectory(p, Form("*_%08d_*_%s", run,fIsRawFile?"*.raw":"*.root"), -1);
 
     const TString name(Next());