diff --git a/HLTriggerOffline/Common/python/HLTValidation_cff.py b/HLTriggerOffline/Common/python/HLTValidation_cff.py index a38ab35fc27a1..3533e729c9270 100644 --- a/HLTriggerOffline/Common/python/HLTValidation_cff.py +++ b/HLTriggerOffline/Common/python/HLTValidation_cff.py @@ -41,9 +41,7 @@ # Temporary Phase-2 config from Configuration.Eras.Modifier_phase2_common_cff import phase2_common -phase2_common.toReplaceWith(hltassociation, hltassociation.copyAndExclude([hltMultiTrackValidation, - hltMultiPVValidation, - egammaSelectors, +phase2_common.toReplaceWith(hltassociation, hltassociation.copyAndExclude([egammaSelectors, ExoticaValidationProdSeq, hltMultiTrackValidationGsfTracks, hltMultiTrackValidationMuonTracks]) diff --git a/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py b/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py index 5f89a3081b6b2..5f90844c6f01b 100644 --- a/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py +++ b/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py @@ -30,3 +30,9 @@ def _modifyForRun3(trackvalidator): from Configuration.Eras.Modifier_run3_common_cff import run3_common run3_common.toModify(hltTrackValidator, _modifyForRun3) + +def _modifyForPhase2(trackvalidator): + trackvalidator.label = ["generalTracks::HLT","hltPhase2PixelTracks"] + +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(hltTrackValidator, _modifyForPhase2) diff --git a/Validation/RecoTrack/python/associators_cff.py b/Validation/RecoTrack/python/associators_cff.py index ab148f9c9e018..2b888e98d55f3 100644 --- a/Validation/RecoTrack/python/associators_cff.py +++ b/Validation/RecoTrack/python/associators_cff.py @@ -13,6 +13,13 @@ stripClusterSrc = "hltSiStripRawToClustersFacility", ) +def _modifyForPhase2(tpClusterProducer): + tpClusterProducer.pixelClusterSrc = "siPixelClusters::HLT" + tpClusterProducer.phase2OTClusterSrc = "siPhase2Clusters::HLT" + +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(hltTPClusterProducer, _modifyForPhase2) + hltTrackAssociatorByHits = SimTracker.TrackAssociatorProducers.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHits.clone() hltTrackAssociatorByHits.cluster2TPSrc = cms.InputTag("hltTPClusterProducer") hltTrackAssociatorByHits.UseGrouped = cms.bool( False ) @@ -24,7 +31,6 @@ hltTrackAssociatorByDeltaR.QCut = cms.double(0.5) hltTrackAssociatorByDeltaR.ConsiderAllSimHits = cms.bool(True) - # Note: the TrackAssociatorEDProducers defined below, and # tpToHLTtracksAssociationSequence sequence, are not currently needed # to run MTV for HLT, as it is configured to produce the @@ -36,6 +42,8 @@ ignoremissingtrackcollection = cms.untracked.bool(True) ) +phase2_tracker.toModify(tpToHLTpixelTrackAssociation, label_tr = "hltPhase2PixelTracks") + tpToHLTiter0tracksAssociation = tpToHLTpixelTrackAssociation.clone( label_tr = cms.InputTag("hltIter0PFlowCtfWithMaterialTracks"), # associator = cms.InputTag('hltTrackAssociatorByDeltaR'), diff --git a/Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py b/Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py index 1952ac19c9a9d..f065f1b0815bc 100644 --- a/Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py +++ b/Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py @@ -22,7 +22,6 @@ trackAssociation = "tpToHLTpfMuonMergingTrackAssociation" ) - hltPixelPVanalysis = hltMultiPVanalysis.clone( do_generic_sim_plots = True, trackAssociatorMap = "tpToHLTpixelTrackAssociation", @@ -33,6 +32,11 @@ ) ) +def _modifyPixelPVanalysisForPhase2(pvanalysis): + pvanalysis.vertexRecoCollections = ["hltPhase2PixelVertices"] + +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(hltPixelPVanalysis, _modifyPixelPVanalysisForPhase2) hltPVanalysis = hltMultiPVanalysis.clone( trackAssociatorMap = "tpToHLTpfMuonMergingTrackAssociation", @@ -42,12 +46,29 @@ #"hltFastPVPixelVertices" ) ) + +tpToHLTphase2TrackAssociation = tpToHLTpixelTrackAssociation.clone( + label_tr = "generalTracks::HLT" +) +vertexAssociatorByPositionAndTracks4phase2HLTTracks = _VertexAssociatorByPositionAndTracks.clone( + trackAssociation = "tpToHLTphase2TrackAssociation" +) + +def _modifyFullPVanalysisForPhase2(pvanalysis): + pvanalysis.vertexRecoCollections = ["offlinePrimaryVertices::HLT"] + pvanalysis.trackAssociatorMap = "tpToHLTphase2TrackAssociation" + pvanalysis.vertexAssociator = "vertexAssociatorByPositionAndTracks4phase2HLTTracks" + +phase2_tracker.toModify(hltPVanalysis, _modifyFullPVanalysisForPhase2) + hltMultiPVAssociations = cms.Task( hltTrackAssociatorByHits, tpToHLTpixelTrackAssociation, vertexAssociatorByPositionAndTracks4pixelTracks, tpToHLTpfMuonMergingTrackAssociation, - vertexAssociatorByPositionAndTracks4pfMuonMergingTracks + vertexAssociatorByPositionAndTracks4pfMuonMergingTracks, + tpToHLTphase2TrackAssociation, + vertexAssociatorByPositionAndTracks4phase2HLTTracks ) hltMultiPVValidation = cms.Sequence(