Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bad PF candidate filter for 2018 PbPb data #31668

Merged
merged 16 commits into from
Oct 21, 2020
+316 −19
Merged

Bad PF candidate filter for 2018 PbPb data #31668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
accdb22
Bad particle filter for 2018 PbPb data
mandrenguyen Oct 5, 2020
b1f1b02
code checks
mandrenguyen Oct 5, 2020
599722e
remove abs causing clang warning
mandrenguyen Oct 5, 2020
482b98e
Change to EDProducer, fix vtx error calculation
mandrenguyen Oct 6, 2020
6bc1375
Changed to global edproducer + other style comments from Andrea
mandrenguyen Oct 6, 2020
6aef984
code format
mandrenguyen Oct 6, 2020
e25e91b
Factorize pp_on_AA_2018 and pp_on_PbPb_run3 era
mandrenguyen Oct 6, 2020
1dcc3b6
Add modifier for HI reMiniAOD of 2018 PbPb data
mandrenguyen Oct 8, 2020
d7d3af1
code checks
mandrenguyen Oct 8, 2020
33075f5
use default destructor
mandrenguyen Oct 8, 2020
525930b
minor cleanup
mandrenguyen Oct 8, 2020
87467f5
missed one instance for new miniAOD modifier
mandrenguyen Oct 8, 2020
8383fb3
Switch from era to process modifier
mandrenguyen Oct 8, 2020
7d85a56
remove modifier from list of eras
mandrenguyen Oct 8, 2020
84cc4d8
Era cleanup that got lost in the shuffle
mandrenguyen Oct 9, 2020
307021a
fix name for keeping cleaned packed candidates
mandrenguyen Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Run3_cff import Run3
from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3

Run3_pp_on_PbPb = cms.ModifierChain(Run3, pp_on_AA_2018, pp_on_PbPb_run3)
Run3_pp_on_PbPb = cms.ModifierChain(Run3, pp_on_PbPb_run3)
4 changes: 4 additions & 0 deletions Configuration/ProcessModifiers/python/run2_miniAOD_pp_on_AA_103X_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

run2_miniAOD_pp_on_AA_103X = cms.Modifier()

6 changes: 4 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1954,6 +1954,7 @@ def lhegensim2018ml(fragment,howMuch):
'--datatier':'MINIAOD,DQMIO',
'--eventcontent':'MINIAOD,DQM',
'--era':'Run2_2018_pp_on_AA',
'--procModifiers':'run2_miniAOD_pp_on_AA_103X',
'--data':'',
'--processName':'PAT',
'-n':'100'
Expand Down Expand Up @@ -2501,15 +2502,16 @@ def gen2021HiMix(fragment,howMuch):
'--datatier':'MINIAODSIM,DQMIO',
'--eventcontent':'MINIAODSIM,DQM',
'-n':100,
'--era':'Run2_2018_pp_on_AA',
'--procModifiers':'run2_miniAOD_pp_on_AA_103X',
},hiDefaults2018_ppReco,step3Up2015Defaults])
steps['REMINIAODHI2018PPRECOMB']=merge([{'-s':'PAT,VALIDATION:@miniAODValidation,DQM:@miniAODDQM',
'--datatier':'MINIAODSIM,DQMIO',
'--eventcontent':'MINIAODSIM,DQM',
'-n':100,
'--era':'Run2_2018_pp_on_AA',
'--procModifiers':'genJetSubEvent',
'--procModifiers':'genJetSubEvent,run2_miniAOD_pp_on_AA_103X',
Copy link
Contributor

@perrotta perrotta Oct 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mandrenguyen , please check: is this additional procModifier ("run2_miniAOD_pp_on_AA_103X") really intended for REMINIAODHI2018PPRECOMB?
(I noticed it because, if I am not wrong, this showed up after the rebase, but it was not there before)

Copy link
Contributor Author

@mandrenguyen mandrenguyen Oct 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this procModifier is the one that enables the cleaning of bad PF candidates (the point of this PR). It should be enabled for the (re)miniAOD workflows, but not for the overall pp_on_AA eras. The "MB" version of the reMiniAOD relval workflow was introduced in #31698, the PR that conflicted with this one, and which caused a rebase to be needed. I'm not 100% sure of the sequence of events that led to this being introduced in the rebase, but I confirm that it is the intended behavior.

},hiDefaults2018_ppReco,step3Up2015Defaults])

