Changeset 0b8551f in git for external/TrackCovariance/AcceptanceClx.cc

Timestamp:

Nov 29, 2021, 4:04:38 PM (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

0c0c9af

Parents:

9a7ea36 (diff), bd376e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michele Selvaggi <michele.selvaggi@…> (11/29/21 16:04:38)

git-committer:

GitHub <noreply@…> (11/29/21 16:04:38)

Message:

Merge pull request #102 from fbedesch/master

Major update to handle highly displaced tracks

File:

• external/TrackCovariance/AcceptanceClx.cc (modified) (9 diffs)

external/TrackCovariance/AcceptanceClx.cc

@@ -1 +1 @@
 #include <TVector3.h>
 #include "AcceptanceClx.h"
-#include <iostream>
 //
 // Pt splitting routine
@@ -59 +58 @@
         // Initializations
         //
-        //std::cout << "Entered constructor of AccpeptanceClx" << std::endl;
+        //cout << "Entered constructor of AccpeptanceClx" << endl;
         // Setup grid
         // Start grid parameters
@@ -74 +73 @@
         TVectorF Tha(NpThInp, ThInit);
         Int_t NpTh = Tha.GetNrows();    // Nr. of starting theta points
-        //std::cout << "AcceptanceClv:: Pta and Tha arrays defined" << std::endl;
+        //cout << "AcceptanceClv:: Pta and Tha arrays defined" << endl;
         //
         // Grid splitting parameters
@@ -128 +127 @@
                                 // Pt split
                                 if (dPt > dPtMin && dAp > dAmin && Nsplits < MaxSplits) {
-                                        //std::cout << "Pt(" << ipt << ") = " << Pta(ipt) << ", dAp = " << dAp << std::endl;
                                         NsplitCnt++;    // Total splits counter
                                         Nsplits++;      // Increase splits/cycle
-                                        NpPt++;         // Increase #pt points
-                                        //std::cout << "New pt split: dAp = " << dAp << ", dPt = " << dPt <<
-                                        //      ", Nsplits = " << Nsplits << ", NpPt = " << NpPt << std::endl;
+                                        NpPt++;         // Increase #pt points 
                                         Float_t newPt = 0.5 * (Pta(ipt + 1) + Pta(ipt));
                                         VecInsert(ipt, newPt, Pta);
@@ -156 +152 @@
                                 // Theta split
                                 if (dTh > dThMin && dAt > dAmin && Nsplits < MaxSplits) {
-                                        //std::cout << "Th(" << ith << ") = " << Tha(ith) << ", dAt = " << dAt << std::endl;
+                                        //cout << "Th(" << ith << ") = " << Tha(ith) << ", dAt = " << dAt << endl;
                                         NsplitCnt++;    // Total splits counter
                                         Nsplits++;      // Increase splits
-                                        NpTh++;         // Increase #pt points
-                                        //std::cout << "New th split: dAt = " << dAt << ", dTh = " << dTh <<
-                                        //      ", Nsplits = " << Nsplits << ", NpTh = " << NpTh << std::endl;
+                                        NpTh++;         // Increase #pt points 
                                         Float_t newTh = 0.5 * (Tha(ith + 1) + Tha(ith));
                                         VecInsert(ith, newTh, Tha);
@@ -202 +196 @@
         fThArray = Tha; // Array of Theta nodes
         //
-        std::cout << "AcceptanceClx:: Acceptance encoding with " << fNPtNodes
+                std::cout << "AcceptanceClx:: Acceptance encoding with " << fNPtNodes
                 <<" pt nodes and "<< fNThNodes <<" theta nodes"<< std::endl;
         Int_t Nrows = fAcc.GetNrows();
         Int_t Ncols = fAcc.GetNcols();
-        //std::cout<<"AcceptanceClx:: fAcc rows: "<<Nrows<<", cols: "<<Ncols<<std::endl;
-        //std::cout<<"AcceptanceClx:: Pta size: "<<Pta.GetNrows()<<", Tha size: "<<Tha.GetNrows()<<std::endl;;
-        //std::cout<<"AcceptanceClx:: pt nodes"<<std::endl; fPtArray.Print();
-        //std::cout<<"AcceptanceClx:: th nodes"<<std::endl; fThArray.Print();
 }
 
@@ -290 +280 @@
         //
         // Protect against values out of range
-        //std::cout << "AcceptanceClx::HitNumber: just in pt= " << pt << ", theta = " << theta << std::endl;
-        //std::cout << "AcceptanceClx::HitNumber: ptArr(0)= " << fPtArray(0) << ", thArr(0) = " << fThArray(0) << std::endl;
-        //std::cout << "AcceptanceClx::HitNumber: ptArr(E)= " << fPtArray(fNPtNodes - 1)
-        //      << ", thArr(E) = " << fThArray(fNThNodes - 1) << std::endl;
         Float_t eps = 1.0e-4;
         Float_t pt0 = (Float_t)pt;
@@ -311 +297 @@
         {
                 std::cout << "Search error: (ip, pt) = (" << ip << ", " << pt << "), pt0 = " << pt0 << std::endl;
-                std::cout << "Search error: pt nodes = " << fNPtNodes
+                std::cout << "Search error: pt nodes = " << fNPtNodes 
                         << " , last value = " << fPtArray(fNPtNodes - 1) << std::endl;
         }
@@ -343 +329 @@
 }
 //
+