diff --git a/RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py b/RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py index 7425dbebfb457..625b8992bdfa6 100644 --- a/RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py +++ b/RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py @@ -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 @@ -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 + diff --git a/RecoPixelVertexing/PixelTrackFitting/python/pixelTracks_cfi.py b/RecoPixelVertexing/PixelTrackFitting/python/pixelTracks_cfi.py new file mode 100644 index 0000000000000..83e54b1405645 --- /dev/null +++ b/RecoPixelVertexing/PixelTrackFitting/python/pixelTracks_cfi.py @@ -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) diff --git a/RecoTauTag/HLTProducers/python/PixelTracksL2Tau_cfi.py b/RecoTauTag/HLTProducers/python/PixelTracksL2Tau_cfi.py index 3b7c4733b3e43..d512d0baf633d 100644 --- a/RecoTauTag/HLTProducers/python/PixelTracksL2Tau_cfi.py +++ b/RecoTauTag/HLTProducers/python/PixelTracksL2Tau_cfi.py @@ -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') diff --git a/RecoTauTag/HLTProducers/src/SealModule.cc b/RecoTauTag/HLTProducers/src/SealModule.cc index 6da1d7c16b5f1..3273cbb25548a 100644 --- a/RecoTauTag/HLTProducers/src/SealModule.cc +++ b/RecoTauTag/HLTProducers/src/SealModule.cc @@ -29,6 +29,8 @@ using TauRegionalPixelSeedTrackingRegionEDProducer = TrackingRegionEDProducerT; DEFINE_FWK_MODULE(CandidateSeededTrackingRegionsEDProducer); +using TrackingRegionsFromBeamSpotAndL2TauEDProducer = TrackingRegionEDProducerT; +DEFINE_FWK_MODULE(TrackingRegionsFromBeamSpotAndL2TauEDProducer); DEFINE_FWK_MODULE(L2TauJetsMerger); DEFINE_FWK_MODULE(L1HLTJetsMatching); diff --git a/RecoTauTag/HLTProducers/src/TrackingRegionsFromBeamSpotAndL2Tau.h b/RecoTauTag/HLTProducers/src/TrackingRegionsFromBeamSpotAndL2Tau.h index 0223f199a86b9..ec7f817daa183 100644 --- a/RecoTauTag/HLTProducers/src/TrackingRegionsFromBeamSpotAndL2Tau.h +++ b/RecoTauTag/HLTProducers/src/TrackingRegionsFromBeamSpotAndL2Tau.h @@ -56,6 +56,29 @@ class TrackingRegionsFromBeamSpotAndL2Tau : public TrackingRegionProducer virtual ~TrackingRegionsFromBeamSpotAndL2Tau() {} + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + + desc.add("ptMin", 5.0); + desc.add("originRadius", 0.2); + desc.add("originHalfLength", 24.0); + desc.add("deltaEta", 0.3); + desc.add("deltaPhi", 0.3); + desc.add("JetSrc", edm::InputTag("hltFilterL2EtCutDoublePFIsoTau25Trk5")); + desc.add("JetMinPt", 25.0); + desc.add("JetMaxEta", 2.1); + desc.add("JetMaxN", 10); + desc.add("beamSpot", edm::InputTag("hltOnlineBeamSpot")); + desc.add("precise", true); + desc.add("howToUseMeasurementTracker", "Never"); + desc.add("measurementTrackerName", edm::InputTag("MeasurementTrackerEvent")); + + // Only for backwards-compatibility + edm::ParameterSetDescription descRegion; + descRegion.add("RegionPSet", desc); + + descriptions.add("trackingRegionsFromBeamSpotAndL2Tau", descRegion); + } virtual std::vector > regions(const edm::Event& e, const edm::EventSetup& es) const override { diff --git a/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromProtoTracksEDProducer_cff.py b/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromProtoTracksEDProducer_cff.py index 1c9bbdac8638c..82fb35202ceb8 100644 --- a/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromProtoTracksEDProducer_cff.py +++ b/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromProtoTracksEDProducer_cff.py @@ -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'