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.

Sign up for GitHub

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

XML and FedId configuration update for PPS #37147

Merged
merged 7 commits into from
Mar 9, 2022
Merged

XML and FedId configuration update for PPS #37147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b764df6
Add PPS 2022 xml mapping
Mar 3, 2022
a5d8a3e
Add PPS run3 fedids
Mar 3, 2022
fa44abe
Xml files update
Mar 4, 2022
3da0471
Fix diamond xml structure and validity range for run2
Mar 5, 2022
4a44629
cms type cleanup
ChrisMisan Mar 8, 2022
9fe2fcf
comments
Mar 8, 2022
5888760
fix config syntax
Mar 8, 2022
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
249 changes: 249 additions & 0 deletions CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml
View file
Open in desktop

Large diffs are not rendered by default.

321 changes: 321 additions & 0 deletions CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml
View file
Open in desktop

Large diffs are not rendered by default.

534 changes: 534 additions & 0 deletions CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 13 additions & 4 deletions EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018

from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi

ctppsDiamondRawToDigi = totemVFATRawToDigi.clone(
subSystem = cms.string('TimingDiamond'),
RawToDigi = totemVFATRawToDigi.RawToDigi.clone(
testCRC = cms.uint32(0), # no need to test CRC for diamond frames
testECMostFrequent = cms.uint32(0) # show error in the DQM and then DAQ is sending resync, no need to test in the unpacker
subSystem = 'TimingDiamond',
fedIds = [579, 581, 582, 583], #as declared in DataFormats/FEDRawData/interface/FEDNumbering.h
RawToDigi = dict(
testCRC = 0, # no need to test CRC for diamond frames
testECMostFrequent = 0, # show error in the DQM and then DAQ is sending resync, no need to test in the unpacker
)
)

# for Run 2 backward compatibility
(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(ctppsDiamondRawToDigi,
fedIds = [] )
26 changes: 23 additions & 3 deletions EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,17 @@
),
# 2018
cms.PSet(
validityRange = cms.EventRange("311626:min - 999999999:max"),
validityRange = cms.EventRange("311626:min - 339999:max"),
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2018.xml"),
maskFileNames = cms.vstring()
),
# 2022
cms.PSet(
validityRange = cms.EventRange("340000:min - 999999999:max"),
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml"),
maskFileNames = cms.vstring()
)

)
)

Expand Down Expand Up @@ -76,10 +83,17 @@
),
# 2018
cms.PSet(
validityRange = cms.EventRange("310001:min - 999999999:max"),
validityRange = cms.EventRange("310001:min - 339999:max"),
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_timing_diamond_2018.xml"),
maskFileNames = cms.vstring()
),
# 2022
cms.PSet(
validityRange = cms.EventRange("340000:min - 999999999:max"),
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml"),
maskFileNames = cms.vstring()
)

)
)

Expand All @@ -99,9 +113,15 @@
),
# 2018
cms.PSet(
validityRange = cms.EventRange("310001:min - 999999999:max"),
validityRange = cms.EventRange("310001:min - 339999:max"),
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_totem_timing_2018.xml"),
maskFileNames = cms.vstring()
),
# 2022
cms.PSet(
validityRange = cms.EventRange("340000:min - 999999999:max"),
mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml"),
maskFileNames = cms.vstring()
)
)
)
Expand Down
11 changes: 10 additions & 1 deletion EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018

from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi

totemRPRawToDigi = totemVFATRawToDigi.clone(
subSystem = cms.string('TrackingStrip')
subSystem = 'TrackingStrip',
fedIds = [578, 580, 584, 585] #as declared in DataFormats/FEDRawData/interface/FEDNumbering.h
)

# for Run 2 backward compatibility
(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(totemRPRawToDigi,
fedIds = [] )
14 changes: 10 additions & 4 deletions EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018

from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi

totemTimingRawToDigi = totemVFATRawToDigi.clone(
subSystem = cms.string('TotemTiming'),
subSystem = 'TotemTiming',

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

RawToDigi = cms.PSet(
verbosity = cms.untracked.uint32(0),
Expand All @@ -26,3 +28,7 @@
printUnknownFrameSummary = cms.untracked.uint32(0)
)
)

# for Run 2 backward compatibility
(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(totemTimingRawToDigi,
fedIds = [] )