diff --git a/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml b/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml new file mode 100644 index 0000000000000..00f57dc83d8dc --- /dev/null +++ b/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml b/CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml new file mode 100644 index 0000000000000..a6414b2948ac4 --- /dev/null +++ b/CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml b/CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml new file mode 100644 index 0000000000000..0dcdf773b3b3f --- /dev/null +++ b/CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml @@ -0,0 +1,534 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py index c5bec951778cc..7d68f5d25265c 100644 --- a/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py @@ -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 = [] ) diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py index 04708735e343c..e220f142e778b 100644 --- a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py +++ b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py @@ -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() ) + ) ) @@ -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() ) + ) ) @@ -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() ) ) ) diff --git a/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py index f2d5b6662fd07..7921022d4b453 100644 --- a/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py @@ -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 = [] ) diff --git a/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py index 1183792e65007..86a1457ad6fc0 100644 --- a/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py @@ -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), @@ -26,3 +28,7 @@ printUnknownFrameSummary = cms.untracked.uint32(0) ) ) + +# for Run 2 backward compatibility +(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(totemTimingRawToDigi, +fedIds = [] )