Changeset 18500 for trunk/FACT++

Timestamp:

05/08/16 22:57:22 (9 years ago)

Author:

tbretz

Message:

Minor improvement to output

File:

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

trunk/FACT++/src/rootifysql.cc

@@ -175 +175 @@
     if (verbose>0)
     {
-        cout << res.size() << " entries received." << endl;
+        cout << res.size() << " rows received." << endl;
         cout << "Query time: " << Time().UnixTime()-start2.UnixTime() << "s" << endl;
     }
@@ -197 +197 @@
 
     if (verbose>0)
-        cout << "Configuring " << r.size() << " branches..." << endl;
+        cout << "Trying to setup " << r.size() << " branches..." << endl;
 
     if (verbose>2)
@@ -206 +206 @@
     vector<double>  buf(l.size());
     vector<uint8_t> typ(l.size(),'-');
+
+    UInt_t cols = 0;
 
     // -------------------- Configure branches of TTree ------------------------
@@ -211 +213 @@
     for (size_t i=0; i<l.size(); i++)
     {
-        ttree->Branch(l[i].c_str(), buf.data()+i);
-
         const string t = r[i].type().sql_name();
 
@@ -232 +232 @@
         if (verbose>2)
             cout << l[i].c_str() << " [" << typ[i] << "] " << t << '\n';
+
+        if (typ[i]!='V' && typ[i]!='C')
+        {
+            ttree->Branch(l[i].c_str(), buf.data()+i);
+            cols++;
+        }
     }
     // -------------------------------------------------------------------------
@@ -238 +244 @@
         cout << endl;
     if (verbose>0)
-        cout << "Filling branches..." << endl;
+        cout << "Configured " << cols << " branches.\nFilling branches..." << endl;
 
     if (display)
@@ -303 +309 @@
 
     if (verbose>0)
-        cout << ttree->GetEntries() << " filled into tree." << endl;
+        cout << ttree->GetEntries() << " rows filled into tree." << endl;
 
     ttree->Write();