From 11e6a996b25275d9489ff6bd656aeb8d4e1eabc9 Mon Sep 17 00:00:00 2001 From: Mia Date: Tue, 25 Nov 2014 16:53:53 +0100 Subject: [PATCH 1/3] add trackClusterRemover_cfi.py file --- .../python/trackClusterRemover_cfi.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 RecoLocalTracker/SubCollectionProducers/python/trackClusterRemover_cfi.py diff --git a/RecoLocalTracker/SubCollectionProducers/python/trackClusterRemover_cfi.py b/RecoLocalTracker/SubCollectionProducers/python/trackClusterRemover_cfi.py new file mode 100644 index 0000000000000..150a4a7d3a45f --- /dev/null +++ b/RecoLocalTracker/SubCollectionProducers/python/trackClusterRemover_cfi.py @@ -0,0 +1,13 @@ +import FWCore.ParameterSet.Config as cms + +trackClusterRemover = cms.EDProducer("TrackClusterRemover", + maxChi2 = cms.double(30.0), + trajectories = cms.InputTag("tracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag(""), + overrideTrkQuals = cms.InputTag(''), + TrackQuality = cms.string('highPurity'), + minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), # this is used only if TrackQuality exists + # if it is not available, its value is set to 0 +) From 4f24e19e888096e06ca0c49e21657f617dd9c3f9 Mon Sep 17 00:00:00 2001 From: Mia Date: Tue, 25 Nov 2014 16:54:10 +0100 Subject: [PATCH 2/3] fix input parameters handling --- .../src/TrackClusterRemover.cc | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc b/RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc index 2582fd2c23536..4c45f1f1bd576 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc @@ -61,28 +61,41 @@ namespace { TrackClusterRemover::TrackClusterRemover(const edm::ParameterSet& iConfig) : - mergeOld_(iConfig.exists("oldClusterRemovalInfo")), maxChi2_(iConfig.getParameter("maxChi2")) { + produces > >(); produces > >(); - if (iConfig.exists("overrideTrkQuals")) - overrideTrkQuals_.push_back(consumes >(iConfig.getParameter("overrideTrkQuals"))); + trajectories_ = consumes (iConfig.getParameter("trajectories") ); + pixelClusters_ = consumes >(iConfig.getParameter("pixelClusters")); + stripClusters_ = consumes >(iConfig.getParameter("stripClusters")); + + + if (iConfig.exists("overrideTrkQuals")) { + edm::InputTag overrideTrkQuals = iConfig.getParameter("overrideTrkQuals"); + if ( !(overrideTrkQuals==edm::InputTag("")) ) + overrideTrkQuals_.push_back( consumes >(overrideTrkQuals) ); + } trackQuality_=reco::TrackBase::undefQuality; filterTracks_=false; if (iConfig.exists("TrackQuality")){ filterTracks_=true; - trackQuality_=reco::TrackBase::qualityByName(iConfig.getParameter("TrackQuality")); - minNumberOfLayersWithMeasBeforeFiltering_ = iConfig.existsAs("minNumberOfLayersWithMeasBeforeFiltering") ? - iConfig.getParameter("minNumberOfLayersWithMeasBeforeFiltering") : 0; + std::string trackQuality = iConfig.getParameter("TrackQuality"); + if ( !trackQuality.empty() ) { + trackQuality_=reco::TrackBase::qualityByName( trackQuality ); + minNumberOfLayersWithMeasBeforeFiltering_ = iConfig.existsAs("minNumberOfLayersWithMeasBeforeFiltering") ? + iConfig.getParameter("minNumberOfLayersWithMeasBeforeFiltering") : 0; + } } - trajectories_ = consumes(iConfig.getParameter("trajectories")); - pixelClusters_ = consumes >(iConfig.getParameter("pixelClusters")); - stripClusters_ = consumes >(iConfig.getParameter("stripClusters")); + if ( iConfig.exists("oldClusterRemovalInfo") ) { + edm::InputTag oldClusterRemovalInfo = iConfig.getParameter("oldClusterRemovalInfo"); + mergeOld_ = ( (oldClusterRemovalInfo==edm::InputTag("")) ? false : true ); + } else + mergeOld_ = false; if (mergeOld_) { oldPxlMaskToken_ = consumes(iConfig.getParameter("oldClusterRemovalInfo")); From b17cb4d152f5f7dbd4ac2a730edc6c40cff7671e Mon Sep 17 00:00:00 2001 From: Mia Date: Tue, 25 Nov 2014 16:55:38 +0100 Subject: [PATCH 3/3] cloning the TrackClusterRemover module, instead of explicitly defining it --- .../python/nuclearRemainingHits_cff.py | 19 +++++---- .../python/ConversionStep2_cff.py | 19 +++++---- .../python/ConversionStep_cff.py | 19 +++++---- .../python/Phase1PU140_ConversionStep_cff.py | 23 +++++----- .../python/Phase1PU70_ConversionStep_cff.py | 23 +++++----- .../python/PostLS1_ConversionStep_cff.py | 23 +++++----- .../python/DetachedTripletStep_cff.py | 16 +++---- .../python/HighPtTripletStep_cff.py | 13 +++--- .../python/LowPU_DetachedTripletStep_cff.py | 18 ++++---- .../python/LowPU_LowPtTripletStep_cff.py | 15 +++---- .../python/LowPU_MixedTripletStep_cff.py | 18 ++++---- .../python/LowPU_PixelLessStep_cff.py | 18 ++++---- .../python/LowPU_PixelPairStep_cff.py | 17 ++++---- .../python/LowPU_TobTecStep_cff.py | 18 ++++---- .../python/LowPtBarrelTripletStep_cff.py | 15 +++---- .../python/LowPtForwardTripletStep_cff.py | 13 +++--- .../python/LowPtTripletStep_cff.py | 17 ++++---- .../python/MixedTripletStep_cff.py | 19 +++++---- .../Phase1PU140_DetachedQuadStep_cff.py | 18 ++++---- .../Phase1PU140_HighPtTripletStep_cff.py | 23 +++++----- .../python/Phase1PU140_LowPtQuadStep_cff.py | 23 +++++----- .../Phase1PU140_LowPtTripletStep_cff.py | 15 +++---- .../python/Phase1PU140_PixelPairStep_cff.py | 17 ++++---- .../python/Phase1PU70_DetachedQuadStep_cff.py | 17 ++++---- .../Phase1PU70_HighPtTripletStep_cff.py | 23 +++++----- .../python/Phase1PU70_LowPtQuadStep_cff.py | 20 ++++----- .../python/Phase1PU70_LowPtTripletStep_cff.py | 15 +++---- .../python/Phase1PU70_MixedTripletStep_cff.py | 18 ++++---- .../python/Phase1PU70_PixelPairStep_cff.py | 17 ++++---- .../python/Phase1PU70_TobTecStep_cff.py | 42 +++++++++---------- .../python/PixelLessStep_cff.py | 17 ++++---- .../python/PixelPairStep_cff.py | 17 ++++---- .../python/RunI_DetachedTripletStep_cff.py | 18 ++++---- .../python/RunI_LowPtTripletStep_cff.py | 15 +++---- .../python/RunI_MixedTripletStep_cff.py | 18 ++++---- .../python/RunI_PixelLessStep_cff.py | 18 ++++---- .../python/RunI_PixelPairStep_cff.py | 18 ++++---- .../python/RunI_TobTecStep_cff.py | 18 ++++---- .../python/TobTecStep_cff.py | 17 ++++---- 39 files changed, 376 insertions(+), 351 deletions(-) diff --git a/RecoParticleFlow/PFTracking/python/nuclearRemainingHits_cff.py b/RecoParticleFlow/PFTracking/python/nuclearRemainingHits_cff.py index 62c2e321290c2..4c49deab76dca 100644 --- a/RecoParticleFlow/PFTracking/python/nuclearRemainingHits_cff.py +++ b/RecoParticleFlow/PFTracking/python/nuclearRemainingHits_cff.py @@ -1,3 +1,6 @@ +### who is using this python file ? +### I found it obsolete, at least in terms of the TrackClusterRemover setting +### now, it is ok, but .... import FWCore.ParameterSet.Config as cms from RecoParticleFlow.PFTracking.nuclear_cff import * @@ -7,14 +10,14 @@ nuclearStripRecHits = RecoLocalTracker.SiStripRecHitConverter.SiStripRecHitConverter_cfi.siStripMatchedRecHits.clone() import RecoTracker.MeasurementDet.MeasurementTrackerESProducer_cfi nuclearMeasurementTracker = RecoTracker.MeasurementDet.MeasurementTrackerESProducer_cfi.MeasurementTracker.clone() -nuclearClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("thClusters"), - trajectories = cms.InputTag("thStep"), - pixelClusters = cms.InputTag("thClusters"), - Common = cms.PSet( - maxChi2 = cms.double(30.0) - ), - stripClusters = cms.InputTag("thClusters") + +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +nuclearClusters = trackClusterRemover.clone( + maxChi2 = cms.double(30.0), + trajectories = cms.InputTag("thStep"), + pixelClusters = cms.InputTag("thClusters"), + stripClusters = cms.InputTag("thClusters"), + oldClusterRemovalInfo = cms.InputTag("thClusters"), ) nuclearRemainingHits = cms.Sequence(nuclearClusters*nuclearPixelRecHits*nuclearStripRecHits*nuclear) diff --git a/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py b/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py index e610f18a64c30..f94ed2e6e82f8 100644 --- a/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py @@ -2,15 +2,16 @@ from RecoTracker.ConversionSeedGenerators.PhotonConversionTrajectorySeedProducerFromQuadruplets_cfi import * -conv2Clusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("convClusters"), - trajectories = cms.InputTag("convStepTracks"), - overrideTrkQuals = cms.InputTag('convStepSelector','convStep'), - TrackQuality = cms.string('highPurity'), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(30.0) - ) +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +conv2Clusters = trackClusterRemover.clone( + maxChi2 = cms.double(30.0), + trajectories = cms.InputTag("convStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("convClusters"), + overrideTrkQuals = cms.InputTag('convStepSelector','convStep'), + TrackQuality = cms.string('highPurity'), +) conv2LayerPairs = cms.EDProducer("SeedingLayersEDProducer", layerList = cms.vstring('BPix1+BPix2', diff --git a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py index 2811098717368..47ec7a95da0c5 100644 --- a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py @@ -3,15 +3,16 @@ from RecoTracker.ConversionSeedGenerators.PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi import * from RecoTracker.ConversionSeedGenerators.ConversionStep2_cff import * -convClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("tobTecStepClusters"), - trajectories = cms.InputTag("tobTecStepTracks"), - overrideTrkQuals = cms.InputTag('tobTecStepSelector','tobTecStep'), - TrackQuality = cms.string('highPurity'), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(30.0) - ) +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +convClusters = trackClusterRemover.clone( + maxChi2 = cms.double(30.0), + trajectories = cms.InputTag("tobTecStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("tobTecStepClusters"), + overrideTrkQuals = cms.InputTag('tobTecStepSelector','tobTecStep'), + TrackQuality = cms.string('highPurity'), +) convLayerPairs = cms.EDProducer("SeedingLayersEDProducer", layerList = cms.vstring('BPix1+BPix2', diff --git a/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py index 78ed1ca3ab084..98f8fdc6268de 100644 --- a/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py @@ -1,18 +1,21 @@ +### who is using this python file ? +### I found it obsolete, at least in terms of the TrackClusterRemover setting +### now, it is ok, but .... import FWCore.ParameterSet.Config as cms from RecoTracker.ConversionSeedGenerators.Phase1PU140_PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi import * from RecoTracker.ConversionSeedGenerators.ConversionStep2_cff import * -convClusters = cms.EDProducer("TrackClusterRemover", - clusterLessSolution = cms.bool(True), - oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), - trajectories = cms.InputTag("pixelPairStepTracks"), - overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), - TrackQuality = cms.string('highPurity'), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - Common = cms.PSet(maxChi2 = cms.double(30.0)) - ) +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +convClusters = trackClusterRemover.clone( + maxChi2 = cms.double(30.0), + trajectories = cms.InputTag("pixelPairStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), + overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), + TrackQuality = cms.string('highPurity'), +) convLayerPairs = cms.EDProducer("SeedingLayersEDProducer", layerList = cms.vstring('BPix1+BPix2', diff --git a/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py index cf00fb57ee56b..ff904931ddd50 100644 --- a/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py @@ -1,18 +1,21 @@ +### who is using this python file ? +### I found it obsolete, at least in terms of the TrackClusterRemover setting +### now, it is ok, but .... import FWCore.ParameterSet.Config as cms from RecoTracker.ConversionSeedGenerators.Phase1PU70_PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi import * from RecoTracker.ConversionSeedGenerators.ConversionStep2_cff import * -convClusters = cms.EDProducer("TrackClusterRemover", - clusterLessSolution = cms.bool(True), - oldClusterRemovalInfo = cms.InputTag("tobTecStepClusters"), - trajectories = cms.InputTag("tobTecStepTracks"), - overrideTrkQuals = cms.InputTag('tobTecStepSelector','tobTecStep'), - TrackQuality = cms.string('highPurity'), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - Common = cms.PSet(maxChi2 = cms.double(30.0)) - ) +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +convClusters = trackClusterRemover.clone( + maxChi2 = cms.double(30.0), + trajectories = cms.InputTag("tobTecStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("tobTecStepClusters"), + overrideTrkQuals = cms.InputTag('tobTecStepSelector','tobTecStep'), + TrackQuality = cms.string('highPurity'), +) convLayerPairs = cms.EDProducer("SeedingLayersEDProducer", layerList = cms.vstring('BPix1+BPix2', diff --git a/RecoTracker/ConversionSeedGenerators/python/PostLS1_ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/PostLS1_ConversionStep_cff.py index 6931cd591c846..00fc6fe4b263b 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PostLS1_ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/PostLS1_ConversionStep_cff.py @@ -1,18 +1,21 @@ +### who is using this python file ? +### I found it obsolete, at least in terms of the TrackClusterRemover setting +### now, it is ok, but .... import FWCore.ParameterSet.Config as cms from RecoTracker.ConversionSeedGenerators.PostLS1_PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi import * from RecoTracker.ConversionSeedGenerators.ConversionStep2_cff import * -convClusters = cms.EDProducer("TrackClusterRemover", - clusterLessSolution = cms.bool(True), - oldClusterRemovalInfo = cms.InputTag("tobTecStepClusters"), - trajectories = cms.InputTag("tobTecStepTracks"), - overrideTrkQuals = cms.InputTag('tobTecStepSelector','tobTecStep'), - TrackQuality = cms.string('highPurity'), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - Common = cms.PSet(maxChi2 = cms.double(30.0)) - ) +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +convClusters = trackClusterRemover.clone( + maxChi2 = cms.double(30.0), + trajectories = cms.InputTag("tobTecStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("tobTecStepClusters"), + overrideTrkQuals = cms.InputTag('tobTecStepSelector','tobTecStep'), + TrackQuality = cms.string('highPurity'), +) convLayerPairs = cms.EDProducer("SeedingLayersEDProducer", layerList = cms.vstring('BPix1+BPix2', diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py index ed1fe853707cc..2355d08b42834 100644 --- a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py @@ -6,14 +6,16 @@ # REMOVE HITS ASSIGNED TO GOOD TRACKS FROM PREVIOUS ITERATIONS -detachedTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("initialStepTracks"), - overrideTrkQuals = cms.InputTag('initialStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +detachedTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("initialStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag(""), + overrideTrkQuals = cms.InputTag('initialStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py index 83d2369d3d615..cecd34a3554bd 100644 --- a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py @@ -1,13 +1,14 @@ import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -highPtTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("initialStepTracks"), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +highPtTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("initialStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), - TrackQuality = cms.string('highPurity'), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) + TrackQuality = cms.string('highPurity'), ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/LowPU_DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_DetachedTripletStep_cff.py index c95735a74870a..7afa30d904bd6 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_DetachedTripletStep_cff.py @@ -5,16 +5,16 @@ ############################################### # REMOVE HITS ASSIGNED TO GOOD TRACKS FROM PREVIOUS ITERATIONS - -detachedTripletStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), - trajectories = cms.InputTag("pixelPairStepTracks"), - overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +detachedTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("pixelPairStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), + overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/LowPU_LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_LowPtTripletStep_cff.py index 569c7dd50a7aa..d77771e92532c 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_LowPtTripletStep_cff.py @@ -1,14 +1,15 @@ import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -lowPtTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("initialStepTracks"), - overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +lowPtTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("initialStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/LowPU_MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_MixedTripletStep_cff.py index 83f1926a2cede..7289a6a9310de 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_MixedTripletStep_cff.py @@ -3,16 +3,16 @@ ############################################################### # Large impact parameter Tracking using mixed-triplet seeding # ############################################################### - -mixedTripletStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("detachedTripletStepClusters"), - trajectories = cms.InputTag("detachedTripletStepTracks"), - overrideTrkQuals = cms.InputTag('detachedTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +mixedTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("detachedTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("detachedTripletStepClusters"), + overrideTrkQuals = cms.InputTag('detachedTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/LowPU_PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_PixelLessStep_cff.py index c3f5f8bb1c1d9..7cddbcb66c6e2 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_PixelLessStep_cff.py @@ -4,16 +4,16 @@ # Large impact parameter tracking using TIB/TID/TEC stereo layer seeding # ########################################################################## - -pixelLessStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), - trajectories = cms.InputTag("mixedTripletStepTracks"), - overrideTrkQuals = cms.InputTag('mixedTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +pixelLessStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("mixedTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), + overrideTrkQuals = cms.InputTag('mixedTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/LowPU_PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_PixelPairStep_cff.py index 09db8b54be667..b85b3ab07dde3 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_PixelPairStep_cff.py @@ -2,15 +2,16 @@ # NEW CLUSTERS (remove previously used clusters) -pixelPairStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), - trajectories = cms.InputTag("lowPtTripletStepTracks"), - overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +pixelPairStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("lowPtTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), + overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/LowPU_TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_TobTecStep_cff.py index 5afe0db2d18c1..58b48a425da6c 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_TobTecStep_cff.py @@ -3,16 +3,16 @@ ####################################################################### # Very large impact parameter tracking using TOB + TEC ring 5 seeding # ####################################################################### - -tobTecStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("pixelLessStepClusters"), - trajectories = cms.InputTag("pixelLessStepTracks"), - overrideTrkQuals = cms.InputTag('pixelLessStepSelector','pixelLessStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +tobTecStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("pixelLessStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("pixelLessStepClusters"), + overrideTrkQuals = cms.InputTag('pixelLessStepSelector','pixelLessStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/LowPtBarrelTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtBarrelTripletStep_cff.py index e91ef6845c85e..fdafc42e1036f 100644 --- a/RecoTracker/IterativeTracking/python/LowPtBarrelTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtBarrelTripletStep_cff.py @@ -1,14 +1,15 @@ import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -lowPtBarrelTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("lowPtForwardTripletStepTracks"), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +lowPtBarrelTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("lowPtForwardTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), oldClusterRemovalInfo = cms.InputTag("lowPtForwardTripletStepClusters"), - overrideTrkQuals = cms.InputTag('lowPtForwardTripletStepSelector','lowPtForwardTripletStep'), - TrackQuality = cms.string('highPurity'), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) + overrideTrkQuals = cms.InputTag('lowPtForwardTripletStepSelector','lowPtForwardTripletStep'), + TrackQuality = cms.string('highPurity'), ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py index 8c9178ae1bb8b..9f6b6157ca5e7 100644 --- a/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py @@ -1,13 +1,14 @@ import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -lowPtForwardTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("initialStepTracks"), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +lowPtForwardTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("initialStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), - TrackQuality = cms.string('highPurity'), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) + TrackQuality = cms.string('highPurity'), ) diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py index 21bd559f56dcf..452685a27afce 100644 --- a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py @@ -1,15 +1,16 @@ import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -lowPtTripletStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("detachedTripletStepClusters"), - trajectories = cms.InputTag("detachedTripletStepTracks"), - overrideTrkQuals = cms.InputTag('detachedTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +lowPtTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("detachedTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("detachedTripletStepClusters"), + overrideTrkQuals = cms.InputTag('detachedTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py index c7a295a6f50fd..bdecb691d5770 100644 --- a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py @@ -12,16 +12,17 @@ minGoodStripCharge = cms.double(2069) ) -mixedTripletStepClusters = cms.EDProducer("TrackClusterRemover", -# oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), - oldClusterRemovalInfo = cms.InputTag("chargeCut2069Clusters"), - trajectories = cms.InputTag("pixelPairStepTracks"), - overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +mixedTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("pixelPairStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), +# oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), + oldClusterRemovalInfo = cms.InputTag("chargeCut2069Clusters"), + overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_DetachedQuadStep_cff.py index 97d4b14c5a4c8..2475360fb52fd 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_DetachedQuadStep_cff.py @@ -5,16 +5,16 @@ ############################################### # REMOVE HITS ASSIGNED TO GOOD TRACKS FROM PREVIOUS ITERATIONS - -detachedQuadStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), - trajectories = cms.InputTag("lowPtTripletStepTracks"), - overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +detachedQuadStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("lowPtTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), + overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_HighPtTripletStep_cff.py index 4d47fc7cb02ac..bb9f821da75ff 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_HighPtTripletStep_cff.py @@ -1,19 +1,18 @@ +### who is using this python file ? +### I found it obsolete, at least in terms of the TrackClusterRemover setting +### now, it is ok, but .... import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -highPtTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("initialStepTracks"), - overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +highPtTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("initialStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - doStripChargeCheck = cms.bool(True), - stripRecHits = cms.string('siStripMatchedRecHits'), - Common = cms.PSet( - maxChi2 = cms.double(9.0), - minGoodStripCharge = cms.double(50.0) - ) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py index b2489992c06e9..528bdd784ebc2 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py @@ -1,19 +1,18 @@ +### who is using this python file ? +### I found it obsolete, at least in terms of the TrackClusterRemover setting +### now, it is ok, but .... import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -lowPtQuadStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("highPtTripletStepTracks"), - overrideTrkQuals = cms.InputTag('highPtTripletStepSelector','highPtTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +lowPtQuadStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("highPtTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + overrideTrkQuals = cms.InputTag('highPtTripletStepSelector','highPtTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - doStripChargeCheck = cms.bool(True), - stripRecHits = cms.string('siStripMatchedRecHits'), - Common = cms.PSet( - maxChi2 = cms.double(9.0), - minGoodStripCharge = cms.double(60.0) - ) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py index e20adb2195cb1..326b416b622cd 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py @@ -1,14 +1,15 @@ import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -lowPtTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("lowPtQuadStepTracks"), - overrideTrkQuals = cms.InputTag('lowPtQuadStepSelector','lowPtQuadStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +lowPtTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("lowPtQuadStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + overrideTrkQuals = cms.InputTag('lowPtQuadStepSelector','lowPtQuadStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py index f1789ff617697..71ab9587d6a9a 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py @@ -2,15 +2,16 @@ # NEW CLUSTERS (remove previously used clusters) -pixelPairStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("detachedQuadStepClusters"), - trajectories = cms.InputTag("detachedQuadStepTracks"), - overrideTrkQuals = cms.InputTag('detachedQuadStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +pixelPairStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("detachedQuadStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("detachedQuadStepClusters"), + overrideTrkQuals = cms.InputTag('detachedQuadStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_DetachedQuadStep_cff.py index 2c4d90cacbcf4..47921ab9d50ab 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_DetachedQuadStep_cff.py @@ -6,15 +6,16 @@ # REMOVE HITS ASSIGNED TO GOOD TRACKS FROM PREVIOUS ITERATIONS -detachedQuadStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), - trajectories = cms.InputTag("lowPtTripletStepTracks"), - overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +detachedQuadStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("lowPtTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), + overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_HighPtTripletStep_cff.py index a01d8ac3f3e6d..da1630aad7706 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_HighPtTripletStep_cff.py @@ -1,19 +1,18 @@ +### who is using this python file ? +### I found it obsolete, at least in terms of the TrackClusterRemover setting +### now, it is ok, but .... import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -highPtTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("initialStepTracks"), - overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +highPtTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("initialStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - doStripChargeCheck = cms.bool(True), - stripRecHits = cms.string('siStripMatchedRecHits'), - Common = cms.PSet( - maxChi2 = cms.double(9.0), - minGoodStripCharge = cms.double(50.0) - ) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py index 5015f47124ac3..3c370dec6716c 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py @@ -1,19 +1,15 @@ import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -lowPtQuadStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("highPtTripletStepTracks"), - overrideTrkQuals = cms.InputTag('highPtTripletStepSelector','highPtTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +lowPtQuadStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("highPtTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + overrideTrkQuals = cms.InputTag('highPtTripletStepSelector','highPtTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - doStripChargeCheck = cms.bool(True), - stripRecHits = cms.string('siStripMatchedRecHits'), - Common = cms.PSet( - maxChi2 = cms.double(9.0), - minGoodStripCharge = cms.double(60.0) - ) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py index bd436db7b5d51..d900df78186c0 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py @@ -1,14 +1,15 @@ import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -lowPtTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("lowPtQuadStepTracks"), - overrideTrkQuals = cms.InputTag('lowPtQuadStepSelector','lowPtQuadStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +lowPtTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("lowPtQuadStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + overrideTrkQuals = cms.InputTag('lowPtQuadStepSelector','lowPtQuadStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_MixedTripletStep_cff.py index 1ad1afc1082c1..40cdd7eca764e 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_MixedTripletStep_cff.py @@ -3,16 +3,16 @@ ############################################################### # Large impact parameter Tracking using mixed-triplet seeding # ############################################################### - -mixedTripletStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("detachedQuadStepClusters"), - trajectories = cms.InputTag("detachedQuadStepTracks"), - overrideTrkQuals = cms.InputTag('detachedQuadStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +mixedTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("detachedQuadStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("detachedQuadStepClusters"), + overrideTrkQuals = cms.InputTag('detachedQuadStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py index 4523b3ae627e8..2691a0341cab3 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py @@ -2,15 +2,16 @@ # NEW CLUSTERS (remove previously used clusters) -pixelPairStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), - trajectories = cms.InputTag("mixedTripletStepTracks"), - overrideTrkQuals = cms.InputTag('mixedTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +pixelPairStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("mixedTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), + overrideTrkQuals = cms.InputTag('mixedTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_TobTecStep_cff.py index 4cafdadfbac0e..ad839c95cdd0a 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_TobTecStep_cff.py @@ -3,32 +3,30 @@ ####################################################################### # Very large impact parameter tracking using TOB + TEC ring 5 seeding # ####################################################################### - -tobTecStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), - trajectories = cms.InputTag("pixelPairStepTracks"), - overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +tobTecStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("pixelPairStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), + overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) -tobTecStepSeedClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), - trajectories = cms.InputTag("mixedTripletStepTracks"), - overrideTrkQuals = cms.InputTag('mixedTripletStep'), - TrackQuality = cms.string('highPurity'), +### who is using this python file ? +### I found it obsolete, at least in terms of the TrackClusterRemover setting +### now, it is ok, but .... +tobTecStepSeedClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("mixedTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), + overrideTrkQuals = cms.InputTag('mixedTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - doStripChargeCheck = cms.bool(True), - stripRecHits = cms.string('siStripMatchedRecHits'), - Common = cms.PSet( - maxChi2 = cms.double(9.0), - minGoodStripCharge = cms.double(80.0) - ) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py index 64d4d6d1f819c..b638b3b9cfe90 100644 --- a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py @@ -4,15 +4,16 @@ # Large impact parameter tracking using TIB/TID/TEC stereo layer seeding # ########################################################################## -pixelLessStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), - trajectories = cms.InputTag("mixedTripletStepTracks"), - overrideTrkQuals = cms.InputTag('mixedTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +pixelLessStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("mixedTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), + overrideTrkQuals = cms.InputTag('mixedTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py index 379218a934ec7..6f97a9680b8b8 100644 --- a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py @@ -2,15 +2,16 @@ # NEW CLUSTERS (remove previously used clusters) -pixelPairStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), - trajectories = cms.InputTag("lowPtTripletStepTracks"), - overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +pixelPairStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("lowPtTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), + overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/RunI_DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_DetachedTripletStep_cff.py index b68bd54c0ea00..494f9512b1dc5 100644 --- a/RecoTracker/IterativeTracking/python/RunI_DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_DetachedTripletStep_cff.py @@ -5,16 +5,16 @@ ############################################### # REMOVE HITS ASSIGNED TO GOOD TRACKS FROM PREVIOUS ITERATIONS - -detachedTripletStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), - trajectories = cms.InputTag("pixelPairStepTracks"), - overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +detachedTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("pixelPairStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), + overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/RunI_LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_LowPtTripletStep_cff.py index e02b1a35d458a..79a36b9c2a614 100644 --- a/RecoTracker/IterativeTracking/python/RunI_LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_LowPtTripletStep_cff.py @@ -1,14 +1,15 @@ import FWCore.ParameterSet.Config as cms # NEW CLUSTERS (remove previously used clusters) -lowPtTripletStepClusters = cms.EDProducer("TrackClusterRemover", - trajectories = cms.InputTag("initialStepTracks"), - overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +lowPtTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("initialStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + overrideTrkQuals = cms.InputTag('initialStepSelector','initialStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/RunI_MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_MixedTripletStep_cff.py index 07b4b70bf65d2..c7e90dc054664 100644 --- a/RecoTracker/IterativeTracking/python/RunI_MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_MixedTripletStep_cff.py @@ -3,16 +3,16 @@ ############################################################### # Large impact parameter Tracking using mixed-triplet seeding # ############################################################### - -mixedTripletStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("detachedTripletStepClusters"), - trajectories = cms.InputTag("detachedTripletStepTracks"), - overrideTrkQuals = cms.InputTag('detachedTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +mixedTripletStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("detachedTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("detachedTripletStepClusters"), + overrideTrkQuals = cms.InputTag('detachedTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/RunI_PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_PixelLessStep_cff.py index ca82306a54cee..747eaf8633d1e 100644 --- a/RecoTracker/IterativeTracking/python/RunI_PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_PixelLessStep_cff.py @@ -4,16 +4,16 @@ # Large impact parameter tracking using TIB/TID/TEC stereo layer seeding # ########################################################################## - -pixelLessStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), - trajectories = cms.InputTag("mixedTripletStepTracks"), - overrideTrkQuals = cms.InputTag('mixedTripletStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +pixelLessStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("mixedTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("mixedTripletStepClusters"), + overrideTrkQuals = cms.InputTag('mixedTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/RunI_PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_PixelPairStep_cff.py index c8e60f7522a7b..ceea6130ba052 100644 --- a/RecoTracker/IterativeTracking/python/RunI_PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_PixelPairStep_cff.py @@ -2,15 +2,17 @@ # NEW CLUSTERS (remove previously used clusters) -pixelPairStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), - trajectories = cms.InputTag("lowPtTripletStepTracks"), - overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), - TrackQuality = cms.string('highPurity'), + +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +pixelPairStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("lowPtTripletStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("lowPtTripletStepClusters"), + overrideTrkQuals = cms.InputTag('lowPtTripletStepSelector','lowPtTripletStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/RunI_TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_TobTecStep_cff.py index ab6469895b6ad..f7a80e73947bf 100644 --- a/RecoTracker/IterativeTracking/python/RunI_TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_TobTecStep_cff.py @@ -3,16 +3,16 @@ ####################################################################### # Very large impact parameter tracking using TOB + TEC ring 5 seeding # ####################################################################### - -tobTecStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("pixelLessStepClusters"), - trajectories = cms.InputTag("pixelLessStepTracks"), - overrideTrkQuals = cms.InputTag('pixelLessStepSelector','pixelLessStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +tobTecStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("pixelLessStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("pixelLessStepClusters"), + overrideTrkQuals = cms.InputTag('pixelLessStepSelector','pixelLessStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # SEEDING LAYERS diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py index bc61b5710a5b3..3aec1e47a58d9 100644 --- a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py @@ -4,15 +4,16 @@ # Very large impact parameter tracking using TOB + TEC ring 5 seeding # ####################################################################### -tobTecStepClusters = cms.EDProducer("TrackClusterRemover", - oldClusterRemovalInfo = cms.InputTag("pixelLessStepClusters"), - trajectories = cms.InputTag("pixelLessStepTracks"), - overrideTrkQuals = cms.InputTag('pixelLessStep'), - TrackQuality = cms.string('highPurity'), +from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * +tobTecStepClusters = trackClusterRemover.clone( + maxChi2 = cms.double(9.0), + trajectories = cms.InputTag("pixelLessStepTracks"), + pixelClusters = cms.InputTag("siPixelClusters"), + stripClusters = cms.InputTag("siStripClusters"), + oldClusterRemovalInfo = cms.InputTag("pixelLessStepClusters"), + overrideTrkQuals = cms.InputTag('pixelLessStep'), + TrackQuality = cms.string('highPurity'), minNumberOfLayersWithMeasBeforeFiltering = cms.int32(0), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - maxChi2 = cms.double(9.0) ) # TRIPLET SEEDING LAYERS