Changed tmath functions to std equivalents. Reverted track quality parameter to default to false

Author: ryanm124

L1Trigger/L1TTrackMatch/interface/DisplacedVertexProducer.h

@@ -12,7 +12,6 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimDataFormats/Associations/interface/TTTrackAssociationMap.h"
-#include "TMath.h"
 #include <iostream>
 #include <map>
 #include <set>
@@ -42,9 +41,9 @@ class Track_Parameters {
   float bendchi2;
   float MVA1;
 
-  float z(float x, float y) {
-    float t = std::sinh(eta);
-    float r = TMath::Sqrt(pow(x, 2) + pow(y, 2));
+  float trackZAtVertex(float x, float y) {
+    float t = sinh(eta);
+    float r = sqrt(pow(x, 2) + pow(y, 2));
     return (z0 +
             (t * r *
              (1 + (pow(d0, 2) / pow(r, 2)) +
@@ -55,13 +54,13 @@ class Track_Parameters {
                    float z0_in,
                    float eta_in,
                    float phi_in,
-                   float rho_in = 0,
-                   int index_in = -1,
-                   int nstubs_in = 0,
-                   float chi2rphi_in = 0,
-                   float chi2rz_in = 0,
-                   float bendchi2_in = 0,
-                   float MVA1_in = 0) {
+                   float rho_in,
+                   int index_in,
+                   int nstubs_in,
+                   float chi2rphi_in,
+                   float chi2rz_in,
+                   float bendchi2_in,
+                   float MVA1_in) {
     pt = pt_in;
     d0 = d0_in;
     z0 = z0_in;
@@ -76,8 +75,8 @@ class Track_Parameters {
     }
     index = index_in;
     rho = fabs(rho_in);
-    x0 = (rho + charge * d0) * TMath::Cos(phi - (charge * TMath::Pi() / 2));
-    y0 = (rho + charge * d0) * TMath::Sin(phi - (charge * TMath::Pi() / 2));
+    x0 = (rho + charge * d0) * cos(phi - (charge * numbers::pi / 2));
+    y0 = (rho + charge * d0) * sin(phi - (charge * numbers::pi / 2));
     nstubs = nstubs_in;
     chi2rphi = chi2rphi_in;
     chi2rz = chi2rz_in;
@@ -95,7 +94,7 @@ inline std::valarray<float> calcPVec(Track_Parameters a, double_t v_x, double_t
     p_vec *= -1;
   }
   if ((p_vec[0] != 0.0) || (p_vec[1] != 0.0)) {
-    p_vec /= TMath::Sqrt(pow(p_vec[0], 2) + pow(p_vec[1], 2));
+    p_vec /= sqrt(pow(p_vec[0], 2) + pow(p_vec[1], 2));
   }
   p_vec *= a.pt;
   return p_vec;
@@ -127,20 +126,19 @@ class Vertex_Parameters {
     std::valarray<float> p_trk_1 = calcPVec(a_in, x_dv_in, y_dv_in);
     std::valarray<float> p_trk_2 = calcPVec(b_in, x_dv_in, y_dv_in);
     std::valarray<float> p_tot = p_trk_1 + p_trk_2;
-    p_mag = TMath::Sqrt(pow(p_tot[0], 2) + pow(p_tot[1], 2));
+    p_mag = sqrt(pow(p_tot[0], 2) + pow(p_tot[1], 2));
     if (((p_trk_1[0] != 0.0) || (p_trk_2[1] != 0.0)) && ((p_trk_2[0] != 0.0) || (p_trk_2[1] != 0.0))) {
-      openingAngle =
-          (p_trk_1[0] * p_trk_2[0] + p_trk_1[1] * p_trk_2[1]) /
-          (TMath::Sqrt(pow(p_trk_1[0], 2) + pow(p_trk_1[1], 2)) * TMath::Sqrt(pow(p_trk_2[0], 2) + pow(p_trk_2[1], 2)));
+      openingAngle = (p_trk_1[0] * p_trk_2[0] + p_trk_1[1] * p_trk_2[1]) /
+                     (sqrt(pow(p_trk_1[0], 2) + pow(p_trk_1[1], 2)) * sqrt(pow(p_trk_2[0], 2) + pow(p_trk_2[1], 2)));
     }
-    R_T = TMath::Sqrt(pow(x_dv_in, 2) + pow(y_dv_in, 2));
+    R_T = sqrt(pow(x_dv_in, 2) + pow(y_dv_in, 2));
     if ((R_T != 0.0) && ((p_tot[0] != 0.0) || (p_tot[1] != 0.0))) {
-      cos_T = (p_tot[0] * x_dv_in + p_tot[1] * y_dv_in) / (R_T * TMath::Sqrt(pow(p_tot[0], 2) + pow(p_tot[1], 2)));
+      cos_T = (p_tot[0] * x_dv_in + p_tot[1] * y_dv_in) / (R_T * sqrt(pow(p_tot[0], 2) + pow(p_tot[1], 2)));
     }
     phi = atan2(p_tot[1], p_tot[0]);
     d_T = fabs(cos(phi) * y_dv_in - sin(phi) * x_dv_in);
     p2_mag = pow(a_in.pt, 2) + pow(b_in.pt, 2);
-    delta_z = fabs(a_in.z(x_dv_in, y_dv_in) - b_in.z(x_dv_in, y_dv_in));
+    delta_z = fabs(a_in.trackZAtVertex(x_dv_in, y_dv_in) - b_in.trackZAtVertex(x_dv_in, y_dv_in));
   }
 
   Vertex_Parameters() {};

L1Trigger/L1TTrackMatch/plugins/DisplacedVertexProducer.cc

@@ -65,7 +65,7 @@ bool ComparePtTrack(std::pair<Track_Parameters, edm::Ptr<TrackingParticle>> a,
 }
 
 Double_t dist(Double_t x1, Double_t y1, Double_t x2 = 0, Double_t y2 = 0) {  // Distance between 2 points
-  return (TMath::Sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2)));
+  return (sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2)));
 }
 
 Double_t dist_TPs(Track_Parameters a, Track_Parameters b) {
@@ -99,16 +99,16 @@ Int_t calcVertex(Track_Parameters a, Track_Parameters b, Double_t& x_vtx, Double
   float radicand = (2 / pow(R, 2)) * (pow(R1, 2) + pow(R2, 2)) - (pow(pow(R1, 2) - pow(R2, 2), 2) / pow(R, 4)) - 1;
   float co2 = 0;
   if (radicand > 0)
-    co2 = 0.5 * TMath::Sqrt(radicand);
+    co2 = 0.5 * sqrt(radicand);
   float ix1_x = 0.5 * (x1 + x2) + co1 * (x2 - x1) + co2 * (y2 - y1);
   float ix2_x = 0.5 * (x1 + x2) + co1 * (x2 - x1) - co2 * (y2 - y1);
   float ix1_y = 0.5 * (y1 + y2) + co1 * (y2 - y1) + co2 * (x1 - x2);
   float ix2_y = 0.5 * (y1 + y2) + co1 * (y2 - y1) - co2 * (x1 - x2);
-  float ix1_z1 = a.z(ix1_x, ix1_y);
-  float ix1_z2 = b.z(ix1_x, ix1_y);
+  float ix1_z1 = a.trackZAtVertex(ix1_x, ix1_y);
+  float ix1_z2 = b.trackZAtVertex(ix1_x, ix1_y);
   float ix1_delz = fabs(ix1_z1 - ix1_z2);
-  float ix2_z1 = a.z(ix2_x, ix2_y);
-  float ix2_z2 = b.z(ix2_x, ix2_y);
+  float ix2_z1 = a.trackZAtVertex(ix2_x, ix2_y);
+  float ix2_z2 = b.trackZAtVertex(ix2_x, ix2_y);
   float ix2_delz = fabs(ix2_z1 - ix2_z2);
   float trk1_POCA[2] = {a.d0 * sin(a.phi), -1 * a.d0 * cos(a.phi)};
   float trk2_POCA[2] = {b.d0 * sin(b.phi), -1 * b.d0 * cos(b.phi)};

L1Trigger/L1TTrackMatch/python/DisplacedVertexProducer_cfi.py

@@ -29,4 +29,7 @@
 Features for displaced vertex BDT: ['trkExt_pt_firstTrk', 'trkExt_pt', 'trkExt_eta_firstTrk', 'trkExt_eta', 'trkExt_phi_firstTrk', 'trkExt_phi', 'trkExt_d0_firstTrk', 'trkExt_d0', 'trkExt_z0_firstTrk', 'trkExt_z0', 'trkExt_chi2rz_firstTrk', 'trkExt_chi2rz', 'trkExt_bendchi2_firstTrk', 'trkExt_bendchi2', 'trkExt_MVA_firstTrk', 'trkExt_MVA', 'dv_d_T', 'dv_R_T', 'dv_cos_T', 'dv_del_Z'])
 
 dv inputs are vertex quantities and trkExt is a displaced track property. The firstTrk suffix means the track quantity comes from the higher pt track associated to a vertex. If there's no firstTrk suffix, then the track property is from the lower pt track associated to a vertex.
+
+Note: TrackQuality parameter in L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py needs to be set to True to get MVA values needed for BDT
+
 '''

L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py

@@ -20,7 +20,7 @@
                                                processingModulesFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/processingmodules_hourglassExtendedAllCombined.dat'),
                                                wiresFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/wires_hourglassExtendedAllCombined.dat'),
                                                # Quality Flag and Quality params
-                                               TrackQuality = cms.bool(True),
+                                               TrackQuality = cms.bool(False),
                                                TrackQualityPSet = cms.PSet(TrackQualityParams),
                                                Fakefit = cms.bool(False), # True causes Tracklet reco to output TTTracks before DR & KF
                                                StoreTrackBuilderOutput = cms.bool(False), # if True EDProducts for TrackBuilder tracks and stubs will be filled