From f5ca4f0b9b66cbd875d8eb61b11292886dcf2d19 Mon Sep 17 00:00:00 2001 From: Jeongeun Lee Date: Mon, 19 Jul 2021 05:34:40 +0200 Subject: [PATCH 1/2] replace EDProducer with clone cfipy, drop type spec, and duplicated param --- .../python/ak4PFJetsBetaStar_cfi.py | 10 +-- .../JetProducers/python/hltMVAJetPuId_cff.py | 22 +++--- .../JetProducers/python/hltak4CaloJets_cfi.py | 71 ++++--------------- 3 files changed, 27 insertions(+), 76 deletions(-) diff --git a/RecoJets/JetProducers/python/ak4PFJetsBetaStar_cfi.py b/RecoJets/JetProducers/python/ak4PFJetsBetaStar_cfi.py index 8898fb830d74d..61374f0d5ad0f 100644 --- a/RecoJets/JetProducers/python/ak4PFJetsBetaStar_cfi.py +++ b/RecoJets/JetProducers/python/ak4PFJetsBetaStar_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms +import RecoJets.JetProducers.BetaStarVarProducer_cfi as _mod - -ak4BetaStar = cms.EDProducer("BetaStarPackedCandidateVarProducer", - srcJet = cms.InputTag("slimmedJets"), - srcPF = cms.InputTag("packedPFCandidates"), - maxDR = cms.double(0.4) +ak4BetaStar = _mod.BetaStarVarProducer.clone( + srcJet = "slimmedJets", + srcPF = "packedPFCandidates", + maxDR = 0.4 ) diff --git a/RecoJets/JetProducers/python/hltMVAJetPuId_cff.py b/RecoJets/JetProducers/python/hltMVAJetPuId_cff.py index f74e98c491d6a..7210466048fbf 100644 --- a/RecoJets/JetProducers/python/hltMVAJetPuId_cff.py +++ b/RecoJets/JetProducers/python/hltMVAJetPuId_cff.py @@ -1,15 +1,11 @@ from RecoJets.JetProducers.hltPUIdAlgo_cff import * +import RecoJets.JetProducers.MVAJetPuIdProducer_cfi as _mod -hltMVAJetPuIdCalculator = cms.EDProducer('MVAJetPuIdProducer', - produceJetIds = cms.bool(False), - jetids = cms.InputTag(""), - runMvas = cms.bool(True), - algos = cms.VPSet(cms.VPSet(full_74x)), - jets = cms.InputTag('hltAK4PFJetsCorrected'), - rho = cms.InputTag('hltFixedGridRhoFastjetAll'), - vertexes = cms.InputTag('hltPixelVertices'), - jec = cms.string("AK4PFchs"), - applyJec = cms.bool(False), - inputIsCorrected = cms.bool(True), - ) -hltMVAJetPuIdEvaluator = hltMVAJetPuIdCalculator.clone( jetids = "pileupJetIdCalculator" ) +hltMVAJetPuIdCalculator = _mod.MVAJetPuIdProducer.clone( + produceJetIds = False, + algos = cms.VPSet(cms.VPSet(full_74x)), + jec = "AK4PFchs" +) +hltMVAJetPuIdEvaluator = hltMVAJetPuIdCalculator.clone( + jetids = "pileupJetIdCalculator" +) diff --git a/RecoJets/JetProducers/python/hltak4CaloJets_cfi.py b/RecoJets/JetProducers/python/hltak4CaloJets_cfi.py index 8169047843b0b..5fc058d90a2a6 100644 --- a/RecoJets/JetProducers/python/hltak4CaloJets_cfi.py +++ b/RecoJets/JetProducers/python/hltak4CaloJets_cfi.py @@ -1,61 +1,16 @@ import FWCore.ParameterSet.Config as cms +import RecoJets.JetProducers.FastjetJetProducer_cfi _mod -hltak4CaloJets = cms.EDProducer( "FastjetJetProducer", - Active_Area_Repeats = cms.int32(1), - useDeterministicSeed = cms.bool(True), - doPVCorrection = cms.bool(False), - minSeed = cms.uint32(14327), - Ghost_EtaMax = cms.double(5.0), - voronoiRfact = cms.double(0.9), - doRhoFastjet = cms.bool(False), - srcPVs = cms.InputTag("offlinePrimaryVertices"), - inputEtMin = cms.double(0.3), - doAreaFastjet = cms.bool(False), - nSigmaPU = cms.double(1.0), - GhostArea = cms.double(0.01), - Rho_EtaMax = cms.double(4.4), - jetPtMin = cms.double(3.0), - jetType = cms.string('CaloJet'), - doPUOffsetCorr = cms.bool(False), - radiusPU = cms.double(0.4), - doAreaDiskApprox = cms.bool(True), - inputEMin = cms.double(0.0), - maxRecoveredHcalCells = cms.uint32(9999999), - maxRecoveredEcalCells = cms.uint32(9999999), - maxProblematicEcalCells = cms.uint32(9999999), - maxBadHcalCells = cms.uint32(9999999), - maxBadEcalCells = cms.uint32(9999999), - maxProblematicHcalCells = cms.uint32(9999999), - jetAlgorithm = cms.string('AntiKt'), - rParam = cms.double(0.4), - UseOnlyVertexTracks = cms.bool(False), - UseOnlyOnePV = cms.bool(False), - DzTrVtxMax = cms.double(0.0), - DxyTrVtxMax = cms.double(0.0), - MinVtxNdof = cms.int32(5), - MaxVtxZ = cms.double(15.0), - src = cms.InputTag("hltTowerMakerForAll"), - subtractorName = cms.string(""), - sumRecHits = cms.bool(False), - useMassDropTagger = cms.bool(False), - useCMSBoostedTauSeedingAlgorithm = cms.bool(False), - muCut = cms.double(-1.0), - yCut = cms.double(-1.0), - useFiltering = cms.bool(False), - rFilt = cms.double(-1.0), - nFilt = cms.int32(-1), - useTrimming = cms.bool(False), - trimPtFracMin = cms.double(-1.0), - usePruning = cms.bool(False), - zcut = cms.double(-1.0), - rcut_factor = cms.double(-1.0), - muMin = cms.double(-1.0), - muMax = cms.double(-1.0), - yMin = cms.double(-1.0), - yMax = cms.double(-1.0), - dRMin = cms.double(-1.0), - dRMax = cms.double(-1.0), - maxDepth = cms.int32(-1), - subjetPtMin = cms.double(-1.0), - puPtMin = cms.double(10.0), +hltak4CaloJets = _mod.FastjetJetProducer.clone( + useDeterministicSeed = True, + voronoiRfact = 0.9, + srcPVs = "offlinePrimaryVertices", + inputEtMin = 0.3, + jetPtMin = 3.0, + jetType = 'CaloJet', + radiusPU = 0.4, + doAreaDiskApprox = True, + DzTrVtxMax = 0.0, + DxyTrVtxMax = 0.0, + src = "hltTowerMakerForAll" ) From f12f4bf1a491ecb3881b212aa36a8b103a98f914 Mon Sep 17 00:00:00 2001 From: Jeongeun Lee Date: Wed, 21 Jul 2021 08:02:43 +0200 Subject: [PATCH 2/2] fix typo --- RecoJets/JetProducers/python/hltak4CaloJets_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoJets/JetProducers/python/hltak4CaloJets_cfi.py b/RecoJets/JetProducers/python/hltak4CaloJets_cfi.py index 5fc058d90a2a6..b22e492e12bc8 100644 --- a/RecoJets/JetProducers/python/hltak4CaloJets_cfi.py +++ b/RecoJets/JetProducers/python/hltak4CaloJets_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms -import RecoJets.JetProducers.FastjetJetProducer_cfi _mod +import RecoJets.JetProducers.FastjetJetProducer_cfi as _mod hltak4CaloJets = _mod.FastjetJetProducer.clone( useDeterministicSeed = True,