Merge pull request cms-sw#33774 from elusian/track-gen-matching-by-tp

Track-gen matching passing through TrackingParticle

Author: cmsbuild

Configuration/PyReleaseValidation/python/relval_standard.py

@@ -35,7 +35,7 @@
 workflows[1302.18] = ['', ['ProdTTbar_13UP18','DIGIUP18PROD1','RECOPRODUP18','MINIAODMCUP18','NANOPRODUP18']]
 #workflows[1303.18] = ['', ['ProdQCD_Pt_3000_3500_13UP18','DIGIUP18PROD1','RECOPRODUP18']]
 workflows[1304.18] = ['', ['ProdZEE_13UP18','DIGIUP18PROD1','RECOPRODUP18','MINIAODMCUP18','NANOPRODUP18']]
-workflows[1304.182] = ['', ['ProdZEE_13UP18','DIGIUP18PROD1','RECOPRODUP18bParking','MINIAODMCUP18bParking']]
+workflows[1304.182] = ['', ['ProdZEE_13UP18','DIGIUP18PROD1bParking','RECOPRODUP18bParking','MINIAODMCUP18bParking']]
 #workflows.addOverride(1303.17,overridesEv5)
 
 #####Prod2018 with concurrentlumi

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1667,6 +1667,7 @@ def lhegensim2018ml(fragment,howMuch):
 steps['DIGIUP18']=merge([step2Upg2018Defaults])
 steps['DIGIUP17PROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval2017','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Upg2017Defaults])
 steps['DIGIUP18PROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval2018','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Upg2018Defaults])
+steps['DIGIUP18PROD1bParking']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval2018','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW','--era' :'Run2_2018,bParking'},step2Upg2018Defaults])
 steps['DIGIUP17_PU25']=merge([PU25UP17,step2Upg2017Defaults])
 steps['DIGIUP18_PU25']=merge([PU25UP18,step2Upg2018Defaults])
 

Configuration/StandardSequences/python/Digi_cff.py

@@ -29,6 +29,8 @@
 #
 from SimGeneral.Configuration.SimGeneral_cff import *
 
+from SimTracker.Configuration.SimTrackerLinks_cff import *
+
 # add updating the GEN information by default
 from Configuration.StandardSequences.Generator_cff import *
 from GeneratorInterface.Core.generatorSmeared_cfi import *
@@ -42,7 +44,7 @@
 # premixing stage2 runs addPileupInfo after PreMixingModule (configured in DataMixerPreMix_cff)
 premix_stage2.toReplaceWith(pdigiTask_nogen, pdigiTask_nogen.copyAndExclude([addPileupInfo]))
 
-pdigiTask = cms.Task(pdigiTask_nogen, fixGenInfoTask)
+pdigiTask = cms.Task(pdigiTask_nogen, fixGenInfoTask, tpPruningTask)
 
 doAllDigi = cms.Sequence(doAllDigiTask)
 pdigi = cms.Sequence(pdigiTask)

Configuration/StandardSequences/python/RecoSim_cff.py

@@ -1,5 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 from SimMuon.MCTruth.muonSimClassificationByHits_cff import *
+from SimTracker.TrackAssociation.trackPrunedMCMatchTask_cff import *
 
-recosim = cms.Task( muonSimClassificationByHitsTask )
+recosim = cms.Task( muonSimClassificationByHitsTask, trackPrunedMCMatchTask )

PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py

@@ -102,6 +102,8 @@
     outputCommands = cms.untracked.vstring(
         'keep patPackedGenParticles_packedGenParticles_*_*',
         'keep recoGenParticles_prunedGenParticles_*_*',
+        'keep *_packedPFCandidateToGenAssociation_*_*',
+        'keep *_lostTracksToGenAssociation_*_*',
         'keep LHEEventProduct_*_*_*',
         'keep GenFilterInfo_*_*_*',
         'keep GenLumiInfoHeader_generator_*_*',

PhysicsTools/PatAlgos/python/slimming/genParticleAssociation_cff.py

@@ -0,0 +1,12 @@
+import FWCore.ParameterSet.Config as cms
+
+packedPFCandidateToGenAssociation = cms.EDProducer("PackedCandidateGenAssociationProducer",
+    trackToGenAssoc = cms.InputTag("prunedTrackMCMatch"),
+)
+
+lostTracksToGenAssociation = cms.EDProducer("PackedCandidateGenAssociationProducer",
+    trackToGenAssoc = cms.InputTag("prunedTrackMCMatch"),
+    trackToPackedCandidatesAssoc = cms.InputTag("lostTracks")
+)
+
+packedCandidateToGenAssociationTask = cms.Task(packedPFCandidateToGenAssociation,lostTracksToGenAssociation)

PhysicsTools/PatAlgos/python/slimming/slimming_cff.py

@@ -8,6 +8,7 @@
 from PhysicsTools.PatAlgos.slimming.offlineSlimmedPrimaryVerticesWithBS_cfi import *
 from PhysicsTools.PatAlgos.slimming.primaryVertexAssociation_cfi import *
 from PhysicsTools.PatAlgos.slimming.genParticles_cff import *
+from PhysicsTools.PatAlgos.slimming.genParticleAssociation_cff import *
 from PhysicsTools.PatAlgos.slimming.selectedPatTrigger_cfi import *
 from PhysicsTools.PatAlgos.slimming.slimmedPatTrigger_cfi import *
 from PhysicsTools.PatAlgos.slimming.slimmedJets_cfi      import *
@@ -39,6 +40,7 @@
     primaryVertexAssociation,
     primaryVertexWithBSAssociation,
     genParticlesTask,
+    packedCandidateToGenAssociationTask,
     selectedPatTrigger,
     slimmedPatTrigger,
     slimmedCaloJets,

SimTracker/Configuration/python/SimTrackerLinks_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+from SimTracker.TrackAssociation.trackingParticlePrunerByGen_cfi import *
+from SimTracker.TrackAssociation.digiSimLinkPruner_cfi import *
+
+from Configuration.Eras.Modifier_fastSim_cff import fastSim
+
+
+tpPruningTask = cms.Task(prunedTrackingParticles,prunedDigiSimLinks)
+
+fastSim.toModify(tpPruningTask, lambda x: x.remove(prunedDigiSimLinks))

SimTracker/Configuration/python/SimTracker_EventContent_cff.py

@@ -37,15 +37,22 @@
 )
 #RAW content 
 SimTrackerRAW = cms.PSet(
-    outputCommands = cms.untracked.vstring('keep *_allTrackMCMatch_*_*')
+    outputCommands = cms.untracked.vstring(
+        'keep *_allTrackMCMatch_*_*',
+        'keep *_prunedTrackingParticles_*_*',
+        'keep *_prunedDigiSimLinks_*_*')
 )
 #RECO content
 SimTrackerRECO = cms.PSet(
-    outputCommands = cms.untracked.vstring('keep *_allTrackMCMatch_*_*')
+    outputCommands = cms.untracked.vstring(
+        'keep *_allTrackMCMatch_*_*',
+        'keep *_prunedTrackMCMatch_*_*')
 )
 #AOD content
 SimTrackerAOD = cms.PSet(
-    outputCommands = cms.untracked.vstring('keep *_allTrackMCMatch_*_*')
+    outputCommands = cms.untracked.vstring(
+        'keep *_allTrackMCMatch_*_*',
+        'keep *_prunedTrackMCMatch_*_*')
 )
 
 # Event content for premixing library

SimTracker/TrackAssociation/plugins/BuildFile.xml

@@ -6,6 +6,7 @@
 <use name="SimDataFormats/TrackerDigiSimLink"/>
 <use name="SimDataFormats/TrackingAnalysis"/>
 <use name="TrackingTools/TransientTrack"/>
+<use name="PhysicsTools/HepMCCandAlgos"/>
 <library name="SimTrackerTrackAssociation_plugins" file="*.cc">
   <flags EDM_PLUGIN="1"/>
 </library>