diff --git a/Configuration/Eras/python/Era_Run3_2024_ppRef_cff.py b/Configuration/Eras/python/Era_Run3_2024_ppRef_cff.py new file mode 100644 index 0000000000000..53b9aeca57368 --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_2024_ppRef_cff.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run3_cff import Run3 +from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 +from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024 +from Configuration.ProcessModifiers.storeZDCDigis_cff import storeZDCDigis + +Run3_2024_ppRef = cms.ModifierChain(Run3, ppRef_2017, ppRef_2024, storeZDCDigis) diff --git a/Configuration/Eras/python/Era_Run3_UPC_cff.py b/Configuration/Eras/python/Era_Run3_UPC_cff.py new file mode 100644 index 0000000000000..900a32c538e3d --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_UPC_cff.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run3_cff import Run3 +from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018 +from Configuration.Eras.Modifier_run3_upc_cff import run3_upc + +Run3_UPC = cms.ModifierChain(Run3, egamma_lowPt_exclusive, highBetaStar_2018, run3_upc) diff --git a/Configuration/Eras/python/Modifier_ppRef_2024_cff.py b/Configuration/Eras/python/Modifier_ppRef_2024_cff.py new file mode 100644 index 0000000000000..61ac36518fecd --- /dev/null +++ b/Configuration/Eras/python/Modifier_ppRef_2024_cff.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +ppRef_2024 = cms.Modifier() + diff --git a/Configuration/Generator/python/Pythia8_GammaNucleus_5p36TeV_cfi.py b/Configuration/Generator/python/Pythia8_GammaNucleus_5p36TeV_cfi.py new file mode 100644 index 0000000000000..aa8cfbdb87dcd --- /dev/null +++ b/Configuration/Generator/python/Pythia8_GammaNucleus_5p36TeV_cfi.py @@ -0,0 +1,27 @@ +import FWCore.ParameterSet.Config as cms + +generator = cms.EDFilter("Pythia8GeneratorFilter", + maxEventsToPrint = cms.untracked.int32(1), + pythiaPylistVerbosity = cms.untracked.int32(1), + filterEfficiency = cms.untracked.double(1.0), + pythiaHepMCVerbosity = cms.untracked.bool(False), + comEnergy = cms.double(5360.), + doProtonPhotonFlux = cms.untracked.bool(True), + PythiaParameters = cms.PSet( + parameterSets = cms.vstring('pythia8_example02'), + pythia8_example02 = cms.vstring( + 'HardQCD:all = on', + 'PhaseSpace:pTHatMin = 10.', + 'PhotonParton:all = on', + 'MultipartonInteractions:pT0Ref = 3.0', + 'PDF:beamA2gamma = on', + 'PDF:proton2gammaSet = 0', + 'PDF:useHardNPDFB = on', + 'PDF:gammaFluxApprox2bMin = 13.272', + 'PDF:beam2gammaApprox = 2', + 'Photon:sampleQ2 = off', + 'Photon:ProcessType = 3' + ) + ) +) +ProductionFilterSequence = cms.Sequence(generator) diff --git a/Configuration/Generator/python/Starlight_DoubleDiffraction_5p36TeV_cfi.py b/Configuration/Generator/python/Starlight_DoubleDiffraction_5p36TeV_cfi.py new file mode 100644 index 0000000000000..48b0b1cd5889c --- /dev/null +++ b/Configuration/Generator/python/Starlight_DoubleDiffraction_5p36TeV_cfi.py @@ -0,0 +1,26 @@ +import FWCore.ParameterSet.Config as cms + +externalLHEProducer = cms.EDProducer("ExternalLHEProducer", + args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/RunIII/5p36TeV/starlight/starlight_double_diffraction_el8_amd64_gcc10_CMSSW_12_5_5_patch1_tarball.tgz'), + nEvents = cms.untracked.uint32(5000), + numberOfParameters = cms.uint32(1), + outputFile = cms.string('cmsgrid_final.lhe'), + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) + ) + + +generator = cms.EDFilter("Pythia8ConcurrentHadronizerFilter", + maxEventsToPrint = cms.untracked.int32(1), + pythiaPylistVerbosity = cms.untracked.int32(1), + filterEfficiency = cms.untracked.double(1.0), + pythiaHepMCVerbosity = cms.untracked.bool(False), + comEnergy = cms.double(5360), + PythiaParameters = cms.PSet( + parameterSets = cms.vstring('skip_hadronization'), + skip_hadronization = cms.vstring('ProcessLevel:all = off', + 'Check:event = off') + ) +) + +ProductionFilterSequence = cms.Sequence(generator) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index eb0a677a42482..2dc48a1d1e1bf 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -849,8 +849,14 @@ # Patatrack Pixel Tracks on CPU workflows[160.501] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackCPU','MINIHI2023PROD']] +### UPC test ### +workflows[180] = ['',['Pythia8_GammaNucleus_5360_HI_2023','DIGIHI2023PPRECO','RECOUPC2023','ALCARECOUPC2023','HARVESTUPC2023']] +workflows[180.1] = ['',['Starlight_DoubleDiffraction_5360_HI_2023','DIGIHI2023PPRECO','RECOUPC2023','ALCARECOUPC2023','HARVESTUPC2023']] +workflows[181] = ['',['Pythia8_GammaNucleus_5360_HI_2024','DIGIHI2024PPRECO','RECOUPC2024','ALCARECOUPC2024','HARVESTUPC2024']] + ### pp reference test ### workflows[149] = ['',['QCD_Pt_80_120_13_PPREF','DIGIPPREF2017','RECOPPREF2017','HARVESTPPREF2017']] +workflows[149.1] = ['',['QCD_Pt_80_120_5362_PPREF_2024','DIGIPPREF2024','RECOPPREF2024','HARVESTPPREF2024']] ### pPb test ### workflows[280]= ['',['AMPT_PPb_5020GeV_MinimumBias','DIGI','RECO','HARVEST']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 8c538e2f269c0..f0c9ad423d6b9 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -37,6 +37,10 @@ # step1 gensim: for 2022 HI prod step1Up2022HiProdDefaults = merge ([{'--conditions':'auto:phase1_2022_realistic_hi','--era':'Run3_pp_on_PbPb','--beamspot':'Realistic2022PbPbCollision','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults]) step1Up2023HiProdDefaults = merge ([{'--conditions':'auto:phase1_2023_realistic_hi','--era':'Run3_pp_on_PbPb_2023','--beamspot':'Realistic2022PbPbCollision','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults]) +# step1 gensim: for 2024 +step1Up2024Defaults = merge ([{'--conditions':'auto:phase1_2024_realistic','--era':'Run3','--beamspot':'Realistic25ns13p6TeVEarly2023Collision'},step1Up2018Defaults]) +# step1 gensim: for 2024 HI prod +step1Up2024HiProdDefaults = merge ([{'--conditions':'auto:phase1_2023_realistic_hi','--era':'Run3_pp_on_PbPb','--beamspot':'Realistic2023PbPbCollision'},step1Up2023HiProdDefaults]) steps = Steps() @@ -700,6 +704,12 @@ def gen2022hiprod(fragment,howMuch): def gen2023hiprod(fragment,howMuch): global step1Up2023HiProdDefaults return merge([{'cfg':fragment},howMuch,step1Up2023HiProdDefaults]) +def gen2024(fragment,howMuch): + global step1Up2024Defaults + return merge([{'cfg':fragment},howMuch,step1Up2024Defaults]) +def gen2024hiprod(fragment,howMuch): + global step1Up2024HiProdDefaults + return merge([{'cfg':fragment},howMuch,step1Up2024HiProdDefaults]) ### Production test: 13 TeV equivalents steps['ProdMinBias_13']=gen2015('MinBias_13TeV_pythia8_TuneCUETP8M1_cfi',Kby(9,100)) @@ -1150,6 +1160,9 @@ def genS(fragment,howMuch): hiDefaults2022_ppReco_approxClusters = {'--conditions':'auto:phase1_2022_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters'} hiDefaults2023_ppReco = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb_2023'} hiDefaults2023_ppReco_approxClusters = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023'} +upcDefaults2023 = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_2023_UPC'} +hiDefaults2024_ppReco = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb'} +upcDefaults2024 = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_UPC'} steps['Hydjet2Q_MinBias_5020GeV_2018_ppReco']=merge([{'-n':1},hiDefaults2018_ppReco,gen2018hiprod('Hydjet2_Quenched_MinBias_5020GeV_cfi',U2000by1)]) steps['HydjetQ_B12_5020GeV_2011']=merge([{'-n':1,'--beamspot':'RealisticHI2011Collision'},hiDefaults2011,genS('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)]) @@ -1176,12 +1189,16 @@ def genS(fragment,howMuch): steps['ZMM_5362_HI_2023']=merge([hiDefaults2023_ppReco,gen2023hiprod('ZMM_5362GeV_TuneCP5_cfi',Kby(18,300))]) steps['ZEE_5362_HI_2023']=merge([hiDefaults2023_ppReco,gen2023hiprod('ZEE_5362GeV_TuneCP5_cfi',Kby(18,300))]) -## pp reference tests +steps['Starlight_DoubleDiffraction_5360_HI_2023']=merge([{'-s':'LHE,GEN,SIM'},gen2023hiprod('Configuration/Generator/python/Starlight_DoubleDiffraction_5p36TeV_cfi.py',Kby(9,150))]) +steps['Pythia8_GammaNucleus_5360_HI_2023']=gen2023hiprod('Pythia8_GammaNucleus_5p36TeV_cfi',Kby(9,150)) +steps['Pythia8_GammaNucleus_5360_HI_2024']=gen2024hiprod('Pythia8_GammaNucleus_5p36TeV_cfi',Kby(9,150)) -ppRefAlca2017 = {'--conditions':'auto:phase1_2017_realistic_ppref', '--era':'Run2_2017_ppRef', '--beamspot':'Fixed_EmitRealistic5TeVppCollision2017'} -ppRefDefaults2017=merge([ppRefAlca2017,{'-n':2}]) +## pp reference tests +ppRefDefaults2017 = {'--conditions':'auto:phase1_2017_realistic_ppref', '--era':'Run2_2017_ppRef', '--beamspot':'Fixed_EmitRealistic5TeVppCollision2017', '-n':2} +ppRefDefaults2024 = {'--conditions':'auto:phase1_2024_realistic', '--era':'Run3_2024_ppRef', '--beamspot':'Realistic25ns13p6TeVEarly2023Collision', '-n':2} steps['QCD_Pt_80_120_13_PPREF']=merge([ppRefDefaults2017,gen2017('QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi',Kby(9,150))]) +steps['QCD_Pt_80_120_5362_PPREF_2024']=merge([ppRefDefaults2024,gen2024('QCD_Pt_80_120_5362GeV_TuneCP5_cfi',Kby(9,150))]) #### fastsim section #### ##no forseen to do things in two steps GEN-SIM then FASTIM->end: maybe later @@ -1913,6 +1930,7 @@ def lhegensim2018ml(fragment,howMuch): #steps['RESIMDIGI']=merge([{'-s':'reGEN,reSIM,DIGI,L1,DIGI2RAW,HLT:@fake,RAW2DIGI,L1Reco','-n':10,'--restoreRNDSeeds':'','--process':'HLT'},steps['DIGI']]) +steps['DIGIHI2024PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2024_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults]) steps['DIGIHI2023PPRECOAPPROXCLUSTERS']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2023_ppReco_approxClusters, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults]) steps['DIGIHI2023PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2023_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults]) steps['DIGIHI2022PPRECOAPPROXCLUSTERS']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2022_ppReco_approxClusters, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults]) @@ -1926,6 +1944,7 @@ def lhegensim2018ml(fragment,howMuch): steps['DIGIHI2022MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2022_ppReco, {'--pileup':'HiMix'}, PUHI2022, step2Upg2015Defaults]) steps['DIGIHIMIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2018_ppReco, {'--pileup':'HiMix'}, PUHI, step2Upg2015Defaults]) +steps['DIGIPPREF2024']=merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@fake2'}, ppRefDefaults2024, step2Upg2015Defaults]) steps['DIGIPPREF2017']=merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@fake2'}, ppRefDefaults2017, step2Upg2015Defaults]) # PRE-MIXING : https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideSimulation#Pre_Mixing_Instructions @@ -3088,6 +3107,14 @@ def gen2023HiMix(fragment,howMuch): steps['RECOUP15_ID']=merge([{'--hltProcess':'HLT2'},steps['RECOUP15']]) +steps['RECOUPC2024']=merge([upcDefaults2024,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM','--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO','--eventcontent':'RECOSIM,MINIAODSIM,DQM'},step3Up2015Defaults]) +steps['MINIUPC2024']=merge([upcDefaults2024,{'-s':'PAT','--datatier':'MINIAODSIM','--eventcontent':'MINIAODSIM'},step3Up2015Defaults]) +steps['ALCARECOUPC2024']=merge([upcDefaults2024,{'-s':'ALCA:TkAlMinBias+SiStripCalMinBias','--datatier':'ALCARECO','--eventcontent':'ALCARECO'}]) + +steps['RECOUPC2023']=merge([upcDefaults2023,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM','--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO','--eventcontent':'RECOSIM,MINIAODSIM,DQM'},step3Up2015Defaults]) +steps['MINIUPC2023']=merge([upcDefaults2023,{'-s':'PAT','--datatier':'MINIAODSIM','--eventcontent':'MINIAODSIM'},step3Up2015Defaults]) +steps['ALCARECOUPC2023']=merge([upcDefaults2023,{'-s':'ALCA:TkAlMinBias+SiStripCalMinBias','--datatier':'ALCARECO','--eventcontent':'ALCARECO'}]) + steps['RECOHI2023PPRECOAPPROXCLUSTERS']=merge([hiDefaults2023_ppReco_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', '--eventcontent':'RECOSIM,MINIAODSIM,DQM', @@ -3247,6 +3274,7 @@ def gen2023HiMix(fragment,howMuch): steps['RECOHI2015']=merge([hiDefaults2015,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Up2015Defaults]) steps['RECOHI2011']=merge([hiDefaults2011,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Defaults]) +steps['RECOPPREF2024']=merge([ppRefDefaults2024,step3Up2015Defaults]) steps['RECOPPREF2017']=merge([ppRefDefaults2017,step3Up2015Defaults]) steps['RECOHID11St3']=merge([{ @@ -3795,6 +3823,9 @@ def gen2023HiMix(fragment,howMuch): '--filetype':'DQM', '--scenario':'pp'} +steps['HARVESTUPC2024']=merge([upcDefaults2024,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT','--filein':'file:step3_inDQM.root','--mc':'','--filetype':'DQM'}]) +steps['HARVESTUPC2023']=merge([upcDefaults2023,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT','--filein':'file:step3_inDQM.root','--mc':'','--filetype':'DQM'}]) + steps['HARVESTHI2023PPRECO']=merge([hiDefaults2023_ppReco,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT', '--filein':'file:step3_inDQM.root', '--mc':'', @@ -3862,6 +3893,10 @@ def gen2023HiMix(fragment,howMuch): '--mc':'', '--filetype':'DQM'}]) +steps['HARVESTPPREF2024']=merge([ppRefDefaults2024,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT', + '--mc':'', + '--era' : 'Run2_2024_ppRef', + '--filetype':'DQM'}]) steps['HARVESTPPREF2017']=merge([ppRefDefaults2017,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT', '--mc':'', '--era' : 'Run2_2017_ppRef', diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 9c875e8fba998..52e9a364b5393 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -46,6 +46,8 @@ def __init__(self): 'Run3_2023_FastSim', 'Run3_2023_ZDC', 'Run3_2023_UPC', + 'Run3_2024_ppRef', + 'Run3_UPC', 'Phase2', 'Phase2C9', 'Phase2C10', diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py index 158d2261913d4..5c08b6712a2e9 100644 --- a/Configuration/StandardSequences/python/Reconstruction_cff.py +++ b/Configuration/StandardSequences/python/Reconstruction_cff.py @@ -192,6 +192,8 @@ _highlevelreco_HITask.add(hiClusterCompatibility) (pp_on_XeXe_2017 | pp_on_AA | run3_upc).toReplaceWith(highlevelrecoTask, _highlevelreco_HITask) pp_on_AA.toReplaceWith(highlevelrecoTask,highlevelrecoTask.copyAndExclude([PFTauTask])) +from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024 +ppRef_2024.toReplaceWith(highlevelrecoTask, cms.Task(highlevelrecoTask.copy(), hiClusterCompatibility)) # not commisoned and not relevant in FastSim (?): _fastSim_highlevelrecoTask = highlevelrecoTask.copyAndExclude([muoncosmichighlevelrecoTask]) diff --git a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py index e33dc63a6e637..17442c0ebf5fa 100644 --- a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py @@ -172,6 +172,14 @@ from Configuration.Eras.Modifier_run3_upc_cff import run3_upc run3_upc.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _upc_extraCommands) +_ppRef_extraCommands = [ + 'keep floatedmValueMap_*TrackChi2_*_*', + 'keep recoClusterCompatibility_hiClusterCompatibility_*_*', +] + +from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024 +ppRef_2024.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _ppRef_extraCommands) + _zdc_extraCommands = ['keep QIE10DataFrameHcalDataFrameContainer_hcalDigis_ZDC_*'] from Configuration.ProcessModifiers.storeZDCDigis_cff import storeZDCDigis storeZDCDigis.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _zdc_extraCommands) diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py index aa761d6cfd623..17a9af5037ed1 100644 --- a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py +++ b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py @@ -126,6 +126,8 @@ def miniAOD_customizeCommon(process): pp_on_AA.toModify(process.selectedPatMuons, cut = "pt > 5 || isPFMuon || (pt > 1.2 && (isGlobalMuon || isStandAloneMuon) )") from Configuration.Eras.Modifier_run3_upc_cff import run3_upc run3_upc.toModify(process.selectedPatMuons, cut = "") + from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024 + ppRef_2024.toModify(process.selectedPatMuons, cut = "pt > 5 || isPFMuon || isTrackerMuon || (pt > 1.2 && (isGlobalMuon || isStandAloneMuon))") process.selectedPatElectrons.cut = cms.string("") process.selectedPatTaus.cut = cms.string("pt > 18. && tauID('decayModeFindingNewDMs')> 0.5") diff --git a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py index 668b6725f9b3a..0ad78a4318fdd 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py @@ -125,3 +125,6 @@ from Configuration.Eras.Modifier_run3_upc_cff import run3_upc run3_upc.toReplaceWith(slimmingTask, cms.Task(slimmingTask.copy(), hiPixelTracks, packedPFCandidateTrackChi2, lostTrackChi2)) + +from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024 +ppRef_2024.toReplaceWith(slimmingTask, cms.Task(slimmingTask.copy(), packedPFCandidateTrackChi2, lostTrackChi2)) diff --git a/RecoJets/Configuration/python/RecoJets_EventContent_cff.py b/RecoJets/Configuration/python/RecoJets_EventContent_cff.py index 1ee57683ddf1f..4ed4208dac651 100644 --- a/RecoJets/Configuration/python/RecoJets_EventContent_cff.py +++ b/RecoJets/Configuration/python/RecoJets_EventContent_cff.py @@ -53,6 +53,7 @@ from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_run3_upc_cff import run3_upc +from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024 #products from regular pp which does not fit the normal AOD for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017, pp_on_AA]: e.toModify( RecoJetsAOD.outputCommands, @@ -64,6 +65,9 @@ 'keep recoClusterCompatibility*_hiClusterCompatibility_*_*' ]) ) +ppRef_2024.toModify( RecoJetsAOD.outputCommands, + func=lambda outputCommands: outputCommands.extend(['keep recoClusterCompatibility*_hiClusterCompatibility_*_*']) + ) #HI-specific products: needed in AOD, propagate to more inclusive tiers as well pA_2016.toModify( RecoJetsAOD.outputCommands, func=lambda outputCommands: outputCommands.extend(['keep recoCentrality*_pACentrality_*_*',