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/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index f93c7c3f3d57f..ef62a5e8fc31e 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_11_0_0/HLT --type FULL -# /dev/CMSSW_11_0_0/HLT/V24 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/HLT/V26 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/HLT/V24') + tableName = cms.string('/dev/CMSSW_11_0_0/HLT/V26') ) fragment.transferSystem = cms.PSet( @@ -8005,15 +8005,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", @@ -13549,7 +13541,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 ), @@ -13637,12 +13631,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 ), @@ -13654,7 +13649,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" ), @@ -13665,6 +13660,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 ), @@ -13721,19 +13717,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" ), @@ -13743,7 +13733,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 ), @@ -32068,7 +32065,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 ), @@ -32156,12 +32155,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 ), @@ -32173,7 +32173,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" ), @@ -32184,6 +32184,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 ), @@ -32240,19 +32241,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" ), @@ -32262,7 +32257,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 ), @@ -37840,7 +37842,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 ), @@ -37928,12 +37932,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 ), @@ -37945,7 +37950,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" ), @@ -37956,6 +37961,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 ), @@ -38012,19 +38018,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" ), @@ -38034,7 +38034,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 ), @@ -54880,13 +54887,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 ), @@ -95402,13 +95409,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 ), @@ -95625,13 +95632,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 ), @@ -100829,15 +100836,15 @@ ) fragment.hltSiPixelClustersAfterSplittingPPOnAA = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAA" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAA" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) @@ -102236,7 +102243,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 ), @@ -102324,12 +102333,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 ), @@ -102341,7 +102351,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVerticesPPOnAA" ), - 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( "hltMuonsPPOnAA" ), @@ -102352,6 +102362,7 @@ blocks = cms.InputTag( "hltParticleFlowBlockPPOnAA" ), 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 ), @@ -102408,19 +102419,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" ), @@ -102430,7 +102435,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.hltKT4PFJetsForRho = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -107906,15 +107918,15 @@ ) fragment.hltSiPixelClustersAfterSplittingPPOnAAForDmeson = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAAForDmeson" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAA" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) @@ -114307,15 +114319,15 @@ ) fragment.hltSiPixelClustersAfterSplittingPPOnAAForLowPt = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAAForLowPt" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAAForLowPt" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py index b97b9ec4ba737..5f10c765d2e54 100644 --- a/HLTrigger/Configuration/python/HLT_Fake1_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake1_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_11_0_0/Fake1 --type Fake1 -# /dev/CMSSW_11_0_0/Fake1/V9 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/Fake1/V10 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/Fake1/V9') + tableName = cms.string('/dev/CMSSW_11_0_0/Fake1/V10') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_Fake2_cff.py b/HLTrigger/Configuration/python/HLT_Fake2_cff.py index 85da89752a0da..162a4a0d58167 100644 --- a/HLTrigger/Configuration/python/HLT_Fake2_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake2_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_11_0_0/Fake2 --type Fake2 -# /dev/CMSSW_11_0_0/Fake2/V9 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/Fake2/V10 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/Fake2/V9') + tableName = cms.string('/dev/CMSSW_11_0_0/Fake2/V10') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py index 05acd7a7f6707..f1fe06de0d8c2 100644 --- a/HLTrigger/Configuration/python/HLT_Fake_cff.py +++ b/HLTrigger/Configuration/python/HLT_Fake_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_11_0_0/Fake --type Fake -# /dev/CMSSW_11_0_0/Fake/V9 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/Fake/V10 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/Fake/V9') + tableName = cms.string('/dev/CMSSW_11_0_0/Fake/V10') ) fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index 0392652f927fd..23406f7004af2 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_11_0_0/GRun --type GRun -# /dev/CMSSW_11_0_0/GRun/V12 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/GRun/V13 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/GRun/V12') + tableName = cms.string('/dev/CMSSW_11_0_0/GRun/V13') ) 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", @@ -12232,7 +12224,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 ), @@ -12320,12 +12314,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 ), @@ -12337,7 +12332,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" ), @@ -12348,6 +12343,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 ), @@ -12404,19 +12400,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" ), @@ -12426,7 +12416,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 ), @@ -30703,7 +30700,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 ), @@ -30791,12 +30790,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 ), @@ -30808,7 +30808,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" ), @@ -30819,6 +30819,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 ), @@ -30875,19 +30876,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" ), @@ -30897,7 +30892,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 ), @@ -36451,7 +36453,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 ), @@ -36539,12 +36543,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 ), @@ -36556,7 +36561,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" ), @@ -36567,6 +36572,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 ), @@ -36623,19 +36629,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" ), @@ -36645,7 +36645,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 ), @@ -53107,13 +53114,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 ), @@ -86092,13 +86099,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 ), @@ -86315,13 +86322,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/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py index c887c6f8b5798..84e17ac8f16a8 100644 --- a/HLTrigger/Configuration/python/HLT_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_11_0_0/HIon --type HIon -# /dev/CMSSW_11_0_0/HIon/V12 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/HIon/V13 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/HIon/V12') + tableName = cms.string('/dev/CMSSW_11_0_0/HIon/V13') ) fragment.transferSystem = cms.PSet( @@ -5801,15 +5801,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", @@ -10210,15 +10202,15 @@ ) fragment.hltSiPixelClustersAfterSplittingPPOnAA = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAA" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAA" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) @@ -12152,7 +12144,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 ), @@ -12240,12 +12234,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 ), @@ -12257,7 +12252,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVerticesPPOnAA" ), - 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( "hltMuonsPPOnAA" ), @@ -12268,6 +12263,7 @@ blocks = cms.InputTag( "hltParticleFlowBlockPPOnAA" ), 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 ), @@ -12324,19 +12320,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" ), @@ -12346,7 +12336,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.hltKT4PFJetsForRho = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -17894,15 +17891,15 @@ ) fragment.hltSiPixelClustersAfterSplittingPPOnAAForDmeson = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAAForDmeson" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAA" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) @@ -24306,15 +24303,15 @@ ) fragment.hltSiPixelClustersAfterSplittingPPOnAAForLowPt = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAAForLowPt" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAAForLowPt" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py index 8f8521ae23d1e..d31a6b45c4165 100644 --- a/HLTrigger/Configuration/python/HLT_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_PIon_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_11_0_0/PIon --type PIon -# /dev/CMSSW_11_0_0/PIon/V12 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/PIon/V13 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/PIon/V12') + tableName = cms.string('/dev/CMSSW_11_0_0/PIon/V13') ) fragment.transferSystem = cms.PSet( @@ -5272,15 +5272,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", diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py index 93bc00f548bf9..a4eac250394b4 100644 --- a/HLTrigger/Configuration/python/HLT_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py @@ -1,13 +1,13 @@ # hltGetConfiguration --cff --data /dev/CMSSW_11_0_0/PRef --type PRef -# /dev/CMSSW_11_0_0/PRef/V12 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/PRef/V13 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms fragment = cms.ProcessFragment( "HLT" ) fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/PRef/V12') + tableName = cms.string('/dev/CMSSW_11_0_0/PRef/V13') ) fragment.transferSystem = cms.PSet( @@ -5350,15 +5350,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", diff --git a/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py b/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py index c9f830b0120bc..1dd9f7f454945 100644 --- a/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py @@ -208,6 +208,7 @@ 'keep *_hltIter3Merged_*_*', 'keep *_hltIter4Merged_*_*', 'keep *_hltIterL3GlbMuon_*_*', + 'keep *_hltIterL3MuonAndMuonFromL1Merged_*_*', 'keep *_hltIterL3MuonMerged_*_*', 'keep *_hltIterL3MuonsNoID_*_*', 'keep *_hltIterL3Muons_*_*', @@ -547,6 +548,7 @@ 'keep *_hltIter3Merged_*_*', 'keep *_hltIter4Merged_*_*', 'keep *_hltIterL3GlbMuon_*_*', + 'keep *_hltIterL3MuonAndMuonFromL1Merged_*_*', 'keep *_hltIterL3MuonMerged_*_*', 'keep *_hltIterL3MuonsNoID_*_*', 'keep *_hltIterL3Muons_*_*', diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 46f4093c6bdfb..e627f103846db 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -164,51 +164,10 @@ def customiseFor2017DtUnpacking(process): return process -# for PFBlockProducer/Algo change to enable both track-HCAL and track-HF links -hltPFBlockLinkDefPrePhase2 = cms.VPSet( - cms.PSet( linkType = cms.string( "PS1:ECAL" ), - useKDTree = cms.bool( True ), - linkerName = cms.string( "PreshowerAndECALLinker" ) - ), - cms.PSet( linkType = cms.string( "PS2:ECAL" ), - useKDTree = cms.bool( True ), - linkerName = cms.string( "PreshowerAndECALLinker" ) - ), - cms.PSet( linkType = cms.string( "TRACK:ECAL" ), - useKDTree = cms.bool( True ), - linkerName = cms.string( "TrackAndECALLinker" ) - ), - cms.PSet( linkType = cms.string( "TRACK:HCAL" ), - useKDTree = cms.bool( True ), - linkerName = cms.string( "TrackAndHCALLinker" ), - trajectoryLayerEntrance = cms.string("HCALEntrance"), # added - trajectoryLayerExit = cms.string("HCALExit") # added - ), - cms.PSet( linkType = cms.string( "ECAL:HCAL" ), - useKDTree = cms.bool( False ), - linkerName = cms.string( "ECALAndHCALLinker" ) - ), - cms.PSet( linkType = cms.string( "HFEM:HFHAD" ), - useKDTree = cms.bool( False ), - linkerName = cms.string( "HFEMAndHFHADLinker" ) - ) -) -def customiseFor28442(process): - if hasattr(process,'hltParticleFlowBlock'): - process.hltParticleFlowBlock.linkDefinitions = hltPFBlockLinkDefPrePhase2 - if hasattr(process,'hltParticleFlowBlockForTaus'): - process.hltParticleFlowBlockForTaus.linkDefinitions = hltPFBlockLinkDefPrePhase2 - if hasattr(process,'hltParticleFlowBlockReg'): - process.hltParticleFlowBlockReg.linkDefinitions = hltPFBlockLinkDefPrePhase2 - if hasattr(process,'hltParticleFlowBlockPPOnAA'): - process.hltParticleFlowBlockPPOnAA.linkDefinitions = hltPFBlockLinkDefPrePhase2 - return process - # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) - process = customiseFor28442(process) return process 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 ), diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index 13b0baa7bd780..4abe5e4f232ad 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_11_0_0/HLT --type FULL --unprescale --process HLTFULL --globaltag auto:run2_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root -# /dev/CMSSW_11_0_0/HLT/V24 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/HLT/V26 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFULL" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/HLT/V24') + tableName = cms.string('/dev/CMSSW_11_0_0/HLT/V26') ) process.transferSystem = cms.PSet( @@ -8170,15 +8170,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", @@ -13850,7 +13842,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 ), @@ -13938,12 +13932,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 ), @@ -13955,7 +13950,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" ), @@ -13966,6 +13961,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 ), @@ -14022,19 +14018,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" ), @@ -14044,7 +14034,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 ), @@ -32369,7 +32366,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 ), @@ -32457,12 +32456,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 ), @@ -32474,7 +32474,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" ), @@ -32485,6 +32485,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 ), @@ -32541,19 +32542,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" ), @@ -32563,7 +32558,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 ), @@ -38141,7 +38143,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 ), @@ -38229,12 +38233,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 ), @@ -38246,7 +38251,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" ), @@ -38257,6 +38262,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 ), @@ -38313,19 +38319,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" ), @@ -38335,7 +38335,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 ), @@ -55181,13 +55188,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 ), @@ -95703,13 +95710,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 ), @@ -95926,13 +95933,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 ), @@ -101130,15 +101137,15 @@ ) process.hltSiPixelClustersAfterSplittingPPOnAA = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAA" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAA" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) @@ -102537,7 +102544,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 ), @@ -102625,12 +102634,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 ), @@ -102642,7 +102652,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVerticesPPOnAA" ), - 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( "hltMuonsPPOnAA" ), @@ -102653,6 +102663,7 @@ blocks = cms.InputTag( "hltParticleFlowBlockPPOnAA" ), 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 ), @@ -102709,19 +102720,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" ), @@ -102731,7 +102736,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.hltKT4PFJetsForRho = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -108207,15 +108219,15 @@ ) process.hltSiPixelClustersAfterSplittingPPOnAAForDmeson = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAAForDmeson" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAA" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) @@ -114608,15 +114620,15 @@ ) process.hltSiPixelClustersAfterSplittingPPOnAAForLowPt = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAAForLowPt" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAAForLowPt" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py index 89c554f709ad1..5c89d7b8a0b4c 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_11_0_0/Fake --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root -# /dev/CMSSW_11_0_0/Fake/V9 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/Fake/V10 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/Fake/V9') + tableName = cms.string('/dev/CMSSW_11_0_0/Fake/V10') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py index c05508c303209..8acac1549a0a4 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_11_0_0/Fake1 --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root -# /dev/CMSSW_11_0_0/Fake1/V9 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/Fake1/V10 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake1" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/Fake1/V9') + tableName = cms.string('/dev/CMSSW_11_0_0/Fake1/V10') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py index 06290f76ba34f..63ca0da5e2eb6 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_11_0_0/Fake2 --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root -# /dev/CMSSW_11_0_0/Fake2/V9 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/Fake2/V10 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTFake2" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/Fake2/V9') + tableName = cms.string('/dev/CMSSW_11_0_0/Fake2/V10') ) process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index ad55e5a3b8be7..2f32e95f68347 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_11_0_0/GRun --type GRun --unprescale --process HLTGRun --globaltag auto:run2_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root -# /dev/CMSSW_11_0_0/GRun/V12 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/GRun/V13 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTGRun" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/GRun/V12') + tableName = cms.string('/dev/CMSSW_11_0_0/GRun/V13') ) 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", @@ -12533,7 +12525,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 ), @@ -12621,12 +12615,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 ), @@ -12638,7 +12633,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" ), @@ -12649,6 +12644,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 ), @@ -12705,19 +12701,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" ), @@ -12727,7 +12717,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 ), @@ -31004,7 +31001,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 ), @@ -31092,12 +31091,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 ), @@ -31109,7 +31109,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" ), @@ -31120,6 +31120,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 ), @@ -31176,19 +31177,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" ), @@ -31198,7 +31193,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 ), @@ -36752,7 +36754,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 ), @@ -36840,12 +36844,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 ), @@ -36857,7 +36862,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" ), @@ -36868,6 +36873,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 ), @@ -36924,19 +36930,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" ), @@ -36946,7 +36946,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 ), @@ -53408,13 +53415,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 ), @@ -86393,13 +86400,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 ), @@ -86616,13 +86623,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_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index 7de839369b34b..7382277d409c8 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_11_0_0/HIon --type HIon --unprescale --process HLTHIon --globaltag auto:run2_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root -# /dev/CMSSW_11_0_0/HIon/V12 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/HIon/V13 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTHIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/HIon/V12') + tableName = cms.string('/dev/CMSSW_11_0_0/HIon/V13') ) process.transferSystem = cms.PSet( @@ -5966,15 +5966,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", @@ -10511,15 +10503,15 @@ ) process.hltSiPixelClustersAfterSplittingPPOnAA = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAA" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAA" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) @@ -12453,7 +12445,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 ), @@ -12541,12 +12535,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 ), @@ -12558,7 +12553,7 @@ ), rejectTracks_Bad = cms.bool( False ), vertexCollection = cms.InputTag( "hltPixelVerticesPPOnAA" ), - 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( "hltMuonsPPOnAA" ), @@ -12569,6 +12564,7 @@ blocks = cms.InputTag( "hltParticleFlowBlockPPOnAA" ), 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 ), @@ -12625,19 +12621,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" ), @@ -12647,7 +12637,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.hltKT4PFJetsForRho = cms.EDProducer( "FastjetJetProducer", Active_Area_Repeats = cms.int32( 5 ), @@ -18195,15 +18192,15 @@ ) process.hltSiPixelClustersAfterSplittingPPOnAAForDmeson = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAAForDmeson" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAA" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) @@ -24607,15 +24604,15 @@ ) process.hltSiPixelClustersAfterSplittingPPOnAAForLowPt = cms.EDProducer( "JetCoreClusterSplitter", verbose = cms.bool( False ), - deltaRmax = cms.double( 0.05 ), + chargeFractionMin = cms.double( 2.0 ), forceXError = cms.double( 100.0 ), vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingPPOnAAForLowPt" ), chargePerUnit = cms.double( 2000.0 ), - forceYError = cms.double( 150.0 ), centralMIPCharge = cms.double( 26000.0 ), + forceYError = cms.double( 150.0 ), pixelClusters = cms.InputTag( "hltSiPixelClustersPPOnAAForLowPt" ), ptMin = cms.double( 200.0 ), - chargeFractionMin = cms.double( 2.0 ), + deltaRmax = cms.double( 0.05 ), cores = cms.InputTag( "hltJetsForCoreTracking" ), fractionalWidth = cms.double( 0.4 ), pixelCPE = cms.string( "hltESPPixelCPEGeneric" ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index c603ad983ce0d..ef257111c4ccc 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_11_0_0/PIon --type PIon --unprescale --process HLTPIon --globaltag auto:run2_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root -# /dev/CMSSW_11_0_0/PIon/V12 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/PIon/V13 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPIon" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/PIon/V12') + tableName = cms.string('/dev/CMSSW_11_0_0/PIon/V13') ) process.transferSystem = cms.PSet( @@ -5437,15 +5437,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", diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py index 341e977254461..5c17ef019ea39 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py @@ -1,13 +1,13 @@ # hltGetConfiguration --full --data /dev/CMSSW_11_0_0/PRef --type PRef --unprescale --process HLTPRef --globaltag auto:run2_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root -# /dev/CMSSW_11_0_0/PRef/V12 (CMSSW_11_0_0_pre13) +# /dev/CMSSW_11_0_0/PRef/V13 (CMSSW_11_0_0) import FWCore.ParameterSet.Config as cms process = cms.Process( "HLTPRef" ) process.HLTConfigVersion = cms.PSet( - tableName = cms.string('/dev/CMSSW_11_0_0/PRef/V12') + tableName = cms.string('/dev/CMSSW_11_0_0/PRef/V13') ) process.transferSystem = cms.PSet( @@ -5515,15 +5515,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",