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

Clean up QuickTrackAssociatorByHits configuration #22983

Merged
merged 4 commits into from Apr 24, 2018
Merged

Clean up QuickTrackAssociatorByHits configuration #22983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69e19e7
Remove useless customization
makortel Mar 12, 2018
5ccabb0
Construct TrackerHitAssociator::Config and hence call relevant consum…
makortel Mar 12, 2018
f8e2498
Remove TrackerHitAssociator parameters from default configuration to …
makortel Apr 4, 2018
5182fff
Generalize for HI
makortel Apr 17, 2018
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
4 changes: 3 additions & 1 deletion SimTracker/TrackAssociatorProducers/plugins/QuickTrackAssociatorByHitsProducer.cc
View file
Open in desktop
Expand Up @@ -80,7 +80,6 @@ class QuickTrackAssociatorByHitsProducer : public edm::global::EDProducer<> {
// constructors and destructor
//
QuickTrackAssociatorByHitsProducer::QuickTrackAssociatorByHitsProducer(const edm::ParameterSet& iConfig):
trackerHitAssociatorConfig_(makeHitAssociatorParameters(iConfig), consumesCollector()),
qualitySimToReco_( iConfig.getParameter<double>( "Quality_SimToReco" ) ),
puritySimToReco_( iConfig.getParameter<double>( "Purity_SimToReco" ) ),
pixelHitWeight_( iConfig.getParameter<double>( "PixelHitWeight" ) ),
Expand Down Expand Up @@ -123,6 +122,9 @@ QuickTrackAssociatorByHitsProducer::QuickTrackAssociatorByHitsProducer(const edm
if(useClusterTPAssociation_) {
cluster2TPToken_ = consumes<ClusterTPAssociation>(iConfig.getParameter < edm::InputTag > ("cluster2TPSrc"));
}
else {
trackerHitAssociatorConfig_ = TrackerHitAssociator::Config(makeHitAssociatorParameters(iConfig), consumesCollector());
}

}

Expand Down
26 changes: 11 additions & 15 deletions SimTracker/TrackAssociatorProducers/python/quickTrackAssociatorByHits_cfi.py
View file
Open in desktop
Expand Up @@ -8,30 +8,26 @@
Purity_SimToReco = cms.double(0.75),
ThreeHitTracksAreSpecial = cms.bool(True),
PixelHitWeight = cms.double(1.0),
associatePixel = cms.bool(True),
associateStrip = cms.bool(True),
pixelSimLinkSrc = cms.InputTag("simSiPixelDigis"),
stripSimLinkSrc = cms.InputTag("simSiStripDigis"),
useClusterTPAssociation = cms.bool(True),
cluster2TPSrc = cms.InputTag("tpClusterProducer")
)

quickTrackAssociatorByHitsTrackerHitAssociator = quickTrackAssociatorByHits.clone(
useClusterTPAssociation = False,
associateStrip = cms.bool(True),
associatePixel = cms.bool(True),
pixelSimLinkSrc = cms.InputTag("simSiPixelDigis"),
stripSimLinkSrc = cms.InputTag("simSiStripDigis"),
)

from Configuration.Eras.Modifier_fastSim_cff import fastSim
fastSim.toModify(quickTrackAssociatorByHits,
fastSim.toReplaceWith(quickTrackAssociatorByHits, quickTrackAssociatorByHitsTrackerHitAssociator.clone(
associateStrip = False,
associatePixel = False,
useClusterTPAssociation = False
)

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(
quickTrackAssociatorByHits,
pixelSimLinkSrc = cms.InputTag("simSiPixelDigis","Pixel"),
stripSimLinkSrc = cms.InputTag("simSiPixelDigis","Tracker")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The starting point for these developments was this customization, which is

  • incorrect: for phase 2, instead of stripSimLinkSrc one should set
usePhase2Tracker = cms.bool(True),
phase2TrackerSimLinkSrc = cms.InputTag("simSiPixelDigis","Tracker")
  • useless: These parameters are for TrackerHitAssociator, while by default QuickTrackAssociatorByHits uses ClusterTPAssociation

So this PR makes an attempt to remove the customization of useless and possibly confusing parameters.

)
))

from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
premix_stage2.toModify(quickTrackAssociatorByHits,
(fastSim & premix_stage2).toModify(quickTrackAssociatorByHits,
pixelSimLinkSrc = "mixData:PixelDigiSimLink",
stripSimLinkSrc = "mixData:StripDigiSimLink",
)
1 change: 1 addition & 0 deletions SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h
View file
Open in desktop
Expand Up @@ -56,6 +56,7 @@ class TrackerHitAssociator {

public:
struct Config {
Config() {}
Config(const edm::ParameterSet& conf, edm::ConsumesCollector && iC);
Config(edm::ConsumesCollector && iC);
bool doPixel_, doStrip_, useOTph2_, doTrackAssoc_, assocHitbySimTrack_;
Expand Down
5 changes: 2 additions & 3 deletions Validation/RecoHI/python/TrackValidationHeavyIons_cff.py
View file
Open in desktop
Expand Up @@ -2,9 +2,8 @@

# track associator settings
import SimTracker.TrackAssociatorProducers.quickTrackAssociatorByHits_cfi
trackAssociatorByHitsRecoDenom = SimTracker.TrackAssociatorProducers.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHits.clone(
useClusterTPAssociation = False # to do the track<->TP association with TrackerHitAssociator
)
# to do the track<->TP association with TrackerHitAssociator
trackAssociatorByHitsRecoDenom = SimTracker.TrackAssociatorProducers.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHitsTrackerHitAssociator.clone()
from SimGeneral.TrackingAnalysis.trackingParticleNumberOfLayersProducer_cff import *

# reco track quality cuts
Expand Down