Commit 5491214a authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'ep/nsw-decoder-development' into 'master'

Bugs and comments fixed

See merge request atlas/athena!45635
parents 54877c5e 902ad17c
......@@ -26,7 +26,7 @@ namespace Muon
static const std::vector <uint8_t> s_stgc_sector_type = {0, 1};
// Layer type: 0 for layers 0 and 4 and 1 for layers 2 and 4 in the quadruplet
// Layer type: 0 for layers 0 and 3 and 1 for layers 1 and 2 in the quadruplet
static const std::vector <uint8_t> s_stgc_layer_type = {0, 1};
......@@ -40,7 +40,7 @@ namespace Muon
static const std::map <std::pair <uint8_t, uint8_t>, uint16_t> s_stgc_nchan_map =
{{{0, 0}, Muon::nsw::sTGCQS1ChannelNumber}, {{0, 1}, Muon::nsw::sTGCQS2ChannelNumber},
{{0, 2}, Muon::nsw::sTGCQS3ChannelNumber}, {{1, 0}, Muon::nsw::sTGCQL1ChannelNumber},
{{1, 1}, Muon::nsw::sTGCQS2ChannelNumber}, {{1, 2}, Muon::nsw::sTGCQS3ChannelNumber}};
{{1, 1}, Muon::nsw::sTGCQL2ChannelNumber}, {{1, 2}, Muon::nsw::sTGCQL3ChannelNumber}};
// First VMM (number, channel) used as function of {sector type, layer_type, quadruplet}
......
......@@ -31,7 +31,7 @@ uint16_t Muon::nsw::VMMChannel::channel_number ()
// Configuration of channels in a quadruplets is the same for 0, 3 and 1, 2
uint8_t quad_layer = m_elink->elinkId ()->layer () % 4;
uint8_t layer_type = (quad_layer & 0x1) ^ (quad_layer & 0x2);
uint8_t layer_type = (quad_layer & 0x1) ^ ((quad_layer >> 1) & 0x1);
// In the offline convention (sectors 1-16) odd sectors are large, even sectors are small;
// in the online convention (sectors 0-15) odd sectors are small, even sectors are large
......
......@@ -34,7 +34,7 @@ Muon::nsw::sTGCMapper::sTGCMapper ()
else if (q == 0 && l_type == 1 && (j == jmax - 336 || j == jmax - 400)) j -= 32;
unsigned int vmm_chan = l_type == 0 ? i : j;
uint32_t id = private_id (s_type, l_type, q, vmm_chan);
uint32_t id = private_id (s_type, q, l_type, vmm_chan);
std::pair <uint32_t, uint16_t> p (id, c);
m_channel_map.insert (p);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment