Skip to content
Snippets Groups Projects
Commit 7b0005b5 authored by Edward Moyse's avatar Edward Moyse Committed by Atlas Nightlybuild
Browse files

Merge branch 'clang.L1CaloFEXByteStream-20220923' into 'master'

L1CaloFEXByteStream: Fix compilation with clang.

See merge request !56999

(cherry picked from commit e4f4a454)

cac64025 L1CaloFEXByteStream: Fix compilation with clang.
parent e920faa3
No related branches found
No related tags found
4 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!5717730.09.2022: daily merge merge of 22.0 into master,!57053Sweeping !56999 from master to 22.0. L1CaloFEXByteStream: Fix compilation with clang.
Pipeline #4541820 passed
......@@ -370,7 +370,7 @@ StatusCode jFexInputByteStreamTool::ReadfromFile(const std::string & fileName){
}
constexpr unsigned int jFexInputByteStreamTool::mapIndex(unsigned int jfex, unsigned int fpga, unsigned int channel, unsigned int tower) const{
constexpr unsigned int jFexInputByteStreamTool::mapIndex(unsigned int jfex, unsigned int fpga, unsigned int channel, unsigned int tower) {
// values from hardware: jfex=[0,5] 4 bits, fpga=[0,3] 4 bits, channel=[0,59] 8 bits, tower=[0,15] 4 bits
return (jfex << 16) | (fpga << 12) | (channel << 4) | tower;
}
......
......@@ -71,7 +71,7 @@ class jFexInputByteStreamTool : public extends<AthAlgTool, IL1TriggerByteStreamT
StatusCode ReadfromFile(const std::string&);
// hash the index into one integer in the format 0xJFCCT (hexadecimal)
constexpr unsigned int mapIndex(unsigned int jfex, unsigned int fpga, unsigned int channel, unsigned int tower) const;
constexpr static unsigned int mapIndex(unsigned int jfex, unsigned int fpga, unsigned int channel, unsigned int tower);
std::unordered_map<unsigned int, std::array<float,4> > m_Firm2Tower_map; /// {map index, {IDsimulation,eta,phi}}
......
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