Skip to content
Snippets Groups Projects
Commit 84b62b3b authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'clang.FastTRT_Digitization-20210104' into 'master'

FastTRT_Digitization+InDetEtaDependentCuts+GeoModelEnvelopes: Fix clang warnings.

See merge request !39457
parents fcbdffaa 5ff217f7
No related branches found
No related tags found
No related merge requests found
/* /*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
#ifndef ForDetEnvelopeTool_h #ifndef ForDetEnvelopeTool_h
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "GeoModelUtilities/GeoModelTool.h" #include "GeoModelUtilities/GeoModelTool.h"
class ForDetEnvelopeManager; class ForDetEnvelopeManager;
class ForDetEnvelopeTool : public GeoModelTool class ForDetEnvelopeTool final : public GeoModelTool
{ {
public: public:
......
/* /*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
...@@ -391,7 +391,7 @@ StatusCode TRTFastDigitizationTool::produceDriftCircles(const EventContext& ctx) ...@@ -391,7 +391,7 @@ StatusCode TRTFastDigitizationTool::produceDriftCircles(const EventContext& ctx)
if ( m_useTrtElectronPidTool ) { if ( m_useTrtElectronPidTool ) {
double position = ( fabs(BEC) == 1 ? hitGlobalPosition.z() : hitGlobalPosition.perp() ); double position = ( std::abs(BEC) == 1 ? hitGlobalPosition.z() : hitGlobalPosition.perp() );
double probability; double probability;
if ( abs( particleEncoding ) == 11 && kineticEnergy > 5000. ) { // electron if ( abs( particleEncoding ) == 11 && kineticEnergy > 5000. ) { // electron
......
/* /*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
#ifndef INDETETADEPENDENTCUTS_INDETETADEPENDENTCUTSSVC_H #ifndef INDETETADEPENDENTCUTS_INDETETADEPENDENTCUTSSVC_H
#define INDETETADEPENDENTCUTS_INDETETADEPENDENTCUTSSVC_H #define INDETETADEPENDENTCUTS_INDETETADEPENDENTCUTSSVC_H
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
#include "GaudiKernel/ISvcLocator.h" #include "GaudiKernel/ISvcLocator.h"
namespace InDet { namespace InDet {
class InDetEtaDependentCutsSvc: virtual public IInDetEtaDependentCutsSvc, class InDetEtaDependentCutsSvc final
public AthService { : virtual public IInDetEtaDependentCutsSvc, public AthService
{
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
// Public methods: // Public methods:
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
......
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