Merge pull request #43809 from SohamBhattacharya/test-egamma_P2-L1-GT…

…-emulator_14_0_0_X

[14_1_X] [Phase-2] Change Phase-2 HLT Egamma paths to use the GT emulator

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(

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')
 )

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')
 )

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')
 )

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')
 )

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')
 )

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')
 )

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')

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),
 )

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),
 )

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(

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(

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')

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
 )

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
 )

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
 )

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
 )

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
 )

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
 )

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
 )

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
 )

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
 )

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
 )

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
 )

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
 )

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

@@ -7,7 +7,6 @@
 
 HLT_Photon187_L1Seeded = cms.Path(
     HLTBeginSequence +
-    hltPrePhoton187L1Seeded +
     HLTPhoton187L1SeededSequence +
     HLTEndSequence
 )

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

@@ -7,7 +7,6 @@
 
 HLT_Photon187_Unseeded = cms.Path(
     HLTBeginSequence +
-    hltPrePhoton187Unseeded +
     HLTPhoton187UnseededSequence +
     HLTEndSequence
 )

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 +

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 +

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 +

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 +

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 +

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 +

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')

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<CaloObjType, CaloObjCollType>::validIDForGeom(c
 template <typename CaloObjType, typename CaloObjCollType>
 EtaPhiRegionDataBase* HLTCaloObjInRegionsProducer<CaloObjType, CaloObjCollType>::createEtaPhiRegionData(
     const std::string& type, const edm::ParameterSet& para, edm::ConsumesCollector&& consumesColl) {
-  if (type == "L1EGamma") {
+  if (type == "L1P2GTCandidate") {
+    return new EtaPhiRegionData<l1t::P2GTCandidateCollection>(para, consumesColl);
+  } else if (type == "L1EGamma") {
     return new EtaPhiRegionData<l1t::EGammaBxCollection>(para, consumesColl);
   } else if (type == "L1Jet") {
     return new EtaPhiRegionData<l1t::JetBxCollection>(para, consumesColl);