Skip to content
Snippets Groups Projects
Commit 7fa64299 authored by scott snyder's avatar scott snyder
Browse files

GeoModelKernel: Fix compilation warnings.

Order of member initialization.
Unused class data members.
Unused function parameter.
parent ff0b07aa
Branches
No related tags found
1 merge request!94GeoModelKernel: Fix compilation warnings.
/* /*
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 GEOMODELKERNEL_GEOTWISTEDTRAP_H #ifndef GEOMODELKERNEL_GEOTWISTEDTRAP_H
...@@ -113,12 +113,7 @@ class GeoTwistedTrap : public GeoShape ...@@ -113,12 +113,7 @@ class GeoTwistedTrap : public GeoShape
double m_dx3; double m_dx3;
double m_dx4; double m_dx4;
double m_dz; // Half-length along the z axis double m_dz; // Half-length along the z axis
double m_dx ; // maximum side in x
double m_dy ; // maximum side in y
double m_alph ; double m_alph ;
double m_tAlph ; // std::tan(fAlph)
double m_deltaX ;
double m_deltaY ;
double m_phiTwist; // twist angle ( dphi in surface equation) double m_phiTwist; // twist angle ( dphi in surface equation)
const double m_CarTolerance = 1E-9 * SYSTEM_OF_UNITS::mm; const double m_CarTolerance = 1E-9 * SYSTEM_OF_UNITS::mm;
......
/* /*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
#include "GeoModelKernel/GeoMaterialManager.h" #include "GeoModelKernel/GeoMaterialManager.h"
...@@ -18,7 +18,7 @@ GeoMaterialManager* GeoMaterialManager::s_instance{nullptr}; ...@@ -18,7 +18,7 @@ GeoMaterialManager* GeoMaterialManager::s_instance{nullptr};
class Impl { class Impl {
public: public:
Impl(GeoMaterialManager* man) Impl(GeoMaterialManager* /*man*/)
{} {}
~Impl(){} ~Impl(){}
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
#include "GeoModelKernel/GeoTwistedTrap.h" #include "GeoModelKernel/GeoTwistedTrap.h"
...@@ -15,9 +15,7 @@ GeoTwistedTrap::GeoTwistedTrap(double pPhiTwist, ...@@ -15,9 +15,7 @@ GeoTwistedTrap::GeoTwistedTrap(double pPhiTwist,
double pDx2, double pDx2,
double pDy, double pDy,
double pDz ) double pDz )
: m_phiTwist(pPhiTwist), : m_theta(0.),
m_dz(pDz),
m_theta(0.),
m_phi(0.), m_phi(0.),
m_dy1(pDy), m_dy1(pDy),
m_dx1(pDx1), m_dx1(pDx1),
...@@ -25,7 +23,9 @@ m_dx2(pDx2), ...@@ -25,7 +23,9 @@ m_dx2(pDx2),
m_dy2(pDy), m_dy2(pDy),
m_dx3(pDx1), m_dx3(pDx1),
m_dx4(pDx2), m_dx4(pDx2),
m_alph(0.) m_dz(pDz),
m_alph(0.),
m_phiTwist(pPhiTwist)
{ {
} }
...@@ -41,9 +41,7 @@ GeoTwistedTrap(double pPhiTwist, // twist angle ...@@ -41,9 +41,7 @@ GeoTwistedTrap(double pPhiTwist, // twist angle
double pDx3, // half x length at +pDz,-pDy double pDx3, // half x length at +pDz,-pDy
double pDx4, // half x length at +pDz,+pDy double pDx4, // half x length at +pDz,+pDy
double pAlph ) // tilt angle double pAlph ) // tilt angle
: m_phiTwist(pPhiTwist), : m_theta(pTheta),
m_dz(pDz),
m_theta(pTheta),
m_phi(pPhi), m_phi(pPhi),
m_dy1(pDy1), m_dy1(pDy1),
m_dx1(pDx1), m_dx1(pDx1),
...@@ -51,7 +49,9 @@ m_dx2(pDx2), ...@@ -51,7 +49,9 @@ m_dx2(pDx2),
m_dy2(pDy2), m_dy2(pDy2),
m_dx3(pDx3), m_dx3(pDx3),
m_dx4(pDx4), m_dx4(pDx4),
m_alph(pAlph) m_dz(pDz),
m_alph(pAlph),
m_phiTwist(pPhiTwist)
{ {
if ( ! ( ( m_dx1 > 2*m_CarTolerance) if ( ! ( ( m_dx1 > 2*m_CarTolerance)
&& ( m_dx2 > 2*m_CarTolerance) && ( m_dx2 > 2*m_CarTolerance)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment