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 pixelTracks imports #17470

Merged
merged 2 commits into from Feb 11, 2017
Merged

Fix pixelTracks imports #17470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95e2e20
Move definition of pixelTracks to its own cfi file, import that inste…
makortel Feb 9, 2017
47a7493
Add TrackingRegionsFromBeamSpotAndL2TauEDProducer
makortel Feb 9, 2017
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
8 changes: 1 addition & 7 deletions RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
from RecoPixelVertexing.PixelTrackFitting.pixelFitterByHelixProjections_cfi import pixelFitterByHelixProjections
from RecoPixelVertexing.PixelTrackFitting.pixelTrackFilterByKinematics_cfi import pixelTrackFilterByKinematics
from RecoPixelVertexing.PixelTrackFitting.pixelTrackCleanerBySharedHits_cfi import pixelTrackCleanerBySharedHits
from RecoPixelVertexing.PixelTrackFitting.pixelTracksDefault_cfi import pixelTracksDefault as _pixelTracksDefault
from RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi import pixelTracks
from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpot_cfi import globalTrackingRegionFromBeamSpot as _globalTrackingRegionFromBeamSpot
from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer
from RecoPixelVertexing.PixelTriplets.pixelTripletHLTEDProducer_cfi import pixelTripletHLTEDProducer as _pixelTripletHLTEDProducer
Expand Down Expand Up @@ -69,12 +69,6 @@
layerList = dict(refToPSet_ = cms.string("PixelSeedMergerQuadruplets")),
)

# Pixel tracks
pixelTracks = _pixelTracksDefault.clone()
_SeedingHitSets = dict(SeedingHitSets = "pixelTracksHitQuadruplets")
trackingPhase1PU70.toModify(pixelTracks, **_SeedingHitSets)
trackingPhase2PU140.toModify(pixelTracks, **_SeedingHitSets)

pixelTracksSequence = cms.Sequence(
pixelTracksTrackingRegions +
pixelTracksHitDoublets +
Expand Down
9 changes: 9 additions & 0 deletions RecoPixelVertexing/PixelTrackFitting/python/pixelTracks_cfi.py
View file
Open in desktop
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms
from RecoPixelVertexing.PixelTrackFitting.pixelTracksDefault_cfi import pixelTracksDefault as _pixelTracksDefault
pixelTracks = _pixelTracksDefault.clone()

from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
_SeedingHitSets = dict(SeedingHitSets = "pixelTracksHitQuadruplets")
trackingPhase1PU70.toModify(pixelTracks, **_SeedingHitSets)
trackingPhase2PU140.toModify(pixelTracks, **_SeedingHitSets)
16 changes: 8 additions & 8 deletions RecoTauTag/HLTProducers/python/PixelTracksL2Tau_cfi.py
View file
Open in desktop
@@ -1,12 +1,12 @@
import FWCore.ParameterSet.Config as cms

from RecoPixelVertexing.PixelTrackFitting.pixelTracksDefault_cfi import *
from RecoTauTag.HLTProducers.TrackingRegionsFromBeamSpotAndL2Tau_cfi import *

pixelTracksL2Tau = pixelTracksDefault.clone()
pixelTracksL2Tau.RegionFactoryPSet = cms.PSet(
TrackingRegionsFromBeamSpotAndL2TauBlock,
ComponentName = cms.string( "TrackingRegionsFromBeamSpotAndL2Tau" )
)
from RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi import pixelTracks as _pixelTracks
from RecoTauTag.HLTProducers.trackingRegionsFromBeamSpotAndL2Tau_cfi import trackingRegionsFromBeamSpotAndL2Tau

# Note from new seeding framework migration
# Previously the TrackingRegion was set as a parameter of PixelTrackProducer
# Now the TrackingRegion EDProducer must be inserted in a sequence, and set as an input to HitPairEDProducer

pixelTracksL2Tau = _pixelTracks.clone()
pixelTracksL2Tau.passLabel = cms.string('pixelTracksL2Tau')

2 changes: 2 additions & 0 deletions RecoTauTag/HLTProducers/src/SealModule.cc
View file
Open in desktop
Expand Up @@ -29,6 +29,8 @@ using TauRegionalPixelSeedTrackingRegionEDProducer = TrackingRegionEDProducerT<T
DEFINE_FWK_MODULE(TauRegionalPixelSeedTrackingRegionEDProducer);
using CandidateSeededTrackingRegionsEDProducer = TrackingRegionEDProducerT<CandidateSeededTrackingRegionsProducer>;
DEFINE_FWK_MODULE(CandidateSeededTrackingRegionsEDProducer);
using TrackingRegionsFromBeamSpotAndL2TauEDProducer = TrackingRegionEDProducerT<TrackingRegionsFromBeamSpotAndL2Tau>;
DEFINE_FWK_MODULE(TrackingRegionsFromBeamSpotAndL2TauEDProducer);

DEFINE_FWK_MODULE(L2TauJetsMerger);
DEFINE_FWK_MODULE(L1HLTJetsMatching);
Expand Down
23 changes: 23 additions & 0 deletions RecoTauTag/HLTProducers/src/TrackingRegionsFromBeamSpotAndL2Tau.h
View file
Open in desktop
Expand Up @@ -56,6 +56,29 @@ class TrackingRegionsFromBeamSpotAndL2Tau : public TrackingRegionProducer

virtual ~TrackingRegionsFromBeamSpotAndL2Tau() {}

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;

desc.add<double>("ptMin", 5.0);
desc.add<double>("originRadius", 0.2);
desc.add<double>("originHalfLength", 24.0);
desc.add<double>("deltaEta", 0.3);
desc.add<double>("deltaPhi", 0.3);
desc.add<edm::InputTag>("JetSrc", edm::InputTag("hltFilterL2EtCutDoublePFIsoTau25Trk5"));
desc.add<double>("JetMinPt", 25.0);
desc.add<double>("JetMaxEta", 2.1);
desc.add<int>("JetMaxN", 10);
desc.add<edm::InputTag>("beamSpot", edm::InputTag("hltOnlineBeamSpot"));
desc.add<bool>("precise", true);
desc.add<std::string>("howToUseMeasurementTracker", "Never");
desc.add<edm::InputTag>("measurementTrackerName", edm::InputTag("MeasurementTrackerEvent"));

// Only for backwards-compatibility
edm::ParameterSetDescription descRegion;
descRegion.add<edm::ParameterSetDescription>("RegionPSet", desc);

descriptions.add("trackingRegionsFromBeamSpotAndL2Tau", descRegion);
}

virtual std::vector<std::unique_ptr<TrackingRegion> > regions(const edm::Event& e, const edm::EventSetup& es) const override
{
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TkSeedGenerator/python/SeedGeneratorFromProtoTracksEDProducer_cff.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
pixelTTRHBuilderWithoutAngle = copy.deepcopy(ttrhbwr)
from RecoTracker.TkSeedingLayers.TTRHBuilderWithoutAngle4PixelTriplets_cfi import *
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import *
from RecoPixelVertexing.PixelTrackFitting.pixelTracksDefault_cfi import *
from RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi import pixelTracks
from RecoTracker.TkSeedGenerator.SeedGeneratorFromProtoTracksEDProducer_cfi import *
pixelTTRHBuilderWithoutAngle.StripCPE = 'Fake'
pixelTTRHBuilderWithoutAngle.ComponentName = 'PixelTTRHBuilderWithoutAngle'
Expand Down