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

Jump to bottom

[12_4_X] Bug fix in EMTF GEM and RPC unpacker blocks #39462

Merged
merged 1 commit into from
Sep 21, 2022
Merged

[12_4_X] Bug fix in EMTF GEM and RPC unpacker blocks #39462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockGEM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ namespace l1t {
uint16_t GEMc = payload[2];
uint16_t GEMd = payload[3];

for (int i = 0; i < nTPs; i++) {
// If there are 2 TPs in the block we fill them 1 by 1
for (int i = 1; i <= nTPs; i++) {
// res is a pointer to a collection of EMTFDaqOut class objects
// There is one EMTFDaqOut for each MTF7 (60 deg. sector) in the event
EMTFDaqOutCollection* res;
Expand Down
5 changes: 3 additions & 2 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockRPC.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ namespace l1t {
uint16_t RPCc = payload[2];
uint16_t RPCd = payload[3];

for (int i = 0; i < nTPs; i++) {
// If there are 2 TPs in the block we fill them 1 by 1
for (int i = 1; i <= nTPs; i++) {
// res is a pointer to a collection of EMTFDaqOut class objects
// There is one EMTFDaqOut for each MTF7 (60 deg. sector) in the event
EMTFDaqOutCollection* res;
Expand All @@ -159,7 +160,7 @@ namespace l1t {
////////////////////////////

if (run3_DAQ_format) { // Run 3 DAQ format has 2 TPs per block
if (i == 0) {
if (i == 1) {
RPC_.set_phi(GetHexBits(RPCa, 0, 10));
RPC_.set_word(GetHexBits(RPCa, 11, 12));
RPC_.set_frame(GetHexBits(RPCa, 13, 14));
Expand Down