Changeset 2531

Timestamp:

11/19/03 00:23:54 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mars.cc (modified) (4 diffs)
• merpp.cc (modified) (2 diffs)
• mona.cc (modified) (1 diff)
• readraw.cc (modified) (1 diff)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -42 +42 @@
    * mreport/MReportFileRead.cc:
      - fixed handling of MTimes
+
+   * mhist/MH.cc:
+     - added some const qualifiers in CutEdges
 
 

trunk/MagicSoft/Mars/mars.cc

@@ -7 +7 @@
 
 #include "MMars.h"
+#include "MArgs.h"
 #include "MArray.h"
 #include "MParContainer.h"
@@ -67 +68 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << "   mars [-v#]" << endl << endl;
-    gLog << "     -v0: verbosity level: as less as possible" << endl;
-    gLog << "     -v1: errors only"                          << endl;
-    gLog << "     -v2: errors and warnings <default>"        << endl;
-    gLog << "     -v3: errors, warnings and infos"           << endl;
+    gLog << "   mars [-h] [-?] [-a0] [-vn]" << endl << endl;
+    gLog << "     -a0: Do not use Ansii codes." << endl;
+    gLog << "     -vn: Verbosity level n [default=2]" << endl;
+    gLog << "     -?/-h: This help" << endl << endl;
 }
 
@@ -79 +79 @@
 
     //
-    // check for the right usage of the program
+    // Evaluate arguments
     //
-    if (argc<1 || argc>2)
+    MArgs arg(argc, argv);
+
+    if (arg.HasOption("-?") || arg.HasOption("-h"))
     {
         Usage();
@@ -87 +89 @@
     }
 
-    if (argc==2)
-    {
-        if (argv[1][0]!='-' || argv[1][1]!='v')
-        {
-            Usage();
-            return -1;
-        }
+    //
+    // Set verbosity to highest level.
+    //
+    gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
 
-        switch (argv[1][2])
-        {
-        case '0':
-            gLog.SetDebugLevel(0);
-            break;
-        case '1':
-            gLog.SetDebugLevel(1);
-            break;
-        case '2':
-            gLog.SetDebugLevel(2);
-            break;
-        case '3':
-            gLog.SetDebugLevel(3);
-            break;
-        default:
-            Usage();
-            return -1;
-        }
-    }
-    else
-        gLog.SetDebugLevel(2);
+    if (arg.HasOption("-a") && arg.GetIntAndRemove("-a")==0)
+        gLog.SetNoColors();
 
 #ifdef HAVE_XPM

trunk/MagicSoft/Mars/merpp.cc

@@ -64 +64 @@
 }
 
-int main(const int argc, const char **argv)
+int main(const int argc, char **argv)
 {
     StartUpMessage();
@@ -79 +79 @@
     }
 
-    //
-    // Set verbosity to highest level.
-    //
-    gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
-
     if (arg.HasOption("-a") && arg.GetIntAndRemove("-a")==0)
         gLog.SetNoColors();
 
     const int kComprlvl = arg.HasOption("-c") ? arg.GetIntAndRemove("-c") : 1;
+
+    gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
 
     //

trunk/MagicSoft/Mars/mona.cc

@@ -355 +355 @@
     // Evaluate arguments
     //
-    MArgs arg(argc, (const char**)argv);
+    MArgs arg(argc, argv);
 
     if (arg.HasOption("-?") || arg.HasOption("-h"))

trunk/MagicSoft/Mars/readraw.cc

@@ -69 +69 @@
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
     StartUpMessage();

trunk/MagicSoft/Mars/star.cc

@@ -65 +65 @@
 }
 
-int main(const int argc, const char **argv)
+int main(const int argc, char **argv)
 {
     StartUpMessage();