diff --git a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py index 8a52dee220994..8ddbed4872a96 100644 --- a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py +++ b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py @@ -3,6 +3,5 @@ from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pf_badHcalMitigation_cff import pf_badHcalMitigation -Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018, pp_on_AA, pp_on_AA_2018, pf_badHcalMitigation) +Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018, pp_on_AA, pp_on_AA_2018) diff --git a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_noHCALmitigation_cff.py b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_noHCALmitigation_cff.py index b6e6c62f8526d..3ce8b9d3e9493 100644 --- a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_noHCALmitigation_cff.py +++ b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_noHCALmitigation_cff.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA -from Configuration.Eras.Modifier_pf_badHcalMitigation_cff import pf_badHcalMitigation +from Configuration.Eras.Modifier_pf_badHcalMitigationOff_cff import pf_badHcalMitigationOff + +Run2_2018_pp_on_AA_noHCALmitigation = cms.ModifierChain(Run2_2018_pp_on_AA,pf_badHcalMitigationOff) -Run2_2018_pp_on_AA_noHCALmitigation = cms.ModifierChain(Run2_2018_pp_on_AA.copyAndExclude([pf_badHcalMitigation])) diff --git a/Configuration/Eras/python/Modifier_pf_badHcalMitigation_cff.py b/Configuration/Eras/python/Modifier_pf_badHcalMitigationOff_cff.py similarity index 50% rename from Configuration/Eras/python/Modifier_pf_badHcalMitigation_cff.py rename to Configuration/Eras/python/Modifier_pf_badHcalMitigationOff_cff.py index 3a29156e0ba85..59df5549570ce 100644 --- a/Configuration/Eras/python/Modifier_pf_badHcalMitigation_cff.py +++ b/Configuration/Eras/python/Modifier_pf_badHcalMitigationOff_cff.py @@ -1,3 +1,3 @@ import FWCore.ParameterSet.Config as cms -pf_badHcalMitigation = cms.Modifier() +pf_badHcalMitigationOff = cms.Modifier() diff --git a/Configuration/PyReleaseValidation/python/relval_pileup.py b/Configuration/PyReleaseValidation/python/relval_pileup.py index be7d1e352a108..8f2fd8794c9d9 100644 --- a/Configuration/PyReleaseValidation/python/relval_pileup.py +++ b/Configuration/PyReleaseValidation/python/relval_pileup.py @@ -71,7 +71,6 @@ workflows[25215.18]=['',['GluGluHToGG_M125_Pow_MINLO_NNLOPS_py8_13UP18','Hadronizer_TuneCUETP8M1_13TeV_powhegEmissionVeto_2p_HToGG_M125_13UP18','DIGIUP18_PU25','RECOUP18_PU25','HARVESTUP18_PU25']] workflows[11024.2]=['',['TTbar_13UP18HEfailINPUT','DigiFullHEfail','RecoFullHEfail','HARVESTFullHEfail','NanoFullHEfail']] -workflows[11024.3]=['',['TTbar_13UP18BadHcalMitigINPUT','DigiFullBadHcalMitig','RecoFullBadHcalMitig','HARVESTFullBadHcalMitig','NanoFullBadHcalMitig']] #fastsim workflows[25400] = ['ZEE_13',["FS_ZEE_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]] diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index e3abf667d608e..431062551de54 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -380,7 +380,6 @@ workflows[136.898] = ['',['RunParkingBPH2018B','HLTDR2_2018','RECODR2_2018reHLT_skimParkingBPH_Offline','HARVEST2018']] workflows[136.8642] = ['',['RunJetHT2018BHEfail','HLTDR2_2018','RECODR2_2018reHLT_skimJetHT_Prompt_HEfail','HARVEST2018_HEfail']] -workflows[136.8643] = ['',['RunJetHT2018BBadHcalMitig','HLTDR2_2018_BadHcalMitig','RECODR2_2018reHLT_skimJetHT_Prompt_BadHcalMitig','HARVEST2018_BadHcalMitig']] ### run 2018C ### workflows[136.873] = ['',['RunHLTPhy2018C','HLTDR2_2018','RECODR2_2018reHLT_Offline','HARVEST2018']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 97235248c83b6..ca5df64402dc7 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -438,7 +438,6 @@ steps['RunCharmonium2018B']={'INPUT':InputInfo(dataSet='/Charmonium/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)} steps['RunParkingBPH2018B']={'INPUT':InputInfo(dataSet='/ParkingBPH5/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B_parkingBPH)} steps['RunJetHT2018BHEfail']={'INPUT':InputInfo(dataSet='/JetHT/Run2018B-v1/RAW',label='HEfail',events=100000,location='STD', ls=Run2018B)} -steps['RunJetHT2018BBadHcalMitig']={'INPUT':InputInfo(dataSet='/JetHT/Run2018B-v1/RAW',label='BadHcalMitig',events=100000,location='STD', ls=Run2018B)} #### run2 2018C #### Run2018C={319450: [[1, 100]]} @@ -807,7 +806,6 @@ def identitySim(wf): # INPUT commands for 2018 wf steps['TTbar_13UP18INPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/%s/GEN-SIM'%(baseDataSetRelease[18],),location='STD')} steps['TTbar_13UP18HEfailINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/%s/GEN-SIM'%(baseDataSetRelease[18],),location='STD')} -steps['TTbar_13UP18BadHcalMitigINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/%s/GEN-SIM'%(baseDataSetRelease[18],),label='Mitig',location='STD')} steps['ZEE_13UP18INPUT']={'INPUT':InputInfo(dataSet='/RelValZEE_13/%s/GEN-SIM'%(baseDataSetRelease[18],),location='STD')} steps['ZMM_13UP18INPUT']={'INPUT':InputInfo(dataSet='/RelValZMM_13/%s/GEN-SIM'%(baseDataSetRelease[18],),location='STD')} steps['ZTT_13UP18INPUT']={'INPUT':InputInfo(dataSet='/RelValZTT_13/%s/GEN-SIM'%(baseDataSetRelease[18],),location='STD')} @@ -1879,7 +1877,6 @@ def lhegensim2018ml(fragment,howMuch): steps['HLTDR2_2018_hBStar']=merge( [ {'--era' : 'Run2_2018_highBetaStar'},steps['HLTDR2_2018'] ] ) -steps['HLTDR2_2018_BadHcalMitig']=merge( [ {'--era' : 'Run2_2018,pf_badHcalMitigation'},steps['HLTDR2_2018'] ] ) # use --era steps['RECODR2_50ns']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--era':'Run2_50ns',},dataReco]) @@ -2359,8 +2356,6 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR2_2018reHLT_Prompt_hBStar']=merge([{'--era':'Run2_2018_highBetaStar'},steps['RECODR2_2018reHLT_Prompt']]) steps['RECODR2_2018reHLT_Offline_hBStar']=merge([{'--era':'Run2_2018_highBetaStar'},steps['RECODR2_2018reHLT_Offline']]) steps['RECODR2_2018reHLT_skimJetHT_Prompt_HEfail']=merge([{'--conditions':'auto:run2_data_HEfail'},steps['RECODR2_2018reHLT_skimJetHT']]) -steps['RECODR2_2018reHLT_skimJetHT_Prompt_BadHcalMitig']=merge([{'--conditions':'auto:run2_data_HEfail','--era':'Run2_2018,pf_badHcalMitigation'},steps['RECODR2_2018reHLT_skimJetHT']]) - steps['RECO']=merge([step3Defaults]) @@ -2718,7 +2713,6 @@ def gen2021HiMix(fragment,howMuch): steps['HARVEST2018_HCALOnly'] = merge([ {'-s':'HARVESTING:@hcalOnly'}, steps['HARVEST2018'] ]) steps['HARVEST2018_hBStar'] = merge([ {'--era' : 'Run2_2018_highBetaStar'}, steps['HARVEST2018'] ]) steps['HARVEST2018_HEfail'] = merge([ {'--conditions':'auto:run2_data_HEfail'}, steps['HARVEST2018'] ]) -steps['HARVEST2018_BadHcalMitig'] = merge([ {'--era' : 'Run2_2018,pf_badHcalMitigation','--conditions':'auto:run2_data_HEfail'}, steps['HARVEST2018'] ]) steps['HARVEST2018_L1TEgDQM_MULTIRUN'] = merge([ { '--customise':"Configuration/StandardSequences/DQMSaverAtJobEnd_cff", @@ -3208,10 +3202,6 @@ def gen2021HiMix(fragment,howMuch): '--datatier':'NANOAODSIM', '--eventcontent':'NANOEDMAODSIM', '--filein':'file:step3_inMINIAODSIM.root'} -steps['DigiFullBadHcalMitig']=merge([{'--era' : 'Run2_2018,pf_badHcalMitigation'}, steps['DigiFullHEfail']]) -steps['RecoFullBadHcalMitig']=merge([{'--era' : 'Run2_2018,pf_badHcalMitigation'}, steps['RecoFullHEfail']]) -steps['HARVESTFullBadHcalMitig']=merge([{'--era' : 'Run2_2018,pf_badHcalMitigation'}, steps['HARVESTFullHEfail']]) -steps['NanoFullBadHcalMitig']=merge([{'--era' : 'Run2_2018,pf_badHcalMitigation'}, steps['NanoFullHEfail']]) ################################################################################# ####From this line till the end of the file : diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 5420a7f05ead5..585d3d7c67250 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -70,7 +70,7 @@ def __init__(self): 'phase2_trigger', 'phase2_squarePixels', 'phase2_3DPixels', 'trackingLowPU', 'trackingPhase1', 'ctpps', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018', - 'tracker_apv_vfp30_2016', 'pf_badHcalMitigation', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X', + 'tracker_apv_vfp30_2016', 'pf_badHcalMitigationOff', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X', 'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'run2_nanoAOD_94X2016', 'run2_miniAOD_devel', 'run2_nanoAOD_102Xv1', 'run2_nanoAOD_106Xv1', 'run2_nanoAOD_106Xv2', 'hcalHardcodeConditions', 'hcalSkipPacker', diff --git a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py index 0f66e78976b33..72c5f21386fcf 100644 --- a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py +++ b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py @@ -4,7 +4,8 @@ from RecoHI.HiJetAlgos.HiRecoJets_cff import akPu4CaloJets as _akPu4CaloJets from RecoLocalCalo.CaloTowersCreator.calotowermaker_cfi import calotowermaker caloTowerForTrk = calotowermaker.clone( - hbheInput='hbheprereco' + hbheInput='hbheprereco', + missingHcalRescaleFactorForEcal = 1.0 ) ak4CaloJetsForTrk = _ak4CaloJets.clone( @@ -26,8 +27,8 @@ caloJetsForTrkTask = cms.Task(caloTowerForTrk,ak4CaloJetsForTrk) caloJetsForTrk = cms.Sequence(caloJetsForTrkTask) -from Configuration.Eras.Modifier_pf_badHcalMitigation_cff import pf_badHcalMitigation -pf_badHcalMitigation.toModify( caloTowerForTrk, missingHcalRescaleFactorForEcal = 1.0 ) - from Configuration.Eras.Modifier_run3_HB_cff import run3_HB run3_HB.toModify( caloTowerForTrk, hbheInput = "hbhereco" ) + +from Configuration.Eras.Modifier_pf_badHcalMitigationOff_cff import pf_badHcalMitigationOff +pf_badHcalMitigationOff.toModify( caloTowerForTrk, missingHcalRescaleFactorForEcal = 0.0 ) diff --git a/RecoParticleFlow/PFClusterProducer/plugins/PFBadHcalPseudoClusterProducer.cc b/RecoParticleFlow/PFClusterProducer/plugins/PFBadHcalPseudoClusterProducer.cc index a19c13a92dcaa..b2c4b59d849d2 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/PFBadHcalPseudoClusterProducer.cc +++ b/RecoParticleFlow/PFClusterProducer/plugins/PFBadHcalPseudoClusterProducer.cc @@ -164,7 +164,7 @@ void PFBadHcalPseudoClusterProducer::produce(edm::Event& iEvent, const edm::Even void PFBadHcalPseudoClusterProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("enable", false) + desc.add("enable", true) ->setComment("activate the module (if false, it doesn't check the DB and produces an empty collection)"); desc.addUntracked("debug", false); descriptions.add("particleFlowBadHcalPseudoCluster", desc); diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowBadHcalPseudoCluster_cff.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowBadHcalPseudoCluster_cff.py index 028b5381922ea..7993a869c5bda 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowBadHcalPseudoCluster_cff.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowBadHcalPseudoCluster_cff.py @@ -1,6 +1,7 @@ from RecoParticleFlow.PFClusterProducer.particleFlowBadHcalPseudoCluster_cfi import * -# OFF by default, turned on via modifier -from Configuration.Eras.Modifier_pf_badHcalMitigation_cff import pf_badHcalMitigation -pf_badHcalMitigation.toModify(particleFlowBadHcalPseudoCluster, enable = True) +# ON by default, turned off via modifier +from Configuration.Eras.Modifier_pf_badHcalMitigationOff_cff import pf_badHcalMitigationOff +pf_badHcalMitigationOff.toModify(particleFlowBadHcalPseudoCluster, enable = False) + diff --git a/RecoParticleFlow/PFProducer/python/particleFlow_cff.py b/RecoParticleFlow/PFProducer/python/particleFlow_cff.py index db8d3cfff0dc8..cbe424ea2a15e 100644 --- a/RecoParticleFlow/PFProducer/python/particleFlow_cff.py +++ b/RecoParticleFlow/PFProducer/python/particleFlow_cff.py @@ -10,10 +10,10 @@ particleFlowTmp = particleFlow.clone() -from Configuration.Eras.Modifier_pf_badHcalMitigation_cff import pf_badHcalMitigation -pf_badHcalMitigation.toModify(particleFlowTmp.PFEGammaFiltersParameters, - electron_protectionsForBadHcal = dict(enableProtections = True), - photon_protectionsForBadHcal = dict(enableProtections = True)) +from Configuration.Eras.Modifier_pf_badHcalMitigationOff_cff import pf_badHcalMitigationOff +pf_badHcalMitigationOff.toModify(particleFlowTmp.PFEGammaFiltersParameters, + electron_protectionsForBadHcal = dict(enableProtections = False), + photon_protectionsForBadHcal = dict(enableProtections = False)) from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive egamma_lowPt_exclusive.toModify(particleFlowTmp.PFEGammaFiltersParameters,photon_MinEt = 1.) diff --git a/RecoParticleFlow/PFProducer/src/PFEGammaFilters.cc b/RecoParticleFlow/PFProducer/src/PFEGammaFilters.cc index a39c7c5943119..3c8f2f9f078bd 100644 --- a/RecoParticleFlow/PFProducer/src/PFEGammaFilters.cc +++ b/RecoParticleFlow/PFProducer/src/PFEGammaFilters.cc @@ -430,7 +430,7 @@ void PFEGammaFilters::fillPSetDescription(edm::ParameterSetDescription& iDesc) { } { edm::ParameterSetDescription psd; - psd.add("enableProtections", false); + psd.add("enableProtections", true); psd.add>("full5x5_sigmaIetaIeta", // EB, EE; 94Xv2 cut-based medium id {0.0106, 0.0387}); psd.add>("eInvPInv", {0.184, 0.0721}); @@ -455,7 +455,7 @@ void PFEGammaFilters::fillPSetDescription(edm::ParameterSetDescription& iDesc) { { edm::ParameterSetDescription psd; psd.add("solidConeTrkIsoSlope", 0.3); - psd.add("enableProtections", false); + psd.add("enableProtections", true); psd.add("solidConeTrkIsoOffset", 10.0); iDesc.add("photon_protectionsForBadHcal", psd); }