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

Timestamp:

07/06/03 23:38:12 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/merpp.cc

@@ -9 +9 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
+
+#include "MArgs.h"
 #include "MTime.h"
 #include "MArray.h"
@@ -15 +18 @@
 #include "MRawEvtHeader.h"
 #include "MRawCrateArray.h"
-#include "MInputStreamID.h"
 
 using namespace std;
@@ -34 +36 @@
 //////////////////////////////////////////////////////////////////////////////
 
+void Usage()
+{
+    gLog << "Sorry the usage is:" << endl;
+    gLog << "   merpp [-vn] inputfile outputfile [compression level]" << endl << endl;
+    gLog << "     input file:   Magic DAQ binary file." << endl;
+    gLog << "     ouput file:   Merpped root file." << endl;
+    gLog << "     compr. level: 1..9 [default=1]" << endl;
+    gLog << "     -vn: Verbosity level n [default=2]" << endl << endl;
+}
+
 int main(const int argc, const char **argv)
 {
+    MArgs arg(argc, argv);
+    arg.Print();
+
     gLog << "==================================================" << endl ;
     gLog << "                   MERPP v0.1" << endl;
@@ -47 +62 @@
     // check for the right usage of the program
     //
-    if (argc<3 || argc>4)
+    if (arg.GetNumArguments()<2 || arg.GetNumArguments()>3)
     {
-        gLog << "Sorry the usage is:" << endl;
-        gLog << "   merpp inputfile outputfile [compression level]" << endl << endl;
-        gLog << "     input file:   Magic DAQ binary file." << endl;
-        gLog << "     ouput file:   Merpped root file." << endl;
-        gLog << "     compr. level: 1..9 [default=1]" << endl << endl;
+        Usage();
         return -1;
     }
@@ -60 +71 @@
     // Set verbosity to highest level.
     //
-    gLog.SetDebugLevel(2);
+    gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetInt("-v") : 2);
 
     //
     // This is to make argv[i] more readable insidethe code
     //
-    const char *kNamein   = argv[1];
-    const char *kNameout  = argv[2];
-    const int   kComprlvl = argc==4 ? atoi(argv[3]) : 1;
+    const char *kNamein   = arg.GetArgumentStr(0);
+    const char *kNameout  = arg.GetArgumentStr(1);
+    const int   kComprlvl = arg.GetNumArguments()==3 ? arg.GetArgumentInt(2) : 1;
 
     //
     //     initialize ROOT  (this is obligatory here)
     //
-    TROOT simple("merpp", "Mars - Merging and Preprocessing Program");
+    TROOT merpp("merpp", "Mars - Merging and Preprocessing Program");
+    merpp.SetBatch();
 
     //
@@ -79 +91 @@
     if (gSystem->AccessPathName(kNamein, kFileExists))
     {
-        gLog << "Sorry, the input file '" << kNamein << "' doesn't exist." << endl;
+        gLog << err << "Sorry, the input file '" << kNamein << "' doesn't exist." << endl;
         return -1;
     }
 
     if (!gSystem->AccessPathName(kNameout, kFileExists))
-        gLog << "Warning: A file '" << kNameout << "' exists." << endl;
+        gLog << warn << "Warning: A file '" << kNameout << "' exists." << endl;
     else
         if (!gSystem->AccessPathName(kNameout, kWritePermission))
         {
-            gLog << "Sorry, you don't have write permission for '" << kNameout << "'." << endl;
+            gLog << err << "Sorry, you don't have write permission for '" << kNameout << "'." << endl;
             return -1;
         }
@@ -148 +160 @@
     if (!magic.Eventloop())
     {
-        gLog << "ERROR: Merging and preprocessing failed!" << endl;
+        gLog << err << "ERROR: Merging and preprocessing failed!" << endl;
         return -1;
     }
 
-    gLog << "Merpp finished successfull!" << endl;
+    gLog << all << "Merpp finished successfull!" << endl;
     return 0;
 }