Changeset 2194

Timestamp:

06/18/03 12:02:47 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/merpp.C (modified) (3 diffs)
• mmain/MStatusDisplay.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -11 +11 @@
      - changed histogram name
      - added axis titles
+
+   * mbase/MLog.cc:
+     - include iomanip onstead of MLogManip
+
+   * mbase/MLogManip.h:
+     - replaced preprocessor defintions for all, warn, inf, err and dbg
+       by const variable declarations
+     - fixed dynamic_casts
+
+   * macros/merpp.C:
+     - made capable of more than one directory
+     
+   * mmain/MStatusDisplay.cc:
+     - removed an unsused variable
 
 

trunk/MagicSoft/Mars/macros/merpp.C

@@ -38 +38 @@
 /////////////////////////////////////////////////////////////////////////////
 
-void merpp()
+void ProcessFile(TString fname)
 {
     //
@@ -59 +59 @@
     //         (Using root 2.25/03, with Cint 5.14.50 on OSF1)
     //
-
-    MRawFileRead  reader("/home/tbretz/data/20010219-00020-d-octobertest-e");
-    MRawFileWrite writer("otest.root", "RECREATE");
+    MRawFileRead  reader(fname);
+    MRawFileWrite writer(fname(0, fname.Last('.')+1) + "root");
     tasks.AddToList(&reader);
     tasks.AddToList(&writer);
@@ -83 +82 @@
 }
 
+void merpp(const char *dirname="/home/MAGIC/online_data/rawdata/")
+{
+    MDirIter Next;
+    Next.AddDirectory(dirname, "*.raw", -1);
 
+    TString fname;
+    while (1)
+    {
+        fname = Next();
+        if (fname.IsNull())
+            break;
+
+        ProcessFile(fname);
+    }
+}
+

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -1452 +1452 @@
     while (1)
     {
-        streampos p1 = f.tellg();
         f.read(c[(i+1)%2], l);
         f.seekp(-l, ios::cur);