Skip to content
Snippets Groups Projects
Commit 27dec8be authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'master-tile-cell-builder-tb-period-2018' into 'master'

TileRecUtils: Add Tile Demo cabling for TB 2018

See merge request !47612
parents eb4e34f7 4f42c305
5 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!50012RecExConfig: Adjust log message levels from GetRunNumber and GetLBNumber,!47612TileRecUtils: Add Tile Demo cabling for TB 2018
......@@ -1155,12 +1155,16 @@ void TileCellBuilder::build (const EventContext& ctx,
26,25,24,29,31,32,27,28,30,35,34,33,38,37,43,44,41,40,39,36,42,47,46,45};
channel1 = pmt2channel[channel];
} else if ( (m_useDemoCabling == 2016 || m_useDemoCabling == 2017 )
&& (/* (ros == 1 && drawer == 0) || */ (ros == 2 && drawer == 1) || (drawer>2) )) {
} else if ( (m_useDemoCabling >= 2016 && m_useDemoCabling <= 2019)
&& (ros == 2 && (drawer == 1 || drawer>2)) ) {
int pmt2channel[48] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,
26,25,24,29,28,27,32,31,30,35,34,33,38,37,36,41,40,39,44,43,42,47,46,45
};
26,25,24,29,28,27,32,31,30,35,34,33,38,37,36,41,40,39,44,43,42,47,46,45};
channel1 = pmt2channel[channel];
} else if ( (m_useDemoCabling >= 2018)
&& (ros == 4 && drawer>=2) ) {
int pmt2channelEB[48] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,
31,32,30,35, 33,34, 38,37,41,40,39,36, 26,25,24,29,28,27, 44,43,42,47,46,45};
channel1 = pmt2channelEB[channel];
}
Identifier cell_id = m_cabling->h2s_cell_id_index (ros, drawer, channel1, index, pmt);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment