Skip to content

Commit 9038a30

Browse files
authored
Merge pull request #47506 from mmusich/mm_dev_ph2_menu_refactor_HLTL1Sequence
Phase-2 HLT menu: refactor `HLTL1Sequence`
2 parents e890291 + 0e05435 commit 9038a30

17 files changed

+68
-85
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
from ..modules.hltTriggerType_cfi import *
44
from ..sequences.HLTBeamSpotSequence_cfi import *
5+
from ..sequences.HLTL1Sequence_cfi import *
56

6-
HLTBeginSequence = cms.Sequence(hltTriggerType+HLTBeamSpotSequence)
7+
HLTBeginSequence = cms.Sequence(hltTriggerType+HLTL1Sequence+HLTBeamSpotSequence)

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424
from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import *
2525
from ..sequences.HLTFastJetForEgammaSequence_cfi import *
2626
from ..sequences.HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi import *
27-
from ..sequences.HLTL1Sequence_cfi import *
2827
from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
2928
from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import *
3029

31-
HLTDiphoton3023IsoCaloIdL1SeededSequence = cms.Sequence(HLTL1Sequence
32-
+hltEGL1SeedsForDoublePhotonIsolatedFilter
30+
HLTDiphoton3023IsoCaloIdL1SeededSequence = cms.Sequence(hltEGL1SeedsForDoublePhotonIsolatedFilter
3331
+HLTDoFullUnpackingEgammaEcalL1SeededSequence
3432
+HLTPFClusteringForEgammaL1SeededSequence
3533
+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence
@@ -52,5 +50,5 @@
5250
+hltEgammaHGCalLayerClusterIsoL1Seeded
5351
+hltDiEG3023IsoCaloIdHgcalIsoL1SeededFilter
5452
+HLTPFHcalClusteringForEgammaSequence
55-
+hltEgammaHcalPFClusterIsoL1Seeded
53+
+hltEgammaHcalPFClusterIsoL1Seeded
5654
+hltDiEG3023IsoCaloIdHcalIsoL1SeededFilter)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@
2424
from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import *
2525
from ..sequences.HLTFastJetForEgammaSequence_cfi import *
2626
from ..sequences.HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi import *
27-
from ..sequences.HLTL1Sequence_cfi import *
2827
from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import *
2928
from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import *
3029

3130

32-
HLTDiphoton3023IsoCaloIdUnseededSequence = cms.Sequence(HLTL1Sequence
33-
+hltEGL1SeedsForDoublePhotonIsolatedFilter
31+
HLTDiphoton3023IsoCaloIdUnseededSequence = cms.Sequence(hltEGL1SeedsForDoublePhotonIsolatedFilter
3432
+HLTDoFullUnpackingEgammaEcalSequence
3533
+HLTPFClusteringForEgammaUnseededSequence
3634
+HLTHgcalTiclPFClusteringForEgammaUnseededSequence

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

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from ..sequences.HLTFastJetForEgammaSequence_cfi import *
77
from ..sequences.HLTGsfElectronL1SeededSequence_cfi import *
88
from ..sequences.HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi import *
9-
from ..sequences.HLTL1Sequence_cfi import *
109
from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
1110
from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import *
1211
from ..sequences.HLTTrackingSequence_cfi import *
@@ -43,44 +42,43 @@
4342
from ..modules.hltEgammaHoverEL1Seeded_cfi import *
4443

4544

46-
HLTDoubleEle2312IsoL1SeededSequence = cms.Sequence(HLTL1Sequence
47-
+hltEGL1SeedsForDoubleEleIsolatedFilter
48-
+HLTDoFullUnpackingEgammaEcalL1SeededSequence
49-
+HLTPFClusteringForEgammaL1SeededSequence
50-
+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence
51-
+hltEgammaCandidatesL1Seeded
52-
+hltEgammaCandidatesWrapperL1Seeded
53-
+hltEG23EtL1SeededFilter
54-
+hltDiEG12EtL1SeededFilter
55-
+hltEgammaClusterShapeL1Seeded
56-
+hltDiEG2312IsoClusterShapeL1SeededFilter
57-
+hltEgammaHGCALIDVarsL1Seeded
58-
+hltDiEG2312IsoClusterShapeSigmavvL1SeededFilter
59-
+hltDiEG2312IsoClusterShapeSigmawwL1SeededFilter
60-
+hltDiEG2312IsoHgcalHEL1SeededFilter
61-
+HLTEGammaDoLocalHcalSequence
62-
+HLTFastJetForEgammaSequence
63-
+hltEgammaHoverEL1Seeded
64-
+hltDiEG2312IsoHEL1SeededFilter
65-
+hltEgammaEcalPFClusterIsoL1Seeded
66-
+hltDiEG2312IsoEcalIsoL1SeededFilter
67-
+hltEgammaHGCalLayerClusterIsoL1Seeded
68-
+hltDiEG2312IsoHgcalIsoL1SeededFilter
69-
+HLTPFHcalClusteringForEgammaSequence
70-
+hltEgammaHcalPFClusterIsoL1Seeded
71-
+hltDiEG2312IsoHcalIsoL1SeededFilter
72-
+HLTElePixelMatchL1SeededSequence
73-
+hltDiEle2312IsoPixelMatchL1SeededFilter
74-
+hltDiEle2312IsoPMS2L1SeededFilter
75-
+HLTGsfElectronL1SeededSequence
76-
+hltDiEle2312IsoGsfOneOEMinusOneOPL1SeededFilter
77-
+hltDiEle2312IsoGsfDetaL1SeededFilter
78-
+hltDiEle2312IsoGsfDphiL1SeededFilter
79-
+hltDiEle2312IsoBestGsfNLayerITL1SeededFilter
80-
+hltDiEle2312IsoBestGsfChi2L1SeededFilter
81-
+hltEgammaEleL1TrkIsoL1Seeded
82-
+hltDiEle2312IsoGsfTrackIsoFromL1TracksL1SeededFilter
83-
+HLTTrackingSequence
84-
+hltEgammaEleGsfTrackIsoL1Seeded
85-
+hltDiEle2312IsoGsfTrackIsoL1SeededFilter
86-
)
45+
HLTDoubleEle2312IsoL1SeededSequence = cms.Sequence(hltEGL1SeedsForDoubleEleIsolatedFilter
46+
+HLTDoFullUnpackingEgammaEcalL1SeededSequence
47+
+HLTPFClusteringForEgammaL1SeededSequence
48+
+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence
49+
+hltEgammaCandidatesL1Seeded
50+
+hltEgammaCandidatesWrapperL1Seeded
51+
+hltEG23EtL1SeededFilter
52+
+hltDiEG12EtL1SeededFilter
53+
+hltEgammaClusterShapeL1Seeded
54+
+hltDiEG2312IsoClusterShapeL1SeededFilter
55+
+hltEgammaHGCALIDVarsL1Seeded
56+
+hltDiEG2312IsoClusterShapeSigmavvL1SeededFilter
57+
+hltDiEG2312IsoClusterShapeSigmawwL1SeededFilter
58+
+hltDiEG2312IsoHgcalHEL1SeededFilter
59+
+HLTEGammaDoLocalHcalSequence
60+
+HLTFastJetForEgammaSequence
61+
+hltEgammaHoverEL1Seeded
62+
+hltDiEG2312IsoHEL1SeededFilter
63+
+hltEgammaEcalPFClusterIsoL1Seeded
64+
+hltDiEG2312IsoEcalIsoL1SeededFilter
65+
+hltEgammaHGCalLayerClusterIsoL1Seeded
66+
+hltDiEG2312IsoHgcalIsoL1SeededFilter
67+
+HLTPFHcalClusteringForEgammaSequence
68+
+hltEgammaHcalPFClusterIsoL1Seeded
69+
+hltDiEG2312IsoHcalIsoL1SeededFilter
70+
+HLTElePixelMatchL1SeededSequence
71+
+hltDiEle2312IsoPixelMatchL1SeededFilter
72+
+hltDiEle2312IsoPMS2L1SeededFilter
73+
+HLTGsfElectronL1SeededSequence
74+
+hltDiEle2312IsoGsfOneOEMinusOneOPL1SeededFilter
75+
+hltDiEle2312IsoGsfDetaL1SeededFilter
76+
+hltDiEle2312IsoGsfDphiL1SeededFilter
77+
+hltDiEle2312IsoBestGsfNLayerITL1SeededFilter
78+
+hltDiEle2312IsoBestGsfChi2L1SeededFilter
79+
+hltEgammaEleL1TrkIsoL1Seeded
80+
+hltDiEle2312IsoGsfTrackIsoFromL1TracksL1SeededFilter
81+
+HLTTrackingSequence
82+
+hltEgammaEleGsfTrackIsoL1Seeded
83+
+hltDiEle2312IsoGsfTrackIsoL1SeededFilter
84+
)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
from ..sequences.HLTEGammaDoLocalHcalSequence_cfi import *
1919
from ..sequences.HLTElePixelMatchL1SeededSequence_cfi import *
2020
from ..sequences.HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi import *
21-
from ..sequences.HLTL1Sequence_cfi import *
2221
from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
2322

24-
HLTDoubleEle25CaloIdLPMS2L1SeededSequence = cms.Sequence(HLTL1Sequence
25-
+hltEGL1SeedsForDoubleEleNonIsolatedFilter
23+
HLTDoubleEle25CaloIdLPMS2L1SeededSequence = cms.Sequence(hltEGL1SeedsForDoubleEleNonIsolatedFilter
2624
+HLTDoFullUnpackingEgammaEcalL1SeededSequence
2725
+HLTPFClusteringForEgammaL1SeededSequence
2826
+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
from ..sequences.HLTEle115NonIsoL1SeededGsfElectronL1SeededSequence_cfi import *
2323
from ..sequences.HLTElePixelMatchL1SeededSequence_cfi import *
2424
from ..sequences.HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi import *
25-
from ..sequences.HLTL1Sequence_cfi import *
2625
from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
2726
from ..sequences.HLTFastJetForEgammaSequence_cfi import *
2827

29-
HLTEle115NonIsoL1SeededSequence = cms.Sequence(HLTL1Sequence
30-
+hltEGL1SeedsForSingleEleNonIsolatedFilter
28+
HLTEle115NonIsoL1SeededSequence = cms.Sequence(
29+
hltEGL1SeedsForSingleEleNonIsolatedFilter
3130
+HLTDoFullUnpackingEgammaEcalL1SeededSequence
3231
+HLTPFClusteringForEgammaL1SeededSequence
3332
+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from ..sequences.HLTFastJetForEgammaSequence_cfi import *
77
from ..sequences.HLTGsfElectronL1SeededSequence_cfi import *
88
from ..sequences.HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi import *
9-
from ..sequences.HLTL1Sequence_cfi import *
109
from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
1110
from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import *
1211
from ..sequences.HLTTrackingSequence_cfi import *
@@ -41,8 +40,8 @@
4140
from ..modules.hltEle26WP70PixelMatchL1SeededFilter_cfi import *
4241
from ..modules.hltEle26WP70PMS2L1SeededFilter_cfi import *
4342

44-
HLTEle26WP70L1SeededSequence = cms.Sequence(HLTL1Sequence
45-
+hltEGL1SeedsForSingleEleIsolatedFilter
43+
HLTEle26WP70L1SeededSequence = cms.Sequence(
44+
hltEGL1SeedsForSingleEleIsolatedFilter
4645
+HLTDoFullUnpackingEgammaEcalL1SeededSequence
4746
+HLTPFClusteringForEgammaL1SeededSequence
4847
+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,11 @@
3636
from ..sequences.HLTFastJetForEgammaSequence_cfi import *
3737
from ..sequences.HLTGsfElectronUnseededSequence_cfi import *
3838
from ..sequences.HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi import *
39-
from ..sequences.HLTL1Sequence_cfi import *
4039
from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import *
4140
from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import *
4241
from ..sequences.HLTTrackingSequence_cfi import *
4342

44-
HLTEle26WP70UnseededSequence = cms.Sequence(HLTL1Sequence
45-
+hltEGL1SeedsForSingleEleIsolatedFilter
43+
HLTEle26WP70UnseededSequence = cms.Sequence(hltEGL1SeedsForSingleEleIsolatedFilter
4644
+HLTDoFullUnpackingEgammaEcalSequence
4745
+HLTPFClusteringForEgammaUnseededSequence
4846
+HLTHgcalTiclPFClusteringForEgammaUnseededSequence

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from ..sequences.HLTFastJetForEgammaSequence_cfi import *
77
from ..sequences.HLTGsfElectronL1SeededSequence_cfi import *
88
from ..sequences.HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi import *
9-
from ..sequences.HLTL1Sequence_cfi import *
109
from ..sequences.HLTPFClusteringForEgammaL1SeededSequence_cfi import *
1110
from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import *
1211
from ..sequences.HLTTrackingSequence_cfi import *
@@ -42,8 +41,8 @@
4241
from ..modules.hltEgammaHGCALIDVarsL1Seeded_cfi import *
4342
from ..modules.hltEgammaHoverEL1Seeded_cfi import *
4443

45-
HLTEle32WPTightL1SeededSequence = cms.Sequence(HLTL1Sequence
46-
+hltEGL1SeedsForSingleEleIsolatedFilter
44+
HLTEle32WPTightL1SeededSequence = cms.Sequence(
45+
hltEGL1SeedsForSingleEleIsolatedFilter
4746
+HLTDoFullUnpackingEgammaEcalL1SeededSequence
4847
+HLTPFClusteringForEgammaL1SeededSequence
4948
+HLTHgcalTiclPFClusteringForEgammaL1SeededSequence

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from ..sequences.HLTFastJetForEgammaSequence_cfi import *
77
from ..sequences.HLTGsfElectronUnseededSequence_cfi import *
88
from ..sequences.HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi import *
9-
from ..sequences.HLTL1Sequence_cfi import *
109
from ..sequences.HLTPFClusteringForEgammaUnseededSequence_cfi import *
1110
from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import *
1211
from ..sequences.HLTTrackingSequence_cfi import *
@@ -41,8 +40,8 @@
4140
from ..modules.hltEle32WPTightPixelMatchUnseededFilter_cfi import *
4241
from ..modules.hltEle32WPTightPMS2UnseededFilter_cfi import *
4342

44-
HLTEle32WPTightUnseededSequence = cms.Sequence(HLTL1Sequence
45-
+hltEGL1SeedsForSingleEleIsolatedFilter
43+
HLTEle32WPTightUnseededSequence = cms.Sequence(
44+
hltEGL1SeedsForSingleEleIsolatedFilter
4645
+HLTDoFullUnpackingEgammaEcalSequence
4746
+HLTPFClusteringForEgammaUnseededSequence
4847
+HLTHgcalTiclPFClusteringForEgammaUnseededSequence

0 commit comments

Comments
 (0)