diff --git a/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py b/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py index 4c7bd7bedef36..974dcea588b7f 100644 --- a/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py +++ b/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py @@ -226,7 +226,7 @@ hltTrackRefitterForSiStripMonitorTrack.Fitter = cms.string('hltESPFittingSmootherIT') hltTrackRefitterForSiStripMonitorTrack.MeasurementTrackerEvent = cms.InputTag('hltMeasurementTrackerEvent') hltTrackRefitterForSiStripMonitorTrack.NavigationSchool = cms.string('navigationSchoolESProducer') -hltTrackRefitterForSiStripMonitorTrack.src = cms.InputTag("hltIter2Merged") +hltTrackRefitterForSiStripMonitorTrack.src = cms.InputTag("hltTracksMerged") # hltIter2Merged HLTSiStripMonitorTrack.TopFolderName = cms.string('HLT/SiStrip') HLTSiStripMonitorTrack.TrackProducer = 'hltTrackRefitterForSiStripMonitorTrack' diff --git a/DQM/HLTEvF/python/HLTTrackingMonitoring_cff.py b/DQM/HLTEvF/python/HLTTrackingMonitoring_cff.py index 5a69ff1b001f6..1b417d25f89fc 100644 --- a/DQM/HLTEvF/python/HLTTrackingMonitoring_cff.py +++ b/DQM/HLTEvF/python/HLTTrackingMonitoring_cff.py @@ -11,7 +11,8 @@ trackingMonitoringHLTsequence = cms.Sequence( pixelTracksMonitoringHLT # hltPixel tracks monitoring - * iterHLTTracksMonitoringHLT # hltIter2Merged tracks monitoring + * iter2MergedTracksMonitoringHLT # hltIter2Merged tracks monitoring + * iterHLTTracksMonitoringHLT # hltTracksMerged tracks monitoring ) egmTrackingMonitorHLTsequence = cms.Sequence( diff --git a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackCluster_cff.py b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackCluster_cff.py index f025fb0e6b6ae..8ba5bea141a68 100644 --- a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackCluster_cff.py +++ b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackCluster_cff.py @@ -138,7 +138,7 @@ hltSiPixelPhase1TrackClustersAnalyzer = cms.EDAnalyzer("SiPixelPhase1TrackClusters", clusters = cms.InputTag("hltSiPixelClusters"), - tracks = cms.InputTag("hltIter2Merged"), + tracks = cms.InputTag("hltTracksMerged"), #hltIter2Merged" histograms = hltSiPixelPhase1TrackClustersConf, geometry = hltSiPixelPhase1Geometry ) diff --git a/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py b/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py index d6ea0ac8690ae..c7c07b0679080 100644 --- a/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py +++ b/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py @@ -138,7 +138,7 @@ hltTrackRefitterForSiStripMonitorTrack.TrajectoryInEvent = cms.bool(True) hltTrackRefitterForSiStripMonitorTrack.useHitsSplitting = cms.bool(False) #hltTrackRefitterForSiStripMonitorTrack.src = cms.InputTag("hltIter4Merged") # scenario 0 -hltTrackRefitterForSiStripMonitorTrack.src = cms.InputTag("hltIter2Merged") # scenario 1 +hltTrackRefitterForSiStripMonitorTrack.src = cms.InputTag("hltTracksMerged") # hltIter2Merged # scenario 1 #hltTrackRefitterForSiStripMonitorTrack.TTRHBuilder = cms.string('hltESPTTRHBuilderAngleAndTemplate') hltTrackRefitterForSiStripMonitorTrack.TTRHBuilder = cms.string('hltESPTTRHBWithTrackAngle') diff --git a/DQMOffline/Trigger/python/TrackingMonitoring_Client_cff.py b/DQMOffline/Trigger/python/TrackingMonitoring_Client_cff.py index de809e2d3bd53..9d90b43408dd8 100644 --- a/DQMOffline/Trigger/python/TrackingMonitoring_Client_cff.py +++ b/DQMOffline/Trigger/python/TrackingMonitoring_Client_cff.py @@ -6,7 +6,8 @@ trackingEffFromHitPatternHLT.subDirs = cms.untracked.vstring( "HLT/Tracking/pixelTracks/HitEffFromHitPattern*", "HLT/Tracking/iter0HP/HitEffFromHitPattern*", - "HLT/Tracking/iter2Merged/HitEffFromHitPattern*" + "HLT/Tracking/iter2Merged/HitEffFromHitPattern*", + "HLT/Tracking/tracks/HitEffFromHitPattern*" ) # Sequence diff --git a/DQMOffline/Trigger/python/TrackingMonitoring_cff.py b/DQMOffline/Trigger/python/TrackingMonitoring_cff.py index e09737e9ebe97..65c781c49f020 100644 --- a/DQMOffline/Trigger/python/TrackingMonitoring_cff.py +++ b/DQMOffline/Trigger/python/TrackingMonitoring_cff.py @@ -53,10 +53,15 @@ iter2HPTracksMonitoringHLT.TrackProducer = 'hltIter2PFlowTrackSelectionHighPurity' iter2HPTracksMonitoringHLT.allTrackProducer = 'hltIter2PFlowTrackSelectionHighPurity' +iter2MergedTracksMonitoringHLT = trackingMonHLT.clone() +iter2MergedTracksMonitoringHLT.FolderName = 'HLT/Tracking/iter2Merged' +iter2MergedTracksMonitoringHLT.TrackProducer = 'hltIter2Merged' +iter2MergedTracksMonitoringHLT.allTrackProducer = 'hltIter2Merged' + iterHLTTracksMonitoringHLT = trackingMonHLT.clone() -iterHLTTracksMonitoringHLT.FolderName = 'HLT/Tracking/iter2Merged' -iterHLTTracksMonitoringHLT.TrackProducer = 'hltIter2Merged' -iterHLTTracksMonitoringHLT.allTrackProducer = 'hltIter2Merged' +iterHLTTracksMonitoringHLT.FolderName = 'HLT/Tracking/tracks' +iterHLTTracksMonitoringHLT.TrackProducer = 'hltTracksMerged' +iterHLTTracksMonitoringHLT.allTrackProducer = 'hltTracksMerged' iter3TracksMonitoringHLT = trackingMonHLT.clone() iter3TracksMonitoringHLT.FolderName = 'HLT/Tracking/iter3Merged' @@ -73,6 +78,7 @@ + iter0HPTracksMonitoringHLT # + iter1HPTracksMonitoringHLT # + iter2HPTracksMonitoringHLT + + iter2MergedTracksMonitoringHLT + iterHLTTracksMonitoringHLT ) @@ -84,6 +90,7 @@ + iter1HPTracksMonitoringHLT + iter2TracksMonitoringHLT + iter2HPTracksMonitoringHLT + + iter2MergedTracksMonitoringHLT + iterHLTTracksMonitoringHLT # + iter3TracksMonitoringHLT # + iter4TracksMonitoringHLT diff --git a/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py b/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py index f5740729c175d..6b1d891f92eb1 100644 --- a/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py +++ b/Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py @@ -11,6 +11,7 @@ "hltIter1Merged", "hltIter2PFlowTrackSelectionHighPurity", "hltIter2Merged", + "hltTracksMerged", # "hltIter3PFlowTrackSelectionHighPurity", # "hltIter3Merged", # "hltIter4PFlowTrackSelectionHighPurity",