From 50e7b0541147fc5b5ecd952bfc3b9f8a50791c5f Mon Sep 17 00:00:00 2001 From: nminafra Date: Mon, 26 Feb 2018 19:32:13 +0100 Subject: [PATCH 1/3] Updated mapping for 2018 --- .../xml/mapping_timing_diamond_2018.xml | 129 ++++++++++++++++++ .../python/ctppsRawToDigi_cff.py | 8 +- 2 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml b/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml new file mode 100644 index 0000000000000..97f46a9fc44df --- /dev/null +++ b/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py index 2258fa24139f2..19c31c2ede1fa 100644 --- a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py +++ b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py @@ -68,10 +68,16 @@ ), # 2017 cms.PSet( - validityRange = cms.EventRange("292521:min - 999999999:max"), + validityRange = cms.EventRange("292521:min - 310000:max"), mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2017.xml"), maskFileNames = cms.vstring() ) + # 2018 + cms.PSet( + validityRange = cms.EventRange("310001:min - 999999999:max"), + mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml"), + maskFileNames = cms.vstring() + ) ) ) From 0275564811acb3d83ad3adbd4702f7dbd54db7c2 Mon Sep 17 00:00:00 2001 From: nminafra Date: Thu, 1 Mar 2018 19:15:31 +0100 Subject: [PATCH 2/3] Mapping checked, connections done in the LHC --- .../xml/mapping_timing_diamond_2018.xml | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml b/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml index 97f46a9fc44df..b59cdf5c87f54 100644 --- a/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml +++ b/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml @@ -67,61 +67,61 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + From 629657e19b648372cb0a7b3244e0d2a9fa358cd2 Mon Sep 17 00:00:00 2001 From: nminafra Date: Thu, 1 Mar 2018 22:06:59 +0100 Subject: [PATCH 3/3] Comma fixed --- EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py index 19c31c2ede1fa..b58cf406d8eda 100644 --- a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py +++ b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py @@ -71,7 +71,7 @@ validityRange = cms.EventRange("292521:min - 310000:max"), mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2017.xml"), maskFileNames = cms.vstring() - ) + ), # 2018 cms.PSet( validityRange = cms.EventRange("310001:min - 999999999:max"),