From 1868a343addc4f1ce487139f067fb3228c45b274 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 1 Jul 2020 16:50:13 +0200
Subject: [PATCH] LArRawConditions: Fix clang10 warnings.
Shorten flag values that were losing precision in implicit conversions
from int to float.
---
.../LArRawConditions/LArCableAttenuationP.h | 4 ++--
.../LArRawConditions/LArCableLengthP.h | 4 ++--
.../LArRawConditions/LArCaliPulseParamsP.h | 6 +++---
.../LArRawConditions/LArDetCellParamsP.h | 4 ++--
.../LArRawConditions/LArEMEC_CphiP.h | 4 ++--
.../LArRawConditions/LArEMEC_HValphaP.h | 4 ++--
.../LArRawConditions/LArEMEC_HVbetaP.h | 4 ++--
.../LArRawConditions/LArMinBiasAverageP.h | 4 ++--
.../LArRawConditions/LArMinBiasP.h | 4 ++--
.../LArRawConditions/LArNoiseP.h | 4 ++--
.../LArRawConditions/LArPhysCaliTdiffP.h | 4 ++--
.../LArRawConditions/LArRawConditions/LArRinjP.h | 4 ++--
.../LArRawConditions/LArTdriftP.h | 4 ++--
.../LArRawConditions/LArTshaperP.h | 4 ++--
.../LArRawConditions/LArWaveDerivedQuantitiesP.h | 16 ++++++++--------
.../LArRawConditions/LArfSamplP.h | 4 ++--
16 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArCableAttenuationP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArCableAttenuationP.h
index 4eb95817b02..bd31b1d01d6 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArCableAttenuationP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArCableAttenuationP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARCABLEATTENUATIONP
@@ -20,7 +20,7 @@
class LArCableAttenuationP{
public:
- LArCableAttenuationP() : m_CableAttenuation(-999999999) {}
+ LArCableAttenuationP() : m_CableAttenuation(-9999999) {}
LArCableAttenuationP(float f)
: m_CableAttenuation(f) {}
bool isEmpty() const { return m_CableAttenuation < -9999 ; } ;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArCableLengthP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArCableLengthP.h
index 95de4732ee7..820b1de41df 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArCableLengthP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArCableLengthP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARCABLELENGTHP
@@ -20,7 +20,7 @@
class LArCableLengthP{
public:
- LArCableLengthP() : m_CableLength(-999999999) {}
+ LArCableLengthP() : m_CableLength(-9999999) {}
LArCableLengthP(float f)
: m_CableLength(f) {}
bool isEmpty() const { return m_CableLength < -9999 ; } ;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArCaliPulseParamsP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArCaliPulseParamsP.h
index 50e9f369323..7d5c82f50bc 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArCaliPulseParamsP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArCaliPulseParamsP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARCALIPULSEPARAMSP
@@ -12,9 +12,9 @@ class LArCaliPulseParamsP
{
public:
LArCaliPulseParamsP()
- : m_Tcal(-999999999), m_Fstep(-999999999), m_Offset(-999999999), m_dTimeCal(-999999999), m_nCB(-999) {} ;
+ : m_Tcal(-9999999), m_Fstep(-9999999), m_Offset(-9999999), m_dTimeCal(-99999), m_nCB(-999) {} ;
LArCaliPulseParamsP(float r, float s)
- : m_Tcal(r), m_Fstep(s), m_Offset(-999999999), m_dTimeCal(-999999999), m_nCB(-999) {} ;
+ : m_Tcal(r), m_Fstep(s), m_Offset(-9999999), m_dTimeCal(-9999999), m_nCB(-999) {} ;
LArCaliPulseParamsP(float r, float s, float t, float u)
: m_Tcal(r), m_Fstep(s), m_Offset(t), m_dTimeCal(u), m_nCB(-999) {} ;
LArCaliPulseParamsP(float r, float s, float t, float u ,short v)
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArDetCellParamsP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArDetCellParamsP.h
index f4ce1b816a9..e842f1d7b2f 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArDetCellParamsP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArDetCellParamsP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARDETCELLPARAMSP
@@ -10,7 +10,7 @@
// persistent c-struct
class LArDetCellParamsP{
public:
- LArDetCellParamsP() : m_Omega0(-999999999), m_Taur(-999999999) {}
+ LArDetCellParamsP() : m_Omega0(-9999999), m_Taur(-9999999) {}
LArDetCellParamsP(float o, float t)
: m_Omega0(o), m_Taur(t) {}
bool isEmpty() const { return (m_Omega0 < -9999 && m_Taur < -9999) ; } ;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_CphiP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_CphiP.h
index ad8be3fb8d6..84da1ff6a4c 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_CphiP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_CphiP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LAREMEC_CPHIP
@@ -20,7 +20,7 @@
class LArEMEC_CphiP{
public:
- LArEMEC_CphiP() : m_EMEC_Cphi(-999999999) {}
+ LArEMEC_CphiP() : m_EMEC_Cphi(-9999999) {}
LArEMEC_CphiP(float f)
: m_EMEC_Cphi(f) {}
float m_EMEC_Cphi;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_HValphaP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_HValphaP.h
index 58d85bb7c58..57d813fa961 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_HValphaP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_HValphaP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LAREMEC_HVALPHAP
@@ -20,7 +20,7 @@
class LArEMEC_HValphaP{
public:
- LArEMEC_HValphaP() : m_EMEC_HValpha(-999999999) {}
+ LArEMEC_HValphaP() : m_EMEC_HValpha(-9999999) {}
LArEMEC_HValphaP(float f)
: m_EMEC_HValpha(f) {}
bool isEmpty() const { return m_EMEC_HValpha < -9999 ; } ;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_HVbetaP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_HVbetaP.h
index 51bee1a3848..19f141abe81 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_HVbetaP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArEMEC_HVbetaP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LAREMEC_HVBETAP
@@ -20,7 +20,7 @@
class LArEMEC_HVbetaP{
public:
- LArEMEC_HVbetaP() : m_EMEC_HVbeta(-999999999) {}
+ LArEMEC_HVbetaP() : m_EMEC_HVbeta(-9999999) {}
LArEMEC_HVbetaP(float f)
: m_EMEC_HVbeta(f) {}
bool isEmpty() const { return m_EMEC_HVbeta < -9999 ; } ;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasAverageP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasAverageP.h
index 47ff3ccf4ec..ca279d83c9b 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasAverageP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasAverageP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARMINBIASAVERAGEP
@@ -15,7 +15,7 @@ class LArMinBiasAverageP
{
public:
- LArMinBiasAverageP() : m_MinBiasAverage(-999999999) {}
+ LArMinBiasAverageP() : m_MinBiasAverage(-9999999) {}
LArMinBiasAverageP(float average) : m_MinBiasAverage(average) {}
bool isEmpty() const { return m_MinBiasAverage < -9999 ; } ;
float m_MinBiasAverage;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasP.h
index 36ff5f40d78..39ea2c5d2db 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARMINBIASP
@@ -15,7 +15,7 @@ class LArMinBiasP
{
public:
- LArMinBiasP() : m_MinBiasRMS(-999999999) {}
+ LArMinBiasP() : m_MinBiasRMS(-9999999) {}
LArMinBiasP(float rms) : m_MinBiasRMS(rms) {}
bool isEmpty() const { return m_MinBiasRMS < -9999 ; } ;
float m_MinBiasRMS;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseP.h
index 08e1ccd7d4f..2668989800f 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARNOISEP
@@ -11,7 +11,7 @@
class LArNoiseP
{
public:
- LArNoiseP() : m_Noise(-999999999) {}
+ LArNoiseP() : m_Noise(-9999999) {}
LArNoiseP(float n) : m_Noise(n) {}
bool isEmpty() const { return m_Noise < -9999 ; } ;
float m_Noise;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArPhysCaliTdiffP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArPhysCaliTdiffP.h
index 8bc0537b66e..989a1546728 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArPhysCaliTdiffP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArPhysCaliTdiffP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARPHYSCALITDIFFP
@@ -11,7 +11,7 @@ class LArPhysCaliTdiffP
{
public:
- LArPhysCaliTdiffP() : m_Tdiff(-999999999) {}
+ LArPhysCaliTdiffP() : m_Tdiff(-9999999) {}
LArPhysCaliTdiffP(float t)
: m_Tdiff(t) {}
bool isEmpty() const { return m_Tdiff < -9999 ; } ;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArRinjP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArRinjP.h
index 6b9d92f1376..1737eb60e08 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArRinjP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArRinjP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARRINJP
@@ -20,7 +20,7 @@
class LArRinjP{
public:
- LArRinjP() : m_Rinj(-999999999) {}
+ LArRinjP() : m_Rinj(-9999999) {}
LArRinjP(float f) : m_Rinj(f) {}
bool isEmpty() const { return m_Rinj < -9999 ; } ;
float m_Rinj;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArTdriftP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArTdriftP.h
index 198bc07442e..1693c5765a2 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArTdriftP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArTdriftP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARTDRIFTP
@@ -10,7 +10,7 @@
// persistent c-struct
class LArTdriftP{
public:
- LArTdriftP(): m_Tdrift(-999999999) {}
+ LArTdriftP(): m_Tdrift(-9999999) {}
LArTdriftP(float d): m_Tdrift(d) {}
bool isEmpty() const { return m_Tdrift < -9999 ; } ;
float m_Tdrift;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArTshaperP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArTshaperP.h
index ad614c61f33..422c07eb291 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArTshaperP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArTshaperP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARTSHAPERP
@@ -20,7 +20,7 @@
class LArTshaperP{
public:
- LArTshaperP() : m_Tshaper(-999999999) {}
+ LArTshaperP() : m_Tshaper(-9999999) {}
LArTshaperP(float f) : m_Tshaper(f) {}
bool isEmpty() const { return m_Tshaper < -9999 ; } ;
float m_Tshaper;
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArWaveDerivedQuantitiesP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArWaveDerivedQuantitiesP.h
index 648cbea79c5..79adc236f81 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArWaveDerivedQuantitiesP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArWaveDerivedQuantitiesP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARWAVEDERIVEDQUANTITIESP_H
@@ -12,13 +12,13 @@ class LArWaveDerivedQuantitiesP
public:
LArWaveDerivedQuantitiesP() :
- m_baseline(-999999999),
- m_maxAmp(-999999999),
- m_tmaxAmp(-999999999),
- m_width(-999999999),
- m_rT0(-999999999),
- m_posLobe(-999999999),
- m_jitter(-999999999),
+ m_baseline(-9999999),
+ m_maxAmp(-9999999),
+ m_tmaxAmp(-9999999),
+ m_width(-9999999),
+ m_rT0(-9999999),
+ m_posLobe(-9999999),
+ m_jitter(-9999999),
m_flag(0)
{};
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArfSamplP.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArfSamplP.h
index a3adf909424..722704e207e 100755
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArfSamplP.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArfSamplP.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARRAWCONDITIONS_LARFSAMPLP
@@ -20,7 +20,7 @@ class LArfSamplP
{
public:
- LArfSamplP() : m_fSampl(-999999999) {}
+ LArfSamplP() : m_fSampl(-9999999) {}
LArfSamplP(float f) : m_fSampl(f) {}
bool isEmpty() const { return m_fSampl < -9999 ; } ;
float m_fSampl;
--
GitLab