Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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')
)
Original file line number Diff line number Diff line change
@@ -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')
)
Original file line number Diff line number Diff line change
@@ -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')
)
Original file line number Diff line number Diff line change
@@ -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')
)
Original file line number Diff line number Diff line change
@@ -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')
)
Original file line number Diff line number Diff line change
@@ -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')
)
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Diphoton30_23_IsoCaloId_L1Seeded = cms.Path(
HLTBeginSequence +
hltPreDiphoton3023IsoCaloIdL1Seeded +
HLTDiphoton3023IsoCaloIdL1SeededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Diphoton30_23_IsoCaloId_Unseeded = cms.Path(
HLTBeginSequence +
hltPreDiphoton3023IsoCaloIdUnseeded +
HLTDiphoton3023IsoCaloIdUnseededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_DoubleEle23_12_Iso_L1Seeded = cms.Path(
HLTBeginSequence +
hltPreDoubleEle2312IsoL1Seeded +
HLTDoubleEle2312IsoL1SeededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_DoubleEle25_CaloIdL_PMS2_L1Seeded = cms.Path(
HLTBeginSequence +
hltPreDoubleEle25CaloIdLPMS2L1Seeded +
HLTDoubleEle25CaloIdLPMS2L1SeededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_DoubleEle25_CaloIdL_PMS2_Unseeded = cms.Path(
HLTBeginSequence +
hltPreDoubleEle25CaloIdLPMS2Unseeded +
HLTDoubleEle25CaloIdLPMS2UnseededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Ele115_NonIso_L1Seeded = cms.Path(
HLTBeginSequence +
hltPreEle115NonIsoL1Seeded +
HLTEle115NonIsoL1SeededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Ele26_WP70_L1Seeded = cms.Path(
HLTBeginSequence +
hltPreEle26WP70L1Seeded +
HLTEle26WP70L1SeededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Ele26_WP70_Unseeded = cms.Path(
HLTBeginSequence +
hltPreEle26WP70Unseeded +
HLTEle26WP70UnseededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Ele32_WPTight_L1Seeded = cms.Path(
HLTBeginSequence +
hltPreEle32WPTightL1Seeded +
HLTEle32WPTightL1SeededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Ele32_WPTight_Unseeded = cms.Path(
HLTBeginSequence +
hltPreEle32WPTightUnseeded +
HLTEle32WPTightUnseededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Photon108EB_TightID_TightIso_L1Seeded = cms.Path(
HLTBeginSequence +
hltPrePhoton108EBTightIDTightIsoL1Seeded +
HLTPhoton108EBTightIDTightIsoL1SeededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Photon108EB_TightID_TightIso_Unseeded = cms.Path(
HLTBeginSequence +
hltPrePhoton108EBTightIDTightIsoUnseeded +
HLTPhoton108EBTightIDTightIsoUnseededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Photon187_L1Seeded = cms.Path(
HLTBeginSequence +
hltPrePhoton187L1Seeded +
HLTPhoton187L1SeededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

HLT_Photon187_Unseeded = cms.Path(
HLTBeginSequence +
hltPrePhoton187Unseeded +
HLTPhoton187UnseededSequence +
HLTEndSequence
)
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
from ..tasks.HLTDoubleEle2312IsoL1SeededTask_cfi import *

HLTDoubleEle2312IsoL1SeededSequence = cms.Sequence(
HLTL1Sequence +
hltEGL1SeedsForDoubleEleIsolatedFilter +
HLTDoFullUnpackingEgammaEcalL1SeededSequence +
HLTPFClusteringForEgammaL1Seeded +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from ..tasks.HLTDoubleEle25CaloIdLPMS2L1SeededTask_cfi import *

HLTDoubleEle25CaloIdLPMS2L1SeededSequence = cms.Sequence(
HLTL1Sequence +
hltEGL1SeedsForDoubleEleNonIsolatedFilter +
HLTDoFullUnpackingEgammaEcalL1SeededSequence +
HLTPFClusteringForEgammaL1Seeded +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from ..tasks.HLTDoubleEle25CaloIdLPMS2UnseededTask_cfi import *

HLTDoubleEle25CaloIdLPMS2UnseededSequence = cms.Sequence(
HLTL1Sequence +
hltEGL1SeedsForDoubleEleNonIsolatedFilter +
HLTDoFullUnpackingEgammaEcalSequence +
HLTPFClusteringForEgammaUnseeded +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
from ..tasks.HLTEle26WP70L1SeededTask_cfi import *

HLTEle26WP70L1SeededSequence = cms.Sequence(
HLTL1Sequence +
hltEGL1SeedsForSingleEleIsolatedFilter +
HLTDoFullUnpackingEgammaEcalL1SeededSequence +
HLTPFClusteringForEgammaL1Seeded +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
from ..tasks.HLTEle5OpenL1SeededTask_cfi import *

HLTEle5OpenL1SeededSequence = cms.Sequence(
HLTL1Sequence +
HLTDoFullUnpackingEgammaEcalL1SeededSequence +
HLTPFClusteringForEgammaL1Seeded +
HLTHgcalTiclPFClusteringForEgammaL1Seeded +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
from ..tasks.HLTEle5OpenUnseededTask_cfi import *

HLTEle5OpenUnseededSequence = cms.Sequence(
HLTL1Sequence +
HLTDoFullUnpackingEgammaEcalL1SeededSequence +
HLTPFClusteringForEgammaUnseeded +
HLTHgcalTiclPFClusteringForEgammaUnseeded +
Expand Down
2 changes: 2 additions & 0 deletions HLTrigger/Configuration/python/HLT_75e33_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Comment on lines +240 to +241
Copy link
Contributor Author

@SohamBhattacharya SohamBhattacharya Jan 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if the HLT workflows will run with the recent change of the L1 collections.
To be enabled/removed if the workflows fail/run.

fragment.GTemulatorTask = cms.Task(fragment.l1tGTProducer, fragment.l1tGTAlgoBlockProducer)
fragment.GTemulation_step = cms.Path(cms.Sequence(fragment.GTemulatorTask))
fragment.load('L1Trigger.Phase2L1GT.l1tGTMenu_cff')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
Expand Down
Loading