Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix track cluster remover template definition #6595

Merged
merged 3 commits into from
Nov 29, 2014
Merged

fix track cluster remover template definition #6595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11e6a99
add trackClusterRemover_cfi.py file
mtosi Nov 25, 2014
4f24e19
fix input parameters handling
mtosi Nov 25, 2014
b17cb4d
cloning the TrackClusterRemover module, instead of explicitly definin…
mtosi Nov 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions RecoLocalTracker/SubCollectionProducers/python/trackClusterRemover_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
31 changes: 22 additions & 9 deletions RecoLocalTracker/SubCollectionProducers/src/TrackClusterRemover.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,28 +61,41 @@ namespace {


TrackClusterRemover::TrackClusterRemover(const edm::ParameterSet& iConfig) :
mergeOld_(iConfig.exists("oldClusterRemovalInfo")),
maxChi2_(iConfig.getParameter<double>("maxChi2"))
{

produces<edm::ContainerMask<edmNew::DetSetVector<SiPixelCluster> > >();
produces<edm::ContainerMask<edmNew::DetSetVector<SiStripCluster> > >();


if (iConfig.exists("overrideTrkQuals"))
overrideTrkQuals_.push_back(consumes<edm::ValueMap<int> >(iConfig.getParameter<edm::InputTag>("overrideTrkQuals")));
trajectories_ = consumes<TrajTrackAssociationCollection> (iConfig.getParameter<edm::InputTag>("trajectories") );
pixelClusters_ = consumes<edmNew::DetSetVector<SiPixelCluster> >(iConfig.getParameter<edm::InputTag>("pixelClusters"));
stripClusters_ = consumes<edmNew::DetSetVector<SiStripCluster> >(iConfig.getParameter<edm::InputTag>("stripClusters"));


if (iConfig.exists("overrideTrkQuals")) {
edm::InputTag overrideTrkQuals = iConfig.getParameter<edm::InputTag>("overrideTrkQuals");
if ( !(overrideTrkQuals==edm::InputTag("")) )
overrideTrkQuals_.push_back( consumes<edm::ValueMap<int> >(overrideTrkQuals) );
}

trackQuality_=reco::TrackBase::undefQuality;
filterTracks_=false;
if (iConfig.exists("TrackQuality")){
filterTracks_=true;
trackQuality_=reco::TrackBase::qualityByName(iConfig.getParameter<std::string>("TrackQuality"));
minNumberOfLayersWithMeasBeforeFiltering_ = iConfig.existsAs<int>("minNumberOfLayersWithMeasBeforeFiltering") ?
iConfig.getParameter<int>("minNumberOfLayersWithMeasBeforeFiltering") : 0;
std::string trackQuality = iConfig.getParameter<std::string>("TrackQuality");
if ( !trackQuality.empty() ) {
trackQuality_=reco::TrackBase::qualityByName( trackQuality );
minNumberOfLayersWithMeasBeforeFiltering_ = iConfig.existsAs<int>("minNumberOfLayersWithMeasBeforeFiltering") ?
iConfig.getParameter<int>("minNumberOfLayersWithMeasBeforeFiltering") : 0;
}
}

trajectories_ = consumes<TrajTrackAssociationCollection>(iConfig.getParameter<edm::InputTag>("trajectories"));
pixelClusters_ = consumes<edmNew::DetSetVector<SiPixelCluster> >(iConfig.getParameter<edm::InputTag>("pixelClusters"));
stripClusters_ = consumes<edmNew::DetSetVector<SiStripCluster> >(iConfig.getParameter<edm::InputTag>("stripClusters"));
if ( iConfig.exists("oldClusterRemovalInfo") ) {
edm::InputTag oldClusterRemovalInfo = iConfig.getParameter<edm::InputTag>("oldClusterRemovalInfo");
mergeOld_ = ( (oldClusterRemovalInfo==edm::InputTag("")) ? false : true );
} else
mergeOld_ = false;

if (mergeOld_) {
oldPxlMaskToken_ = consumes<PixelMaskContainer>(iConfig.getParameter<edm::InputTag>("oldClusterRemovalInfo"));
Expand Down
19 changes: 11 additions & 8 deletions RecoParticleFlow/PFTracking/python/nuclearRemainingHits_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 *
Expand All @@ -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)
Expand Down
19 changes: 10 additions & 9 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
19 changes: 10 additions & 9 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
23 changes: 13 additions & 10 deletions RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
### who is using this python file ?
### I found it obsolete, at least in terms of the TrackClusterRemover setting
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@VinInn @rovere @cerati
Please take note of these comments and possibly clean up in not so distant future. (not this PR)
Thank you.

### 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',
Expand Down
23 changes: 13 additions & 10 deletions RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
23 changes: 13 additions & 10 deletions RecoTracker/ConversionSeedGenerators/python/PostLS1_ConversionStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
16 changes: 9 additions & 7 deletions RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
18 changes: 9 additions & 9 deletions RecoTracker/IterativeTracking/python/LowPU_DetachedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions RecoTracker/IterativeTracking/python/LowPU_LowPtTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
18 changes: 9 additions & 9 deletions RecoTracker/IterativeTracking/python/LowPU_MixedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down