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

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/readraw.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/readraw.cc

@@ -54 +54 @@
     gLog << "   readraw [-h] [-?] [-vn] [-dec] [-a0] inputfile[.root]" << endl << endl;
     gLog << "     input file:   Magic DAQ binary file." << endl;
-    gLog << "     -a0: Do not use Ansii codes." << endl;
     gLog << "     -vn: Verbosity level n [default=2]" << endl;
-    gLog << "     -d1: print data in decimal values" << endl;
-    gLog << "     -?/-h: This help" << endl << endl;
+    gLog << "     -d, --dec: print data in decimal values" << endl;
+    gLog << "     -a, --no-colors: Do not use Ansii color codes" << endl;
+    gLog << "     -?,-h,--help: This help" << endl << endl;
 }
 
@@ -73 +73 @@
     StartUpMessage();
 
-    //
     // Evaluate arguments
-    //
     MArgs arg(argc, argv);
 
-    if (arg.HasOption("-?") || arg.HasOption("-h"))
+    // check for the right usage of the program
+    if (arg.HasOption("-?") || arg.HasOption("-h") || arg.HasOption("--help") ||
+        arg.GetNumArguments()!=1)
     {
         Usage();
@@ -84 +84 @@
     }
 
-    //
-    // Set verbosity to highest level.
-    //
+    // Set verbosity
     gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
 
-    if (arg.HasOption("-a") && arg.GetIntAndRemove("-a")==0)
+    // Set color usage
+    if (arg.HasOnlyAndRemove("--no-colors") || arg.HasOnlyAndRemove("-a"))
         gLog.SetNoColors();
 
-    const bool kDecimal = arg.HasOption("-d") && arg.GetIntAndRemove("-d")==1;
-
-    //
-    // check for the right usage of the program
-    //
-    if (arg.GetNumArguments()!=1)
-    {
-        Usage();
-        return -1;
+    // Set usage of decimal values
+    const bool kDecimal = arg.HasOnlyAndRemove("-d") || arg.HasOnlyAndRemove("--dec");
+
+    //
+    // check for unidentified options
+    //
+    if (arg.GetNumOptions()>0)
+    {
+        gLog << warn << "WARNING - unknown commandline options..." << endl;
+        arg.Print("options");
+        gLog << endl;
     }
 
@@ -128 +129 @@
     //  open the file
     //
-    gLog << " Open the file '" << kNamein << "'" << endl;
+    gLog << inf << " Open the file '" << kNamein << "'" << endl;
     TFile input(kNamein, "READ");
 
@@ -137 +138 @@
     TTree *runtree = (TTree*)input.Get("RunHeaders");
     if (!runtree)
-        gLog << " WARNING: This file has NO Tree 'RunHeaders'" << endl << endl;
+        gLog << warn << " WARNING - This file has no Tree 'RunHeaders'" << endl << endl;
     else
     {
@@ -151 +152 @@
     // open the DataTree and read in 
     //
-    gLog << " Check the Tree 'Events'" << endl ;
+    gLog << inf << " Check the Tree 'Events'" << endl ;
     TTree *evttree = (TTree*)input.Get("Events") ;
     if (!evttree)
     {
-        gLog << "Tree 'Events' not found in file... exit!" << endl;
+        gLog << err << "Tree 'Events' not found in file... exit!" << endl;
         return -1;
     }
@@ -184 +185 @@
     const Int_t nent = (Int_t)evttree->GetEntries();
 
-    gLog << endl;
     gLog << " Entries in Tree Data: " << dec << nent << endl;
     gLog << endl;
@@ -190 +190 @@
     for (Int_t i = 0; i<nent; i++)
     {
-        gLog << "Entry: " << i << endl;
+        gLog << all << "Entry: " << i << endl;
 
         //