steps['ALCARECOHI2018PPRECO']=merge([hiDefaults2018_ppReco,{'-s':'ALCA:TkAlMinBias+SiStripCalMinBias',
'--datatier':'ALCARECO',
'--eventcontent':'ALCARECO'
Expand Down
3 changes: 2 additions & 1 deletion Configuration/StandardSequences/python/Reconstruction_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,15 @@
# AA data with pp reco
from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
from RecoHI.HiTracking.HILowPtConformalPixelTracks_cfi import *
from RecoHI.HiCentralityAlgos.HiCentrality_cfi import hiCentrality
from RecoHI.HiCentralityAlgos.HiClusterCompatibility_cfi import hiClusterCompatibility
_highlevelreco_HITask = highlevelrecoTask.copy()
_highlevelreco_HITask.add(hiConformalPixelTracksTaskPhase1)
_highlevelreco_HITask.add(hiCentrality)
_highlevelreco_HITask.add(hiClusterCompatibility)
(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(highlevelrecoTask, _highlevelreco_HITask)
(pp_on_XeXe_2017 | pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(highlevelrecoTask, _highlevelreco_HITask)
pp_on_AA_2018.toReplaceWith(highlevelrecoTask,highlevelrecoTask.copyAndExclude([PFTauTask]))

# not commisoned and not relevant in FastSim (?):
Expand Down
5 changes: 3 additions & 2 deletions PhysicsTools/PatAlgos/python/selectionLayer1/selectedPatCandidates_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
selectedPatCandidates = cms.Sequence(selectedPatCandidateSummary, selectedPatCandidatesTask)

from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
pp_on_AA_2018.toReplaceWith(selectedPatCandidatesTask, selectedPatCandidatesTask.copyAndExclude([selectedPatOOTPhotons]))
pp_on_AA_2018.toModify(selectedPatCandidateSummary.candidates, func = lambda list: list.remove(cms.InputTag("selectedPatOOTPhotons")) )
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(selectedPatCandidatesTask, selectedPatCandidatesTask.copyAndExclude([selectedPatOOTPhotons]))
(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(selectedPatCandidateSummary.candidates, func = lambda list: list.remove(cms.InputTag("selectedPatOOTPhotons")) )
1 change: 1 addition & 0 deletions PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@

_pp_on_AA_extraCommands = [
'keep patPackedCandidates_hiPixelTracks_*_*',
'keep patPackedCandidates_packedPFCandidatesRemoved_*_*',
'keep *_packedCandidateMuonID_*_*',
'keep *_slimmedJets_pfCandidates_*',
'keep floatedmValueMap_packedPFCandidateTrackChi2_*_*',
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/python/slimming/lostTracks_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@
from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
phase1Pixel.toModify(lostTracks, covarianceVersion =1 )

from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X
run2_miniAOD_pp_on_AA_103X.toModify(lostTracks,inputCandidates = 'cleanedParticleFlow')
11 changes: 11 additions & 0 deletions PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,14 @@
pfPileUpPFBRECO,
pfNoPileUpPFBRECO
)

from RecoHI.HiJetAlgos.HiBadParticleCleaner_cfi import cleanedParticleFlow

packedPFCandidatesRemoved = packedPFCandidates.clone(
inputCollection = "cleanedParticleFlow:removed",
vertexAssociator = "primaryVertexAssociationCleaned:original"
)

_pp_on_AA_2018_packedPFCandidatesTask = cms.Task(cleanedParticleFlow,packedPFCandidatesRemoved,packedPFCandidatesTask.copy())
from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X
run2_miniAOD_pp_on_AA_103X.toReplaceWith(packedPFCandidatesTask,_pp_on_AA_2018_packedPFCandidatesTask)
5 changes: 5 additions & 0 deletions PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,8 @@
from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(packedPFCandidates, PuppiSrc = "", PuppiNoLepSrc = "")
from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X
run2_miniAOD_pp_on_AA_103X.toModify(packedPFCandidates,
inputCollection = "cleanedParticleFlow",
chargedHadronIsolation = ""
)
3 changes: 3 additions & 0 deletions PhysicsTools/PatAlgos/python/slimming/primaryVertexAssociation_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@
produceNoPileUpCollection = cms.bool(False)
)

from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X
run2_miniAOD_pp_on_AA_103X.toModify(primaryVertexAssociation,particles = "cleanedParticleFlow")
primaryVertexAssociationCleaned = primaryVertexAssociation.clone(particles = "cleanedParticleFlow:removed")
5 changes: 5 additions & 0 deletions PhysicsTools/PatAlgos/python/slimming/slimmedMuons_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@
from Configuration.ProcessModifiers.miniAOD_skip_trackExtras_cff import miniAOD_skip_trackExtras

(run2_miniAOD_80XLegacy | run2_miniAOD_94XFall17 | pp_on_AA_2018 | miniAOD_skip_trackExtras).toModify(slimmedMuons, trackExtraAssocs = ["slimmedMuonTrackExtras"])
from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X
run2_miniAOD_pp_on_AA_103X.toModify(slimmedMuons,
packedPFCandidates = ["packedPFCandidates","packedPFCandidatesRemoved"],
pfCandidates = ["cleanedParticleFlow","cleanedParticleFlow:removed"]
)
4 changes: 3 additions & 1 deletion PhysicsTools/PatAlgos/python/slimming/slimming_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
)

from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
pp_on_AA_2018.toReplaceWith(slimmingTask, slimmingTask.copyAndExclude([slimmedOOTPhotons]))
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(slimmingTask, slimmingTask.copyAndExclude([slimmedOOTPhotons]))
from PhysicsTools.PatAlgos.slimming.hiPixelTracks_cfi import hiPixelTracks
(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(slimmingTask, cms.Task(slimmingTask.copy(), hiPixelTracks))

Expand All @@ -78,6 +78,8 @@
(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(
slimmingTask,
cms.Task(slimmingTask.copy(), packedCandidateMuonID, packedPFCandidateTrackChi2, lostTrackChi2, centralityBin, hiHFfilters))
from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X
run2_miniAOD_pp_on_AA_103X.toReplaceWith(slimmingTask,cms.Task(primaryVertexAssociationCleaned,slimmingTask.copy()))

from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
_phase2_timing_slimmingTask = cms.Task(slimmingTask.copy(),
Expand Down
14 changes: 7 additions & 7 deletions RecoHI/HiCentralityAlgos/python/HiCentrality_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@

from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
for e in [pp_on_XeXe_2017, pp_on_AA_2018]:
e.toModify(hiCentrality,
producePixelTracks = True,
srcPixelTracks = "hiConformalPixelTracks",
srcTracks = cms.InputTag("generalTracks"),
srcVertex = cms.InputTag("offlinePrimaryVertices")
)
from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
(pp_on_XeXe_2017 | pp_on_AA_2018 | pp_on_PbPb_run3).toModify(hiCentrality,
producePixelTracks = True,
srcPixelTracks = "hiConformalPixelTracks",
srcTracks = "generalTracks",
srcVertex = "offlinePrimaryVertices"
)

Loading