From 262dd08cddf28ed7d9844b4e5c8d85eeaafe4801 Mon Sep 17 00:00:00 2001 From: Martin Grunewald Date: Mon, 23 Dec 2019 15:34:08 +0100 Subject: [PATCH] Migration of HLT menus to 11_0_0 Template --- .../Configuration/python/HLT_2018_cff.py | 131 +++++++++--------- .../Configuration/test/OnLine_HLT_2018.py | 131 +++++++++--------- 2 files changed, 138 insertions(+), 124 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_2018_cff.py b/HLTrigger/Configuration/python/HLT_2018_cff.py index a82e24520b852..a56510d784bec 100644 --- a/HLTrigger/Configuration/python/HLT_2018_cff.py +++ b/HLTrigger/Configuration/python/HLT_2018_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /frozen/2018/110X/HLT --type 2018 -# /frozen/2018/110X/HLT/V4 (CMSSW_11_0_0_pre13) +# /frozen/2018/110X/HLT/V5 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/frozen/2018/110X/HLT/V4') + tableName = cms.string('/frozen/2018/110X/HLT/V5') ) fragment.transferSystem = cms.PSet( @@ -6688,15 +6688,7 @@ includeGEM = cms.bool( False ) ) fragment.siPixelQualityESProducer = cms.ESProducer( "SiPixelQualityESProducer", - siPixelQualityLabel = cms.string( "" ), - ListOfRecordToMerge = cms.VPSet( - cms.PSet( record = cms.string( "SiPixelQualityFromDbRcd" ), - tag = cms.string( "" ) - ), - cms.PSet( record = cms.string( "SiPixelDetVOffRcd" ), - tag = cms.string( "" ) - ) - ) + siPixelQualityLabel = cms.string( "" ) ) fragment.siPixelTemplateDBObjectESProducer = cms.ESProducer( "SiPixelTemplateDBObjectESProducer" ) fragment.siStripBackPlaneCorrectionDepESProducer = cms.ESProducer( "SiStripBackPlaneCorrectionDepESProducer", @@ -12210,7 +12202,9 @@ ), cms.PSet( linkType = cms.string( "TRACK:HCAL" ), useKDTree = cms.bool( True ), - linkerName = cms.string( "TrackAndHCALLinker" ) + linkerName = cms.string( "TrackAndHCALLinker" ), + trajectoryLayerEntrance = cms.string( "HCALEntrance" ), + trajectoryLayerExit = cms.string( "HCALExit" ) ), cms.PSet( linkType = cms.string( "ECAL:HCAL" ), useKDTree = cms.bool( False ), @@ -12298,12 +12292,13 @@ verbose = cms.untracked.bool( False ), pf_nsigma_ECAL = cms.double( 0.0 ), usePFConversions = cms.bool( False ), - goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), useCalibrationsFromDB = cms.bool( True ), + resolHF_square = cms.vdouble( 7.834401, 0.012996, 0.0 ), goodPixelTrackDeadHcal_ptErrRel = cms.double( 1.0 ), goodTrackDeadHcal_validFr = cms.double( 0.5 ), postMuonCleaning = cms.bool( True ), - egammaElectrons = cms.InputTag( "" ), + calibrationsLabel = cms.string( "HLT" ), muon_HO = cms.vdouble( 0.9, 0.9 ), postHFCleaning = cms.bool( False ), factors_45 = cms.vdouble( 10.0, 100.0 ), @@ -12315,7 +12310,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVertices" ), - calibrationsLabel = cms.string( "HLT" ), + egammaElectrons = cms.InputTag( "" ), calibHF_a_EMonly = cms.vdouble( 0.96945, 0.96701, 0.76309, 0.82268, 0.87583, 0.89718, 0.98674, 1.4681, 1.458, 1.458 ), dptRel_DispVtx = cms.double( 10.0 ), muons = cms.InputTag( "hltMuons" ), @@ -12326,6 +12321,7 @@ blocks = cms.InputTag( "hltParticleFlowBlock" ), goodTrackDeadHcal_ptErrRel = cms.double( 0.2 ), useEGammaFilters = cms.bool( False ), + pf_nsigma_HFHAD = cms.double( 1.0 ), useEGammaElectrons = cms.bool( False ), useHO = cms.bool( False ), nsigma_TRACK = cms.double( 1.0 ), @@ -12382,19 +12378,13 @@ goodTrackDeadHcal_dxy = cms.double( 0.5 ), goodPixelTrackDeadHcal_dz = cms.double( 0.05 ), PFEGammaCandidates = cms.InputTag( "particleFlowEGamma" ), - goodTrackDeadHcal_layers = cms.uint32( 4 ), + pf_nsigma_HFEM = cms.double( 1.0 ), usePFDecays = cms.bool( False ), calibHF_b_EMHAD = cms.vdouble( 1.27541, 0.85361, 0.86333, 0.89091, 0.94348, 0.94348, 0.9437, 1.0034, 1.0444, 1.0444 ), rejectTracks_Step45 = cms.bool( False ), - GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), - PFHFCleaningParameters = cms.PSet( - minSignificance = cms.double( 2.5 ), - maxSignificance = cms.double( 2.5 ), - minDeltaMet = cms.double( 0.4 ), - maxDeltaPhiPt = cms.double( 7.0 ), - minHFCleaningPt = cms.double( 5.0 ), - minSignificanceReduction = cms.double( 1.4 ) - ), + goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ), + goodTrackDeadHcal_layers = cms.uint32( 4 ), goodPixelTrackDeadHcal_dxy = cms.double( 0.02 ), usePFNuclearInteractions = cms.bool( False ), GedElectronValueMap = cms.InputTag( "gedGsfElectronsTmp" ), @@ -12404,7 +12394,14 @@ pt_Error = cms.double( 1.0 ), debug = cms.untracked.bool( False ), useProtectionsForJetMET = cms.bool( True ), - calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ) + PFHFCleaningParameters = cms.PSet( + minSignificance = cms.double( 2.5 ), + maxSignificance = cms.double( 2.5 ), + minDeltaMet = cms.double( 0.4 ), + maxDeltaPhiPt = cms.double( 7.0 ), + minHFCleaningPt = cms.double( 5.0 ), + minSignificanceReduction = cms.double( 1.4 ) + ) ) fragment.hltAK8PFJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -30834,7 +30831,9 @@ ), cms.PSet( linkType = cms.string( "TRACK:HCAL" ), useKDTree = cms.bool( True ), - linkerName = cms.string( "TrackAndHCALLinker" ) + linkerName = cms.string( "TrackAndHCALLinker" ), + trajectoryLayerEntrance = cms.string( "HCALEntrance" ), + trajectoryLayerExit = cms.string( "HCALExit" ) ), cms.PSet( linkType = cms.string( "ECAL:HCAL" ), useKDTree = cms.bool( False ), @@ -30922,12 +30921,13 @@ verbose = cms.untracked.bool( False ), pf_nsigma_ECAL = cms.double( 0.0 ), usePFConversions = cms.bool( False ), - goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), useCalibrationsFromDB = cms.bool( True ), + resolHF_square = cms.vdouble( 7.834401, 0.012996, 0.0 ), goodPixelTrackDeadHcal_ptErrRel = cms.double( 1.0 ), goodTrackDeadHcal_validFr = cms.double( 0.5 ), postMuonCleaning = cms.bool( True ), - egammaElectrons = cms.InputTag( "" ), + calibrationsLabel = cms.string( "HLT" ), muon_HO = cms.vdouble( 0.9, 0.9 ), postHFCleaning = cms.bool( False ), factors_45 = cms.vdouble( 10.0, 100.0 ), @@ -30939,7 +30939,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVertices" ), - calibrationsLabel = cms.string( "HLT" ), + egammaElectrons = cms.InputTag( "" ), calibHF_a_EMonly = cms.vdouble( 0.96945, 0.96701, 0.76309, 0.82268, 0.87583, 0.89718, 0.98674, 1.4681, 1.458, 1.458 ), dptRel_DispVtx = cms.double( 10.0 ), muons = cms.InputTag( "hltMuons" ), @@ -30950,6 +30950,7 @@ blocks = cms.InputTag( "hltParticleFlowBlockForTaus" ), goodTrackDeadHcal_ptErrRel = cms.double( 0.2 ), useEGammaFilters = cms.bool( False ), + pf_nsigma_HFHAD = cms.double( 1.0 ), useEGammaElectrons = cms.bool( False ), useHO = cms.bool( False ), nsigma_TRACK = cms.double( 1.0 ), @@ -31006,19 +31007,13 @@ goodTrackDeadHcal_dxy = cms.double( 0.5 ), goodPixelTrackDeadHcal_dz = cms.double( 0.05 ), PFEGammaCandidates = cms.InputTag( "particleFlowEGamma" ), - goodTrackDeadHcal_layers = cms.uint32( 4 ), + pf_nsigma_HFEM = cms.double( 1.0 ), usePFDecays = cms.bool( False ), calibHF_b_EMHAD = cms.vdouble( 1.27541, 0.85361, 0.86333, 0.89091, 0.94348, 0.94348, 0.9437, 1.0034, 1.0444, 1.0444 ), rejectTracks_Step45 = cms.bool( False ), - GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), - PFHFCleaningParameters = cms.PSet( - minSignificance = cms.double( 2.5 ), - maxSignificance = cms.double( 2.5 ), - minDeltaMet = cms.double( 0.4 ), - maxDeltaPhiPt = cms.double( 7.0 ), - minHFCleaningPt = cms.double( 5.0 ), - minSignificanceReduction = cms.double( 1.4 ) - ), + goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ), + goodTrackDeadHcal_layers = cms.uint32( 4 ), goodPixelTrackDeadHcal_dxy = cms.double( 0.02 ), usePFNuclearInteractions = cms.bool( False ), GedElectronValueMap = cms.InputTag( "gedGsfElectronsTmp" ), @@ -31028,7 +31023,14 @@ pt_Error = cms.double( 1.0 ), debug = cms.untracked.bool( False ), useProtectionsForJetMET = cms.bool( True ), - calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ) + PFHFCleaningParameters = cms.PSet( + minSignificance = cms.double( 2.5 ), + maxSignificance = cms.double( 2.5 ), + minDeltaMet = cms.double( 0.4 ), + maxDeltaPhiPt = cms.double( 7.0 ), + minHFCleaningPt = cms.double( 5.0 ), + minSignificanceReduction = cms.double( 1.4 ) + ) ) fragment.hltAK4PFJetsForTaus = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -36735,7 +36737,9 @@ ), cms.PSet( linkType = cms.string( "TRACK:HCAL" ), useKDTree = cms.bool( True ), - linkerName = cms.string( "TrackAndHCALLinker" ) + linkerName = cms.string( "TrackAndHCALLinker" ), + trajectoryLayerEntrance = cms.string( "HCALEntrance" ), + trajectoryLayerExit = cms.string( "HCALExit" ) ), cms.PSet( linkType = cms.string( "ECAL:HCAL" ), useKDTree = cms.bool( False ), @@ -36823,12 +36827,13 @@ verbose = cms.untracked.bool( False ), pf_nsigma_ECAL = cms.double( 0.0 ), usePFConversions = cms.bool( False ), - goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), useCalibrationsFromDB = cms.bool( True ), + resolHF_square = cms.vdouble( 7.834401, 0.012996, 0.0 ), goodPixelTrackDeadHcal_ptErrRel = cms.double( 1.0 ), goodTrackDeadHcal_validFr = cms.double( 0.5 ), postMuonCleaning = cms.bool( True ), - egammaElectrons = cms.InputTag( "" ), + calibrationsLabel = cms.string( "HLT" ), muon_HO = cms.vdouble( 0.9, 0.9 ), postHFCleaning = cms.bool( False ), factors_45 = cms.vdouble( 10.0, 100.0 ), @@ -36840,7 +36845,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVertices" ), - calibrationsLabel = cms.string( "HLT" ), + egammaElectrons = cms.InputTag( "" ), calibHF_a_EMonly = cms.vdouble( 0.96945, 0.96701, 0.76309, 0.82268, 0.87583, 0.89718, 0.98674, 1.4681, 1.458, 1.458 ), dptRel_DispVtx = cms.double( 10.0 ), muons = cms.InputTag( "hltMuonsReg" ), @@ -36851,6 +36856,7 @@ blocks = cms.InputTag( "hltParticleFlowBlockReg" ), goodTrackDeadHcal_ptErrRel = cms.double( 0.2 ), useEGammaFilters = cms.bool( False ), + pf_nsigma_HFHAD = cms.double( 1.0 ), useEGammaElectrons = cms.bool( False ), useHO = cms.bool( False ), nsigma_TRACK = cms.double( 1.0 ), @@ -36907,19 +36913,13 @@ goodTrackDeadHcal_dxy = cms.double( 0.5 ), goodPixelTrackDeadHcal_dz = cms.double( 0.05 ), PFEGammaCandidates = cms.InputTag( "particleFlowEGamma" ), - goodTrackDeadHcal_layers = cms.uint32( 4 ), + pf_nsigma_HFEM = cms.double( 1.0 ), usePFDecays = cms.bool( False ), calibHF_b_EMHAD = cms.vdouble( 1.27541, 0.85361, 0.86333, 0.89091, 0.94348, 0.94348, 0.9437, 1.0034, 1.0444, 1.0444 ), rejectTracks_Step45 = cms.bool( False ), - GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), - PFHFCleaningParameters = cms.PSet( - minSignificance = cms.double( 2.5 ), - maxSignificance = cms.double( 2.5 ), - minDeltaMet = cms.double( 0.4 ), - maxDeltaPhiPt = cms.double( 7.0 ), - minHFCleaningPt = cms.double( 5.0 ), - minSignificanceReduction = cms.double( 1.4 ) - ), + goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ), + goodTrackDeadHcal_layers = cms.uint32( 4 ), goodPixelTrackDeadHcal_dxy = cms.double( 0.02 ), usePFNuclearInteractions = cms.bool( False ), GedElectronValueMap = cms.InputTag( "gedGsfElectronsTmp" ), @@ -36929,7 +36929,14 @@ pt_Error = cms.double( 1.0 ), debug = cms.untracked.bool( False ), useProtectionsForJetMET = cms.bool( True ), - calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ) + PFHFCleaningParameters = cms.PSet( + minSignificance = cms.double( 2.5 ), + maxSignificance = cms.double( 2.5 ), + minDeltaMet = cms.double( 0.4 ), + maxDeltaPhiPt = cms.double( 7.0 ), + minHFCleaningPt = cms.double( 5.0 ), + minSignificanceReduction = cms.double( 1.4 ) + ) ) fragment.hltAK4PFJetsReg = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -53391,13 +53398,13 @@ minimumTransverseMomentum = cms.double( 1.0 ), primaryVertex = cms.InputTag( "hltVerticesPFFilter" ), maximumLongitudinalImpactParameter = cms.double( 17.0 ), - jets = cms.InputTag( "hltPFJetForBtag" ), + computeGhostTrack = cms.bool( True ), maxDeltaR = cms.double( 0.4 ), candidates = cms.InputTag( "hltParticleFlow" ), jetDirectionUsingGhostTrack = cms.bool( False ), minimumNumberOfPixelHits = cms.int32( 2 ), jetDirectionUsingTracks = cms.bool( False ), - computeGhostTrack = cms.bool( True ), + jets = cms.InputTag( "hltPFJetForBtag" ), useTrackQuality = cms.bool( False ), ghostTrackPriorDeltaR = cms.double( 0.03 ), maximumChiSquared = cms.double( 5.0 ), @@ -86682,13 +86689,13 @@ minimumTransverseMomentum = cms.double( 1.0 ), primaryVertex = cms.InputTag( "hltVerticesPFFilter" ), maximumLongitudinalImpactParameter = cms.double( 17.0 ), - jets = cms.InputTag( "hltPFJetForBtagAK8" ), + computeGhostTrack = cms.bool( True ), maxDeltaR = cms.double( 0.4 ), candidates = cms.InputTag( "hltParticleFlow" ), jetDirectionUsingGhostTrack = cms.bool( False ), minimumNumberOfPixelHits = cms.int32( 2 ), jetDirectionUsingTracks = cms.bool( False ), - computeGhostTrack = cms.bool( True ), + jets = cms.InputTag( "hltPFJetForBtagAK8" ), useTrackQuality = cms.bool( False ), ghostTrackPriorDeltaR = cms.double( 0.03 ), maximumChiSquared = cms.double( 5.0 ), @@ -86905,13 +86912,13 @@ minimumTransverseMomentum = cms.double( 1.0 ), primaryVertex = cms.InputTag( "hltVerticesPFFilter" ), maximumLongitudinalImpactParameter = cms.double( 17.0 ), - jets = cms.InputTag( "hltPFJetForDBtagAK8" ), + computeGhostTrack = cms.bool( True ), maxDeltaR = cms.double( 0.4 ), candidates = cms.InputTag( "hltParticleFlow" ), jetDirectionUsingGhostTrack = cms.bool( False ), minimumNumberOfPixelHits = cms.int32( 2 ), jetDirectionUsingTracks = cms.bool( False ), - computeGhostTrack = cms.bool( True ), + jets = cms.InputTag( "hltPFJetForDBtagAK8" ), useTrackQuality = cms.bool( False ), ghostTrackPriorDeltaR = cms.double( 0.03 ), maximumChiSquared = cms.double( 5.0 ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_2018.py b/HLTrigger/Configuration/test/OnLine_HLT_2018.py index e46e61bfa4f9d..5abc18ca285b3 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_2018.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_2018.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /frozen/2018/110X/HLT --type 2018 --unprescale --process HLT2018 --globaltag auto:run2_hlt_2018 --input file:RelVal_Raw_2018_DATA.root -# /frozen/2018/110X/HLT/V4 (CMSSW_11_0_0_pre13) +# /frozen/2018/110X/HLT/V5 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLT2018" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/frozen/2018/110X/HLT/V4') + tableName = cms.string('/frozen/2018/110X/HLT/V5') ) process.transferSystem = cms.PSet( @@ -6853,15 +6853,7 @@ includeGEM = cms.bool( False ) ) process.siPixelQualityESProducer = cms.ESProducer( "SiPixelQualityESProducer", - siPixelQualityLabel = cms.string( "" ), - ListOfRecordToMerge = cms.VPSet( - cms.PSet( record = cms.string( "SiPixelQualityFromDbRcd" ), - tag = cms.string( "" ) - ), - cms.PSet( record = cms.string( "SiPixelDetVOffRcd" ), - tag = cms.string( "" ) - ) - ) + siPixelQualityLabel = cms.string( "" ) ) process.siPixelTemplateDBObjectESProducer = cms.ESProducer( "SiPixelTemplateDBObjectESProducer" ) process.siStripBackPlaneCorrectionDepESProducer = cms.ESProducer( "SiStripBackPlaneCorrectionDepESProducer", @@ -12511,7 +12503,9 @@ ), cms.PSet( linkType = cms.string( "TRACK:HCAL" ), useKDTree = cms.bool( True ), - linkerName = cms.string( "TrackAndHCALLinker" ) + linkerName = cms.string( "TrackAndHCALLinker" ), + trajectoryLayerEntrance = cms.string( "HCALEntrance" ), + trajectoryLayerExit = cms.string( "HCALExit" ) ), cms.PSet( linkType = cms.string( "ECAL:HCAL" ), useKDTree = cms.bool( False ), @@ -12599,12 +12593,13 @@ verbose = cms.untracked.bool( False ), pf_nsigma_ECAL = cms.double( 0.0 ), usePFConversions = cms.bool( False ), - goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), useCalibrationsFromDB = cms.bool( True ), + resolHF_square = cms.vdouble( 7.834401, 0.012996, 0.0 ), goodPixelTrackDeadHcal_ptErrRel = cms.double( 1.0 ), goodTrackDeadHcal_validFr = cms.double( 0.5 ), postMuonCleaning = cms.bool( True ), - egammaElectrons = cms.InputTag( "" ), + calibrationsLabel = cms.string( "HLT" ), muon_HO = cms.vdouble( 0.9, 0.9 ), postHFCleaning = cms.bool( False ), factors_45 = cms.vdouble( 10.0, 100.0 ), @@ -12616,7 +12611,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVertices" ), - calibrationsLabel = cms.string( "HLT" ), + egammaElectrons = cms.InputTag( "" ), calibHF_a_EMonly = cms.vdouble( 0.96945, 0.96701, 0.76309, 0.82268, 0.87583, 0.89718, 0.98674, 1.4681, 1.458, 1.458 ), dptRel_DispVtx = cms.double( 10.0 ), muons = cms.InputTag( "hltMuons" ), @@ -12627,6 +12622,7 @@ blocks = cms.InputTag( "hltParticleFlowBlock" ), goodTrackDeadHcal_ptErrRel = cms.double( 0.2 ), useEGammaFilters = cms.bool( False ), + pf_nsigma_HFHAD = cms.double( 1.0 ), useEGammaElectrons = cms.bool( False ), useHO = cms.bool( False ), nsigma_TRACK = cms.double( 1.0 ), @@ -12683,19 +12679,13 @@ goodTrackDeadHcal_dxy = cms.double( 0.5 ), goodPixelTrackDeadHcal_dz = cms.double( 0.05 ), PFEGammaCandidates = cms.InputTag( "particleFlowEGamma" ), - goodTrackDeadHcal_layers = cms.uint32( 4 ), + pf_nsigma_HFEM = cms.double( 1.0 ), usePFDecays = cms.bool( False ), calibHF_b_EMHAD = cms.vdouble( 1.27541, 0.85361, 0.86333, 0.89091, 0.94348, 0.94348, 0.9437, 1.0034, 1.0444, 1.0444 ), rejectTracks_Step45 = cms.bool( False ), - GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), - PFHFCleaningParameters = cms.PSet( - minSignificance = cms.double( 2.5 ), - maxSignificance = cms.double( 2.5 ), - minDeltaMet = cms.double( 0.4 ), - maxDeltaPhiPt = cms.double( 7.0 ), - minHFCleaningPt = cms.double( 5.0 ), - minSignificanceReduction = cms.double( 1.4 ) - ), + goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ), + goodTrackDeadHcal_layers = cms.uint32( 4 ), goodPixelTrackDeadHcal_dxy = cms.double( 0.02 ), usePFNuclearInteractions = cms.bool( False ), GedElectronValueMap = cms.InputTag( "gedGsfElectronsTmp" ), @@ -12705,7 +12695,14 @@ pt_Error = cms.double( 1.0 ), debug = cms.untracked.bool( False ), useProtectionsForJetMET = cms.bool( True ), - calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ) + PFHFCleaningParameters = cms.PSet( + minSignificance = cms.double( 2.5 ), + maxSignificance = cms.double( 2.5 ), + minDeltaMet = cms.double( 0.4 ), + maxDeltaPhiPt = cms.double( 7.0 ), + minHFCleaningPt = cms.double( 5.0 ), + minSignificanceReduction = cms.double( 1.4 ) + ) ) process.hltAK8PFJets = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -31135,7 +31132,9 @@ ), cms.PSet( linkType = cms.string( "TRACK:HCAL" ), useKDTree = cms.bool( True ), - linkerName = cms.string( "TrackAndHCALLinker" ) + linkerName = cms.string( "TrackAndHCALLinker" ), + trajectoryLayerEntrance = cms.string( "HCALEntrance" ), + trajectoryLayerExit = cms.string( "HCALExit" ) ), cms.PSet( linkType = cms.string( "ECAL:HCAL" ), useKDTree = cms.bool( False ), @@ -31223,12 +31222,13 @@ verbose = cms.untracked.bool( False ), pf_nsigma_ECAL = cms.double( 0.0 ), usePFConversions = cms.bool( False ), - goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), useCalibrationsFromDB = cms.bool( True ), + resolHF_square = cms.vdouble( 7.834401, 0.012996, 0.0 ), goodPixelTrackDeadHcal_ptErrRel = cms.double( 1.0 ), goodTrackDeadHcal_validFr = cms.double( 0.5 ), postMuonCleaning = cms.bool( True ), - egammaElectrons = cms.InputTag( "" ), + calibrationsLabel = cms.string( "HLT" ), muon_HO = cms.vdouble( 0.9, 0.9 ), postHFCleaning = cms.bool( False ), factors_45 = cms.vdouble( 10.0, 100.0 ), @@ -31240,7 +31240,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVertices" ), - calibrationsLabel = cms.string( "HLT" ), + egammaElectrons = cms.InputTag( "" ), calibHF_a_EMonly = cms.vdouble( 0.96945, 0.96701, 0.76309, 0.82268, 0.87583, 0.89718, 0.98674, 1.4681, 1.458, 1.458 ), dptRel_DispVtx = cms.double( 10.0 ), muons = cms.InputTag( "hltMuons" ), @@ -31251,6 +31251,7 @@ blocks = cms.InputTag( "hltParticleFlowBlockForTaus" ), goodTrackDeadHcal_ptErrRel = cms.double( 0.2 ), useEGammaFilters = cms.bool( False ), + pf_nsigma_HFHAD = cms.double( 1.0 ), useEGammaElectrons = cms.bool( False ), useHO = cms.bool( False ), nsigma_TRACK = cms.double( 1.0 ), @@ -31307,19 +31308,13 @@ goodTrackDeadHcal_dxy = cms.double( 0.5 ), goodPixelTrackDeadHcal_dz = cms.double( 0.05 ), PFEGammaCandidates = cms.InputTag( "particleFlowEGamma" ), - goodTrackDeadHcal_layers = cms.uint32( 4 ), + pf_nsigma_HFEM = cms.double( 1.0 ), usePFDecays = cms.bool( False ), calibHF_b_EMHAD = cms.vdouble( 1.27541, 0.85361, 0.86333, 0.89091, 0.94348, 0.94348, 0.9437, 1.0034, 1.0444, 1.0444 ), rejectTracks_Step45 = cms.bool( False ), - GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), - PFHFCleaningParameters = cms.PSet( - minSignificance = cms.double( 2.5 ), - maxSignificance = cms.double( 2.5 ), - minDeltaMet = cms.double( 0.4 ), - maxDeltaPhiPt = cms.double( 7.0 ), - minHFCleaningPt = cms.double( 5.0 ), - minSignificanceReduction = cms.double( 1.4 ) - ), + goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ), + goodTrackDeadHcal_layers = cms.uint32( 4 ), goodPixelTrackDeadHcal_dxy = cms.double( 0.02 ), usePFNuclearInteractions = cms.bool( False ), GedElectronValueMap = cms.InputTag( "gedGsfElectronsTmp" ), @@ -31329,7 +31324,14 @@ pt_Error = cms.double( 1.0 ), debug = cms.untracked.bool( False ), useProtectionsForJetMET = cms.bool( True ), - calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ) + PFHFCleaningParameters = cms.PSet( + minSignificance = cms.double( 2.5 ), + maxSignificance = cms.double( 2.5 ), + minDeltaMet = cms.double( 0.4 ), + maxDeltaPhiPt = cms.double( 7.0 ), + minHFCleaningPt = cms.double( 5.0 ), + minSignificanceReduction = cms.double( 1.4 ) + ) ) process.hltAK4PFJetsForTaus = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -37036,7 +37038,9 @@ ), cms.PSet( linkType = cms.string( "TRACK:HCAL" ), useKDTree = cms.bool( True ), - linkerName = cms.string( "TrackAndHCALLinker" ) + linkerName = cms.string( "TrackAndHCALLinker" ), + trajectoryLayerEntrance = cms.string( "HCALEntrance" ), + trajectoryLayerExit = cms.string( "HCALExit" ) ), cms.PSet( linkType = cms.string( "ECAL:HCAL" ), useKDTree = cms.bool( False ), @@ -37124,12 +37128,13 @@ verbose = cms.untracked.bool( False ), pf_nsigma_ECAL = cms.double( 0.0 ), usePFConversions = cms.bool( False ), - goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), useCalibrationsFromDB = cms.bool( True ), + resolHF_square = cms.vdouble( 7.834401, 0.012996, 0.0 ), goodPixelTrackDeadHcal_ptErrRel = cms.double( 1.0 ), goodTrackDeadHcal_validFr = cms.double( 0.5 ), postMuonCleaning = cms.bool( True ), - egammaElectrons = cms.InputTag( "" ), + calibrationsLabel = cms.string( "HLT" ), muon_HO = cms.vdouble( 0.9, 0.9 ), postHFCleaning = cms.bool( False ), factors_45 = cms.vdouble( 10.0, 100.0 ), @@ -37141,7 +37146,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVertices" ), - calibrationsLabel = cms.string( "HLT" ), + egammaElectrons = cms.InputTag( "" ), calibHF_a_EMonly = cms.vdouble( 0.96945, 0.96701, 0.76309, 0.82268, 0.87583, 0.89718, 0.98674, 1.4681, 1.458, 1.458 ), dptRel_DispVtx = cms.double( 10.0 ), muons = cms.InputTag( "hltMuonsReg" ), @@ -37152,6 +37157,7 @@ blocks = cms.InputTag( "hltParticleFlowBlockReg" ), goodTrackDeadHcal_ptErrRel = cms.double( 0.2 ), useEGammaFilters = cms.bool( False ), + pf_nsigma_HFHAD = cms.double( 1.0 ), useEGammaElectrons = cms.bool( False ), useHO = cms.bool( False ), nsigma_TRACK = cms.double( 1.0 ), @@ -37208,19 +37214,13 @@ goodTrackDeadHcal_dxy = cms.double( 0.5 ), goodPixelTrackDeadHcal_dz = cms.double( 0.05 ), PFEGammaCandidates = cms.InputTag( "particleFlowEGamma" ), - goodTrackDeadHcal_layers = cms.uint32( 4 ), + pf_nsigma_HFEM = cms.double( 1.0 ), usePFDecays = cms.bool( False ), calibHF_b_EMHAD = cms.vdouble( 1.27541, 0.85361, 0.86333, 0.89091, 0.94348, 0.94348, 0.9437, 1.0034, 1.0444, 1.0444 ), rejectTracks_Step45 = cms.bool( False ), - GedPhotonValueMap = cms.InputTag( 'tmpGedPhotons','valMapPFEgammaCandToPhoton' ), - PFHFCleaningParameters = cms.PSet( - minSignificance = cms.double( 2.5 ), - maxSignificance = cms.double( 2.5 ), - minDeltaMet = cms.double( 0.4 ), - maxDeltaPhiPt = cms.double( 7.0 ), - minHFCleaningPt = cms.double( 5.0 ), - minSignificanceReduction = cms.double( 1.4 ) - ), + goodPixelTrackDeadHcal_maxLost4Hit = cms.int32( 1 ), + calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ), + goodTrackDeadHcal_layers = cms.uint32( 4 ), goodPixelTrackDeadHcal_dxy = cms.double( 0.02 ), usePFNuclearInteractions = cms.bool( False ), GedElectronValueMap = cms.InputTag( "gedGsfElectronsTmp" ), @@ -37230,7 +37230,14 @@ pt_Error = cms.double( 1.0 ), debug = cms.untracked.bool( False ), useProtectionsForJetMET = cms.bool( True ), - calibHF_eta_step = cms.vdouble( 0.0, 2.9, 3.0, 3.2, 4.2, 4.4, 4.6, 4.8, 5.2, 5.4 ) + PFHFCleaningParameters = cms.PSet( + minSignificance = cms.double( 2.5 ), + maxSignificance = cms.double( 2.5 ), + minDeltaMet = cms.double( 0.4 ), + maxDeltaPhiPt = cms.double( 7.0 ), + minHFCleaningPt = cms.double( 5.0 ), + minSignificanceReduction = cms.double( 1.4 ) + ) ) process.hltAK4PFJetsReg = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -53692,13 +53699,13 @@ minimumTransverseMomentum = cms.double( 1.0 ), primaryVertex = cms.InputTag( "hltVerticesPFFilter" ), maximumLongitudinalImpactParameter = cms.double( 17.0 ), - jets = cms.InputTag( "hltPFJetForBtag" ), + computeGhostTrack = cms.bool( True ), maxDeltaR = cms.double( 0.4 ), candidates = cms.InputTag( "hltParticleFlow" ), jetDirectionUsingGhostTrack = cms.bool( False ), minimumNumberOfPixelHits = cms.int32( 2 ), jetDirectionUsingTracks = cms.bool( False ), - computeGhostTrack = cms.bool( True ), + jets = cms.InputTag( "hltPFJetForBtag" ), useTrackQuality = cms.bool( False ), ghostTrackPriorDeltaR = cms.double( 0.03 ), maximumChiSquared = cms.double( 5.0 ), @@ -86983,13 +86990,13 @@ minimumTransverseMomentum = cms.double( 1.0 ), primaryVertex = cms.InputTag( "hltVerticesPFFilter" ), maximumLongitudinalImpactParameter = cms.double( 17.0 ), - jets = cms.InputTag( "hltPFJetForBtagAK8" ), + computeGhostTrack = cms.bool( True ), maxDeltaR = cms.double( 0.4 ), candidates = cms.InputTag( "hltParticleFlow" ), jetDirectionUsingGhostTrack = cms.bool( False ), minimumNumberOfPixelHits = cms.int32( 2 ), jetDirectionUsingTracks = cms.bool( False ), - computeGhostTrack = cms.bool( True ), + jets = cms.InputTag( "hltPFJetForBtagAK8" ), useTrackQuality = cms.bool( False ), ghostTrackPriorDeltaR = cms.double( 0.03 ), maximumChiSquared = cms.double( 5.0 ), @@ -87206,13 +87213,13 @@ minimumTransverseMomentum = cms.double( 1.0 ), primaryVertex = cms.InputTag( "hltVerticesPFFilter" ), maximumLongitudinalImpactParameter = cms.double( 17.0 ), - jets = cms.InputTag( "hltPFJetForDBtagAK8" ), + computeGhostTrack = cms.bool( True ), maxDeltaR = cms.double( 0.4 ), candidates = cms.InputTag( "hltParticleFlow" ), jetDirectionUsingGhostTrack = cms.bool( False ), minimumNumberOfPixelHits = cms.int32( 2 ), jetDirectionUsingTracks = cms.bool( False ), - computeGhostTrack = cms.bool( True ), + jets = cms.InputTag( "hltPFJetForDBtagAK8" ), useTrackQuality = cms.bool( False ), ghostTrackPriorDeltaR = cms.double( 0.03 ), maximumChiSquared = cms.double( 5.0 ),