Changeset 19811

Timestamp:

10/27/19 18:16:29 (5 years ago)

Author:

tbretz

Message:

Spaces removed.

File:

• trunk/FACT++/src/root2csv.cc (modified) (1 diff)

trunk/FACT++/src/root2csv.cc

@@ -418 +418 @@
     // ------------------------- Setup all branches in tree -------------------
 
-        TIter Next(leaves);
-        TObject *o = 0;
-        while ((o=Next()))
-        {
-            TLeaf *L = dynamic_cast<TLeaf*>(o);//c.GetLeaf(o->GetName());
-            if (!L)
-                continue;
-
-            string name = L->GetName();
+    TIter Next(leaves);
+    TObject *o = 0;
+    while ((o=Next()))
+    {
+        TLeaf *L = dynamic_cast<TLeaf*>(o);//c.GetLeaf(o->GetName());
+        if (!L)
+            continue;
+
+        string name = L->GetName();
+        if (verbose>2)
+            cout << '\n' << L->GetTitle() << " {" << L->GetTypeName() << "}";
+
+        const string tn = L->GetTypeName();
+
+        // Check if this is a basic type, otherwise skip
+        const auto it = FileEntry::LUT.root(tn);
+        if (it==FileEntry::LUT.cend())
+        {
             if (verbose>2)
-                cout << '\n' << L->GetTitle() << " {" << L->GetTypeName() << "}";
-
-            const string tn = L->GetTypeName();
-
-            // Check if this is a basic type, otherwise skip
-            const auto it = FileEntry::LUT.root(tn);
-            if (it==FileEntry::LUT.cend())
+                cout << " (-n/a-)";
+            continue;
+        }
+
+        // Check if this is an array, otherwise skip
+        if (L->GetLenStatic()!=L->GetLen())
+        {
+            if (verbose>2)
+                cout << " (-skipped-)";
+            continue;
+        }
+
+        // Check for renaming via auto-alias
+        for (auto m=autoalias.cbegin(); m!=autoalias.cend(); m++)
+            name = boost::regex_replace(name, boost::regex(m->first), m->second);
+
+        // if renaming has changed name, define alias
+        if (name!=L->GetName())
+        {
+            if (!c.SetAlias(name.c_str(), L->GetName()))
             {
-                if (verbose>2)
-                    cout << " (-n/a-)";
-                continue;
+                cerr << "\nERROR - Alias could not be established!\n";
+                cerr << "   " << name << " = " << L->GetName() << endl;
+                return 1;
             }
-
-            // Check if this is an array, otherwise skip
-            if (L->GetLenStatic()!=L->GetLen())
+            if (verbose==1 || verbose==2)
+                cout << "\nAuto-alias: " << name << " = " << L->GetName();
+            if (verbose>2)
+                cout << " <alias:" << name << ">";
+        }
+
+        // Check whether the un-aliased column is in the ignore list
+        bool found = skip;
+        for (auto b=_ignore.cbegin(); b!=_ignore.cend(); b++)
+        {
+            if (boost::regex_match(L->GetName(), boost::regex(*b)))
             {
-                if (verbose>2)
-                    cout << " (-skipped-)";
-                continue;
+                found = true;
+                break;
             }
-
-            // Check for renaming via auto-alias
-            for (auto m=autoalias.cbegin(); m!=autoalias.cend(); m++)
-                name = boost::regex_replace(name, boost::regex(m->first), m->second);
-
-            // if renaming has changed name, define alias
-            if (name!=L->GetName())
+        }
+
+        // Check whether the aliased column is in the ignore list
+        for (auto b=_ignore.cbegin(); b!=_ignore.cend(); b++)
+        {
+            if (boost::regex_match(name.c_str(), boost::regex(*b)))
             {
-                if (!c.SetAlias(name.c_str(), L->GetName()))
-                {
-                    cerr << "\nERROR - Alias could not be established!\n";
-                    cerr << "   " << name << " = " << L->GetName() << endl;
-                    return 1;
-                }
-                if (verbose==1 || verbose==2)
-                    cout << "\nAuto-alias: " << name << " = " << L->GetName();
-                if (verbose>2)
-                    cout << " <alias:" << name << ">";
+                found = true;
+                break;
             }
-
-            // Check whether the un-aliased column is in the ignore list
-            bool found = skip;
-            for (auto b=_ignore.cbegin(); b!=_ignore.cend(); b++)
-            {
-                if (boost::regex_match(L->GetName(), boost::regex(*b)))
-                {
-                    found = true;
-                    break;
-                }
-            }
-
-            // Check whether the aliased column is in the ignore list
-            for (auto b=_ignore.cbegin(); b!=_ignore.cend(); b++)
-            {
-                if (boost::regex_match(name.c_str(), boost::regex(*b)))
-                {
-                    found = true;
-                    break;
-                }
-            }
-
-            if (found)
-            {
-                if (verbose>2)
-                    cout << " (-ignored-)";
-                continue;
-            }
-
-            vec.emplace_back(L->GetName(), name, it->type, L->GetLenStatic());
-            c.SetBranchAddress(L->GetName(), vec.back().ptr);
-        }
-
-        if (verbose>0)
-        {
-            cout << '\n';
-            if (skip)
-                cout << "Default columns skipped: ";
-            cout << vec.size() << " default leaf/leaves setup for reading." << endl;
-        }
+        }
+
+        if (found)
+        {
+            if (verbose>2)
+                cout << " (-ignored-)";
+            continue;
+        }
+
+        vec.emplace_back(L->GetName(), name, it->type, L->GetLenStatic());
+        c.SetBranchAddress(L->GetName(), vec.back().ptr);
+    }
+
+    if (verbose>0)
+    {
+        cout << '\n';
+        if (skip)
+            cout << "Default columns skipped: ";
+        cout << vec.size() << " default leaf/leaves setup for reading." << endl;
+    }
 
     // ------------------- Configure manual aliases ----------------------------