Changeset 2728 for trunk/MagicSoft/Mars/merpp.cc

Timestamp:

12/20/03 13:46:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/merpp.cc

@@ -66 +66 @@
     gLog << "     inputfile.txt:  Magic DC currents file." << endl;
     gLog << "     ouputfile.root: Merpped root file." << endl;
-    gLog << "     -a0: Do not use Ansii codes." << endl;
-    gLog << "     -u1: Update file." << endl;
-    gLog << "     -cn: Compression level n=1..9 [default=2]" << endl;
-    gLog << "     -vn: Verbosity level n [default=2]" << endl;
+    gLog << "     -c#:                             Compression level #=1..9 [default=2]" << endl;
+    gLog << "     -v#:                             Verbosity level # [default=2]" << endl;
+    gLog << "     -u, --update:                    Update file" << endl;
+    gLog << "     -a, --no-colors:                 Do not use Ansii color codes" << endl;
     gLog << "     --start=yyyy-mm-dd/hh:mm:ss.mmm: Start event time for merpping report files" << endl;
     gLog << "     --stop=yyyy-mm-dd/hh:mm:ss.mmm:  Stop  event time for merpping report files" << endl;
     gLog << "     --run=#:                         Only merpp data corresponding to this run number" << endl;
-    gLog << "     -?/-h: This help" << endl << endl;
+    gLog << "     -?, -h, --help:                  This help" << endl << endl;
     gLog << "   REMARK: At the moment you can process a .raw _or_ a .rep file, only!" << endl << endl;
 }
@@ -99 +99 @@
     MArgs arg(argc, argv);
 
-    if (arg.HasOption("-?") || arg.HasOption("-h"))
+    if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))
     {
         Usage();
@@ -105 +105 @@
     }
 
-    if (arg.HasOption("-a") && arg.GetIntAndRemove("-a")==0)
+    if (arg.HasOnlyAndRemove("--no-colors") || arg.HasOnlyAndRemove("-a"))
         gLog.SetNoColors();
 
     const Int_t kComprlvl = arg.HasOption("-c") ? arg.GetIntAndRemove("-c") : 1;
-    Bool_t kUpdate = arg.HasOption("-u") && arg.GetIntAndRemove("-u")==1;
+    Bool_t kUpdate = arg.HasOnlyAndRemove("--update") || arg.HasOnlyAndRemove("-u");
 
     gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);