diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigisL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigisL1Seeded_cfi.py index c4a08a8cd7b25..213654b8c7af9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigisL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hgcalDigisL1Seeded_cfi.py @@ -8,7 +8,7 @@ maxDeltaR = cms.double(0.35), maxEt = cms.double(999999.0), minEt = cms.double(5.0), - type = cms.string('L1EGamma') + type = cms.string('L1P2GTCandidate') )), inputCollTags = cms.VInputTag("hgcalDigis:EE", "hgcalDigis:HEback", "hgcalDigis:HEfront"), outputProductNames = cms.vstring( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoubleEleIsolatedFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoubleEleIsolatedFilter_cfi.py index 1ebe86973493e..4881f8d9dcc31 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoubleEleIsolatedFilter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoubleEleIsolatedFilter_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms hltEGL1SeedsForDoubleEleIsolatedFilter = cms.EDFilter("PathStatusFilter", - logicalExpression = cms.string('L1T_TkEm37TkEm24 or L1T_TkEle25TkEle12 or L1T_TkIsoEle22TkEm12') + logicalExpression = cms.string('pDoubleEGEle37_24 or pDoubleTkEle25_12 or pIsoTkEleEGEle22_12') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoubleEleNonIsolatedFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoubleEleNonIsolatedFilter_cfi.py index 4d96f1eb2e2fe..92b1d8621507c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoubleEleNonIsolatedFilter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoubleEleNonIsolatedFilter_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms hltEGL1SeedsForDoubleEleNonIsolatedFilter = cms.EDFilter("PathStatusFilter", - logicalExpression = cms.string('L1T_TkEm37TkEm24 or L1T_TkEle25TkEle12') + logicalExpression = cms.string('pDoubleEGEle37_24 or pDoubleTkEle25_12') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoublePhotonIsolatedFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoublePhotonIsolatedFilter_cfi.py index 3f812f1c559b2..24e1983dce91f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoublePhotonIsolatedFilter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForDoublePhotonIsolatedFilter_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms hltEGL1SeedsForDoublePhotonIsolatedFilter = cms.EDFilter("PathStatusFilter", - logicalExpression = cms.string('L1T_TkEm37TkEm24 or L1T_TkIsoEm22TkIsoEm12') + logicalExpression = cms.string('pDoubleEGEle37_24 or pDoubleIsoTkPho22_12') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSingleEleIsolatedFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSingleEleIsolatedFilter_cfi.py index 38bdd31bfd4da..29e5e858d3d85 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSingleEleIsolatedFilter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSingleEleIsolatedFilter_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms hltEGL1SeedsForSingleEleIsolatedFilter = cms.EDFilter("PathStatusFilter", - logicalExpression = cms.string('L1T_TkEm51 or L1T_TkEle36 or L1T_TkIsoEle28') + logicalExpression = cms.string('pSingleEGEle51 or pSingleTkEle36 or pSingleIsoTkEle28') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSingleEleNonIsolatedFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSingleEleNonIsolatedFilter_cfi.py index 3c3b04ed6d9a9..c6bf90bd33dc7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSingleEleNonIsolatedFilter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSingleEleNonIsolatedFilter_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms hltEGL1SeedsForSingleEleNonIsolatedFilter = cms.EDFilter("PathStatusFilter", - logicalExpression = cms.string('L1T_TkEm51 or L1T_TkEle36') + logicalExpression = cms.string('pSingleEGEle51 or pSingleTkEle36') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSinglePhotonIsolatedFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSinglePhotonIsolatedFilter_cfi.py index eec47da791c72..14d6b749b9eb5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSinglePhotonIsolatedFilter_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEGL1SeedsForSinglePhotonIsolatedFilter_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms hltEGL1SeedsForSinglePhotonIsolatedFilter = cms.EDFilter("PathStatusFilter", - logicalExpression = cms.string('L1T_TkEm51 or L1T_TkIsoEm36') + logicalExpression = cms.string('pSingleEGEle51 or pSingleIsoTkPho36') ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalBarrelDigisInRegions_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalBarrelDigisInRegions_cfi.py index 12514a5e47580..08df0b0450f27 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalBarrelDigisInRegions_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEcalBarrelDigisInRegions_cfi.py @@ -8,7 +8,7 @@ maxDeltaR = cms.double(0.35), maxEt = cms.double(999999.0), minEt = cms.double(5.0), - type = cms.string('L1EGamma') + type = cms.string('L1P2GTCandidate') )), inputCollTags = cms.VInputTag("hltEcalDigis:ebDigis"), outputProductNames = cms.vstring('ebDigis') diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaFilteredCollectionProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaFilteredCollectionProducer_cfi.py index d5e879d3ac051..a5cc508217c72 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaFilteredCollectionProducer_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaFilteredCollectionProducer_cfi.py @@ -2,11 +2,10 @@ hltL1TEGammaFilteredCollectionProducer = cms.EDProducer("L1TEGammaFilteredCollectionProducer", applyQual = cms.bool(True), - inputTag = cms.InputTag("l1tEGammaClusterEmuProducer"), + inputTag = cms.InputTag("l1tGTProducer", "CL2Photons"), maxBX = cms.int32(1), minBX = cms.int32(-1), minPt = cms.double(5.0), qualIsMask = cms.bool(True), - quality = cms.int32(2), - scalings = cms.vdouble(2.6604, 1.06077, 0.0) + quality = cms.int32(0b0010), ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaHGCFilteredCollectionProducer_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaHGCFilteredCollectionProducer_cfi.py index 484b51db4f30f..d28d31f37ec46 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaHGCFilteredCollectionProducer_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TEGammaHGCFilteredCollectionProducer_cfi.py @@ -2,11 +2,10 @@ hltL1TEGammaHGCFilteredCollectionProducer = cms.EDProducer("L1TEGammaFilteredCollectionProducer", applyQual = cms.bool(True), - inputTag = cms.InputTag("l1tLayer1EG","L1EgEE"), + inputTag = cms.InputTag("l1tGTProducer", "CL2Photons"), maxBX = cms.int32(1), minBX = cms.int32(-1), minPt = cms.double(5.0), qualIsMask = cms.bool(True), - quality = cms.int32(1), - scalings = cms.vdouble(3.17445, 1.13219, 0.0) + quality = cms.int32(0b0100), ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsECAL_cfi.py index 9ff50bee50832..1210cb300a5bc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsECAL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsECAL_cfi.py @@ -8,7 +8,7 @@ maxDeltaR = cms.double(0.35), maxEt = cms.double(999999.0), minEt = cms.double(5.0), - type = cms.string('L1EGamma') + type = cms.string('L1P2GTCandidate') )), inputCollTags = cms.VInputTag("hltEcalRecHitL1Seeded:EcalRecHitsEB", "hltEcalRecHitL1Seeded:EcalRecHitsEE"), outputProductNames = cms.vstring( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsHGCAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsHGCAL_cfi.py index 1f15aacfca796..797a80d231fe5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsHGCAL_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltRechitInRegionsHGCAL_cfi.py @@ -8,7 +8,7 @@ maxDeltaR = cms.double(0.35), maxEt = cms.double(999999.0), minEt = cms.double(5.0), - type = cms.string('L1EGamma') + type = cms.string('L1P2GTCandidate') )), inputCollTags = cms.VInputTag("HGCalRecHitL1Seeded:HGCEERecHits", "HGCalRecHitL1Seeded:HGCHEBRecHits", "HGCalRecHitL1Seeded:HGCHEFRecHits"), outputProductNames = cms.vstring( diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py index d957d8b780ba5..d2677552f976f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/ticlSeedingL1_cfi.py @@ -3,12 +3,11 @@ ticlSeedingL1 = cms.EDProducer("TICLSeedingRegionProducer", seedingPSet = cms.PSet( algo_verbosity = cms.int32(0), - endcapScalings = cms.vdouble(3.17445, 1.13219, 0.0), - l1TkEmColl = cms.InputTag("l1tLayer1EG","L1TkEmEE"), + l1GTCandColl = cms.InputTag("l1tGTProducer", "CL2Photons"), maxAbsEta = cms.double(4.0), minAbsEta = cms.double(1.3), minPt = cms.double(5.0), - quality = cms.int32(4), + quality = cms.int32(0b0100), qualityIsMask = cms.bool(True), applyQuality = cms.bool(True), type = cms.string('SeedingRegionByL1') diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_L1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_L1Seeded_cfi.py index c560d07368eed..404fc49f9db52 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_L1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_L1Seeded_cfi.py @@ -7,7 +7,6 @@ HLT_Diphoton30_23_IsoCaloId_L1Seeded = cms.Path( HLTBeginSequence + - hltPreDiphoton3023IsoCaloIdL1Seeded + HLTDiphoton3023IsoCaloIdL1SeededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_Unseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_Unseeded_cfi.py index 98177607a5317..2c0e74098f74b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_Unseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_Unseeded_cfi.py @@ -7,7 +7,6 @@ HLT_Diphoton30_23_IsoCaloId_Unseeded = cms.Path( HLTBeginSequence + - hltPreDiphoton3023IsoCaloIdUnseeded + HLTDiphoton3023IsoCaloIdUnseededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle23_12_Iso_L1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle23_12_Iso_L1Seeded_cfi.py index 62945514973e4..47046f6d66c60 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle23_12_Iso_L1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle23_12_Iso_L1Seeded_cfi.py @@ -7,7 +7,6 @@ HLT_DoubleEle23_12_Iso_L1Seeded = cms.Path( HLTBeginSequence + - hltPreDoubleEle2312IsoL1Seeded + HLTDoubleEle2312IsoL1SeededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle25_CaloIdL_PMS2_L1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle25_CaloIdL_PMS2_L1Seeded_cfi.py index 0daee2678d607..3fb7a05ea48dc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle25_CaloIdL_PMS2_L1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle25_CaloIdL_PMS2_L1Seeded_cfi.py @@ -7,7 +7,6 @@ HLT_DoubleEle25_CaloIdL_PMS2_L1Seeded = cms.Path( HLTBeginSequence + - hltPreDoubleEle25CaloIdLPMS2L1Seeded + HLTDoubleEle25CaloIdLPMS2L1SeededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle25_CaloIdL_PMS2_Unseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle25_CaloIdL_PMS2_Unseeded_cfi.py index 0b3b77c11af05..151c07eb0294e 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle25_CaloIdL_PMS2_Unseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_DoubleEle25_CaloIdL_PMS2_Unseeded_cfi.py @@ -7,7 +7,6 @@ HLT_DoubleEle25_CaloIdL_PMS2_Unseeded = cms.Path( HLTBeginSequence + - hltPreDoubleEle25CaloIdLPMS2Unseeded + HLTDoubleEle25CaloIdLPMS2UnseededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele115_NonIso_L1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele115_NonIso_L1Seeded_cfi.py index 19fcb9038875e..4e08a0cebc95c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele115_NonIso_L1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele115_NonIso_L1Seeded_cfi.py @@ -7,7 +7,6 @@ HLT_Ele115_NonIso_L1Seeded = cms.Path( HLTBeginSequence + - hltPreEle115NonIsoL1Seeded + HLTEle115NonIsoL1SeededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele26_WP70_L1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele26_WP70_L1Seeded_cfi.py index fb0561cff2baa..d62ae757cb975 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele26_WP70_L1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele26_WP70_L1Seeded_cfi.py @@ -7,7 +7,6 @@ HLT_Ele26_WP70_L1Seeded = cms.Path( HLTBeginSequence + - hltPreEle26WP70L1Seeded + HLTEle26WP70L1SeededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele26_WP70_Unseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele26_WP70_Unseeded_cfi.py index 79489d9929339..632ef89e33fa2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele26_WP70_Unseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele26_WP70_Unseeded_cfi.py @@ -7,7 +7,6 @@ HLT_Ele26_WP70_Unseeded = cms.Path( HLTBeginSequence + - hltPreEle26WP70Unseeded + HLTEle26WP70UnseededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele32_WPTight_L1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele32_WPTight_L1Seeded_cfi.py index f4f6a1a015509..11ba87c693f32 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele32_WPTight_L1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele32_WPTight_L1Seeded_cfi.py @@ -7,7 +7,6 @@ HLT_Ele32_WPTight_L1Seeded = cms.Path( HLTBeginSequence + - hltPreEle32WPTightL1Seeded + HLTEle32WPTightL1SeededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele32_WPTight_Unseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele32_WPTight_Unseeded_cfi.py index 0fd928ad387a0..11abc9d782d5d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele32_WPTight_Unseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Ele32_WPTight_Unseeded_cfi.py @@ -7,7 +7,6 @@ HLT_Ele32_WPTight_Unseeded = cms.Path( HLTBeginSequence + - hltPreEle32WPTightUnseeded + HLTEle32WPTightUnseededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon108EB_TightID_TightIso_L1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon108EB_TightID_TightIso_L1Seeded_cfi.py index da2824fa0923d..a6e5a036debcc 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon108EB_TightID_TightIso_L1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon108EB_TightID_TightIso_L1Seeded_cfi.py @@ -7,7 +7,6 @@ HLT_Photon108EB_TightID_TightIso_L1Seeded = cms.Path( HLTBeginSequence + - hltPrePhoton108EBTightIDTightIsoL1Seeded + HLTPhoton108EBTightIDTightIsoL1SeededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon108EB_TightID_TightIso_Unseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon108EB_TightID_TightIso_Unseeded_cfi.py index d93e2c727bf6f..8bf14dcec5a3a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon108EB_TightID_TightIso_Unseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon108EB_TightID_TightIso_Unseeded_cfi.py @@ -7,7 +7,6 @@ HLT_Photon108EB_TightID_TightIso_Unseeded = cms.Path( HLTBeginSequence + - hltPrePhoton108EBTightIDTightIsoUnseeded + HLTPhoton108EBTightIDTightIsoUnseededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon187_L1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon187_L1Seeded_cfi.py index 04967f475a91f..64d95a14a00b6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon187_L1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon187_L1Seeded_cfi.py @@ -7,7 +7,6 @@ HLT_Photon187_L1Seeded = cms.Path( HLTBeginSequence + - hltPrePhoton187L1Seeded + HLTPhoton187L1SeededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon187_Unseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon187_Unseeded_cfi.py index 0f5fc620ad619..336d0f9930077 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon187_Unseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_Photon187_Unseeded_cfi.py @@ -7,7 +7,6 @@ HLT_Photon187_Unseeded = cms.Path( HLTBeginSequence + - hltPrePhoton187Unseeded + HLTPhoton187UnseededSequence + HLTEndSequence ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle2312IsoL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle2312IsoL1SeededSequence_cfi.py index 32697bc1d9838..2ad56b1f60231 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle2312IsoL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle2312IsoL1SeededSequence_cfi.py @@ -34,7 +34,6 @@ from ..tasks.HLTDoubleEle2312IsoL1SeededTask_cfi import * HLTDoubleEle2312IsoL1SeededSequence = cms.Sequence( - HLTL1Sequence + hltEGL1SeedsForDoubleEleIsolatedFilter + HLTDoFullUnpackingEgammaEcalL1SeededSequence + HLTPFClusteringForEgammaL1Seeded + diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2L1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2L1SeededSequence_cfi.py index 7b290e80a6ecc..f71e10da8268f 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2L1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2L1SeededSequence_cfi.py @@ -19,7 +19,6 @@ from ..tasks.HLTDoubleEle25CaloIdLPMS2L1SeededTask_cfi import * HLTDoubleEle25CaloIdLPMS2L1SeededSequence = cms.Sequence( - HLTL1Sequence + hltEGL1SeedsForDoubleEleNonIsolatedFilter + HLTDoFullUnpackingEgammaEcalL1SeededSequence + HLTPFClusteringForEgammaL1Seeded + diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededSequence_cfi.py index bcb9a06877aec..7f4d5afa1755a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTDoubleEle25CaloIdLPMS2UnseededSequence_cfi.py @@ -19,7 +19,6 @@ from ..tasks.HLTDoubleEle25CaloIdLPMS2UnseededTask_cfi import * HLTDoubleEle25CaloIdLPMS2UnseededSequence = cms.Sequence( - HLTL1Sequence + hltEGL1SeedsForDoubleEleNonIsolatedFilter + HLTDoFullUnpackingEgammaEcalSequence + HLTPFClusteringForEgammaUnseeded + diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70L1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70L1SeededSequence_cfi.py index 1deacc420d9cd..060f75311d81a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70L1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle26WP70L1SeededSequence_cfi.py @@ -33,7 +33,6 @@ from ..tasks.HLTEle26WP70L1SeededTask_cfi import * HLTEle26WP70L1SeededSequence = cms.Sequence( - HLTL1Sequence + hltEGL1SeedsForSingleEleIsolatedFilter + HLTDoFullUnpackingEgammaEcalL1SeededSequence + HLTPFClusteringForEgammaL1Seeded + diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenL1SeededSequence_cfi.py index e74346ad23128..a87047ec51c85 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenL1SeededSequence_cfi.py @@ -33,7 +33,6 @@ from ..tasks.HLTEle5OpenL1SeededTask_cfi import * HLTEle5OpenL1SeededSequence = cms.Sequence( - HLTL1Sequence + HLTDoFullUnpackingEgammaEcalL1SeededSequence + HLTPFClusteringForEgammaL1Seeded + HLTHgcalTiclPFClusteringForEgammaL1Seeded + diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenUnseededSequence_cfi.py index 739464122804c..4ae313f253089 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenUnseededSequence_cfi.py @@ -33,7 +33,6 @@ from ..tasks.HLTEle5OpenUnseededTask_cfi import * HLTEle5OpenUnseededSequence = cms.Sequence( - HLTL1Sequence + HLTDoFullUnpackingEgammaEcalL1SeededSequence + HLTPFClusteringForEgammaUnseeded + HLTHgcalTiclPFClusteringForEgammaUnseeded + diff --git a/HLTrigger/Configuration/python/HLT_75e33_cff.py b/HLTrigger/Configuration/python/HLT_75e33_cff.py index 23f2d5afbfe3b..d1236eec484e3 100644 --- a/HLTrigger/Configuration/python/HLT_75e33_cff.py +++ b/HLTrigger/Configuration/python/HLT_75e33_cff.py @@ -237,6 +237,8 @@ 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') diff --git a/RecoEgamma/EgammaHLTProducers/plugins/HLTCaloObjInRegionsProducer.cc b/RecoEgamma/EgammaHLTProducers/plugins/HLTCaloObjInRegionsProducer.cc index 0de37f35003c4..2ff2218c99f10 100644 --- a/RecoEgamma/EgammaHLTProducers/plugins/HLTCaloObjInRegionsProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/plugins/HLTCaloObjInRegionsProducer.cc @@ -15,6 +15,7 @@ #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h" #include "DataFormats/RecoCandidate/interface/RecoEcalCandidateFwd.h" #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" +#include "DataFormats/L1Trigger/interface/P2GTCandidate.h" #include "DataFormats/EgammaCandidates/interface/Electron.h" #include "DataFormats/EgammaCandidates/interface/ElectronFwd.h" #include "DataFormats/HcalDetId/interface/HcalSubdetector.h" @@ -263,7 +264,9 @@ bool HLTCaloObjInRegionsProducer::validIDForGeom(c template EtaPhiRegionDataBase* HLTCaloObjInRegionsProducer::createEtaPhiRegionData( const std::string& type, const edm::ParameterSet& para, edm::ConsumesCollector&& consumesColl) { - if (type == "L1EGamma") { + if (type == "L1P2GTCandidate") { + return new EtaPhiRegionData(para, consumesColl); + } else if (type == "L1EGamma") { return new EtaPhiRegionData(para, consumesColl); } else if (type == "L1Jet") { return new EtaPhiRegionData(para, consumesColl); diff --git a/RecoEgamma/EgammaHLTProducers/plugins/L1TEGammaFilteredCollectionProducer.cc b/RecoEgamma/EgammaHLTProducers/plugins/L1TEGammaFilteredCollectionProducer.cc index b634ea3d4391e..2bc64cd8e61c4 100644 --- a/RecoEgamma/EgammaHLTProducers/plugins/L1TEGammaFilteredCollectionProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/plugins/L1TEGammaFilteredCollectionProducer.cc @@ -11,18 +11,19 @@ The most generic L1 e/g phase-2 collections are: TkEm, which is std::vector & - StaEG, which is BXVector + StaEG, which is l1t::P2GTCandidateCollection Despite this technical difference, the objects are almost identical, for all practical purposes. So any of these two collections could have been used. - Currently, BXVector is recognised by the next step + Currently, l1t::P2GTCandidateCollection is recognised by the next step HLTEcalRecHitInAllL1RegionsProducer, while std::vector is not. So - using BXVector is straightforward. If for some reason one need to + using l1t::P2GTCandidateCollection is straightforward. If for some reason one need to use std::vector, changes in HLTEcalRecHitInAllL1RegionsProducer would also be necesary. */ #include "DataFormats/L1TCorrelator/interface/TkEm.h" +#include "DataFormats/L1Trigger/interface/P2GTCandidate.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -44,28 +45,26 @@ class L1TEGammaFilteredCollectionProducer : public edm::global::EDProducer<> { private: edm::InputTag l1EgTag_; - edm::EDGetTokenT> l1EgToken_; + edm::EDGetTokenT l1EgToken_; int quality_; bool qualIsMask_; bool applyQual_; int minBX_; int maxBX_; double minPt_; - std::vector scalings_; // pT scaling factors - double getOfflineEt(double et) const; }; L1TEGammaFilteredCollectionProducer::L1TEGammaFilteredCollectionProducer(const edm::ParameterSet& iConfig) - : l1EgTag_(iConfig.getParameter("inputTag")), l1EgToken_(consumes>(l1EgTag_)) { + : l1EgTag_(iConfig.getParameter("inputTag")), + l1EgToken_(consumes(l1EgTag_)) { quality_ = iConfig.getParameter("quality"); qualIsMask_ = iConfig.getParameter("qualIsMask"); applyQual_ = iConfig.getParameter("applyQual"); minBX_ = iConfig.getParameter("minBX"); maxBX_ = iConfig.getParameter("maxBX"); minPt_ = iConfig.getParameter("minPt"); - scalings_ = iConfig.getParameter>("scalings"); - produces>(); + produces(); } L1TEGammaFilteredCollectionProducer::~L1TEGammaFilteredCollectionProducer() = default; @@ -79,43 +78,32 @@ void L1TEGammaFilteredCollectionProducer::fillDescriptions(edm::ConfigurationDes desc.add("minBX", -1); desc.add("maxBX", 1); desc.add("minPt", 5.0); - desc.add>("scalings", {2.6604, 1.06077, 0.0}); descriptions.add("L1TEGammaFilteredCollectionProducer", desc); } void L1TEGammaFilteredCollectionProducer::produce(edm::StreamID sid, edm::Event& iEvent, const edm::EventSetup& iSetup) const { - auto outEgs = std::make_unique>(); + auto outEgs = std::make_unique(); auto l1Egs = iEvent.getHandle(l1EgToken_); - int startBX = std::max((*l1Egs).getFirstBX(), minBX_); - int endBX = std::min((*l1Egs).getLastBX(), maxBX_); - - for (int bx = startBX; bx <= endBX; bx++) { - // Loop over all L1 e/gamma objects - for (BXVector::const_iterator iEg = (*l1Egs).begin(bx); iEg != (*l1Egs).end(bx); iEg++) { - double offlineEt = this->getOfflineEt((*iEg).pt()); - bool passQuality(false); - if (applyQual_) { - if (qualIsMask_) - passQuality = ((*iEg).hwQual() & quality_); - else - passQuality = ((*iEg).hwQual() == quality_); - } else - passQuality = true; - - // if quality is passed, put the object in filtered collection - if (passQuality && (offlineEt > minPt_)) { - outEgs->push_back(bx, *iEg); - } - } // l1EG loop ends - } // BX loop ends + for (l1t::P2GTCandidateCollection::const_iterator iEg = (*l1Egs).begin(); iEg != (*l1Egs).end(); iEg++) { + double offlineEt = (*iEg).pt(); + bool passQuality(false); + if (applyQual_) { + if (qualIsMask_) + passQuality = ((*iEg).hwQual() & quality_); + else + passQuality = ((*iEg).hwQual() == quality_); + } else + passQuality = true; + + // if quality is passed, put the object in filtered collection + if (passQuality && (offlineEt > minPt_)) { + outEgs->push_back(*iEg); + } + } // l1EG loop ends iEvent.put(std::move(outEgs)); } -double L1TEGammaFilteredCollectionProducer::getOfflineEt(double et) const { - return (scalings_.at(0) + et * scalings_.at(1) + et * et * scalings_.at(2)); -} - DEFINE_FWK_MODULE(L1TEGammaFilteredCollectionProducer); diff --git a/RecoHGCal/TICL/plugins/SeedingRegionByL1.cc b/RecoHGCal/TICL/plugins/SeedingRegionByL1.cc index b70549609b605..b3b2f4a766a8d 100644 --- a/RecoHGCal/TICL/plugins/SeedingRegionByL1.cc +++ b/RecoHGCal/TICL/plugins/SeedingRegionByL1.cc @@ -18,12 +18,11 @@ ticl::SeedingRegionByL1::SeedingRegionByL1(const edm::ParameterSet &conf, edm::ConsumesCollector &sumes) : SeedingRegionAlgoBase(conf, sumes), - l1TkEmsToken_(sumes.consumes>(conf.getParameter("l1TkEmColl"))), + l1GTCandsToken_(sumes.consumes(conf.getParameter("l1GTCandColl"))), algoVerbosity_(conf.getParameter("algo_verbosity")), minPt_(conf.getParameter("minPt")), minAbsEta_(conf.getParameter("minAbsEta")), maxAbsEta_(conf.getParameter("maxAbsEta")), - endcapScalings_(conf.getParameter>("endcapScalings")), quality_(conf.getParameter("quality")), qualityIsMask_(conf.getParameter("qualityIsMask")), applyQuality_(conf.getParameter("applyQuality")) {} @@ -31,35 +30,35 @@ ticl::SeedingRegionByL1::SeedingRegionByL1(const edm::ParameterSet &conf, edm::C void ticl::SeedingRegionByL1::makeRegions(const edm::Event &ev, const edm::EventSetup &es, std::vector &result) { - auto l1TrkEms = ev.getHandle(l1TkEmsToken_); - edm::ProductID l1tkemsId = l1TrkEms.id(); + auto l1GTCands = ev.getHandle(l1GTCandsToken_); + edm::ProductID l1gtcandsId = l1GTCands.id(); - for (size_t indx = 0; indx < (*l1TrkEms).size(); indx++) { - const auto &l1TrkEm = (*l1TrkEms)[indx]; - double offlinePt = this->tkEmOfflineEt(l1TrkEm.pt()); + for (size_t indx = 0; indx < (*l1GTCands).size(); indx++) { + const auto &l1GTCand = (*l1GTCands)[indx]; + double offlinePt = l1GTCand.pt(); bool passQuality(false); if (applyQuality_) { if (qualityIsMask_) { - passQuality = (l1TrkEm.hwQual() & quality_); + passQuality = (l1GTCand.hwQual() & quality_); } else { - passQuality = (l1TrkEm.hwQual() == quality_); + passQuality = (l1GTCand.hwQual() == quality_); } } else { passQuality = true; } - if ((offlinePt < minPt_) || (std::abs(l1TrkEm.eta()) < minAbsEta_) || (std::abs(l1TrkEm.eta()) > maxAbsEta_) || + if ((offlinePt < minPt_) || (std::abs(l1GTCand.eta()) < minAbsEta_) || (std::abs(l1GTCand.eta()) > maxAbsEta_) || !passQuality) { continue; } - int iSide = int(l1TrkEm.eta() > 0); - result.emplace_back(GlobalPoint(l1TrkEm.p4().X(), l1TrkEm.p4().Y(), l1TrkEm.p4().Z()), - GlobalVector(l1TrkEm.px(), l1TrkEm.py(), l1TrkEm.pz()), + int iSide = int(l1GTCand.eta() > 0); + result.emplace_back(GlobalPoint(l1GTCand.p4().X(), l1GTCand.p4().Y(), l1GTCand.p4().Z()), + GlobalVector(l1GTCand.px(), l1GTCand.py(), l1GTCand.pz()), iSide, indx, - l1tkemsId); + l1gtcandsId); } std::sort(result.begin(), result.end(), [](const TICLSeedingRegion &a, const TICLSeedingRegion &b) { @@ -67,16 +66,11 @@ void ticl::SeedingRegionByL1::makeRegions(const edm::Event &ev, }); } -double ticl::SeedingRegionByL1::tkEmOfflineEt(double et) const { - return (endcapScalings_.at(0) + et * endcapScalings_.at(1) + et * et * endcapScalings_.at(2)); -} - void ticl::SeedingRegionByL1::fillPSetDescription(edm::ParameterSetDescription &desc) { - desc.add("l1TkEmColl", edm::InputTag("L1TkPhotonsHGC", "EG")); + desc.add("l1GTCandColl", edm::InputTag("L1TkPhotonsHGC", "EG")); desc.add("minPt", 10); desc.add("minAbsEta", 1.479); desc.add("maxAbsEta", 4.0); - desc.add>("endcapScalings", {3.17445, 1.13219, 0.0}); desc.add("quality", 5); desc.add("qualityIsMask", false); desc.add("applyQuality", false); diff --git a/RecoHGCal/TICL/plugins/SeedingRegionByL1.h b/RecoHGCal/TICL/plugins/SeedingRegionByL1.h index a517623a75556..ed8522849aff9 100644 --- a/RecoHGCal/TICL/plugins/SeedingRegionByL1.h +++ b/RecoHGCal/TICL/plugins/SeedingRegionByL1.h @@ -7,6 +7,7 @@ #include "DataFormats/L1TCorrelator/interface/TkEm.h" #include "DataFormats/L1TCorrelator/interface/TkEmFwd.h" +#include "DataFormats/L1Trigger/interface/P2GTCandidate.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" @@ -28,17 +29,14 @@ namespace ticl { static void fillPSetDescription(edm::ParameterSetDescription& desc); private: - edm::EDGetTokenT> l1TkEmsToken_; + edm::EDGetTokenT l1GTCandsToken_; int algoVerbosity_ = 0; - double minPt_; // minimum pT of L1 TkEm objects - double minAbsEta_; // minimum |eta| of L1 TkEm objects - double maxAbsEta_; // maximum |eta| of L1 TkEm objects - std::vector endcapScalings_; // pT scaling factors for endcap - int quality_; // hwQual - bool qualityIsMask_; // is hwQual to be applied as a mask - bool applyQuality_; // whether to apply quality - - double tkEmOfflineEt(double et) const; + double minPt_; // minimum pT of L1 TkEm objects + double minAbsEta_; // minimum |eta| of L1 TkEm objects + double maxAbsEta_; // maximum |eta| of L1 TkEm objects + int quality_; // hwQual + bool qualityIsMask_; // is hwQual to be applied as a mask + bool applyQuality_; // whether to apply quality }; } // namespace ticl #endif