From d39a67ccf04e2b70d9ac723470c47ee6a6185b5d Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Wed, 1 Aug 2018 09:25:10 +0200 Subject: [PATCH 1/2] Fix cluster->TP matching for pixel tracking CPU workflow --- Validation/RecoTrack/python/TrackValidation_cff.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Validation/RecoTrack/python/TrackValidation_cff.py b/Validation/RecoTrack/python/TrackValidation_cff.py index dff571862bb46..4980dac920b20 100644 --- a/Validation/RecoTrack/python/TrackValidation_cff.py +++ b/Validation/RecoTrack/python/TrackValidation_cff.py @@ -716,6 +716,7 @@ def _uniqueFirstLayers(layerList): tpClusterProducerPixelTrackingOnly = tpClusterProducer.clone() # Need to use the modifier to customize because the exact EDProducer type depends on the modifier gpu.toModify(tpClusterProducerPixelTrackingOnly, src = "tpClusterProducerHeterogeneousPixelTrackingOnly") +(~gpu).toModify(tpClusterProducerPixelTrackingOnly, pixelClusterSrc = "siPixelClustersPreSplitting") quickTrackAssociatorByHitsPixelTrackingOnly = quickTrackAssociatorByHits.clone( cluster2TPSrc = "tpClusterProducerPixelTrackingOnly" From 2f9da84058556d963991543f6394ea0b1e0ea712 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Wed, 1 Aug 2018 10:37:39 +0200 Subject: [PATCH 2/2] Less ugly? --- .../python/tpClusterProducer_cfi.py | 4 +--- Validation/RecoTrack/python/TrackValidation_cff.py | 11 +++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/SimTracker/TrackerHitAssociation/python/tpClusterProducer_cfi.py b/SimTracker/TrackerHitAssociation/python/tpClusterProducer_cfi.py index e8330c074dfac..a8de0a96e4678 100644 --- a/SimTracker/TrackerHitAssociation/python/tpClusterProducer_cfi.py +++ b/SimTracker/TrackerHitAssociation/python/tpClusterProducer_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.ProcessModifiers.gpu_cff import gpu from SimTracker.TrackerHitAssociation.tpClusterProducerDefault_cfi import tpClusterProducerDefault as _tpClusterProducerDefault @@ -25,6 +24,5 @@ tpClusterProducerHeterogeneous = _tpClusterProducerHeterogeneous.clone() from SimTracker.TrackerHitAssociation.tpClusterHeterogeneousConverter_cfi import tpClusterHeterogeneousConverter as _tpHeterogeneousConverter - -gpu.toReplaceWith(tpClusterProducer, _tpHeterogeneousConverter.clone()) +tpClusterProducerConverter = _tpHeterogeneousConverter.clone() diff --git a/Validation/RecoTrack/python/TrackValidation_cff.py b/Validation/RecoTrack/python/TrackValidation_cff.py index 4980dac920b20..5a806298bb7b3 100644 --- a/Validation/RecoTrack/python/TrackValidation_cff.py +++ b/Validation/RecoTrack/python/TrackValidation_cff.py @@ -713,10 +713,13 @@ def _uniqueFirstLayers(layerList): tpClusterProducerHeterogeneousPixelTrackingOnly = tpClusterProducerHeterogeneous.clone( pixelClusterSrc = "siPixelClustersPreSplitting" ) -tpClusterProducerPixelTrackingOnly = tpClusterProducer.clone() -# Need to use the modifier to customize because the exact EDProducer type depends on the modifier -gpu.toModify(tpClusterProducerPixelTrackingOnly, src = "tpClusterProducerHeterogeneousPixelTrackingOnly") -(~gpu).toModify(tpClusterProducerPixelTrackingOnly, pixelClusterSrc = "siPixelClustersPreSplitting") +tpClusterProducerPixelTrackingOnly = tpClusterProducer.clone( + pixelClusterSrc = "siPixelClustersPreSplitting" +) +from Configuration.ProcessModifiers.gpu_cff import gpu +gpu.toReplaceWith(tpClusterProducerPixelTrackingOnly, tpClusterProducerConverter.clone( + src = "tpClusterProducerHeterogeneousPixelTrackingOnly" +)) quickTrackAssociatorByHitsPixelTrackingOnly = quickTrackAssociatorByHits.clone( cluster2TPSrc = "tpClusterProducerPixelTrackingOnly"