Changeset 11454

Timestamp:

07/18/11 17:48:09 (13 years ago)

Author:

tbretz

Message:

Fixed raplacing of extension and added fits as a valid extension.

File:

• trunk/Mars/merpp.cc (modified) (3 diffs)

trunk/Mars/merpp.cc

@@ -47 +47 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << " merpp [options] [tel:]seqnumber [outpath [inpath]]" << endl;
-    gLog << " merpp [options] [tel:]seqnumber outpath sumfile.txt" << endl;
-    gLog << " merpp [options] seqfile.txt     [outpath [inpath]]" << endl;
-    gLog << " merpp [options] seqfile.txt     outpath sumfile.txt" << endl;
+    gLog << " merpp [options] [tel:]seqnumber  [outpath [inpath]]" << endl;
+    gLog << " merpp [options] [tel:]seqnumber  outpath sumfile.txt" << endl;
+    gLog << " merpp [options] seqfile.txt      [outpath [inpath]]" << endl;
+    gLog << " merpp [options] seqfile.txt      outpath sumfile.txt" << endl;
 //    gLog << " merpp [options] mysql           [outpath [inpath]]" << endl;
 //    gLog << " merpp [options] mysql           outpath sumfile.txt" << endl;
-    gLog << " merpp [options] infile.raw.[gz] [outfile.root]" << endl;
-    gLog << " merpp [options] infile.rep      [outfile.root]" << endl;
-    gLog << " merpp [options] infile.txt      outfile.root" << endl;
+    gLog << " merpp [options] infile.raw[.gz]  [outfile.root]" << endl;
+    gLog << " merpp [options] infile.fits[.gz] [outfile.root]" << endl;
+    gLog << " merpp [options] infile.rep       [outfile.root]" << endl;
+    gLog << " merpp [options] infile.txt       outfile.root" << endl;
     gLog << endl;
     gLog << " Arguments:" << endl;
@@ -125 +126 @@
 {
     return
-        name.EndsWith(".rep") || name.EndsWith(".txt")    ||
-        name.EndsWith(".raw") || name.EndsWith(".raw.gz") ||
-        name.EndsWith(".root");
+        name.EndsWith(".rep")  || name.EndsWith(".txt")    ||
+        name.EndsWith(".raw")  || name.EndsWith(".raw.gz") ||
+        name.EndsWith(".root") ||
+        name.EndsWith(".fits") || name.EndsWith(".fits.gz");
 }
 
@@ -232 +234 @@
     else
     {
-        kNamein = arg0;
-        kNameout = arg1(0, kNamein.Last('.'));
+        kNamein  = arg0;
+        kNameout = arg1.IsNull() ? arg0(0, arg0.Last('.')) : arg1(0, arg1.Last('.'));
+
         if (!kNameout.EndsWith(".root"))
             kNameout += ".root";