adapt MINIAOD sequence and event content to accommodate two levels of…

… reduction for muon track extras
cms-sw · Aug 30, 2020 · ff0939b · ff0939b
1 parent ecb07b4
commit ff0939b
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 17 deletions.
diff --git a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
@@ -6,12 +6,10 @@
         'keep *_slimmedOOTPhotons_*_*',
         'keep *_slimmedElectrons_*_*',
         'keep *_slimmedMuons_*_*',
-        'keep recoTrackExtras_muonReducedTrackExtras_*_*',
-        'keep TrackingRecHitsOwned_muonReducedTrackExtras_*_*',
-        'keep SiPixelClusteredmNewDetSetVector_muonReducedTrackExtras_*_*',
-        'keep SiStripClusteredmNewDetSetVector_muonReducedTrackExtras_*_*',
-        'keep recoTrackExtras_standAloneMuonReducedTrackExtras_*_*',
-        'keep TrackingRecHitsOwned_standAloneMuonReducedTrackExtras_*_*',
+        'keep recoTrackExtras_slimmedMuonTrackExtras_*_*',
+        'keep TrackingRecHitsOwned_slimmedMuonTrackExtras_*_*',
+        'keep SiPixelClusteredmNewDetSetVector_slimmedMuonTrackExtras_*_*',
+        'keep SiStripClusteredmNewDetSetVector_slimmedMuonTrackExtras_*_*',
         'keep *_slimmedTaus_*_*',
         'keep *_slimmedTausBoosted_*_*',
         'keep *_slimmedCaloJets_*_*',

diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedMuons_cfi.py b/PhysicsTools/PatAlgos/python/slimming/slimmedMuons_cfi.py
@@ -16,18 +16,18 @@
     saveSegments = cms.bool(True),
     modifyMuons = cms.bool(True),
     modifierConfig = cms.PSet( modifications = cms.VPSet() ),
-    trackExtraAssocs = cms.VInputTag(["muonReducedTrackExtras", "standAloneMuonReducedTrackExtras"]),
+    trackExtraAssocs = cms.VInputTag(["muonReducedTrackExtras", "slimmedMuonTrackExtras"]),
 )
 
 # full set of track extras not available in existing AOD
 from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy
-run2_miniAOD_80XLegacy.toModify(slimmedMuons, trackExtraAssocs = cms.VInputTag(["standAloneMuonReducedTrackExtras"]))
+run2_miniAOD_80XLegacy.toModify(slimmedMuons, trackExtraAssocs = ["slimmedMuonTrackExtras"])
 
 from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17
-run2_miniAOD_94XFall17.toModify(slimmedMuons, trackExtraAssocs = cms.VInputTag(["standAloneMuonReducedTrackExtras"]))
+run2_miniAOD_94XFall17.toModify(slimmedMuons, trackExtraAssocs = ["slimmedMuonTrackExtras"])
 
 from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-pp_on_AA_2018.toModify(slimmedMuons, trackExtraAssocs = cms.VInputTag(["standAloneMuonReducedTrackExtras"]))
+pp_on_AA_2018.toModify(slimmedMuons, trackExtraAssocs = ["slimmedMuonTrackExtras"])
 
 from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
-run2_miniAOD_UL.toModify(slimmedMuons, trackExtraAssocs = cms.VInputTag(["standAloneMuonReducedTrackExtras"]))
+run2_miniAOD_UL.toModify(slimmedMuons, trackExtraAssocs = ["slimmedMuonTrackExtras"])
diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedTrackExtras_cff.py b/PhysicsTools/PatAlgos/python/slimming/slimmedTrackExtras_cff.py
@@ -2,9 +2,41 @@
 
 import FWCore.ParameterSet.Config as cms
 
-standAloneMuonReducedTrackExtras = muonReducedTrackExtras.clone(muonTag = "selectedPatMuons",
-                                                                trackExtraTags = ["standAloneMuons"],
-                                                                cut = "pt > 4.5",
-                                                                outputClusters = False)
+slimmedMuonTrackExtras = muonReducedTrackExtras.clone(muonTag = "selectedPatMuons",
+                                                                trackExtraTags = ["muonReducedTrackExtras", "standAloneMuons"],
+                                                                trackExtraAssocs = ["muonReducedTrackExtras"],
+                                                                pixelClusterTag = "muonReducedTrackExtras",
+                                                                stripClusterTag = "muonReducedTrackExtras")
 
-slimmedTrackExtrasTask = cms.Task(standAloneMuonReducedTrackExtras)
+# no clusters in fastsim
+from Configuration.Eras.Modifier_fastSim_cff import fastSim
+fastSim.toModify(slimmedMuonTrackExtras, outputClusters = False)
+
+# cluster collections are different in phase 2, so skip this for now
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(slimmedMuonTrackExtras, outputClusters = False)
+
+# full set of track extras not available in existing AOD
+from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy
+run2_miniAOD_80XLegacy.toModify(slimmedMuonTrackExtras,
+                                trackExtraTags = ["standAloneMuons"],
+                                trackExtraAssocs = [],
+                                outputClusters = False)
+
+from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17
+run2_miniAOD_94XFall17.toModify(slimmedMuonTrackExtras,
+                                trackExtraTags = ["standAloneMuons"],
+                                trackExtraAssocs = [],
+                                outputClusters = False)
+
+from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+pp_on_AA_2018.toModify(slimmedMuonTrackExtras,
+                                trackExtraTags = ["standAloneMuons"],
+                                trackExtraAssocs = [],
+                                outputClusters = False)
+
+from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
+run2_miniAOD_UL.toModify(slimmedMuonTrackExtras,
+                                trackExtraTags = ["standAloneMuons"],
+                                trackExtraAssocs = [],
+                                outputClusters = False)
diff --git a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py
@@ -46,7 +46,7 @@
     slimmedElectrons,
     slimmedLowPtElectrons,
     lowPtGsfLinks,
-    slimmedTrackExtrasTask,
+    slimmedMuonTrackExtras,
     slimmedMuons,
     slimmedPhotons,
     slimmedOOTPhotons,