Skip to content

Commit c2ba821

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#42218 from cms-tsg-storm/HLTdevelopment130X_for132X
HLT menu development for `13_0_X` (11/N) [`13_2_X`]
2 parents 239d50b + deb1b37 commit c2ba821

File tree

13 files changed

+72
-1296
lines changed

13 files changed

+72
-1296
lines changed

‎HLTrigger/Configuration/python/HLT_FULL_cff.py‎

Lines changed: 11 additions & 107 deletions
Large diffs are not rendered by default.

‎HLTrigger/Configuration/python/HLT_GRun_cff.py‎

Lines changed: 11 additions & 107 deletions
Large diffs are not rendered by default.

‎HLTrigger/Configuration/python/HLT_HIon_cff.py‎

Lines changed: 4 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hltGetConfiguration /dev/CMSSW_13_0_0/HIon --cff --data --type HIon
22

3-
# /dev/CMSSW_13_0_0/HIon/V130 (CMSSW_13_0_2)
3+
# /dev/CMSSW_13_0_0/HIon/V140 (CMSSW_13_0_2)
44

55
import FWCore.ParameterSet.Config as cms
66

@@ -12,86 +12,9 @@
1212
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
1313

1414
fragment.HLTConfigVersion = cms.PSet(
15-
tableName = cms.string('/dev/CMSSW_13_0_0/HIon/V130')
15+
tableName = cms.string('/dev/CMSSW_13_0_0/HIon/V140')
1616
)
1717

