add invertRapidityCut

add validation of tracks for TP w/ |eta|>2.7 for phase2 workflow apply code-checks fix workflow 9.0 fix the inversion fix harvesting fix fix switch on fake as well no cores protection style fix style fix 2 fix fake (they are identical)
cms-sw · Aug 24, 2019 · 2750957 · 2750957
1 parent d7fc4b4
commit 2750957
Show file tree

Hide file tree

Showing 15 changed files with 194 additions and 43 deletions.
diff --git a/CommonTools/CandAlgos/interface/GenParticleCustomSelector.h b/CommonTools/CandAlgos/interface/GenParticleCustomSelector.h
@@ -18,15 +18,38 @@ class GenParticleCustomSelector {
                             double lip,
                             bool chargedOnly,
                             int status,
-                            const std::vector<int>& pdgId = std::vector<int>())
+                            const std::vector<int>& pdgId = std::vector<int>(),
+                            bool invertRapidityCut = false,
+                            double minPhi = -3.2,
+                            double maxPhi = 3.2)
       : ptMin_(ptMin),
         minRapidity_(minRapidity),
         maxRapidity_(maxRapidity),
+        meanPhi_((minPhi + maxPhi) / 2.),
+        rangePhi_((maxPhi - minPhi) / 2.),
         tip_(tip),
         lip_(lip),
         chargedOnly_(chargedOnly),
         status_(status),
-        pdgId_(pdgId) {}
+        pdgId_(pdgId),
+        invertRapidityCut_(invertRapidityCut) {
+    if (minPhi >= maxPhi) {
+      throw cms::Exception("Configuration")
+          << "GenParticleCustomSelector: minPhi (" << minPhi << ") must be smaller than maxPhi (" << maxPhi
+          << "). The range is constructed from minPhi to maxPhi around their "
+             "average.";
+    }
+    if (minPhi >= M_PI) {
+      throw cms::Exception("Configuration") << "GenParticleCustomSelector: minPhi (" << minPhi
+                                            << ") must be smaller than PI. The range is constructed from minPhi "
+                                               "to maxPhi around their average.";
+    }
+    if (maxPhi <= -M_PI) {
+      throw cms::Exception("Configuration") << "GenParticleCustomSelector: maxPhi (" << maxPhi
+                                            << ") must be larger than -PI. The range is constructed from minPhi "
+                                               "to maxPhi around their average.";
+    }
+  }
 
   /// Operator() performs the selection: e.g. if (tPSelector(tp)) {...}
   bool operator()(const reco::GenParticle& tp) const {
@@ -42,19 +65,38 @@ class GenParticleCustomSelector {
           testId = true;
       }
 
-    return (tp.pt() >= ptMin_ && tp.eta() >= minRapidity_ && tp.eta() <= maxRapidity_ &&
-            sqrt(tp.vertex().perp2()) <= tip_ && fabs(tp.vertex().z()) <= lip_ && tp.status() == status_ && testId);
+    auto etaOk = [&](const reco::GenParticle& p) -> bool {
+      float eta = p.eta();
+      if (!invertRapidityCut_)
+        return (eta >= minRapidity_) & (eta <= maxRapidity_);
+      else
+        return (!(eta >= minRapidity_) & !(eta <= maxRapidity_));
+    };
+    auto phiOk = [&](const reco::GenParticle& p) {
+      float dphi = deltaPhi(atan2f(p.py(), p.px()), meanPhi_);
+      return dphi >= -rangePhi_ && dphi <= rangePhi_;
+    };
+    auto ptOk = [&](const reco::GenParticle& p) {
+      double pt = tp.pt();
+      return pt >= ptMin_;
+    };
+
+    return (ptOk(tp) && etaOk(tp) && phiOk(tp) && sqrt(tp.vertex().perp2()) <= tip_ && fabs(tp.vertex().z()) <= lip_ &&
+            tp.status() == status_ && testId);
   }
 
 private:
   double ptMin_;
   double minRapidity_;
   double maxRapidity_;
+  float meanPhi_;
+  float rangePhi_;
   double tip_;
   double lip_;
   bool chargedOnly_;
   int status_;
   std::vector<int> pdgId_;
+  bool invertRapidityCut_;
 };
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
@@ -77,7 +119,10 @@ namespace reco {
                                          cfg.getParameter<double>("lip"),
                                          cfg.getParameter<bool>("chargedOnly"),
                                          cfg.getParameter<int>("status"),
-                                         cfg.getParameter<std::vector<int> >("pdgId"));
+                                         cfg.getParameter<std::vector<int> >("pdgId"),
+                                         cfg.getParameter<bool>("invertRapidityCut"),
+                                         cfg.getParameter<double>("minPhi"),
+                                         cfg.getParameter<double>("maxPhi"));
       }
     };
 

