Skip to content
Snippets Groups Projects
Commit dc7e68a4 authored by Ruth Pottgen's avatar Ruth Pottgen
Browse files

Merge branch 'FCS_gcc8' into '21.0'

FCS: Fix building standalone code with gcc8

See merge request atlas/athena!29413
parents 7a45b822 05cf48ff
No related branches found
No related tags found
No related merge requests found
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
// Liquid Argon FCAL detector description package
// -----------------------------------------
// Copyright (C) 1998 by ATLAS Collaboration
//
//
// 10-Sep-2000 S.Simion Handling of the FCAL read-out identifiers
......@@ -209,7 +208,7 @@ FCAL_ChannelMap::create_tileMap(int isam)
// ***********************************************************************
bool
FCAL_ChannelMap::getTileID(int isam, float x_orig, float y_orig,
int& eta, int& phi) const throw (std::range_error)
int& eta, int& phi) const
{
// /* ### MIRROR for compatibility between G3 and ASCII files ### */
......@@ -308,7 +307,6 @@ FCAL_ChannelMap::getTileID(int isam, float x_orig, float y_orig,
---------------------------------------------------------------------- */
float
FCAL_ChannelMap::x(int isam, int eta, int phi) const
throw(std::range_error)
{
if(m_invert_xy){
// temp turn off the flag
......@@ -351,7 +349,6 @@ FCAL_ChannelMap::x(int isam, int eta, int phi) const
---------------------------------------------------------------------- */
float
FCAL_ChannelMap::y(int isam, int eta, int phi) const
throw(std::range_error)
{
if(m_invert_xy){
......@@ -426,7 +423,7 @@ void FCAL_ChannelMap::tileSize(int sam, int ntubes, float &dx, float &dy) const
}
void FCAL_ChannelMap::tileSize(int sam, int eta, int phi,
float& dx, float& dy ) const throw(std::range_error)
float& dx, float& dy ) const
{
tileName_t tilename = (eta << 16) + phi ;
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ***************************************************************************
// Liquid Argon FCAL detector description package
// -----------------------------------------
// Copyright (C) 1998 by ATLAS Collaboration
//
//
// 10-Sep-2000 S.Simion Handling of the FCAL read-out identifiers
......@@ -88,18 +87,18 @@ public:
float x,
float y,
int& eta,
int& phi) const throw (std::range_error);
int& phi) const;
/** For reconstruction, decoding of tile identifiers */
float x(int isam,
int eta,
int phi) const throw(std::range_error) ;
int phi) const;
float y(int isam,
int eta,
int phi) const throw(std::range_error) ;
int phi) const;
void tileSize(int sam, int eta, int phi,
float& dx, float& dy) const throw(std::range_error) ;
float& dx, float& dy) const;
void tileSize(int isam, int ntubes, float& dx, float& dy) const;
......
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