diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForDoublePuppiJetBtagFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForDoublePuppiJetBtagFilter_cfi.py new file mode 100644 index 0000000000000..a2e97c96a9687 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForDoublePuppiJetBtagFilter_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +hltL1SeedsForDoublePuppiJetBtagFilter = cms.EDFilter("PathStatusFilter", + logicalExpression = cms.string('pDoublePuppiJet112_112') +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForPuppiHTFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForPuppiHTFilter_cfi.py new file mode 100644 index 0000000000000..fa7e083337d8f --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForPuppiHTFilter_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +hltL1SeedsForPuppiHTFilter = cms.EDFilter("PathStatusFilter", + logicalExpression = cms.string('pPuppiHT450') +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForPuppiJetFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForPuppiJetFilter_cfi.py new file mode 100644 index 0000000000000..540117cd326ae --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForPuppiJetFilter_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +hltL1SeedsForPuppiJetFilter = cms.EDFilter("PathStatusFilter", + logicalExpression = cms.string('pSinglePuppiJet230') +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForPuppiMETFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForPuppiMETFilter_cfi.py new file mode 100644 index 0000000000000..62e075c88fecc --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForPuppiMETFilter_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +hltL1SeedsForPuppiMETFilter = cms.EDFilter("PathStatusFilter", + logicalExpression = cms.string('pPuppiMET200') +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi.py new file mode 100644 index 0000000000000..ebca175695632 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +hltL1SeedsForQuadPuppiJetTripleBtagFilter = cms.EDFilter("PathStatusFilter", + logicalExpression = cms.string('pPuppiHT400 and pQuadJet70_55_40_40') +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py index 35222453802ea..446525921b7db 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from ..modules.hltSingleAK4PFPuppiJet520_cfi import * -from ..modules.l1tSinglePFPuppiJet230off_cfi import * +from ..modules.hltL1SeedsForPuppiJetFilter_cfi import * from ..sequences.hgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * @@ -12,4 +12,4 @@ from ..sequences.localrecoSequence_cfi import * from ..sequences.RawToDigiSequence_cfi import * -HLT_AK4PFPuppiJet520 = cms.Path(HLTBeginSequence+l1tSinglePFPuppiJet230off+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltSingleAK4PFPuppiJet520+HLTEndSequence) +HLT_AK4PFPuppiJet520 = cms.Path(HLTBeginSequence+hltL1SeedsForPuppiJetFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltSingleAK4PFPuppiJet520+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4_cfi.py index d91dbf8f00268..bfb684df6da2b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4_cfi.py @@ -3,8 +3,7 @@ from ..modules.hltBTagPFPuppiDeepCSV0p865DoubleEta2p4_cfi import * from ..modules.hltDoublePFPuppiJets128Eta2p4MaxDeta1p6_cfi import * from ..modules.hltDoublePFPuppiJets128MaxEta2p4_cfi import * -from ..modules.l1tDoublePFPuppiJet112offMaxEta2p4_cfi import * -from ..modules.l1tDoublePFPuppiJets112offMaxDeta1p6_cfi import * +from ..modules.hltL1SeedsForDoublePuppiJetBtagFilter_cfi import * from ..sequences.hgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * @@ -16,4 +15,4 @@ from ..sequences.localrecoSequence_cfi import * from ..sequences.RawToDigiSequence_cfi import * -HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+l1tDoublePFPuppiJet112offMaxEta2p4+l1tDoublePFPuppiJets112offMaxDeta1p6+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltDoublePFPuppiJets128MaxEta2p4+hltDoublePFPuppiJets128Eta2p4MaxDeta1p6+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p865DoubleEta2p4+HLTEndSequence) +HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForDoublePuppiJetBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltDoublePFPuppiJets128MaxEta2p4+hltDoublePFPuppiJets128Eta2p4MaxDeta1p6+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p865DoubleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4_cfi.py index f1b3b0ee12897..dc0d2517a6804 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4_cfi.py @@ -3,8 +3,7 @@ from ..modules.hltBTagPFPuppiDeepFlavour0p935DoubleEta2p4_cfi import * from ..modules.hltDoublePFPuppiJets128Eta2p4MaxDeta1p6_cfi import * from ..modules.hltDoublePFPuppiJets128MaxEta2p4_cfi import * -from ..modules.l1tDoublePFPuppiJet112offMaxEta2p4_cfi import * -from ..modules.l1tDoublePFPuppiJets112offMaxDeta1p6_cfi import * +from ..modules.hltL1SeedsForDoublePuppiJetBtagFilter_cfi import * from ..sequences.hgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * @@ -16,4 +15,4 @@ from ..sequences.localrecoSequence_cfi import * from ..sequences.RawToDigiSequence_cfi import * -HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+l1tDoublePFPuppiJet112offMaxEta2p4+l1tDoublePFPuppiJets112offMaxDeta1p6+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltDoublePFPuppiJets128MaxEta2p4+hltDoublePFPuppiJets128Eta2p4MaxDeta1p6+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p935DoubleEta2p4+HLTEndSequence) +HLT_DoublePFPuppiJets128_DoublePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForDoublePuppiJetBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltDoublePFPuppiJets128MaxEta2p4+hltDoublePFPuppiJets128Eta2p4MaxDeta1p6+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p935DoubleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py index a8ae56e085617..7f467becb7e82 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4_cfi.py @@ -6,11 +6,7 @@ from ..modules.hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetsQuad30HT200MaxEta2p4_cfi import * -from ..modules.l1t1PFPuppiJet70offMaxEta2p4_cfi import * -from ..modules.l1t2PFPuppiJet55offMaxEta2p4_cfi import * -from ..modules.l1t4PFPuppiJet25OnlineMaxEta2p4_cfi import * -from ..modules.l1t4PFPuppiJet40offMaxEta2p4_cfi import * -from ..modules.l1tPFPuppiHT400offMaxEta2p4_cfi import * +from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * from ..sequences.hgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * @@ -22,4 +18,4 @@ from ..sequences.localrecoSequence_cfi import * from ..sequences.RawToDigiSequence_cfi import * -HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+l1tPFPuppiHT400offMaxEta2p4+l1t1PFPuppiJet70offMaxEta2p4+l1t2PFPuppiJet55offMaxEta2p4+l1t4PFPuppiJet40offMaxEta2p4+l1t4PFPuppiJet25OnlineMaxEta2p4+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet70MaxEta2p4+hlt2PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT200MaxEta2p4+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p38Eta2p4TripleEta2p4+HLTEndSequence) +HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet70MaxEta2p4+hlt2PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT200MaxEta2p4+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p38Eta2p4TripleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py index 0226cd0e0e898..b7f68ccc40bc5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py @@ -6,11 +6,7 @@ from ..modules.hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetsQuad30HT200MaxEta2p4_cfi import * -from ..modules.l1t1PFPuppiJet70offMaxEta2p4_cfi import * -from ..modules.l1t2PFPuppiJet55offMaxEta2p4_cfi import * -from ..modules.l1t4PFPuppiJet25OnlineMaxEta2p4_cfi import * -from ..modules.l1t4PFPuppiJet40offMaxEta2p4_cfi import * -from ..modules.l1tPFPuppiHT400offMaxEta2p4_cfi import * +from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * from ..sequences.hgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * @@ -22,4 +18,4 @@ from ..sequences.localrecoSequence_cfi import * from ..sequences.RawToDigiSequence_cfi import * -HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+l1tPFPuppiHT400offMaxEta2p4+l1t1PFPuppiJet70offMaxEta2p4+l1t2PFPuppiJet55offMaxEta2p4+l1t4PFPuppiJet40offMaxEta2p4+l1t4PFPuppiJet25OnlineMaxEta2p4+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet70MaxEta2p4+hlt2PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT200MaxEta2p4+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p375Eta2p4TripleEta2p4+HLTEndSequence) +HLT_PFHT200PT30_QuadPFPuppiJet_70_40_30_30_TriplePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet70MaxEta2p4+hlt2PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT200MaxEta2p4+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p375Eta2p4TripleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py index 19d5c63238841..82fb7e2ec161a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4_cfi.py @@ -8,11 +8,7 @@ from ..modules.hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetsQuad30HT330MaxEta2p4_cfi import * -from ..modules.l1t1PFPuppiJet70offMaxEta2p4_cfi import * -from ..modules.l1t2PFPuppiJet55offMaxEta2p4_cfi import * -from ..modules.l1t4PFPuppiJet25OnlineMaxEta2p4_cfi import * -from ..modules.l1t4PFPuppiJet40offMaxEta2p4_cfi import * -from ..modules.l1tPFPuppiHT400offMaxEta2p4_cfi import * +from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * from ..sequences.hgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * @@ -24,4 +20,4 @@ from ..sequences.localrecoSequence_cfi import * from ..sequences.RawToDigiSequence_cfi import * -HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+l1tPFPuppiHT400offMaxEta2p4+l1t1PFPuppiJet70offMaxEta2p4+l1t2PFPuppiJet55offMaxEta2p4+l1t4PFPuppiJet40offMaxEta2p4+l1t4PFPuppiJet25OnlineMaxEta2p4+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet75MaxEta2p4+hlt2PFPuppiCentralJet60MaxEta2p4+hlt3PFPuppiCentralJet45MaxEta2p4+hlt4PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT330MaxEta2p4+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p31Eta2p4TripleEta2p4+HLTEndSequence) +HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepCSV_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet75MaxEta2p4+hlt2PFPuppiCentralJet60MaxEta2p4+hlt3PFPuppiCentralJet45MaxEta2p4+hlt4PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT330MaxEta2p4+HLTBtagDeepCSVSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepCSV0p31Eta2p4TripleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py index 7d8010b60c21e..3ba47d5231434 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4_cfi.py @@ -8,11 +8,7 @@ from ..modules.hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetQuad30MaxEta2p4_cfi import * from ..modules.hltPFPuppiCentralJetsQuad30HT330MaxEta2p4_cfi import * -from ..modules.l1t1PFPuppiJet70offMaxEta2p4_cfi import * -from ..modules.l1t2PFPuppiJet55offMaxEta2p4_cfi import * -from ..modules.l1t4PFPuppiJet25OnlineMaxEta2p4_cfi import * -from ..modules.l1t4PFPuppiJet40offMaxEta2p4_cfi import * -from ..modules.l1tPFPuppiHT400offMaxEta2p4_cfi import * +from ..modules.hltL1SeedsForQuadPuppiJetTripleBtagFilter_cfi import * from ..sequences.hgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * @@ -24,4 +20,4 @@ from ..sequences.localrecoSequence_cfi import * from ..sequences.RawToDigiSequence_cfi import * -HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+l1tPFPuppiHT400offMaxEta2p4+l1t1PFPuppiJet70offMaxEta2p4+l1t2PFPuppiJet55offMaxEta2p4+l1t4PFPuppiJet40offMaxEta2p4+l1t4PFPuppiJet25OnlineMaxEta2p4+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet75MaxEta2p4+hlt2PFPuppiCentralJet60MaxEta2p4+hlt3PFPuppiCentralJet45MaxEta2p4+hlt4PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT330MaxEta2p4+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p275Eta2p4TripleEta2p4+HLTEndSequence) +HLT_PFHT330PT30_QuadPFPuppiJet_75_60_45_40_TriplePFPuppiBTagDeepFlavour_2p4 = cms.Path(HLTBeginSequence+hltL1SeedsForQuadPuppiJetTripleBtagFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiCentralJetQuad30MaxEta2p4+hlt1PFPuppiCentralJet75MaxEta2p4+hlt2PFPuppiCentralJet60MaxEta2p4+hlt3PFPuppiCentralJet45MaxEta2p4+hlt4PFPuppiCentralJet40MaxEta2p4+hltHtMhtPFPuppiCentralJetsQuadC30MaxEta2p4+hltPFPuppiCentralJetsQuad30HT330MaxEta2p4+HLTBtagDeepFlavourSequencePFPuppiModEta2p4+hltBTagPFPuppiDeepFlavour0p275Eta2p4TripleEta2p4+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py index 57bc6cc84a231..e389a3bfaa69b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiHT1070_cfi.py @@ -2,7 +2,7 @@ from ..modules.hltPFPuppiHT_cfi import * from ..modules.hltPFPuppiHT1070_cfi import * -from ..modules.l1tPFPuppiHT450off_cfi import * +from ..modules.hltL1SeedsForPuppiHTFilter_cfi import * from ..sequences.hgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * @@ -13,4 +13,4 @@ from ..sequences.localrecoSequence_cfi import * from ..sequences.RawToDigiSequence_cfi import * -HLT_PFPuppiHT1070 = cms.Path(HLTBeginSequence+l1tPFPuppiHT450off+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiHT+hltPFPuppiHT1070+HLTEndSequence) +HLT_PFPuppiHT1070 = cms.Path(HLTBeginSequence+hltL1SeedsForPuppiHTFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+hltPFPuppiHT+hltPFPuppiHT1070+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py index ea1c88c677bbe..7c998d35370a7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_PFPuppiMETTypeOne140_PFPuppiMHT140_cfi.py @@ -5,7 +5,7 @@ from ..modules.hltPFPuppiMETTypeOneCorrector_cfi import * from ..modules.hltPFPuppiMHT_cfi import * from ..modules.hltPFPuppiMHT140_cfi import * -from ..modules.l1tPFPuppiMET220off_cfi import * +from ..modules.hltL1SeedsForPuppiMETFilter_cfi import * from ..sequences.hgcalLocalRecoSequence_cfi import * from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import * from ..sequences.HLTBeginSequence_cfi import * @@ -17,4 +17,4 @@ from ..sequences.localrecoSequence_cfi import * from ..sequences.RawToDigiSequence_cfi import * -HLT_PFPuppiMETTypeOne140_PFPuppiMHT140 = cms.Path(HLTBeginSequence+l1tPFPuppiMET220off+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+HLTPFPuppiMETReconstruction+hltPFPuppiMETTypeOneCorrector+hltPFPuppiMETTypeOne+hltPFPuppiMETTypeOne140+hltPFPuppiMHT+hltPFPuppiMHT140+HLTEndSequence) +HLT_PFPuppiMETTypeOne140_PFPuppiMHT140 = cms.Path(HLTBeginSequence+hltL1SeedsForPuppiMETFilter+RawToDigiSequence+hgcalLocalRecoSequence+localrecoSequence+HLTTrackingV61Sequence+HLTMuonsSequence+HLTParticleFlowSequence+HLTAK4PFPuppiJetsReconstruction+HLTPFPuppiMETReconstruction+hltPFPuppiMETTypeOneCorrector+hltPFPuppiMETTypeOne+hltPFPuppiMETTypeOne140+hltPFPuppiMHT+hltPFPuppiMHT140+HLTEndSequence) diff --git a/HLTrigger/Configuration/python/HLT_75e33_cff.py b/HLTrigger/Configuration/python/HLT_75e33_cff.py index 874dea9249710..743004903dda5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33_cff.py +++ b/HLTrigger/Configuration/python/HLT_75e33_cff.py @@ -341,20 +341,8 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/services/MessageLogger_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/services/ThroughputService_cfi") -fragment.load('L1Trigger.Configuration.GTemulator_cff') -fragment.l1tGTProducer.GMTTkMuons = cms.InputTag("l1tTkMuonsGmt") -#fragment.l1tGTProducer.CL2Jets = cms.InputTag("l1tSCPFL1PuppiCorrectedEmulator") -#fragment.l1tGTProducer.CL2HtSum = cms.InputTag("l1tSCPFL1PuppiCorrectedEmulatorMHT") -fragment.GTemulatorTask = cms.Task(fragment.l1tGTProducer, fragment.l1tGTAlgoBlockProducer) -fragment.GTemulation_step = cms.Path(cms.Sequence(fragment.GTemulatorTask)) -fragment.load('L1Trigger.Phase2L1GT.l1tGTMenu_cff') -from L1Trigger.Phase2L1GT.l1tGTAlgoBlockProducer_cff import collectAlgorithmPaths - fragment.schedule = cms.Schedule(*[ - fragment.GTemulation_step, - *collectAlgorithmPaths(fragment), - fragment.L1T_SinglePFPuppiJet230off, fragment.L1T_PFPuppiHT450off, fragment.L1T_PFPuppiMET220off, diff --git a/HLTrigger/Configuration/python/HLT_75e33_timing_cff.py b/HLTrigger/Configuration/python/HLT_75e33_timing_cff.py index 74062b9bca6f6..52b6f8ab90b19 100644 --- a/HLTrigger/Configuration/python/HLT_75e33_timing_cff.py +++ b/HLTrigger/Configuration/python/HLT_75e33_timing_cff.py @@ -329,20 +329,8 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/services/FastTimerService_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/services/ThroughputService_cfi") -fragment.load('L1Trigger.Configuration.GTemulator_cff') -fragment.l1tGTProducer.GMTTkMuons = cms.InputTag("l1tTkMuonsGmt") -#fragment.l1tGTProducer.CL2Jets = cms.InputTag("l1tSCPFL1PuppiCorrectedEmulator") -#fragment.l1tGTProducer.CL2HtSum = cms.InputTag("l1tSCPFL1PuppiCorrectedEmulatorMHT") -fragment.GTemulatorTask = cms.Task(fragment.l1tGTProducer, fragment.l1tGTAlgoBlockProducer) -fragment.GTemulation_step = cms.Path(cms.Sequence(fragment.GTemulatorTask)) -fragment.load('L1Trigger.Phase2L1GT.l1tGTMenu_cff') -from L1Trigger.Phase2L1GT.l1tGTAlgoBlockProducer_cff import collectAlgorithmPaths - fragment.schedule = cms.Schedule(*[ - fragment.GTemulation_step, - *collectAlgorithmPaths(fragment), - fragment.L1T_SinglePFPuppiJet230off, fragment.L1T_PFPuppiHT450off, fragment.L1T_PFPuppiMET220off, diff --git a/L1Trigger/Phase2L1GT/python/l1tGTMenu_hadr_metSeeds_cff.py b/L1Trigger/Phase2L1GT/python/l1tGTMenu_hadr_metSeeds_cff.py index a0b645aba3695..44323f03466b3 100644 --- a/L1Trigger/Phase2L1GT/python/l1tGTMenu_hadr_metSeeds_cff.py +++ b/L1Trigger/Phase2L1GT/python/l1tGTMenu_hadr_metSeeds_cff.py @@ -43,6 +43,26 @@ pPuppiMET200 = cms.Path(PuppiMET200) algorithms.append(cms.PSet(expression = cms.string("pPuppiMET200"))) +DoublePuppiJet112112 = l1tGTDoubleObjectCond.clone( + collection1 = cms.PSet( + tag = cms.InputTag("l1tGTProducer", "CL2Jets"), + minEta = cms.double(-2.4), + maxEta = cms.double(2.4), + regionsAbsEtaLowerBounds=cms.vdouble(0,1.5), + regionsMinPt=cms.vdouble(70,51) + ), + collection2 = cms.PSet( + tag = cms.InputTag("l1tGTProducer", "CL2Jets"), + minEta = cms.double(-2.4), + maxEta = cms.double(2.4), + regionsAbsEtaLowerBounds=cms.vdouble(0,1.5), + regionsMinPt=cms.vdouble(70,51) + ), + maxDEta = cms.double(1.6), +) +pDoublePuppiJet112_112 = cms.Path(DoublePuppiJet112112) +algorithms.append(cms.PSet(expression = cms.string("pDoublePuppiJet112_112"))) + QuadJet70554040 = l1tGTQuadObjectCond.clone( collection1 = cms.PSet( tag = cms.InputTag("l1tGTProducer", "CL2Jets"),