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

Timestamp:

08/24/04 18:15:29 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/merpp.cc

@@ -58 +58 @@
 static void Usage()
 {
+    //                1         2         3         4         5         6         7         8
+    //       12345678901234567890123456789012345678901234567890123456789012345678901234567890
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << " merpp [-h] [-?] [-a] [-vn] [-cn] [-u, -f]" << endl;
-    gLog << "       inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl;
+    gLog << " merpp [options] inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl;
     gLog << " Arguments:" << endl;
-    gLog << "   inputfile.raw:  Magic DAQ binary file." << endl;
-    gLog << "   inputfile.rep:  Magic Central Control report file." << endl;
-    gLog << "   inputfile.txt:  Magic DC currents file." << endl;
-    gLog << "   ouputfile.root: Merpped root file." << endl << endl;
+    gLog << "   inputfile.raw             Magic DAQ binary file." << endl;
+    gLog << "   inputfile.rep             Magic Central Control report file." << endl;
+    gLog << "   inputfile.txt             Magic DC currents file." << endl;
+    gLog << "   ouputfile.root            Merpped root file." << endl << endl;
     gLog << " Options:" << 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 << "   -f                 Force overwrite of an existing file" << endl;
-    gLog << "   --debug[=n]        Enable root debugging (Default: gDebug=1)" << endl;
-    gLog << "   -?, -h, --help     This help" << endl << endl;
+    gLog.Usage();
+    gLog << "   -?, -h, --help            This help" << endl << endl;
+    gLog << " File Options:" << endl;
+    gLog << "   -c#                       Compression level #=1..9 [default=2]" << endl;
+    gLog << "   -f                        Force overwrite of an existing file" << endl << endl;
     gLog << " Raw Data Options:" << endl;
-    gLog << "   -ff                Force merpp to ignore broken events" << endl;
-    gLog << "   --interleave=#     Process only each i-th event [default=1]" << endl << endl;
+    gLog << "   -ff                       Force merpp to ignore broken events" << endl;
+    gLog << "   --interleave=#            Process only each i-th event [default=1]" << endl << endl;
 //    gLog << "   --sql=mysql://user:password@url  Insert run into database" << endl << endl;
     gLog << " Report File Options:" << endl;
-    gLog << "   --start=date/time  Start event time" << endl;
-    gLog << "   --stop=date/time   Stop  event time" << endl;
-    gLog << "   --run=#            Only data corresponding to this run number" << endl;
-    gLog << "                      (from RUN-REPORT)" << endl;
-    gLog << "   --runfile=#        Allow only run-control files" << endl;
-    gLog << "                      (from .rep header)" << endl;
-    gLog << "   --sumfile          Check for an all night summary file" << endl;
-    gLog << "                      (from .rep header)" << endl;
-    gLog << "   --allfiles         Don't check file type <default>" << endl << endl;
+    gLog << "   --start=date/time         Start event time" << endl;
+    gLog << "   --stop=date/time          Stop  event time" << endl;
+    gLog << "   --run=#                   Only data corresponding to this run number" << endl;
+    gLog << "                             (from RUN-REPORT)" << endl;
+    gLog << "   --runfile=#               Allow only run-control files" << endl;
+    gLog << "                             (from .rep header)" << endl;
+    gLog << "   --sumfile                 Check for an all night summary file" << endl;
+    gLog << "                             (from .rep header)" << endl;
+    gLog << "   --allfiles                Don't check file type <default>" << endl << endl;
     gLog << " REMARK: - At the moment you can process a .raw _or_ a .rep file, only!" << endl;
     gLog << "         - 'date/time' has the format 'yyyy-mm-dd/hh:mm:ss.mmm'" << endl << endl;
@@ -128 +127 @@
     gLog.Setup(arg);
 
-    const Int_t kComprlvl = arg.HasOption("-c") ? arg.GetIntAndRemove("-c") : 2;
-    Bool_t kUpdate = arg.HasOnlyAndRemove("--update") || arg.HasOnlyAndRemove("-u");
-    const Bool_t kInterleave = arg.HasOption("--interleave=") ? arg.GetIntAndRemove("--interleave=") : 1;
-    const Bool_t kForce = arg.HasOnlyAndRemove("-f");
-    const Bool_t kForceProc = arg.HasOnlyAndRemove("-ff");
+    const Int_t  kComprlvl   = arg.GetIntAndRemove("-c", 2);
+    const Bool_t kInterleave = arg.GetIntAndRemove("--interleave=", 1);
+    const Bool_t kForce      = arg.HasOnlyAndRemove("-f");
+    const Bool_t kForceProc  = arg.HasOnlyAndRemove("-ff");
+    const Int_t  kRunNumber  = arg.GetIntAndRemove("--run=", -1);
+          Int_t  kRunFile    = arg.GetIntAndRemove("--runfile=", -1);
+          Bool_t kUpdate     = arg.HasOnlyAndRemove("--update") || arg.HasOnlyAndRemove("-u");
 
     MTime kTimeStart;
@@ -141 +142 @@
         kTimeStop = AnalyseTime(arg.GetStringAndRemove("--stop="));
 
-    const Int_t   kRunNumber   = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1;
 //    const TString kSqlDataBase(arg.GetStringAndRemove("--sql="));
 
-    Int_t kRunFile = arg.HasOption("--runfile=") ? arg.GetIntAndRemove("--runfile=") : -1;
     if (arg.HasOnlyAndRemove("--sumfile"))
         kRunFile = 0;