From 1d627938b9f678c627217c72963eedd9d5b9fb9f Mon Sep 17 00:00:00 2001 From: Diego Figueiredo Date: Mon, 10 Apr 2023 13:02:39 +0200 Subject: [PATCH 1/5] Including new RPOTs 45-220-NR-HR and 56-220-NR-HR. --- DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc | 22 ++++++++++--------- .../OnlineMetaData/interface/CTPPSRecord.h | 2 ++ DataFormats/OnlineMetaData/src/CTPPSRecord.cc | 2 ++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc index 525912377ae6d..3ba6ecfd6ad97 100644 --- a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc +++ b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc @@ -143,16 +143,18 @@ void CTPPSCommonDQMSource::GlobalPlots::Init(DQMStore::IBooker &ibooker) { ya->SetBinLabel(6, "45, 220, FR-HR"); ya->SetBinLabel(7, "45, 220, FR-TP"); ya->SetBinLabel(8, "45, 220, NR-BP"); - ya->SetBinLabel(9, "45, 220, NR-TP"); - ya->SetBinLabel(10, "56, 210, FR-BT"); - ya->SetBinLabel(11, "56, 210, FR-HR"); - ya->SetBinLabel(12, "56, 210, FR-TP"); - ya->SetBinLabel(13, "56, 220, C1"); - ya->SetBinLabel(14, "56, 220, FR-BT"); - ya->SetBinLabel(15, "56, 220, FR-HR"); - ya->SetBinLabel(16, "56, 220, FR-TP"); - ya->SetBinLabel(17, "56, 220, NR-BP"); - ya->SetBinLabel(18, "56, 220, NR-TP"); + ya->SetBinLabel(9, "45, 220, NR-HR"); + ya->SetBinLabel(10, "45, 220, NR-TP"); + ya->SetBinLabel(11, "56, 210, FR-BT"); + ya->SetBinLabel(12, "56, 210, FR-HR"); + ya->SetBinLabel(13, "56, 210, FR-TP"); + ya->SetBinLabel(14, "56, 220, C1"); + ya->SetBinLabel(15, "56, 220, FR-BT"); + ya->SetBinLabel(16, "56, 220, FR-HR"); + ya->SetBinLabel(17, "56, 220, FR-TP"); + ya->SetBinLabel(18, "56, 220, NR-BP"); + ya->SetBinLabel(19, "56, 220, NR-HR"); + ya->SetBinLabel(20, "56, 220, NR-TP"); } h_trackCorr_hor = ibooker.book2D("track correlation hor", "ctpps_common_rp_hor", 8, -0.5, 7.5, 8, -0.5, 7.5); diff --git a/DataFormats/OnlineMetaData/interface/CTPPSRecord.h b/DataFormats/OnlineMetaData/interface/CTPPSRecord.h index d38c998a57968..a6b731ffa380d 100644 --- a/DataFormats/OnlineMetaData/interface/CTPPSRecord.h +++ b/DataFormats/OnlineMetaData/interface/CTPPSRecord.h @@ -28,6 +28,7 @@ class CTPPSRecord { RP_45_220_FR_HR, RP_45_220_FR_TP, RP_45_220_NR_BT, + RP_45_220_NR_HR, RP_45_220_NR_TP, RP_56_210_FR_BT, RP_56_210_FR_HR, @@ -37,6 +38,7 @@ class CTPPSRecord { RP_56_220_FR_HR, RP_56_220_FR_TP, RP_56_220_NR_BT, + RP_56_220_NR_HR, RP_56_220_NR_TP, Last }; diff --git a/DataFormats/OnlineMetaData/src/CTPPSRecord.cc b/DataFormats/OnlineMetaData/src/CTPPSRecord.cc index 6b879398154d8..1417436d6e348 100644 --- a/DataFormats/OnlineMetaData/src/CTPPSRecord.cc +++ b/DataFormats/OnlineMetaData/src/CTPPSRecord.cc @@ -12,6 +12,7 @@ const CTPPSRecord::RomanPotNames CTPPSRecord::romanPotNames_ = {{"RP_45_210_FR_B "RP_45_220_FR_HR", "RP_45_220_FR_TP", "RP_45_220_NR_BT", + "RP_45_220_NR_HR", "RP_45_220_NR_TP", "RP_56_210_FR_BT", "RP_56_210_FR_HR", @@ -21,6 +22,7 @@ const CTPPSRecord::RomanPotNames CTPPSRecord::romanPotNames_ = {{"RP_45_210_FR_B "RP_56_220_FR_HR", "RP_56_220_FR_TP", "RP_56_220_NR_BT", + "RP_56_220_NR_HR", "RP_56_220_NR_TP"}}; const std::array CTPPSRecord::statusNames_ = {{"unused", "bad", "warning", "ok"}}; From 2fa992f21711a4d146c9367fd4346b31b4b3d970 Mon Sep 17 00:00:00 2001 From: grzanka Date: Sun, 23 Apr 2023 22:38:43 +0200 Subject: [PATCH 2/5] fix code-checks --- DataFormats/OnlineMetaData/src/CTPPSRecord.cc | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/DataFormats/OnlineMetaData/src/CTPPSRecord.cc b/DataFormats/OnlineMetaData/src/CTPPSRecord.cc index 1417436d6e348..cae6605ba0a21 100644 --- a/DataFormats/OnlineMetaData/src/CTPPSRecord.cc +++ b/DataFormats/OnlineMetaData/src/CTPPSRecord.cc @@ -4,26 +4,11 @@ #include "DataFormats/OnlineMetaData/interface/CTPPSRecord.h" #include "DataFormats/OnlineMetaData/interface/OnlineMetaDataRaw.h" -const CTPPSRecord::RomanPotNames CTPPSRecord::romanPotNames_ = {{"RP_45_210_FR_BT", - "RP_45_210_FR_HR", - "RP_45_210_FR_TP", - "RP_45_220_C1", - "RP_45_220_FR_BT", - "RP_45_220_FR_HR", - "RP_45_220_FR_TP", - "RP_45_220_NR_BT", - "RP_45_220_NR_HR", - "RP_45_220_NR_TP", - "RP_56_210_FR_BT", - "RP_56_210_FR_HR", - "RP_56_210_FR_TP", - "RP_56_220_C1", - "RP_56_220_FR_BT", - "RP_56_220_FR_HR", - "RP_56_220_FR_TP", - "RP_56_220_NR_BT", - "RP_56_220_NR_HR", - "RP_56_220_NR_TP"}}; +const CTPPSRecord::RomanPotNames CTPPSRecord::romanPotNames_ = { + {"RP_45_210_FR_BT", "RP_45_210_FR_HR", "RP_45_210_FR_TP", "RP_45_220_C1", "RP_45_220_FR_BT", + "RP_45_220_FR_HR", "RP_45_220_FR_TP", "RP_45_220_NR_BT", "RP_45_220_NR_HR", "RP_45_220_NR_TP", + "RP_56_210_FR_BT", "RP_56_210_FR_HR", "RP_56_210_FR_TP", "RP_56_220_C1", "RP_56_220_FR_BT", + "RP_56_220_FR_HR", "RP_56_220_FR_TP", "RP_56_220_NR_BT", "RP_56_220_NR_HR", "RP_56_220_NR_TP"}}; const std::array CTPPSRecord::statusNames_ = {{"unused", "bad", "warning", "ok"}}; From 3994d40f673c004e109df4c7244c7daf1c12789f Mon Sep 17 00:00:00 2001 From: grzanka Date: Tue, 2 May 2023 13:25:18 +0200 Subject: [PATCH 3/5] correct max bins number --- DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc index 3ba6ecfd6ad97..0fc4b23c80084 100644 --- a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc +++ b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc @@ -44,7 +44,7 @@ class CTPPSCommonDQMSource : public DQMOneEDAnalyzer ctppsRecordToken; const edm::EDGetTokenT> tokenLocalTrackLite; From b9443453c5c5a61e5e783fce6164b41ab5f92e5b Mon Sep 17 00:00:00 2001 From: grzanka Date: Wed, 3 May 2023 22:13:50 +0200 Subject: [PATCH 4/5] adjusted unit tests --- .../test/dump_run000001_event6135_fed1022.txt | 13 +++++++++++++ .../OnlineMetaData/test/onlineMetaDataRecord_t.cpp | 12 ++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 DataFormats/OnlineMetaData/test/dump_run000001_event6135_fed1022.txt diff --git a/DataFormats/OnlineMetaData/test/dump_run000001_event6135_fed1022.txt b/DataFormats/OnlineMetaData/test/dump_run000001_event6135_fed1022.txt new file mode 100644 index 0000000000000..cafc23523f56f --- /dev/null +++ b/DataFormats/OnlineMetaData/test/dump_run000001_event6135_fed1022.txt @@ -0,0 +1,13 @@ +==================== DUMP ====================== +Reason for dump: Requested by user +00000000 : 0003fe00 500017f7 00000003 00000000 | human readable swapped : 500017f7 0003fe00 00000000 00000003 : 00000000 +00000010 : 99d65448 00000187 0010006d 00000000 | human readable swapped : 00000187 99d65448 00000000 0010006d : 00000010 +00000020 : 00000000 00000000 99d62140 00000187 | human readable swapped : 00000000 00000000 00000187 99d62140 : 00000020 +00000030 : 00000000 00000000 00000000 00000000 | human readable swapped : 00000000 00000000 00000000 00000000 : 00000030 +00000040 : 00000000 00000000 00000000 00000000 | human readable swapped : 00000000 00000000 00000000 00000000 : 00000040 +00000050 : 00000000 00000000 00000000 00000000 | human readable swapped : 00000000 00000000 00000000 00000000 : 00000050 +00000060 : 00000000 00000000 00000000 00000000 | human readable swapped : 00000000 00000000 00000000 00000000 : 00000060 +00000070 : 99d62e9a 00000187 44410444 00000010 | human readable swapped : 00000187 99d62e9a 00000010 44410444 : 00000070 +00000080 : 99b0cc96 00000187 01fe7fff 07fe7fff | human readable swapped : 00000187 99b0cc96 07fe7fff 01fe7fff : 00000080 +00000090 : 468de7e5 00000000 d41e0000 a0000014 | human readable swapped : 00000000 468de7e5 a0000014 d41e0000 : 00000090 +================ END OF DUMP =================== \ No newline at end of file diff --git a/DataFormats/OnlineMetaData/test/onlineMetaDataRecord_t.cpp b/DataFormats/OnlineMetaData/test/onlineMetaDataRecord_t.cpp index 9a4993e591574..ccbb5241598de 100644 --- a/DataFormats/OnlineMetaData/test/onlineMetaDataRecord_t.cpp +++ b/DataFormats/OnlineMetaData/test/onlineMetaDataRecord_t.cpp @@ -161,16 +161,16 @@ void TestOnlineMetaDataRecord::testOnlineLuminosityRecord_v2() { } void TestOnlineMetaDataRecord::testCTPPSRecord_v2() { - const unsigned char* payload = readPayload("dump_run000001_event00013761_fed1022.txt"); + const unsigned char* payload = readPayload("dump_run000001_event6135_fed1022.txt"); const online::Data_v2* data_v2 = reinterpret_cast(payload + FEDHeader::length); CTPPSRecord ctpps(data_v2->ctpps); std::cout << ctpps << std::endl; // DIP timestamp is in milliseconds const uint64_t ts = ctpps.timestamp().unixTime() * 1000UL + ctpps.timestamp().microsecondOffset() / 1000; - CPPUNIT_ASSERT_EQUAL(static_cast(0x1616b5a0e5f), ts); - CPPUNIT_ASSERT_EQUAL(CTPPSRecord::Status::bad, ctpps.status(CTPPSRecord::RomanPot::RP_45_210_FR_BT)); - CPPUNIT_ASSERT_EQUAL(CTPPSRecord::Status::ok, ctpps.status(CTPPSRecord::RomanPot::RP_45_220_FR_TP)); - CPPUNIT_ASSERT_EQUAL(CTPPSRecord::Status::warning, ctpps.status(CTPPSRecord::RomanPot::RP_45_220_NR_TP)); - CPPUNIT_ASSERT_EQUAL(CTPPSRecord::Status::unused, ctpps.status(CTPPSRecord::RomanPot::RP_56_220_NR_TP)); + CPPUNIT_ASSERT_EQUAL(static_cast(0x18799D62E9A), ts); + CPPUNIT_ASSERT_EQUAL(CTPPSRecord::Status::unused, ctpps.status(CTPPSRecord::RomanPot::RP_45_210_FR_BT)); + CPPUNIT_ASSERT_EQUAL(CTPPSRecord::Status::unused, ctpps.status(CTPPSRecord::RomanPot::RP_45_220_FR_TP)); + CPPUNIT_ASSERT_EQUAL(CTPPSRecord::Status::unused, ctpps.status(CTPPSRecord::RomanPot::RP_45_220_NR_TP)); + CPPUNIT_ASSERT_EQUAL(CTPPSRecord::Status::bad, ctpps.status(CTPPSRecord::RomanPot::RP_56_220_NR_HR)); } From 70b5d0e7571145eb1ea802c605dfeb0a5a66cc13 Mon Sep 17 00:00:00 2001 From: grzanka Date: Mon, 8 May 2023 23:17:03 +0200 Subject: [PATCH 5/5] adjusted RP naming --- DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc index 0fc4b23c80084..e5f62aef6d4b8 100644 --- a/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc +++ b/DQM/CTPPS/plugins/CTPPSCommonDQMSource.cc @@ -142,7 +142,7 @@ void CTPPSCommonDQMSource::GlobalPlots::Init(DQMStore::IBooker &ibooker) { ya->SetBinLabel(5, "45, 220, FR-BT"); ya->SetBinLabel(6, "45, 220, FR-HR"); ya->SetBinLabel(7, "45, 220, FR-TP"); - ya->SetBinLabel(8, "45, 220, NR-BP"); + ya->SetBinLabel(8, "45, 220, NR-BT"); ya->SetBinLabel(9, "45, 220, NR-HR"); ya->SetBinLabel(10, "45, 220, NR-TP"); ya->SetBinLabel(11, "56, 210, FR-BT"); @@ -152,7 +152,7 @@ void CTPPSCommonDQMSource::GlobalPlots::Init(DQMStore::IBooker &ibooker) { ya->SetBinLabel(15, "56, 220, FR-BT"); ya->SetBinLabel(16, "56, 220, FR-HR"); ya->SetBinLabel(17, "56, 220, FR-TP"); - ya->SetBinLabel(18, "56, 220, NR-BP"); + ya->SetBinLabel(18, "56, 220, NR-BT"); ya->SetBinLabel(19, "56, 220, NR-HR"); ya->SetBinLabel(20, "56, 220, NR-TP"); }