From 1d21e4305664ecc635e5f573f36d54c9911bf8e1 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 9 May 2022 09:51:18 +0200
Subject: [PATCH] MagFieldElements: fix uninit members
---
.../MagFieldElements/MagFieldElements/BFieldCacheZR.h | 11 +++++------
.../MagFieldElements/BFieldCacheZR.icc | 11 ++---------
.../MagFieldElements/MagFieldElements/BFieldMeshZR.h | 4 ++--
3 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/MagneticField/MagFieldElements/MagFieldElements/BFieldCacheZR.h b/MagneticField/MagFieldElements/MagFieldElements/BFieldCacheZR.h
index 9597916e5ca0..e69f7ba86384 100644
--- a/MagneticField/MagFieldElements/MagFieldElements/BFieldCacheZR.h
+++ b/MagneticField/MagFieldElements/MagFieldElements/BFieldCacheZR.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
//
@@ -21,8 +21,6 @@
class BFieldCacheZR
{
public:
- // default constructor sets unphysical boundaries, so that inside() will fail
- BFieldCacheZR();
// invalidate this cache, so that inside() will fail
void invalidate();
// set the z, r range that defines the bin
@@ -40,9 +38,10 @@ public:
double* ATH_RESTRICT deriv = nullptr) const;
private:
- double m_zmin, m_zmax; // bin range in z
- double m_rmin, m_rmax; // bin range in r
- double m_invz, m_invr; // 1/(bin size) in z, r
+ // default unphysical boundaries, so that inside() will fail
+ double m_zmin{0}, m_zmax{-1}; // bin range in z
+ double m_rmin{0}, m_rmax{-1}; // bin range in r
+ double m_invz{-1}, m_invr{-1}; // 1/(bin size) in z, r
double m_field[2][4]; // (Bz,Br) at 4 corners of the bin
};
#include "MagFieldElements/BFieldCacheZR.icc"
diff --git a/MagneticField/MagFieldElements/MagFieldElements/BFieldCacheZR.icc b/MagneticField/MagFieldElements/MagFieldElements/BFieldCacheZR.icc
index e63616193c83..8baaece55bcf 100644
--- a/MagneticField/MagFieldElements/MagFieldElements/BFieldCacheZR.icc
+++ b/MagneticField/MagFieldElements/MagFieldElements/BFieldCacheZR.icc
@@ -1,14 +1,7 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
-inline BFieldCacheZR::BFieldCacheZR()
- : m_zmin(0.0)
- , m_zmax(-1.0)
- , m_rmin(0.0)
- , m_rmax(-1.0)
- , m_invz(-1.0)
- , m_invr(-1.0)
-{}
+
inline void
BFieldCacheZR::invalidate()
{
diff --git a/MagneticField/MagFieldElements/MagFieldElements/BFieldMeshZR.h b/MagneticField/MagFieldElements/MagFieldElements/BFieldMeshZR.h
index 1d78885d5312..910023254d22 100644
--- a/MagneticField/MagFieldElements/MagFieldElements/BFieldMeshZR.h
+++ b/MagneticField/MagFieldElements/MagFieldElements/BFieldMeshZR.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -60,7 +60,7 @@ private:
// look-up table and related variables
std::array<std::vector<int>, 2> m_LUT;
std::array<double, 2> m_invUnit; // inverse unit size in the LUT
- int m_zoff;
+ int m_zoff{0};
};
#include "MagFieldElements/BFieldMeshZR.icc"
--
GitLab