Changeset 18501 for trunk

Timestamp:

05/14/16 17:11:40 (9 years ago)

Author:

tbretz

Message:

Minor change to the verbosity option, renamed no-out to null

File:

• trunk/FACT++/src/rootifysql.cc (modified) (6 diffs)

trunk/FACT++/src/rootifysql.cc

@@ -27 +27 @@
         ("tree,t",        var<string>("Result"),       "Name of the root tree")
         ("display,d",     po_switch(),                 "Displays contents on the screen (most usefull in combination with mysql statements as SHOW or EXPLAIN)")
-        ("no-out,n",      po_switch(),                 "Redirect the output file to /dev/null")
+        ("null,n",        po_switch(),                 "Redirect the output file to /dev/null")
         ("delimiter",     var<string>(""),             "The delimiter used if contents are displayed with --display (default=\\t)")
         ("verbose,v",     var<uint16_t>(1),            "Verbosity (0: quiet, 1: default, 2: more, 3, ...)")
@@ -160 +160 @@
         query += '\n';
 
-    if (verbose>1)
+    if (verbose>2)
         cout << '\n' << query << endl;
 
@@ -199 +199 @@
         cout << "Trying to setup " << r.size() << " branches..." << endl;
 
-    if (verbose>2)
+    if (verbose>1)
         cout << endl;
 
@@ -205 +205 @@
 
     vector<double>  buf(l.size());
-    vector<uint8_t> typ(l.size(),'-');
+    vector<uint8_t> typ(l.size(),'n');
 
     UInt_t cols = 0;
@@ -230 +230 @@
                             typ[i] = 'C';
 
-        if (verbose>2)
-            cout << l[i].c_str() << " [" << typ[i] << "] " << t << '\n';
-
-        if (typ[i]!='V' && typ[i]!='C')
+        const bool use = typ[i]!='V' && typ[i]!='C';
+
+        if (verbose>1)
+            cout << (use?" + ":" - ") << l[i].c_str() << " [" << t << "] {" << typ[i] << "}\n";
+
+        if (use)
         {
             ttree->Branch(l[i].c_str(), buf.data()+i);
@@ -241 +243 @@
     // -------------------------------------------------------------------------
 
-    if (verbose>2)
+    if (verbose>1)
         cout << endl;
     if (verbose>0)