From 9fee0bbed1f2099220fa99c13d22fcc9c84e62fe Mon Sep 17 00:00:00 2001 From: Andre Govinda Stahl Leiton Date: Wed, 19 Jun 2024 02:40:13 +0200 Subject: [PATCH] Undo the renaming of gathering, seeding and reHitEnergyNorm double vectors --- .../modules/hltParticleFlowClusterHBHE_cfi.py | 20 ++++---- .../python/customizeHLTforCMSSW.py | 29 +---------- .../interface/InitialClusteringStepBase.h | 4 +- .../plugins/Basic2DGenericPFlowClusterizer.cc | 2 +- .../plugins/LocalMaximumSeedFinder.cc | 4 +- .../plugins/PFClusterProducer.cc | 26 +++++----- .../particleFlowClusterECALUncorrected_cfi.py | 4 +- .../python/particleFlowClusterHBHE_cfi.py | 48 +++++++++---------- .../python/particleFlowClusterHCAL_cfi.py | 5 +- .../python/particleFlowClusterHF_cfi.py | 6 +-- .../python/particleFlowClusterHO_cfi.py | 6 +-- .../python/particleFlowClusterPS_cfi.py | 7 +-- 12 files changed, 57 insertions(+), 104 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHBHE_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHBHE_cfi.py index f7983b260e7b4..552b0472cff12 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHBHE_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHBHE_cfi.py @@ -10,8 +10,8 @@ cms.PSet( depths = cms.vint32(1, 2, 3, 4), detector = cms.string('HCAL_BARREL1'), - gatheringThresholds = cms.vdouble(0.1, 0.2, 0.3, 0.3), - gatheringThresholdsPt = cms.vdouble(0.0, 0.0, 0.0, 0.0) + gatheringThreshold = cms.vdouble(0.1, 0.2, 0.3, 0.3), + gatheringThresholdPt = cms.vdouble(0.0, 0.0, 0.0, 0.0) ), cms.PSet( depths = cms.vint32( @@ -19,11 +19,11 @@ 6, 7 ), detector = cms.string('HCAL_ENDCAP'), - gatheringThresholds = cms.vdouble( + gatheringThreshold = cms.vdouble( 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2 ), - gatheringThresholdsPt = cms.vdouble( + gatheringThresholdPt = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ) @@ -92,7 +92,7 @@ cms.PSet( depths = cms.vint32(1, 2, 3, 4), detector = cms.string('HCAL_BARREL1'), - recHitEnergyNorms = cms.vdouble(0.1, 0.2, 0.3, 0.3) + recHitEnergyNorm = cms.vdouble(0.1, 0.2, 0.3, 0.3) ), cms.PSet( depths = cms.vint32( @@ -100,7 +100,7 @@ 6, 7 ), detector = cms.string('HCAL_ENDCAP'), - recHitEnergyNorms = cms.vdouble( + recHitEnergyNorm = cms.vdouble( 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2 ) @@ -142,8 +142,8 @@ cms.PSet( depths = cms.vint32(1, 2, 3, 4), detector = cms.string('HCAL_BARREL1'), - seedingThresholds = cms.vdouble(0.125, 0.25, 0.35, 0.35), - seedingThresholdsPt = cms.vdouble(0.0, 0.0, 0.0, 0.0) + seedingThreshold = cms.vdouble(0.125, 0.25, 0.35, 0.35), + seedingThresholdPt = cms.vdouble(0.0, 0.0, 0.0, 0.0) ), cms.PSet( depths = cms.vint32( @@ -151,11 +151,11 @@ 6, 7 ), detector = cms.string('HCAL_ENDCAP'), - seedingThresholds = cms.vdouble( + seedingThreshold = cms.vdouble( 0.1375, 0.275, 0.275, 0.275, 0.275, 0.275, 0.275 ), - seedingThresholdsPt = cms.vdouble( + seedingThresholdPt = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 6000de4aace86..86a58c7de66d2 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -52,8 +52,8 @@ def customiseHCALFor2018Input(process): for producer in producers_by_type(process, "PFClusterProducer"): if producer.seedFinder.thresholdsByDetector[0].detector.value() == 'HCAL_BARREL1': - producer.seedFinder.thresholdsByDetector[0].seedingThresholds = _seedingThresholdsHB - producer.initialClusteringStep.thresholdsByDetector[0].gatheringThresholds = _thresholdsHB + producer.seedFinder.thresholdsByDetector[0].seedingThreshold = _seedingThresholdsHB + producer.initialClusteringStep.thresholdsByDetector[0].gatheringThreshold = _thresholdsHB producer.pfClusterBuilder.recHitEnergyNorms[0].recHitEnergyNorm = _thresholdsHB producer.pfClusterBuilder.positionCalc.logWeightDenominatorByDetector = logWeightDenominatorHCAL2018 producer.pfClusterBuilder.allCellsPositionCalc.logWeightDenominatorByDetector = logWeightDenominatorHCAL2018 @@ -314,30 +314,6 @@ def customizeHLTfor45063(process): delattr(prod,"mvaScaleStdEL2") return process - -def customizeHLTfor45212(process): - # Fix types for gathering and seeding thresholds, and recHitEnergyNorm - for prod in producers_by_type(process, 'PFClusterProducer'): - if hasattr(prod, "initialClusteringStep") and hasattr(prod.initialClusteringStep, "thresholdsByDetector"): - if hasattr(prod.initialClusteringStep.thresholdsByDetector, "gatheringThreshold") and isinstance(prod.initialClusteringStep.thresholdsByDetector.gatheringThreshold, cms.vdouble): - prod.initialClusteringStep.thresholdsByDetector.gatheringThresholds = prod.initialClusteringStep.thresholdsByDetector.gatheringThreshold - delattr(prod.initialClusteringStep.thresholdsByDetector, "gatheringThreshold") - if hasattr(prod.initialClusteringStep.thresholdsByDetector, "gatheringThresholdPt") and isinstance(prod.initialClusteringStep.thresholdsByDetector.gatheringThresholdPt, cms.vdouble): - prod.initialClusteringStep.thresholdsByDetector.gatheringThresholdsPt = prod.initialClusteringStep.thresholdsByDetector.gatheringThresholdPt - delattr(prod.initialClusteringStep.thresholdsByDetector, "gatheringThresholdPt") - if hasattr(prod, "seedFinder") and hasattr(prod.seedFinder, "thresholdsByDetector"): - if hasattr(prod.seedFinder.thresholdsByDetector, "seedingThreshold") and isinstance(prod.seedFinder.thresholdsByDetector.seedingThreshold, cms.vdouble): - prod.seedFinder.thresholdsByDetector.seedingThresholds = prod.seedFinder.thresholdsByDetector.seedingThreshold - delattr(prod.seedFinder.thresholdsByDetector, "seedingThreshold") - if hasattr(prod.seedFinder.thresholdsByDetector, "seedingThresholdPt") and isinstance(prod.seedFinder.thresholdsByDetector.seedingThresholdPt, cms.vdouble): - prod.seedFinder.thresholdsByDetector.seedingThresholdsPt = prod.seedFinder.thresholdsByDetector.seedingThresholdPt - delattr(prod.seedFinder.thresholdsByDetector, "seedingThresholdPt") - for n in ["positionCalc", "allCellsPositionCalc"]: - if hasattr(prod, "pfClusterBuilder") and hasattr(prod.pfClusterBuilder, n) and hasattr(getattr(prod.pfClusterBuilder, n), "recHitEnergyNorms") and hasattr(getattr(prod.pfClusterBuilder, n).recHitEnergyNorms, "recHitEnergyNorm") and isinstance(getattr(prod.pfClusterBuilder, n).recHitEnergyNorms.recHitEnergyNorm, cms.vdouble): - getattr(prod.pfClusterBuilder, n).recHitEnergyNorms.recHitEnergyNorms = getattr(prod.pfClusterBuilder, n).recHitEnergyNorms.recHitEnergyNorm - delattr(getattr(prod.pfClusterBuilder, n).recHitEnergyNorms, "recHitEnergyNorm") - - return process # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -350,6 +326,5 @@ def customizeHLTforCMSSW(process, menuType="GRun"): process = checkHLTfor43774(process) process = customizeHLTfor44576(process) process = customizeHLTfor45063(process) - process = customizeHLTfor45212(process) return process diff --git a/RecoParticleFlow/PFClusterProducer/interface/InitialClusteringStepBase.h b/RecoParticleFlow/PFClusterProducer/interface/InitialClusteringStepBase.h index 07a6e547f6607..f70e7b6f35440 100644 --- a/RecoParticleFlow/PFClusterProducer/interface/InitialClusteringStepBase.h +++ b/RecoParticleFlow/PFClusterProducer/interface/InitialClusteringStepBase.h @@ -54,8 +54,8 @@ class InitialClusteringStepBase { if (det == std::string("HCAL_BARREL1") || det == std::string("HCAL_ENDCAP")) { depths = pset.getParameter >("depths"); - thresh_E = pset.getParameter >("gatheringThresholds"); - thresh_pT = pset.getParameter >("gatheringThresholdsPt"); + thresh_E = pset.getParameter >("gatheringThreshold"); + thresh_pT = pset.getParameter >("gatheringThresholdPt"); if (thresh_E.size() != depths.size() || thresh_pT.size() != depths.size()) { throw cms::Exception("InvalidGatheringThreshold") << "gatheringThresholds mismatch with the numbers of depths"; diff --git a/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowClusterizer.cc b/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowClusterizer.cc index 8e6adb499af9d..925a8a6db8705 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowClusterizer.cc +++ b/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowClusterizer.cc @@ -106,7 +106,7 @@ Basic2DGenericPFlowClusterizer::Basic2DGenericPFlowClusterizer(const edm::Parame if (det == std::string("HCAL_BARREL1") || det == std::string("HCAL_ENDCAP")) { depths = pset.getParameter >("depths"); - rhE_norm = pset.getParameter >("recHitEnergyNorms"); + rhE_norm = pset.getParameter >("recHitEnergyNorm"); } else { depths.push_back(0); rhE_norm.push_back(pset.getParameter("recHitEnergyNorm")); diff --git a/RecoParticleFlow/PFClusterProducer/plugins/LocalMaximumSeedFinder.cc b/RecoParticleFlow/PFClusterProducer/plugins/LocalMaximumSeedFinder.cc index 2b0539cf78eff..86bccb6dbaf7b 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/LocalMaximumSeedFinder.cc +++ b/RecoParticleFlow/PFClusterProducer/plugins/LocalMaximumSeedFinder.cc @@ -67,8 +67,8 @@ LocalMaximumSeedFinder::LocalMaximumSeedFinder(const edm::ParameterSet& conf) if (det == std::string("HCAL_BARREL1") || det == std::string("HCAL_ENDCAP")) { depths = pset.getParameter >("depths"); - thresh_E = pset.getParameter >("seedingThresholds"); - thresh_pT = pset.getParameter >("seedingThresholdsPt"); + thresh_E = pset.getParameter >("seedingThreshold"); + thresh_pT = pset.getParameter >("seedingThresholdPt"); if (thresh_E.size() != depths.size() || thresh_pT.size() != depths.size()) { throw cms::Exception("InvalidGatheringThreshold") << "gatheringThresholds mismatch with the numbers of depths"; } diff --git a/RecoParticleFlow/PFClusterProducer/plugins/PFClusterProducer.cc b/RecoParticleFlow/PFClusterProducer/plugins/PFClusterProducer.cc index da2c22d2fc63f..4650a8b6f6450 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/PFClusterProducer.cc +++ b/RecoParticleFlow/PFClusterProducer/plugins/PFClusterProducer.cc @@ -68,11 +68,11 @@ void PFClusterProducer::fillDescriptions(edm::ConfigurationDescriptions& descrip { edm::ParameterSetDescription psd; psd.add("detector", ""); - psd.add("seedingThreshold", 0); - psd.add("seedingThresholdPt", 0); - psd.add>("depths", {}); - psd.add>("seedingThresholds", {}); - psd.add>("seedingThresholdsPt", {}); + psd.addNode((edm::ParameterDescription("seedingThreshold", 0, true) and + edm::ParameterDescription("seedingThresholdPt", 0, true)) xor + (edm::ParameterDescription>("depths", {}, true) and + edm::ParameterDescription>("seedingThreshold", {}, true) and + edm::ParameterDescription>("seedingThresholdPt", {}, true))); pset.addVPSet("thresholdsByDetector", psd, {}); } desc.add("seedFinder", pset); @@ -83,11 +83,11 @@ void PFClusterProducer::fillDescriptions(edm::ConfigurationDescriptions& descrip { edm::ParameterSetDescription psd; psd.add("detector", ""); - psd.add("gatheringThreshold", 0); - psd.add("gatheringThresholdPt", 0); - psd.add>("depths", {}); - psd.add>("gatheringThresholds", {}); - psd.add>("gatheringThresholdsPt", {}); + psd.addNode((edm::ParameterDescription("gatheringThreshold", 0, true) and + edm::ParameterDescription("gatheringThresholdPt", 0, true)) xor + (edm::ParameterDescription>("depths", {}, true) and + edm::ParameterDescription>("gatheringThreshold", {}, true) and + edm::ParameterDescription>("gatheringThresholdPt", {}, true))); pset.addVPSet("thresholdsByDetector", psd, {}); } pset.add("useCornerCells", false); @@ -167,9 +167,9 @@ void PFClusterProducer::fillDescriptions(edm::ConfigurationDescriptions& descrip { edm::ParameterSetDescription psd; psd.add("detector", ""); - psd.add("recHitEnergyNorm", 0); - psd.add>("depths", {}); - psd.add>("recHitEnergyNorms", {}); + psd.addNode(edm::ParameterDescription("recHitEnergyNorm", 0, true) xor + (edm::ParameterDescription>("depths", {}, true) and + edm::ParameterDescription>("recHitEnergyNorm", {}, true))); pset.addVPSet("recHitEnergyNorms", psd, {}); } pset.add("showerSigma", 1.5); diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterECALUncorrected_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterECALUncorrected_cfi.py index cd5b74231d3bb..e86856d6a048b 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterECALUncorrected_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterECALUncorrected_cfi.py @@ -86,7 +86,6 @@ minFractionInCalc = cms.double(1e-9), posCalcNCrystals = cms.int32(-1), logWeightDenominator = cms.double(0.08), # same as gathering threshold - logWeightDenominatorByDetector = cms.VPSet(), minAllowedNormalization = cms.double(1e-9), timeResolutionCalcBarrel = _timeResolutionECALBarrel, timeResolutionCalcEndcap = _timeResolutionECALEndcap, @@ -103,8 +102,7 @@ T0_EE = cms.double(3.1), T0_ES = cms.double(1.2), W0 = cms.double(4.2), - X0 = cms.double(0.89), - timeResolutionCalc = cms.PSet() + X0 = cms.double(0.89) ) # pf clustering diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py index 72443bcf90fd6..36b780828dbb2 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py @@ -27,13 +27,13 @@ thresholdsByDetector = cms.VPSet( cms.PSet( detector = cms.string("HCAL_BARREL1"), depths = cms.vint32(1, 2, 3, 4), - seedingThresholds = _seedingThresholdsHB, - seedingThresholdsPt = cms.vdouble(0.0, 0.0, 0.0, 0.0) + seedingThreshold = _seedingThresholdsHB, + seedingThresholdPt = cms.vdouble(0.0, 0.0, 0.0, 0.0) ), cms.PSet( detector = cms.string("HCAL_ENDCAP"), depths = cms.vint32(1, 2, 3, 4, 5, 6, 7), - seedingThresholds = _seedingThresholdsHE, - seedingThresholdsPt = cms.vdouble(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) + seedingThreshold = _seedingThresholdsHE, + seedingThresholdPt = cms.vdouble(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) ) ), nNeighbours = cms.int32(4), @@ -43,13 +43,13 @@ thresholdsByDetector = cms.VPSet( cms.PSet( detector = cms.string("HCAL_BARREL1"), depths = cms.vint32(1, 2, 3, 4), - gatheringThresholds = _thresholdsHB, - gatheringThresholdsPt = cms.vdouble(0.0, 0.0, 0.0, 0.0) + gatheringThreshold = _thresholdsHB, + gatheringThresholdPt = cms.vdouble(0.0, 0.0, 0.0, 0.0) ), cms.PSet( detector = cms.string("HCAL_ENDCAP"), depths = cms.vint32(1, 2, 3, 4, 5, 6, 7), - gatheringThresholds = _thresholdsHE, - gatheringThresholdsPt = cms.vdouble(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) + gatheringThreshold = _thresholdsHE, + gatheringThresholdPt = cms.vdouble(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) ) ), useCornerCells = cms.bool(True) @@ -73,9 +73,7 @@ logWeightDenominator = _thresholdsHE, ) ), - minAllowedNormalization = cms.double(1e-9), - timeResolutionCalcBarrel = cms.PSet(), - timeResolutionCalcEndcap = cms.PSet() + minAllowedNormalization = cms.double(1e-9) ), allCellsPositionCalc =cms.PSet( algoName = cms.string("Basic2DGenericPFlowPositionCalc"), @@ -91,11 +89,9 @@ logWeightDenominator = _thresholdsHE, ) ), - minAllowedNormalization = cms.double(1e-9), - timeResolutionCalcBarrel = cms.PSet(), - timeResolutionCalcEndcap = cms.PSet() + minAllowedNormalization = cms.double(1e-9) ), - positionCalcForConvergence = cms.PSet(), + timeSigmaEB = cms.double(10.), timeSigmaEE = cms.double(10.), @@ -112,11 +108,11 @@ recHitEnergyNorms = cms.VPSet( cms.PSet( detector = cms.string("HCAL_BARREL1"), depths = cms.vint32(1, 2, 3, 4), - recHitEnergyNorms = _thresholdsHB, + recHitEnergyNorm = _thresholdsHB, ), cms.PSet( detector = cms.string("HCAL_ENDCAP"), depths = cms.vint32(1, 2, 3, 4, 5, 6, 7), - recHitEnergyNorms = _thresholdsHE, + recHitEnergyNorm = _thresholdsHE, ) ) ), @@ -130,10 +126,10 @@ from Configuration.Eras.Modifier_run2_HE_2018_cff import run2_HE_2018 from Configuration.ProcessModifiers.run2_HECollapse_2018_cff import run2_HECollapse_2018 (run2_HE_2018 & ~run2_HECollapse_2018).toModify(particleFlowClusterHBHE, - seedFinder = dict(thresholdsByDetector = {1 : dict(seedingThresholds = _seedingThresholdsHEphase1) } ), - initialClusteringStep = dict(thresholdsByDetector = {1 : dict(gatheringThresholds = _thresholdsHEphase1) } ), + seedFinder = dict(thresholdsByDetector = {1 : dict(seedingThreshold = _seedingThresholdsHEphase1) } ), + initialClusteringStep = dict(thresholdsByDetector = {1 : dict(gatheringThreshold = _thresholdsHEphase1) } ), pfClusterBuilder = dict( - recHitEnergyNorms = {1 : dict(recHitEnergyNorms = _thresholdsHEphase1) }, + recHitEnergyNorms = {1 : dict(recHitEnergyNorm = _thresholdsHEphase1) }, positionCalc = dict(logWeightDenominatorByDetector = {1 : dict(logWeightDenominator = _thresholdsHEphase1) } ), allCellsPositionCalc = dict(logWeightDenominatorByDetector = {1 : dict(logWeightDenominator = _thresholdsHEphase1) } ), ), @@ -142,10 +138,10 @@ # offline 2019 from Configuration.Eras.Modifier_run3_HB_cff import run3_HB run3_HB.toModify(particleFlowClusterHBHE, - seedFinder = dict(thresholdsByDetector = {0 : dict(seedingThresholds = _seedingThresholdsHBphase1) } ), - initialClusteringStep = dict(thresholdsByDetector = {0 : dict(gatheringThresholds = _thresholdsHBphase1) } ), + seedFinder = dict(thresholdsByDetector = {0 : dict(seedingThreshold = _seedingThresholdsHBphase1) } ), + initialClusteringStep = dict(thresholdsByDetector = {0 : dict(gatheringThreshold = _thresholdsHBphase1) } ), pfClusterBuilder = dict( - recHitEnergyNorms = {0 : dict(recHitEnergyNorms = _thresholdsHBphase1) }, + recHitEnergyNorms = {0 : dict(recHitEnergyNorm = _thresholdsHBphase1) }, positionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1) } ), allCellsPositionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1) } ), ), @@ -154,10 +150,10 @@ # offline 2023 from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 run3_egamma_2023.toModify(particleFlowClusterHBHE, - seedFinder = dict(thresholdsByDetector = {0 : dict(seedingThresholds = _seedingThresholdsHBphase1_2023) } ), - initialClusteringStep = dict(thresholdsByDetector = {0 : dict(gatheringThresholds = _thresholdsHBphase1_2023) } ), + seedFinder = dict(thresholdsByDetector = {0 : dict(seedingThreshold = _seedingThresholdsHBphase1_2023) } ), + initialClusteringStep = dict(thresholdsByDetector = {0 : dict(gatheringThreshold = _thresholdsHBphase1_2023) } ), pfClusterBuilder = dict( - recHitEnergyNorms = {0 : dict(recHitEnergyNorms = _thresholdsHBphase1_2023) }, + recHitEnergyNorms = {0 : dict(recHitEnergyNorm = _thresholdsHBphase1_2023) }, positionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1_2023) } ), allCellsPositionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1_2023) } ), ), diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py index aea12920cb824..ebab00eafee74 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py @@ -16,7 +16,6 @@ nSigmaPhi = cms.double(2.), #pf clustering parameters minFractionToKeep = cms.double(1e-7), - positionCalc = cms.PSet(), allCellsPositionCalc = cms.PSet( algoName = cms.string("Basic2DGenericPFlowPositionCalc"), minFractionInCalc = cms.double(1e-9), @@ -31,9 +30,7 @@ logWeightDenominator = _thresholdsHE, ) ), - minAllowedNormalization = cms.double(1e-9), - timeResolutionCalcBarrel = cms.PSet(), - timeResolutionCalcEndcap = cms.PSet() + minAllowedNormalization = cms.double(1e-9) ) ), positionReCalc = cms.PSet(), diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHF_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHF_cfi.py index 6559b47839370..76aa58c69f062 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHF_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHF_cfi.py @@ -72,10 +72,7 @@ minFractionInCalc = cms.double(1e-9), posCalcNCrystals = cms.int32(5), logWeightDenominator = cms.double(0.8), # same as gathering threshold - logWeightDenominatorByDetector = cms.VPSet(), - minAllowedNormalization = cms.double(1e-9), - timeResolutionCalcBarrel = cms.PSet(), - timeResolutionCalcEndcap = cms.PSet() + minAllowedNormalization = cms.double(1e-9) ) _positionCalcHF_all_nodepth = _positionCalcHF_cross_nodepth.clone( @@ -89,7 +86,6 @@ minFractionToKeep = cms.double(1e-7), positionCalc = _positionCalcHF_cross_nodepth, allCellsPositionCalc = _positionCalcHF_all_nodepth, - positionCalcForConvergence = cms.PSet(), showerSigma = cms.double(10.0), stoppingTolerance = cms.double(1e-8), maxIterations = cms.uint32(50), diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py index 7af2c636de8b3..6d1fbfc4da45d 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py @@ -45,10 +45,7 @@ minFractionInCalc = cms.double(1e-9), posCalcNCrystals = cms.int32(5), logWeightDenominator = cms.double(0.5), # same as gathering threshold - logWeightDenominatorByDetector = cms.VPSet(), - minAllowedNormalization = cms.double(1e-9), - timeResolutionCalcBarrel = cms.PSet(), - timeResolutionCalcEndcap = cms.PSet() + minAllowedNormalization = cms.double(1e-9) ) _positionCalcHO_all_nodepth = _positionCalcHO_cross_nodepth.clone( @@ -62,7 +59,6 @@ minFractionToKeep = cms.double(1e-7), positionCalc = _positionCalcHO_cross_nodepth, allCellsPositionCalc = _positionCalcHO_all_nodepth, - positionCalcForConvergence = cms.PSet(), showerSigma = cms.double(10.0), stoppingTolerance = cms.double(1e-8), maxIterations = cms.uint32(50), diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterPS_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterPS_cfi.py index 15a0b08b5180f..d2b9c8ae2ec08 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterPS_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterPS_cfi.py @@ -44,10 +44,7 @@ minFractionInCalc = cms.double(1e-9), posCalcNCrystals = cms.int32(-1), logWeightDenominator = cms.double(6e-5), # same as gathering threshold - logWeightDenominatorByDetector = cms.VPSet(), - minAllowedNormalization = cms.double(1e-9), - timeResolutionCalcBarrel = cms.PSet(), - timeResolutionCalcEndcap = cms.PSet() + minAllowedNormalization = cms.double(1e-9) ) #pf clustering @@ -56,8 +53,6 @@ #pf clustering parameters minFractionToKeep = cms.double(1e-7), positionCalc = _positionCalcPS_all_nodepth, - allCellsPositionCalc = cms.PSet(), - positionCalcForConvergence = cms.PSet(), showerSigma = cms.double(0.3), stoppingTolerance = cms.double(1e-8), maxIterations = cms.uint32(50),