Skip to content

Commit 8ea6464

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#37147 from CTPPS/PPS_xml_run3
XML and FedId configuration update for PPS
2 parents 1183869 + 5888760 commit 8ea6464

7 files changed

+1160
-12
lines changed

‎CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml

+249
Large diffs are not rendered by default.

‎CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml

+321
Large diffs are not rendered by default.

‎CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml

+534
Large diffs are not rendered by default.

‎EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
import FWCore.ParameterSet.Config as cms
22

3+
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
4+
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
5+
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
6+
37
from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi
48

59
ctppsDiamondRawToDigi = totemVFATRawToDigi.clone(
6-
subSystem = cms.string('TimingDiamond'),
7-
RawToDigi = totemVFATRawToDigi.RawToDigi.clone(
8-
testCRC = cms.uint32(0), # no need to test CRC for diamond frames
9-
testECMostFrequent = cms.uint32(0) # show error in the DQM and then DAQ is sending resync, no need to test in the unpacker
10+
subSystem = 'TimingDiamond',
11+
fedIds = [579, 581, 582, 583], #as declared in DataFormats/FEDRawData/interface/FEDNumbering.h
12+
RawToDigi = dict(
13+
testCRC = 0, # no need to test CRC for diamond frames
14+
testECMostFrequent = 0, # show error in the DQM and then DAQ is sending resync, no need to test in the unpacker
1015
)
1116
)
17+
18+
# for Run 2 backward compatibility
19+
(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(ctppsDiamondRawToDigi,
20+
fedIds = [] )

‎EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py

+23-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,17 @@
3535
),
3636
# 2018
3737
cms.PSet(
38-
validityRange = cms.EventRange("311626:min - 999999999:max"),
38+
validityRange = cms.EventRange("311626:min - 339999:max"),
3939
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2018.xml"),
4040
maskFileNames = cms.vstring()
41+
),
42+
# 2022
43+
cms.PSet(
44+
validityRange = cms.EventRange("340000:min - 999999999:max"),
45+
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml"),
46+
maskFileNames = cms.vstring()
4147
)
48+
4249
)
4350
)
4451

@@ -76,10 +83,17 @@
7683
),
7784
# 2018
7885
cms.PSet(
79-
validityRange = cms.EventRange("310001:min - 999999999:max"),
86+
validityRange = cms.EventRange("310001:min - 339999:max"),
8087
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_timing_diamond_2018.xml"),
8188
maskFileNames = cms.vstring()
89+
),
90+
# 2022
91+
cms.PSet(
92+
validityRange = cms.EventRange("340000:min - 999999999:max"),
93+
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml"),
94+
maskFileNames = cms.vstring()
8295
)
96+
8397
)
8498
)
8599

@@ -99,9 +113,15 @@
99113
),
100114
# 2018
101115
cms.PSet(
102-
validityRange = cms.EventRange("310001:min - 999999999:max"),
116+
validityRange = cms.EventRange("310001:min - 339999:max"),
103117
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_totem_timing_2018.xml"),
104118
maskFileNames = cms.vstring()
119+
),
120+
# 2022
121+
cms.PSet(
122+
validityRange = cms.EventRange("340000:min - 999999999:max"),
123+
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml"),
124+
maskFileNames = cms.vstring()
105125
)
106126
)
107127
)

‎EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
import FWCore.ParameterSet.Config as cms
22

3+
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
4+
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
5+
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
6+
37
from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi
48

59
totemRPRawToDigi = totemVFATRawToDigi.clone(
6-
subSystem = cms.string('TrackingStrip')
10+
subSystem = 'TrackingStrip',
11+
fedIds = [578, 580, 584, 585] #as declared in DataFormats/FEDRawData/interface/FEDNumbering.h
712
)
13+
14+
# for Run 2 backward compatibility
15+
(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(totemRPRawToDigi,
16+
fedIds = [] )

‎EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import FWCore.ParameterSet.Config as cms
22

3+
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
4+
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
5+
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
6+
37
from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi
48

59
totemTimingRawToDigi = totemVFATRawToDigi.clone(
6-
subSystem = cms.string('TotemTiming'),
10+
subSystem = 'TotemTiming',
711

8-
# IMPORTANT: leave empty to load the default configuration from
9-
# DataFormats/FEDRawData/interface/FEDNumbering.h
10-
fedIds = cms.vuint32(),
12+
fedIds = cms.vuint32(586, 587), #as declared in DataFormats/FEDRawData/interface/FEDNumbering.h
1113

1214
RawToDigi = cms.PSet(
1315
verbosity = cms.untracked.uint32(0),
@@ -26,3 +28,7 @@
2628
printUnknownFrameSummary = cms.untracked.uint32(0)
2729
)
2830
)
31+
32+
# for Run 2 backward compatibility
33+
(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(totemTimingRawToDigi,
34+
fedIds = [] )

0 commit comments

Comments
 (0)