Merge pull request #45173 from CMSTrackingPOG/dataMCValidation_fixes_14_1_X

Miscellaneous fixes for TRK POG Data/MC validation tool

Author: cmsbuild

DQM/TrackingMonitorSource/plugins/StandaloneTrackMonitor.cc

@@ -1836,17 +1836,18 @@ void StandaloneTrackMonitor::analyze(edm::Event const& iEvent, edm::EventSetup c
             theMainVtx = *theClosestVertex;
           }
           if (theMainVtx.isValid()) {
-            const math::XYZPoint theMainVtxPos(
-                theMainVtx.position().x(), theMainVtx.position().y(), theMainVtx.position().z());
-            const math::XYZPoint myVertex(
-                mumuTransientVtx.position().x(), mumuTransientVtx.position().y(), mumuTransientVtx.position().z());
-            const math::XYZPoint deltaVtx(
-                theMainVtxPos.x() - myVertex.x(), theMainVtxPos.y() - myVertex.y(), theMainVtxPos.z() - myVertex.z());
-            double cosphi3D =
-                (Zp.Px() * deltaVtx.x() + Zp.Py() * deltaVtx.y() + Zp.Pz() * deltaVtx.z()) /
-                (sqrt(Zp.Px() * Zp.Px() + Zp.Py() * Zp.Py() + Zp.Pz() * Zp.Pz()) *
-                 sqrt(deltaVtx.x() * deltaVtx.x() + deltaVtx.y() * deltaVtx.y() + deltaVtx.z() * deltaVtx.z()));
-            cosPhi3DdileptonH_->Fill(cosphi3D, wfac);
+            const auto& mainVertexPos = theMainVtx.position();
+            const auto& myVertexPos = mumuTransientVtx.position();
+
+            const double deltaX = myVertexPos.x() - mainVertexPos.x();
+            const double deltaY = myVertexPos.y() - mainVertexPos.y();
+            const double deltaZ = myVertexPos.z() - mainVertexPos.z();
+
+            const double deltaNorm = sqrt(deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ);
+            const double zpNorm = sqrt(Zp.Px() * Zp.Px() + Zp.Py() * Zp.Py() + Zp.Pz() * Zp.Pz());
+
+            const double cosPhi3D = (Zp.Px() * deltaX + Zp.Py() * deltaY + Zp.Pz() * deltaZ) / (zpNorm * deltaNorm);
+            cosPhi3DdileptonH_->Fill(cosPhi3D, wfac);
           }
         }
       }

DQM/TrackingMonitorSource/python/StandaloneTrackMonitor_cfi.py

@@ -24,6 +24,6 @@
     verbose           = False,
     trackEtaH         = dict(Xbins = 60,  Xmin = -3.0, Xmax = 3.0),
     trackPtH          = dict(Xbins = 100, Xmin =  0.0 ,Xmax = 100.0),
-    trackPhiH         = dict(Xbins = 100, Xmin = 3.15, Xmax = 3.15),
+    trackPhiH         = dict(Xbins = 100, Xmin = -3.15, Xmax = 3.15),
     #trackMVAH        = dict(Xbins = 100 ,Xmin = -1.0, Xmax = 1.0)
 )

DQM/TrackingMonitorSource/python/TrackingDataMCValidation_Standalone_cff.py

@@ -178,7 +178,7 @@
     * selectedPrimaryVertices
     * KShortEventSelector
     * KshortTracks
-    * standaloneTrackMonitorK0
+    * standaloneTrackMonitorK0MC
     * KshortMonitor)
 
 standaloneValidationLambdas = cms.Sequence(