Update the Jets/MET configuration to match the AR and draft TDR

Update the Jets/MET configuration:
  - replace PFPuppiMET with PFPuppiMETTypeOne
  - update the Jets/MET thresholds to match the AR and draft TDR
  - remove the PF CHS reconstruction

HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiHT1050_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiHT1070_cfi.py

@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
-hltPFPuppiHT1050 = cms.EDFilter("HLTHtMhtFilter",
+hltPFPuppiHT1070 = cms.EDFilter("HLTHtMhtFilter",
     htLabels = cms.VInputTag("hltPFPuppiHT"),
     meffSlope = cms.vdouble(1.0),
     mhtLabels = cms.VInputTag("hltPFPuppiHT"),
-    minHt = cms.vdouble(1050.0),
+    minHt = cms.vdouble(1070.0),
     minMeff = cms.vdouble(0.0),
     minMht = cms.vdouble(0.0),
     saveTags = cms.bool(True)

HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMET120_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMETTypeOne140_cfi.py

@@ -1,14 +1,14 @@
 import FWCore.ParameterSet.Config as cms
 
-hltPFPuppiMET120 = cms.EDFilter("HLT1PFMET",
+hltPFPuppiMETTypeOne140 = cms.EDFilter("HLT1PFMET",
     MaxEta = cms.double(-1.0),
     MaxMass = cms.double(-1.0),
     MinE = cms.double(-1.0),
     MinEta = cms.double(-1.0),
     MinMass = cms.double(-1.0),
     MinN = cms.int32(1),
-    MinPt = cms.double(120.0),
-    inputTag = cms.InputTag("hltPFPuppiMET"),
+    MinPt = cms.double(140.0),
+    inputTag = cms.InputTag("hltPFPuppiMETTypeOne"),
     saveTags = cms.bool(True),
     triggerType = cms.int32(87)
 )

HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMHT120_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/hltPFPuppiMHT140_cfi.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-hltPFPuppiMHT120 = cms.EDFilter("HLTMhtFilter",
+hltPFPuppiMHT140 = cms.EDFilter("HLTMhtFilter",
     mhtLabels = cms.VInputTag("hltPFPuppiMHT"),
-    minMht = cms.vdouble(120.0),
+    minMht = cms.vdouble(140.0),
     saveTags = cms.bool(True)
 )

HLTrigger/Configuration/python/HLT_75e33/modules/hltSingleAK4PFPuppiJet500_cfi.py → HLTrigger/Configuration/python/HLT_75e33/modules/hltSingleAK4PFPuppiJet520_cfi.py

@@ -1,13 +1,13 @@
 import FWCore.ParameterSet.Config as cms
 
-hltSingleAK4PFPuppiJet500 = cms.EDFilter("HLT1PFJet",
+hltSingleAK4PFPuppiJet520 = cms.EDFilter("HLT1PFJet",
     MaxEta = cms.double(5.0),
     MaxMass = cms.double(-1.0),
     MinE = cms.double(-1.0),
     MinEta = cms.double(-1.0),
     MinMass = cms.double(-1.0),
     MinN = cms.int32(1),
-    MinPt = cms.double(500.0),
+    MinPt = cms.double(520.0),
     inputTag = cms.InputTag("hltAK4PFPuppiJetsCorrected"),
     saveTags = cms.bool(True),
     triggerType = cms.int32(85)

HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet500_cfi.py → HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py

@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from ..modules.hltSingleAK4PFPuppiJet500_cfi import *
+from ..modules.hltSingleAK4PFPuppiJet520_cfi import *
 from ..modules.l1tSinglePFPuppiJet230off_cfi import *
 from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import *
 from ..sequences.HLTParticleFlowSequence_cfi import *
 
-HLT_AK4PFPuppiJet500 = cms.Path(l1tSinglePFPuppiJet230off+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltSingleAK4PFPuppiJet500)
+HLT_AK4PFPuppiJet520 = cms.Path(l1tSinglePFPuppiJet230off+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltSingleAK4PFPuppiJet520)

HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1050_cfi.py → HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py

@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 from ..modules.hltPFPuppiHT_cfi import *
-from ..modules.hltPFPuppiHT1050_cfi import *
+from ..modules.hltPFPuppiHT1070_cfi import *
 from ..modules.l1tPFPuppiHT_cfi import *
 from ..modules.l1tPFPuppiHT450off_cfi import *
 from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import *
 from ..sequences.HLTParticleFlowSequence_cfi import *
 
-HLT_PFPuppiHT1050 = cms.Path(l1tPFPuppiHT+l1tPFPuppiHT450off+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiHT+hltPFPuppiHT1050)
+HLT_PFPuppiHT1070 = cms.Path(l1tPFPuppiHT+l1tPFPuppiHT450off+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiHT+hltPFPuppiHT1070)

HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py

@@ -0,0 +1,13 @@
+import FWCore.ParameterSet.Config as cms
+
+from ..modules.hltPFPuppiMETTypeOne_cfi import *
+from ..modules.hltPFPuppiMETTypeOne140_cfi import *
+from ..modules.hltPFPuppiMETTypeOneCorrector_cfi import *
+from ..modules.hltPFPuppiMHT_cfi import *
+from ..modules.hltPFPuppiMHT140_cfi import *
+from ..modules.l1tPFPuppiMET220off_cfi import *
+from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import *
+from ..sequences.HLTParticleFlowSequence_cfi import *
+from ..sequences.HLTPFPuppiMETReconstruction_cfi import *
+
+HLT_PFPuppiMETTypeOne140_PFPuppiMHT140 = cms.Path(l1tPFPuppiMET220off+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+HLTPFPuppiMETReconstruction+hltPFPuppiMETTypeOneCorrector+hltPFPuppiMETTypeOne+hltPFPuppiMETTypeOne140+hltPFPuppiMHT+hltPFPuppiMHT140)

HLTrigger/Configuration/python/HLT_75e33/sequences/HLTJMESequence_cfi.py

@@ -3,11 +3,10 @@
 from ..sequences.HLTAK4PFJetsReconstruction_cfi import *
 from ..sequences.HLTAK8PFJetsReconstruction_cfi import *
 from ..sequences.HLTCaloMETReconstruction_cfi import *
-from ..sequences.HLTPFCHSMETReconstruction_cfi import *
 from ..sequences.HLTPFClusterJMEReconstruction_cfi import *
 from ..sequences.HLTPFJetsCHSReconstruction_cfi import *
 from ..sequences.HLTPFMETsReconstruction_cfi import *
 from ..sequences.HLTPFPuppiJMEReconstruction_cfi import *
 from ..sequences.HLTPFSoftKillerMETReconstruction_cfi import *
 
-HLTJMESequence = cms.Sequence(HLTCaloMETReconstruction+HLTPFClusterJMEReconstruction+HLTAK4PFJetsReconstruction+HLTAK8PFJetsReconstruction+HLTPFJetsCHSReconstruction+HLTPFMETsReconstruction+HLTPFCHSMETReconstruction+HLTPFSoftKillerMETReconstruction+HLTPFPuppiJMEReconstruction)
+HLTJMESequence = cms.Sequence(HLTCaloMETReconstruction+HLTPFClusterJMEReconstruction+HLTAK4PFJetsReconstruction+HLTAK8PFJetsReconstruction+HLTPFJetsCHSReconstruction+HLTPFMETsReconstruction+HLTPFSoftKillerMETReconstruction+HLTPFPuppiJMEReconstruction)

HLTrigger/Configuration/python/HLT_75e33_cfg.py

@@ -537,9 +537,7 @@
 process.load("HLT_75e33/modules/hltDoublePFPuppiJets128Eta2p3MaxDeta1p6_cfi")
 process.load("HLT_75e33/modules/hltDoublePFPuppiJets128MaxEta2p4_cfi")
 process.load("HLT_75e33/modules/hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4_cfi")
-process.load("HLT_75e33/modules/hltParticleFlowCHS_cfi")
 process.load("HLT_75e33/modules/hltParticleFlowSoftKiller_cfi")
-process.load("HLT_75e33/modules/hltPFCHSMET_cfi")
 process.load("HLT_75e33/modules/hltPFClusterMET_cfi")
 process.load("HLT_75e33/modules/hltPfDeepFlavourJetTags_cfi")
 process.load("HLT_75e33/modules/hltPfDeepFlavourJetTagsModEta2p4_cfi")
@@ -561,24 +559,24 @@
 process.load("HLT_75e33/modules/hltPFPuppiCentralJetsQuad30HT200MaxEta2p4_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiCentralJetsQuad30HT330MaxEta2p4_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiHT_cfi")
-process.load("HLT_75e33/modules/hltPFPuppiHT1050_cfi")
+process.load("HLT_75e33/modules/hltPFPuppiHT1070_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiJetForBtagEta2p4_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiJetForBtagEta4p0_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiJetForBtagSelectorEta2p4_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiJetForBtagSelectorEta4p0_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiMET_cfi")
-process.load("HLT_75e33/modules/hltPFPuppiMET120_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiMETTypeOne_cfi")
+process.load("HLT_75e33/modules/hltPFPuppiMETTypeOne140_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiMETTypeOneCorrector_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiMETv0_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiMHT_cfi")
-process.load("HLT_75e33/modules/hltPFPuppiMHT120_cfi")
+process.load("HLT_75e33/modules/hltPFPuppiMHT140_cfi")
 process.load("HLT_75e33/modules/hltPFPuppiNoLep_cfi")
 process.load("HLT_75e33/modules/hltPFSoftKillerMET_cfi")
 process.load("HLT_75e33/modules/hltPixelClustersMultiplicity_cfi")
 process.load("HLT_75e33/modules/hltPrimaryVertexAssociation_cfi")
 process.load("HLT_75e33/modules/hltPrimaryVertexAssociationModEta2p4_cfi")
-process.load("HLT_75e33/modules/hltSingleAK4PFPuppiJet500_cfi")
+process.load("HLT_75e33/modules/hltSingleAK4PFPuppiJet520_cfi")
 process.load("HLT_75e33/modules/horeco_cfi")
 process.load("HLT_75e33/modules/hybridSuperClusters_cfi")
 process.load("HLT_75e33/modules/inclusiveSecondaryVertices_cfi")
@@ -731,15 +729,15 @@
 process.load("HLT_75e33/modules/unsortedOfflinePrimaryVertices_cfi")
 process.load("HLT_75e33/modules/vertexMerger_cfi")
 process.load("HLT_75e33/modules/zdcreco_cfi")
-process.load("HLT_75e33/paths/HLT_AK4PFPuppiJet500_cfi")
+process.load("HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi")
 process.load("HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4_v1_cfi")
 process.load("HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4_v1_cfi")
 process.load("HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_v1_cfi")
 process.load("HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_v1_cfi")
 process.load("HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_v1_cfi")
 process.load("HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_v1_cfi")
-process.load("HLT_75e33/paths/HLT_PFPuppiHT1050_cfi")
-process.load("HLT_75e33/paths/HLT_PFPuppiMET120_PFPuppiMHT120_cfi")
+process.load("HLT_75e33/paths/HLT_PFPuppiHT1070_cfi")
+process.load("HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi")
 process.load("HLT_75e33/paths/HLTObjects_cfi")
 process.load("HLT_75e33/paths/L1_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_p71_2p4_v1_cfi")
 process.load("HLT_75e33/paths/L1_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_v1_cfi")
@@ -1064,7 +1062,6 @@
 process.load("HLT_75e33/sequences/HLTCaloMETReconstruction_cfi")
 process.load("HLT_75e33/sequences/HLTJMESequence_cfi")
 process.load("HLT_75e33/sequences/HLTParticleFlowSequence_cfi")
-process.load("HLT_75e33/sequences/HLTPFCHSMETReconstruction_cfi")
 process.load("HLT_75e33/sequences/HLTPFClusterJMEReconstruction_cfi")
 process.load("HLT_75e33/sequences/HLTPFJetsCHSReconstruction_cfi")
 process.load("HLT_75e33/sequences/HLTPFMETsReconstruction_cfi")
@@ -1167,9 +1164,9 @@
     process.L1T_PFPuppiMET220off,
 
     # Jets/MET HLT paths
-    process.HLT_AK4PFPuppiJet500,
-    process.HLT_PFPuppiHT1050,
-    process.HLT_PFPuppiMET120_PFPuppiMHT120,
+    process.HLT_AK4PFPuppiJet520,
+    process.HLT_PFPuppiHT1070,
+    process.HLT_PFPuppiMETTypeOne140_PFPuppiMHT140,
 
     # L1T and HLT objects used by b-tagging
     process.L1Objects,