Changeset 9058 for trunk

Timestamp:

07/31/08 10:40:13 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• merpp.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/07/31 Thomas Bretz
+
+   * merpp.cc:
+     - fixed merpping a single report file
+     - Strip the dir name from MJMerpp's name
+
+   * mreports/MReportCamera.cc:
+     - also allow empty HV Settings file names
+
+
 
  2008/07/30 Thomas Bretz

trunk/MagicSoft/Mars/merpp.cc

@@ -124 +124 @@
 {
     return
-        name.EndsWith(".rep") || name.EndsWith(".txt") ||
-        name.EndsWith(".raw") || name.EndsWith(".raw.gz");
+        name.EndsWith(".rep") || name.EndsWith(".txt")    ||
+        name.EndsWith(".raw") || name.EndsWith(".raw.gz") ||
+        name.EndsWith(".root");
 }
 
@@ -207 +208 @@
 
     const Bool_t isseq =
-        (narg==1 && !(HasExtension(arg0) && !arg0.EndsWith(".txt"))) ||
-        (narg==2 && !HasExtension(arg1)) ||
+        (narg==1 && arg0.EndsWith(".txt")) ||
+        (narg==2 && !HasExtension(arg1))   ||
         (narg==3);
 
@@ -218 +219 @@
         kNamein  = arg2;
 
-        if (HasExtension(arg2))  // set --summary
+        if (arg2.EndsWith(".txt"))  // set --summary
             kHeaderRun = 0;
 
@@ -246 +247 @@
 
     {
-        MJMerpp merpp(Form("MJMerpp %s", arg0.Data()));
+        MJMerpp merpp(Form("MJMerpp %s", gSystem->BaseName(arg0.Data())));
         merpp.SetOverwrite(kOverwrite);
         merpp.SetCompression(kComprlvl);