18-
fragment.transferSystem = cms.PSet(
19-
destinations = cms.vstring( 'Tier0',
20-
'DQM',
21-
'ECAL',
22-
'EventDisplay',
23-
'Lustre',
24-
'None' ),
25-
transferModes = cms.vstring( 'default',
26-
'test',
27-
'emulator' ),
28-
streamA = cms.PSet(
29-
default = cms.vstring( 'Tier0' ),
30-
test = cms.vstring( 'Lustre' ),
31-
emulator = cms.vstring( 'Lustre' )
32-
),
33-
streamCalibration = cms.PSet(
34-
default = cms.vstring( 'Tier0' ),
35-
test = cms.vstring( 'Lustre' ),
36-
emulator = cms.vstring( 'None' )
37-
),
38-
streamDQM = cms.PSet(
39-
default = cms.vstring( 'DQM' ),
40-
test = cms.vstring( 'DQM',
41-
'Lustre' ),
42-
emulator = cms.vstring( 'None' )
43-
),
44-
streamDQMCalibration = cms.PSet(
45-
default = cms.vstring( 'DQM' ),
46-
test = cms.vstring( 'DQM',
47-
'Lustre' ),
48-
emulator = cms.vstring( 'None' )
49-
),
50-
streamEcalCalibration = cms.PSet(
51-
default = cms.vstring( 'ECAL' ),
52-
test = cms.vstring( 'ECAL' ),
53-
emulator = cms.vstring( 'None' )
54-
),
55-
streamEventDisplay = cms.PSet(
56-
default = cms.vstring( 'EventDisplay',
57-
'Tier0' ),
58-
test = cms.vstring( 'EventDisplay',
59-
'Lustre' ),
60-
emulator = cms.vstring( 'None' )
61-
),
62-
streamExpressCosmics = cms.PSet(
63-
default = cms.vstring( 'Tier0' ),
64-
test = cms.vstring( 'Lustre' ),
65-
emulator = cms.vstring( 'Lustre' )
66-
),
67-
streamNanoDST = cms.PSet(
68-
default = cms.vstring( 'Tier0' ),
69-
test = cms.vstring( 'Lustre' ),
70-
emulator = cms.vstring( 'None' )
71-
),
72-
streamRPCMON = cms.PSet(
73-
default = cms.vstring( 'Tier0' ),
74-
test = cms.vstring( 'Lustre' ),
75-
emulator = cms.vstring( 'None' )
76-
),
77-
streamTrackerCalibration = cms.PSet(
78-
default = cms.vstring( 'Tier0' ),
79-
test = cms.vstring( 'Lustre' ),
80-
emulator = cms.vstring( 'None' )
81-
),
82-
default = cms.PSet(
83-
default = cms.vstring( 'Tier0' ),
84-
test = cms.vstring( 'Lustre' ),
85-
emulator = cms.vstring( 'Lustre' ),
86-
streamLookArea = cms.PSet( )
87-
),
88-
streamLookArea = cms.PSet(
89-
default = cms.vstring( 'DQM' ),
90-
test = cms.vstring( 'DQM',
91-
'Lustre' ),
92-
emulator = cms.vstring( 'None' )
93-
)
94-
)
9518
fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
9619
ComponentType = cms.string( "CkfTrajectoryBuilder" ),
9720
lostHitPenalty = cms.double( 30.0 ),
@@ -5511,17 +5434,13 @@
55115434
PVcomparer = cms.PSet( refToPSet_ = cms.string( "HLTPSetPvClusterComparerForIT" ) )
55125435
)
55135436
fragment.hltPixelConsumerCPU = cms.EDAnalyzer( "GenericConsumer",
5514-
eventProducts = cms.untracked.vstring( 'hltSiPixelRecHitsSoA@cpu',
5515-
'hltPixelTracksSoA@cpu',
5516-
'hltPixelVerticesSoA@cpu' ),
5437+
eventProducts = cms.untracked.vstring( 'hltSiPixelDigis@cpu' ),
55175438
lumiProducts = cms.untracked.vstring( ),
55185439
runProducts = cms.untracked.vstring( ),
55195440
processProducts = cms.untracked.vstring( )
55205441
)
55215442
fragment.hltPixelConsumerGPU = cms.EDAnalyzer( "GenericConsumer",
5522-
eventProducts = cms.untracked.vstring( 'hltSiPixelRecHitsSoA@cuda',
5523-
'hltPixelTracksSoA@cuda',
5524-
'hltPixelVerticesSoA@cuda' ),
5443+
eventProducts = cms.untracked.vstring( 'hltSiPixelDigis@cuda' ),
55255444
lumiProducts = cms.untracked.vstring( ),
55265445
runProducts = cms.untracked.vstring( ),
55275446
processProducts = cms.untracked.vstring( )

‎HLTrigger/Configuration/python/HLT_PIon_cff.py‎

Lines changed: 2 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hltGetConfiguration /dev/CMSSW_13_0_0/PIon --cff --data --type PIon
22

3-
# /dev/CMSSW_13_0_0/PIon/V130 (CMSSW_13_0_2)
3+
# /dev/CMSSW_13_0_0/PIon/V140 (CMSSW_13_0_2)
44

55
import FWCore.ParameterSet.Config as cms
66

@@ -12,86 +12,9 @@
1212
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
1313

1414
fragment.HLTConfigVersion = cms.PSet(
15-
tableName = cms.string('/dev/CMSSW_13_0_0/PIon/V130')
15+
tableName = cms.string('/dev/CMSSW_13_0_0/PIon/V140')
1616
)
1717

18-
fragment.transferSystem = cms.PSet(
19-
destinations = cms.vstring( 'Tier0',
20-
'DQM',
21-
'ECAL',
22-
'EventDisplay',
23-
'Lustre',
24-
'None' ),
25-
transferModes = cms.vstring( 'default',
26-
'test',
27-
'emulator' ),
28-
streamA = cms.PSet(
29-
default = cms.vstring( 'Tier0' ),
30-
test = cms.vstring( 'Lustre' ),
31-
emulator = cms.vstring( 'Lustre' )
32-
),
33-
streamCalibration = cms.PSet(
34-
default = cms.vstring( 'Tier0' ),
35-
test = cms.vstring( 'Lustre' ),
36-
emulator = cms.vstring( 'None' )
37-
),
38-
streamDQM = cms.PSet(
39-
default = cms.vstring( 'DQM' ),
40-
test = cms.vstring( 'DQM',
41-
'Lustre' ),
42-
emulator = cms.vstring( 'None' )
43-
),
44-
streamDQMCalibration = cms.PSet(
45-
default = cms.vstring( 'DQM' ),
46-
test = cms.vstring( 'DQM',
47-
'Lustre' ),
48-
emulator = cms.vstring( 'None' )
49-
),
50-
streamEcalCalibration = cms.PSet(
51-
default = cms.vstring( 'ECAL' ),
52-
test = cms.vstring( 'ECAL' ),
53-
emulator = cms.vstring( 'None' )
54-
),
55-
streamEventDisplay = cms.PSet(
56-
default = cms.vstring( 'EventDisplay',
57-
'Tier0' ),
58-
test = cms.vstring( 'EventDisplay',
59-
'Lustre' ),
60-
emulator = cms.vstring( 'None' )
61-
),
62-
streamExpressCosmics = cms.PSet(
63-
default = cms.vstring( 'Tier0' ),
64-
test = cms.vstring( 'Lustre' ),
65-
emulator = cms.vstring( 'Lustre' )
66-
),
67-
streamNanoDST = cms.PSet(
68-
default = cms.vstring( 'Tier0' ),
69-
test = cms.vstring( 'Lustre' ),
70-
emulator = cms.vstring( 'None' )
71-
),
72-
streamRPCMON = cms.PSet(
73-
default = cms.vstring( 'Tier0' ),
74-
test = cms.vstring( 'Lustre' ),
75-
emulator = cms.vstring( 'None' )
76-
),
77-
streamTrackerCalibration = cms.PSet(
78-
default = cms.vstring( 'Tier0' ),
79-
test = cms.vstring( 'Lustre' ),
80-
emulator = cms.vstring( 'None' )
81-
),
82-
default = cms.PSet(
83-
default = cms.vstring( 'Tier0' ),
84-
test = cms.vstring( 'Lustre' ),
85-
emulator = cms.vstring( 'Lustre' ),
86-
streamLookArea = cms.PSet( )
87-
),
88-
streamLookArea = cms.PSet(
89-
default = cms.vstring( 'DQM' ),
90-
test = cms.vstring( 'DQM',
91-
'Lustre' ),
92-
emulator = cms.vstring( 'None' )
93-
)
94-
)
9518
fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
9619
ComponentType = cms.string( "CkfTrajectoryBuilder" ),
9720
lostHitPenalty = cms.double( 30.0 ),

‎HLTrigger/Configuration/python/HLT_PRef_cff.py‎

Lines changed: 4 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hltGetConfiguration /dev/CMSSW_13_0_0/PRef --cff --data --type PRef
22

3-
# /dev/CMSSW_13_0_0/PRef/V130 (CMSSW_13_0_2)
3+
# /dev/CMSSW_13_0_0/PRef/V140 (CMSSW_13_0_2)
44

55
import FWCore.ParameterSet.Config as cms
66

@@ -12,86 +12,9 @@
1212
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
1313

1414
fragment.HLTConfigVersion = cms.PSet(
15-
tableName = cms.string('/dev/CMSSW_13_0_0/PRef/V130')
15+
tableName = cms.string('/dev/CMSSW_13_0_0/PRef/V140')
1616
)
1717

18-
fragment.transferSystem = cms.PSet(
19-
destinations = cms.vstring( 'Tier0',
20-
'DQM',
21-
'ECAL',
22-
'EventDisplay',
23-
'Lustre',
24-
'None' ),
25-
transferModes = cms.vstring( 'default',
26-
'test',
27-
'emulator' ),
28-
streamA = cms.PSet(
29-
default = cms.vstring( 'Tier0' ),
30-
test = cms.vstring( 'Lustre' ),
31-
emulator = cms.vstring( 'Lustre' )
32-
),
33-
streamCalibration = cms.PSet(
34-
default = cms.vstring( 'Tier0' ),
35-
test = cms.vstring( 'Lustre' ),
36-
emulator = cms.vstring( 'None' )
37-
),
38-
streamDQM = cms.PSet(
39-
default = cms.vstring( 'DQM' ),
40-
test = cms.vstring( 'DQM',
41-
'Lustre' ),
42-
emulator = cms.vstring( 'None' )
43-
),
44-
streamDQMCalibration = cms.PSet(
45-
default = cms.vstring( 'DQM' ),
46-
test = cms.vstring( 'DQM',
47-
'Lustre' ),
48-
emulator = cms.vstring( 'None' )
49-
),
50-
streamEcalCalibration = cms.PSet(
51-
default = cms.vstring( 'ECAL' ),
52-
test = cms.vstring( 'ECAL' ),
53-
emulator = cms.vstring( 'None' )
54-
),
55-
streamEventDisplay = cms.PSet(
56-
default = cms.vstring( 'EventDisplay',
57-
'Tier0' ),
58-
test = cms.vstring( 'EventDisplay',
59-
'Lustre' ),
60-
emulator = cms.vstring( 'None' )
61-
),
62-
streamExpressCosmics = cms.PSet(
63-
default = cms.vstring( 'Tier0' ),
64-
test = cms.vstring( 'Lustre' ),
65-
emulator = cms.vstring( 'Lustre' )
66-
),
67-
streamNanoDST = cms.PSet(
68-
default = cms.vstring( 'Tier0' ),
69-
test = cms.vstring( 'Lustre' ),
70-
emulator = cms.vstring( 'None' )
71-
),
72-
streamRPCMON = cms.PSet(
73-
default = cms.vstring( 'Tier0' ),
74-
test = cms.vstring( 'Lustre' ),
75-
emulator = cms.vstring( 'None' )
76-
),
77-
streamTrackerCalibration = cms.PSet(
78-
default = cms.vstring( 'Tier0' ),
79-
test = cms.vstring( 'Lustre' ),
80-
emulator = cms.vstring( 'None' )
81-
),
82-
default = cms.PSet(
83-
default = cms.vstring( 'Tier0' ),
84-
test = cms.vstring( 'Lustre' ),
85-
emulator = cms.vstring( 'Lustre' ),
86-
streamLookArea = cms.PSet( )
87-
),
88-
streamLookArea = cms.PSet(
89-
default = cms.vstring( 'DQM' ),
90-
test = cms.vstring( 'DQM',
91-
'Lustre' ),
92-
emulator = cms.vstring( 'None' )
93-
)
94-
)
9518
fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
9619
ComponentType = cms.string( "CkfTrajectoryBuilder" ),
9720
lostHitPenalty = cms.double( 30.0 ),
@@ -5177,17 +5100,13 @@
51775100
PVcomparer = cms.PSet( refToPSet_ = cms.string( "HLTPSetPvClusterComparerForIT" ) )
51785101
)
51795102
fragment.hltPixelConsumerCPU = cms.EDAnalyzer( "GenericConsumer",
5180-
eventProducts = cms.untracked.vstring( 'hltSiPixelRecHitsSoA@cpu',
5181-
'hltPixelTracksSoA@cpu',
5182-
'hltPixelVerticesSoA@cpu' ),
5103+
eventProducts = cms.untracked.vstring( 'hltSiPixelDigis@cpu' ),
51835104
lumiProducts = cms.untracked.vstring( ),
51845105
runProducts = cms.untracked.vstring( ),
51855106
processProducts = cms.untracked.vstring( )
51865107
)
51875108
fragment.hltPixelConsumerGPU = cms.EDAnalyzer( "GenericConsumer",
5188-
eventProducts = cms.untracked.vstring( 'hltSiPixelRecHitsSoA@cuda',
5189-
'hltPixelTracksSoA@cuda',
5190-
'hltPixelVerticesSoA@cuda' ),
5109+
eventProducts = cms.untracked.vstring( 'hltSiPixelDigis@cuda' ),
51915110
lumiProducts = cms.untracked.vstring( ),
51925111
runProducts = cms.untracked.vstring( ),
51935112
processProducts = cms.untracked.vstring( )

0 commit comments

Comments
 (0)