From b764df67c426725cef86b611311e6840e98b3f8f Mon Sep 17 00:00:00 2001 From: Christopher Date: Thu, 3 Mar 2022 23:25:30 +0100 Subject: [PATCH 1/7] Add PPS 2022 xml mapping --- .../xml/mapping_timing_diamond_2022.xml | 248 ++++++++ .../xml/mapping_totem_timing_2022.xml | 321 +++++++++++ .../xml/mapping_tracking_strip_2022.xml | 534 ++++++++++++++++++ .../python/ctppsRawToDigi_cff.py | 26 +- 4 files changed, 1126 insertions(+), 3 deletions(-) create mode 100644 CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml create mode 100644 CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml create mode 100644 CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml 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..901b9036dbe38 --- /dev/null +++ b/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..77573bce9eb17 --- /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..020749fb970a6 --- /dev/null +++ b/CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml @@ -0,0 +1,534 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py index 04708735e343c..4a33ebbee6a54 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 - 325175: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 - 325175: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 - 325175: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() ) ) ) From a5d8a3e9c3df0c0b8a68111fdb8467071abdab2b Mon Sep 17 00:00:00 2001 From: Christopher Date: Thu, 3 Mar 2022 23:26:25 +0100 Subject: [PATCH 2/7] Add PPS run3 fedids --- .../python/ctppsDiamondRawToDigi_cfi.py | 9 +++++++++ .../CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py | 11 ++++++++++- .../python/totemTimingRawToDigi_cfi.py | 12 +++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py index c5bec951778cc..d35a61eac5808 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'), + fedIds = cms.vuint32(579, 581, 582, 583), 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 ) ) + +# for Run 2 backward compatibility +(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(ctppsDiamondRawToDigi, +fedIds = cms.vuint32()) diff --git a/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py index f2d5b6662fd07..81f5d550125ef 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 = cms.string('TrackingStrip'), + fedIds = cms.vuint32(578, 580, 584, 585) ) + +# for Run 2 backward compatibility +(ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(totemRPRawToDigi, +fedIds = cms.vuint32()) diff --git a/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py index 1183792e65007..4b2c25df4c8c3 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'), - # IMPORTANT: leave empty to load the default configuration from - # DataFormats/FEDRawData/interface/FEDNumbering.h - fedIds = cms.vuint32(), + fedIds = cms.vuint32(586, 587), 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 = cms.vuint32()) From fa44abe6c85d72ddfe6d370165c1c465a962f1c4 Mon Sep 17 00:00:00 2001 From: Christopher Date: Fri, 4 Mar 2022 20:04:49 +0100 Subject: [PATCH 3/7] Xml files update --- .../xml/mapping_timing_diamond_2022.xml | 192 +++++++------- .../xml/mapping_totem_timing_2022.xml | 240 +++++++++--------- .../xml/mapping_tracking_strip_2022.xml | 16 +- 3 files changed, 224 insertions(+), 224 deletions(-) diff --git a/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml b/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml index 901b9036dbe38..7c4f2387a7549 100644 --- a/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml +++ b/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml @@ -65,60 +65,60 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -188,60 +188,60 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml b/CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml index 77573bce9eb17..a6414b2948ac4 100644 --- a/CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml +++ b/CondFormats/PPSObjects/xml/mapping_totem_timing_2022.xml @@ -43,38 +43,38 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -121,38 +121,38 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -201,38 +201,38 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -279,38 +279,38 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml b/CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml index 020749fb970a6..0dcdf773b3b3f 100644 --- a/CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml +++ b/CondFormats/PPSObjects/xml/mapping_tracking_strip_2022.xml @@ -387,16 +387,16 @@ - - - - + + + + - - - - + + + + From 3da0471fe0a2eb02d085a930d6996d08b5a43295 Mon Sep 17 00:00:00 2001 From: Christopher Date: Sat, 5 Mar 2022 11:15:10 +0100 Subject: [PATCH 4/7] Fix diamond xml structure and validity range for run2 --- CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml | 1 + EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml b/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml index 7c4f2387a7549..00f57dc83d8dc 100644 --- a/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml +++ b/CondFormats/PPSObjects/xml/mapping_timing_diamond_2022.xml @@ -185,6 +185,7 @@ + diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py index 4a33ebbee6a54..e220f142e778b 100644 --- a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py +++ b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py @@ -35,7 +35,7 @@ ), # 2018 cms.PSet( - validityRange = cms.EventRange("311626:min - 325175:max"), + validityRange = cms.EventRange("311626:min - 339999:max"), mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2018.xml"), maskFileNames = cms.vstring() ), @@ -83,7 +83,7 @@ ), # 2018 cms.PSet( - validityRange = cms.EventRange("310001:min - 325175:max"), + validityRange = cms.EventRange("310001:min - 339999:max"), mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_timing_diamond_2018.xml"), maskFileNames = cms.vstring() ), @@ -113,7 +113,7 @@ ), # 2018 cms.PSet( - validityRange = cms.EventRange("310001:min - 325175:max"), + validityRange = cms.EventRange("310001:min - 339999:max"), mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_totem_timing_2018.xml"), maskFileNames = cms.vstring() ), From 4a44629506670fc5afa99214b6265b0eeaf206c4 Mon Sep 17 00:00:00 2001 From: Christopher <52073715+ChrisMisan@users.noreply.github.com> Date: Tue, 8 Mar 2022 18:30:36 +0100 Subject: [PATCH 5/7] cms type cleanup Co-authored-by: Andrea Perrotta --- .../CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py | 9 +++++++-- .../CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py | 6 +++--- .../CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py index d35a61eac5808..7d445eefc5e86 100644 --- a/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py @@ -7,7 +7,12 @@ from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi ctppsDiamondRawToDigi = totemVFATRawToDigi.clone( - subSystem = cms.string('TimingDiamond'), + subSystem = 'TimingDiamond', + fedIds = [579, 581, 582, 583], + 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 + ) fedIds = cms.vuint32(579, 581, 582, 583), RawToDigi = totemVFATRawToDigi.RawToDigi.clone( testCRC = cms.uint32(0), # no need to test CRC for diamond frames @@ -17,4 +22,4 @@ # for Run 2 backward compatibility (ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(ctppsDiamondRawToDigi, -fedIds = cms.vuint32()) +fedIds = [] ) diff --git a/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py index 81f5d550125ef..f9f446c44e6c2 100644 --- a/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py @@ -7,10 +7,10 @@ from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi totemRPRawToDigi = totemVFATRawToDigi.clone( - subSystem = cms.string('TrackingStrip'), - fedIds = cms.vuint32(578, 580, 584, 585) + subSystem = 'TrackingStrip', + fedIds = [578, 580, 584, 585] ) # for Run 2 backward compatibility (ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(totemRPRawToDigi, -fedIds = cms.vuint32()) +fedIds = [] ) diff --git a/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py index 4b2c25df4c8c3..11e62f8c93371 100644 --- a/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py @@ -7,7 +7,7 @@ from EventFilter.CTPPSRawToDigi.totemVFATRawToDigi_cfi import totemVFATRawToDigi totemTimingRawToDigi = totemVFATRawToDigi.clone( - subSystem = cms.string('TotemTiming'), + subSystem = 'TotemTiming', fedIds = cms.vuint32(586, 587), @@ -31,4 +31,4 @@ # for Run 2 backward compatibility (ctpps_2016 | ctpps_2017 | ctpps_2018).toModify(totemTimingRawToDigi, -fedIds = cms.vuint32()) +fedIds = [] ) From 9fe2fcf02a730cef2ac5aab068dc8d0fa3d0844a Mon Sep 17 00:00:00 2001 From: Christopher Date: Tue, 8 Mar 2022 18:38:56 +0100 Subject: [PATCH 6/7] comments --- EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py | 2 +- EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py | 2 +- EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py index 7d445eefc5e86..83001443fae6a 100644 --- a/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py @@ -8,7 +8,7 @@ ctppsDiamondRawToDigi = totemVFATRawToDigi.clone( subSystem = 'TimingDiamond', - fedIds = [579, 581, 582, 583], + 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 diff --git a/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py index f9f446c44e6c2..7921022d4b453 100644 --- a/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/totemRPRawToDigi_cfi.py @@ -8,7 +8,7 @@ totemRPRawToDigi = totemVFATRawToDigi.clone( subSystem = 'TrackingStrip', - fedIds = [578, 580, 584, 585] + fedIds = [578, 580, 584, 585] #as declared in DataFormats/FEDRawData/interface/FEDNumbering.h ) # for Run 2 backward compatibility diff --git a/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py index 11e62f8c93371..86a1457ad6fc0 100644 --- a/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/totemTimingRawToDigi_cfi.py @@ -9,7 +9,7 @@ totemTimingRawToDigi = totemVFATRawToDigi.clone( subSystem = 'TotemTiming', - fedIds = cms.vuint32(586, 587), + fedIds = cms.vuint32(586, 587), #as declared in DataFormats/FEDRawData/interface/FEDNumbering.h RawToDigi = cms.PSet( verbosity = cms.untracked.uint32(0), From 5888760c797fcf99f658c645a930bbc4b8d192ac Mon Sep 17 00:00:00 2001 From: Christopher Date: Tue, 8 Mar 2022 22:53:30 +0100 Subject: [PATCH 7/7] fix config syntax --- .../CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py b/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py index 83001443fae6a..7d68f5d25265c 100644 --- a/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py +++ b/EventFilter/CTPPSRawToDigi/python/ctppsDiamondRawToDigi_cfi.py @@ -13,11 +13,6 @@ 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 ) - fedIds = cms.vuint32(579, 581, 582, 583), - 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 - ) ) # for Run 2 backward compatibility