diff --git a/CommonTools/CandAlgos/python/genParticleCustomSelector_cfi.py b/CommonTools/CandAlgos/python/genParticleCustomSelector_cfi.py
@@ -10,6 +10,9 @@
     lip = cms.double(30.0),
     ptMin = cms.double(0.9),
     maxRapidity = cms.double(2.4),
+    minPhi = cms.double(-3.2),
+    maxPhi = cms.double( 3.2),
+    invertRapidityCut = cms.bool(False)
 )
 
 

diff --git a/CommonTools/RecoAlgos/interface/RecoTrackSelectorBase.h b/CommonTools/RecoAlgos/interface/RecoTrackSelectorBase.h
@@ -29,7 +29,8 @@ class RecoTrackSelectorBase {
         minPixelHit_(cfg.getParameter<int>("minPixelHit")),
         minLayer_(cfg.getParameter<int>("minLayer")),
         min3DLayer_(cfg.getParameter<int>("min3DLayer")),
-        usePV_(false) {
+        usePV_(false),
+        invertRapidityCut_(cfg.getParameter<bool>("invertRapidityCut")) {
     const auto minPhi = cfg.getParameter<double>("minPhi");
     const auto maxPhi = cfg.getParameter<double>("maxPhi");
     if (minPhi >= maxPhi) {
@@ -114,14 +115,21 @@ class RecoTrackSelectorBase {
 
     const auto dphi = deltaPhi(t.phi(), meanPhi_);
 
+    auto etaOk = [&](const reco::Track& p) -> bool {
+      float eta = p.eta();
+      if (!invertRapidityCut_)
+        return (eta >= minRapidity_) & (eta <= maxRapidity_);
+      else
+        return (!(eta >= minRapidity_) & !(eta <= maxRapidity_));
+    };
+
     return ((algo_ok & quality_ok) && t.hitPattern().numberOfValidHits() >= minHit_ &&
             t.hitPattern().numberOfValidPixelHits() >= minPixelHit_ &&
             t.hitPattern().trackerLayersWithMeasurement() >= minLayer_ &&
             t.hitPattern().pixelLayersWithMeasurement() + t.hitPattern().numberOfValidStripLayersWithMonoAndStereo() >=
                 min3DLayer_ &&
-            fabs(t.pt()) >= ptMin_ && t.eta() >= minRapidity_ && t.eta() <= maxRapidity_ && dphi >= -rangePhi_ &&
-            dphi <= rangePhi_ && fabs(t.dxy(vertex)) <= tip_ && fabs(t.dsz(vertex)) <= lip_ &&
-            t.normalizedChi2() <= maxChi2_);
+            fabs(t.pt()) >= ptMin_ && etaOk(t) && dphi >= -rangePhi_ && dphi <= rangePhi_ &&
+            fabs(t.dxy(vertex)) <= tip_ && fabs(t.dsz(vertex)) <= lip_ && t.normalizedChi2() <= maxChi2_);
   }
 
 private:
@@ -138,6 +146,7 @@ class RecoTrackSelectorBase {
   int minLayer_;
   int min3DLayer_;
   bool usePV_;
+  bool invertRapidityCut_;
 
   edm::EDGetTokenT<reco::BeamSpot> bsSrcToken_;
   edm::EDGetTokenT<reco::VertexCollection> vertexToken_;

diff --git a/CommonTools/RecoAlgos/python/recoTrackSelectorPSet_cfi.py b/CommonTools/RecoAlgos/python/recoTrackSelectorPSet_cfi.py
@@ -20,5 +20,6 @@
     minPixelHit = cms.int32(0),
     beamSpot = cms.InputTag("offlineBeamSpot"),
     usePV = cms.bool(False),
-    vertexTag = cms.InputTag('offlinePrimaryVertices')
+    vertexTag = cms.InputTag('offlinePrimaryVertices'),
+    invertRapidityCut = cms.bool(False)
 )
diff --git a/CommonTools/RecoAlgos/python/trackingParticleRefSelector_cfi.py b/CommonTools/RecoAlgos/python/trackingParticleRefSelector_cfi.py
@@ -16,6 +16,7 @@
     minHit = cms.int32(0),
     minPhi = cms.double(-3.2),
     maxPhi = cms.double(3.2),
+    invertRapidityCut = cms.bool(False)
 )
 
 from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2

diff --git a/PhysicsTools/RecoAlgos/python/trackingParticleSelector_cfi.py b/PhysicsTools/RecoAlgos/python/trackingParticleSelector_cfi.py
@@ -1,22 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-trackingParticleSelector = cms.EDFilter("TrackingParticleSelector",
-    src = cms.InputTag("mix","MergedTrackTruth"),
-    chargedOnly = cms.bool(True),
-    stableOnly = cms.bool(False),
-    pdgId = cms.vint32(),
-    tip = cms.double(3.5),
-    signalOnly = cms.bool(True),
-    intimeOnly = cms.bool(False),
-    minRapidity = cms.double(-2.4),
-    lip = cms.double(30.0),
-    ptMin = cms.double(0.9),
-    ptMax = cms.double(1e100),
-    maxRapidity = cms.double(2.4),
-    minHit = cms.int32(0),
-    minPhi = cms.double(-3.2),
-    maxPhi = cms.double(3.2),
-)
+import SimTracker.Common.trackingParticleSelector_cfi
+trackingParticleSelector = SimTracker.Common.trackingParticleSelector_cfi.trackingParticleSelector.clone()
 
 from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
 premix_stage2.toModify(trackingParticleSelector, src = "mixData:MergedTrackTruth")
diff --git a/SimTracker/Common/interface/TrackingParticleSelector.h b/SimTracker/Common/interface/TrackingParticleSelector.h
@@ -28,6 +28,7 @@ class TrackingParticleSelector {
                            bool chargedOnly,
                            bool stableOnly,
                            const std::vector<int> &pdgId = std::vector<int>(),
+                           bool invertRapidityCut = false,
                            double minPhi = -3.2,
                            double maxPhi = 3.2)
       : ptMin2_(ptMin * ptMin),
@@ -43,7 +44,8 @@ class TrackingParticleSelector {
         intimeOnly_(intimeOnly),
         chargedOnly_(chargedOnly),
         stableOnly_(stableOnly),
-        pdgId_(pdgId) {
+        pdgId_(pdgId),
+        invertRapidityCut_(invertRapidityCut) {
     if (minPhi >= maxPhi) {
       throw cms::Exception("Configuration")
           << "TrackingParticleSelector: minPhi (" << minPhi << ") must be smaller than maxPhi (" << maxPhi
@@ -103,7 +105,10 @@ class TrackingParticleSelector {
 
     auto etaOk = [&](const TrackingParticle &p) -> bool {
       float eta = etaFromXYZ(p.px(), p.py(), p.pz());
-      return (eta >= minRapidity_) & (eta <= maxRapidity_);
+      if (!invertRapidityCut_)
+        return (eta >= minRapidity_) & (eta <= maxRapidity_);
+      else
+        return (!(eta >= minRapidity_) & !(eta <= maxRapidity_));
     };
     auto phiOk = [&](const TrackingParticle &p) {
       float dphi = deltaPhi(atan2f(p.py(), p.px()), meanPhi_);
@@ -134,6 +139,7 @@ class TrackingParticleSelector {
   bool chargedOnly_;
   bool stableOnly_;
   std::vector<int> pdgId_;
+  bool invertRapidityCut_;
 };
 
 #include "CommonTools/UtilAlgos/interface/ParameterAdapter.h"
@@ -161,6 +167,7 @@ namespace reco {
                                         cfg.getParameter<bool>("chargedOnly"),
                                         cfg.getParameter<bool>("stableOnly"),
                                         cfg.getParameter<std::vector<int>>("pdgId"),
+                                        cfg.getParameter<bool>("invertRapidityCut"),
                                         cfg.getParameter<double>("minPhi"),
                                         cfg.getParameter<double>("maxPhi"));
       }

diff --git a/SimTracker/Common/python/trackingParticleSelector_cfi.py b/SimTracker/Common/python/trackingParticleSelector_cfi.py
@@ -0,0 +1,20 @@
+import FWCore.ParameterSet.Config as cms
+
+trackingParticleSelector = cms.EDFilter("TrackingParticleSelector",
+    src = cms.InputTag("mix","MergedTrackTruth"),
+    chargedOnly = cms.bool(True),
+    stableOnly = cms.bool(False),
+    pdgId = cms.vint32(),
+    tip = cms.double(3.5),
+    signalOnly = cms.bool(True),
+    intimeOnly = cms.bool(False),
+    minRapidity = cms.double(-2.4),
+    lip = cms.double(30.0),
+    ptMin = cms.double(0.9),
+    ptMax = cms.double(1e100),
+    maxRapidity = cms.double(2.4),
+    minHit = cms.int32(0),
+    minPhi = cms.double(-3.2),
+    maxPhi = cms.double(3.2),
+    invertRapidityCut = cms.bool(False)
+)
diff --git a/Validation/RecoTrack/plugins/MultiTrackValidator.cc b/Validation/RecoTrack/plugins/MultiTrackValidator.cc
@@ -166,7 +166,8 @@ MultiTrackValidator::MultiTrackValidator(const edm::ParameterSet& pset)
                                         pset.getParameter<bool>("intimeOnlyTP"),
                                         pset.getParameter<bool>("chargedOnlyTP"),
                                         pset.getParameter<bool>("stableOnlyTP"),
-                                        pset.getParameter<std::vector<int>>("pdgIdTP"));
+                                        pset.getParameter<std::vector<int>>("pdgIdTP"),
+                                        pset.getParameter<bool>("invertRapidityCutTP"));
 
   cosmictpSelector = CosmicTrackingParticleSelector(pset.getParameter<double>("ptMinTP"),
                                                     pset.getParameter<double>("minRapidityTP"),
@@ -189,7 +190,8 @@ MultiTrackValidator::MultiTrackValidator(const edm::ParameterSet& pset)
                                           psetVsPhi.getParameter<bool>("intimeOnly"),
                                           psetVsPhi.getParameter<bool>("chargedOnly"),
                                           psetVsPhi.getParameter<bool>("stableOnly"),
-                                          psetVsPhi.getParameter<std::vector<int>>("pdgId"));
+                                          psetVsPhi.getParameter<std::vector<int>>("pdgId"),
+                                          psetVsPhi.getParameter<bool>("invertRapidityCut"));
 
   dRTrackSelector = MTVHistoProducerAlgoForTracker::makeRecoTrackSelectorFromTPSelectorParameters(psetVsPhi);
 

diff --git a/Validation/RecoTrack/python/GenParticleSelectionsForEfficiency_cff.py b/Validation/RecoTrack/python/GenParticleSelectionsForEfficiency_cff.py
@@ -23,7 +23,10 @@
     minRapidity = cms.double(-2.5),
     ptMin = cms.double(0.9),
     maxRapidity = cms.double(2.5),
-    tip = cms.double(3.5)
+    tip = cms.double(3.5),
+    invertRapidityCut = cms.bool(False),
+    maxPhi = cms.double(3.2),
+    minPhi = cms.double(-3.2)
 )
 
 
@@ -35,7 +38,10 @@
     minRapidity = cms.double(-2.5),
     ptMin = cms.double(0.9),
     maxRapidity = cms.double(2.5),
-    tip = cms.double(3.5)
+    tip = cms.double(3.5),
+    invertRapidityCut = cms.bool(False),
+    maxPhi = cms.double(3.2),
+    minPhi = cms.double(-3.2)
 )
 
 GpSelectorForEfficiencyVsPhiBlock = cms.PSet(
@@ -46,7 +52,10 @@
     minRapidity = cms.double(-2.5),
     ptMin = cms.double(0.9),
     maxRapidity = cms.double(2.5),
-    tip = cms.double(3.5)
+    tip = cms.double(3.5),
+    invertRapidityCut = cms.bool(False),
+    maxPhi = cms.double(3.2),
+    minPhi = cms.double(-3.2)
 )
 
 GpSelectorForEfficiencyVsPtBlock = cms.PSet(
@@ -58,6 +67,9 @@
     ptMin = cms.double(0.050),
     tip = cms.double(3.5),
     lip = cms.double(30.0),
+    invertRapidityCut = cms.bool(False),
+    maxPhi = cms.double(3.2),
+    minPhi = cms.double(-3.2)
 )
 
 GpSelectorForEfficiencyVsVTXRBlock = cms.PSet(
@@ -68,7 +80,10 @@
     ptMin = cms.double(0.9),
     maxRapidity = cms.double(2.5),
     lip = cms.double(30.0),
-    tip = cms.double(30.0)
+    tip = cms.double(30.0),
+    invertRapidityCut = cms.bool(False),
+    maxPhi = cms.double(3.2),
+    minPhi = cms.double(-3.2)
 )
 
 GpSelectorForEfficiencyVsVTXZBlock = cms.PSet(
@@ -79,7 +94,10 @@
     ptMin = cms.double(0.9),
     maxRapidity = cms.double(2.5),
     lip = cms.double(35.0),
-    tip = cms.double(3.5)
+    tip = cms.double(3.5),
+    invertRapidityCut = cms.bool(False),
+    maxPhi = cms.double(3.2),
+    minPhi = cms.double(-3.2)
 )
 
 def _modifyForPhase1(pset):

diff --git a/Validation/RecoTrack/python/PostProcessorTracker_cfi.py b/Validation/RecoTrack/python/PostProcessorTracker_cfi.py
@@ -15,8 +15,13 @@ def _addNoFlow(module):
         if not tmp[ind-1] in _noflowSeen:
             module.noFlowDists.append(tmp[ind-1])
 
+listOfDirs = cms.untracked.vstring("Tracking/Track/*", "Tracking/TrackTPPtLess09/*", "Tracking/TrackFromPV/*", "Tracking/TrackFromPVAllTP/*", "Tracking/TrackAllTPEffic/*", "Tracking/TrackBuilding/*", "Tracking/TrackConversion/*", "Tracking/TrackGsf/*", "Tracking/TrackBHadron/*")
+
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(listOfDirs.extend(["Tracking/TrackTPEtaGreater2p7/*"]))
+
 postProcessorTrack = DQMEDHarvester("DQMGenericClient",
-    subDirs = cms.untracked.vstring("Tracking/Track/*", "Tracking/TrackTPPtLess09/*", "Tracking/TrackFromPV/*", "Tracking/TrackFromPVAllTP/*", "Tracking/TrackAllTPEffic/*", "Tracking/TrackBuilding/*", "Tracking/TrackConversion/*", "Tracking/TrackGsf/*", "Tracking/TrackBHadron/*"),
+    subDirs = listOfDirs,
     efficiency = cms.vstring(
     "effic 'Efficiency vs #eta' num_assoc(simToReco)_eta num_simul_eta",
     "efficPt 'Efficiency vs p_{T}' num_assoc(simToReco)_pT num_simul_pT",
@@ -243,9 +248,14 @@ def _addNoFlow(module):
 )
 _addNoFlow(postProcessorTrack)
 
+listOfDirs = cms.untracked.vstring("Tracking/Track/*", "Tracking/TrackTPPtLess09/*", "Tracking/TrackFromPV/*", "Tracking/TrackFromPVAllTP/*", "Tracking/TrackAllTPEffic/*", "Tracking/TrackBuilding/*", "Tracking/TrackConversion/*", "Tracking/TrackGsf/*", "Tracking/TrackBHadron/*")
+
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(listOfDirs.extend(["Tracking/TrackTPEtaGreater2p7/*"]))
+
 postProcessorTrack2D = DQMEDHarvester("DQMGenericClient",
     makeGlobalEffienciesPlot = cms.untracked.bool(False),
-    subDirs = cms.untracked.vstring("Tracking/Track/*", "Tracking/TrackTPPtLess09/*", "Tracking/TrackFromPV/*", "Tracking/TrackFromPVAllTP/*", "Tracking/TrackAllTPEffic/*", "Tracking/TrackBuilding/*", "Tracking/TrackConversion/*", "Tracking/TrackGsf/*", "Tracking/TrackBHadron/*"),
+    subDirs = listOfDirs,
     efficiency = cms.vstring(
     "efficPtvseta 'Efficiency in p_{T}-#eta plane' num_assoc(simToReco)_pTvseta num_simul_pTvseta",
     "duplicatesRate_Ptvseta 'Duplicates Rate in (p_{T}-#eta) plane' num_duplicate_pTvseta num_reco_pTvseta",
@@ -285,8 +295,14 @@ def _addNoFlow(module):
 )
 _addNoFlow(postProcessorTrackNrecVsNsim2D)
 
+
+listOfDirs = cms.untracked.vstring("Tracking/Track", "Tracking/TrackTPPtLess09", "Tracking/TrackFromPV", "Tracking/TrackFromPVAllTP", "Tracking/TrackAllTPEffic", "Tracking/TrackBuilding", "Tracking/TrackConversion", "Tracking/TrackGsf", "Tracking/TrackBHadron")
+
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(listOfDirs.extend(["Tracking/TrackTPEtaGreater2p7"]))
+
 postProcessorTrackSummary = DQMEDHarvester("DQMGenericClient",
-    subDirs = cms.untracked.vstring("Tracking/Track", "Tracking/TrackTPPtLess09", "Tracking/TrackFromPV", "Tracking/TrackFromPVAllTP", "Tracking/TrackAllTPEffic", "Tracking/TrackBuilding", "Tracking/TrackConversion", "Tracking/TrackGsf", "Tracking/TrackBHadron"),
+    subDirs = listOfDirs,
     efficiency = cms.vstring(
     "effic_vs_coll 'Efficiency vs track collection' num_assoc(simToReco)_coll num_simul_coll",
     "effic_vs_coll_allPt 'Efficiency vs track collection' num_assoc(simToReco)_coll_allPt num_simul_coll_allPt",