From 52261c5b4a298b4918a556561e78b9cfad82c2ac Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Thu, 5 Dec 2019 13:50:26 +0100
Subject: [PATCH] Making a few local variables const in ISF_FastCaloSimEvent
classes.
---
.../src/TFCSEnergyInterpolationLinear.cxx | 2 +-
.../src/TFCSEnergyInterpolationSpline.cxx | 2 +-
...SLateralShapeParametrizationFluctChain.cxx | 12 +++++------
...FCSLateralShapeParametrizationHitChain.cxx | 6 +++---
.../src/TFCSParametrizationBinnedChain.cxx | 2 +-
.../src/TFCSParametrizationChain.cxx | 20 +++++++++----------
.../TFCSParametrizationPDGIDSelectChain.cxx | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationLinear.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationLinear.cxx
index 9f6b46690d20..db15efd4c82c 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationLinear.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationLinear.cxx
@@ -21,7 +21,7 @@ TFCSEnergyInterpolationLinear::TFCSEnergyInterpolationLinear(const char* name, c
FCSReturnCode TFCSEnergyInterpolationLinear::simulate(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState*) const
{
- float Emean=m_slope*truth->Ekin()+m_offset;
+ const float Emean=m_slope*truth->Ekin()+m_offset;
ATH_MSG_DEBUG("set E="<<Emean<<" for true Ekin="<<truth->Ekin());
simulstate.set_E(Emean);
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationSpline.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationSpline.cxx
index 5aa42051993b..38f935eb6e1a 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationSpline.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationSpline.cxx
@@ -37,7 +37,7 @@ void TFCSEnergyInterpolationSpline::InitFromArrayInEkin(Int_t np, Double_t Ekin[
FCSReturnCode TFCSEnergyInterpolationSpline::simulate(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState*) const
{
float Emean;
- float logEkin=TMath::Log(truth->Ekin());
+ const float logEkin=TMath::Log(truth->Ekin());
if(logEkin<m_spline.GetXmin()) {
Emean=m_spline.Eval(m_spline.GetXmin())*truth->Ekin();
} else {
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationFluctChain.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationFluctChain.cxx
index 871686e7e2c2..7f4eb1c71e45 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationFluctChain.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationFluctChain.cxx
@@ -33,17 +33,17 @@ FCSReturnCode TFCSLateralShapeParametrizationFluctChain::simulate(TFCSSimulation
//Limit to relative precision of 10^-4=0.01%. ATLAS calorimeter is ~0.1% at best
if(sigma2<1e-8) sigma2=1e-8;
- float Elayer=simulstate.E(calosample());
- int nhit = 1.0 / sigma2;
+ const float Elayer=simulstate.E(calosample());
+ const int nhit = 1.0 / sigma2;
//Make a good guess of the needed hit energy, assuming all hits would have the same energy
- float Eavghit=Elayer/nhit;
- float Eavghit_tenth=Eavghit/10;
+ const float Eavghit=Elayer/nhit;
+ const float Eavghit_tenth=Eavghit/10;
float sumEhit=0;
float error2_sumEhit=0;
float error2=2*s_max_sigma2_fluctuation;
- bool debug = msgLvl(MSG::DEBUG);
+ const bool debug = msgLvl(MSG::DEBUG);
if (debug) {
ATH_MSG_DEBUG("E("<<calosample()<<")="<<Elayer<<" sigma2="<<sigma2);
}
@@ -78,7 +78,7 @@ FCSReturnCode TFCSLateralShapeParametrizationFluctChain::simulate(TFCSSimulation
if(!failed) {
ifail=0;
++ihit;
- float Ehit=hit.E();
+ const float Ehit=hit.E();
sumEhit+=Ehit;
error2_sumEhit+=Ehit*Ehit;
if(sumEhit>0) error2=error2_sumEhit/(sumEhit*sumEhit);
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitChain.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitChain.cxx
index 2ad11effc320..0caeea393620 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitChain.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitChain.cxx
@@ -66,11 +66,11 @@ FCSReturnCode TFCSLateralShapeParametrizationHitChain::simulate(TFCSSimulationSt
return FCSFatal;
}
- float Elayer=simulstate.E(calosample());
- float Ehit=Elayer/nhit;
+ const float Elayer=simulstate.E(calosample());
+ const float Ehit=Elayer/nhit;
float sumEhit=0;
- bool debug = msgLvl(MSG::DEBUG);
+ const bool debug = msgLvl(MSG::DEBUG);
if (debug) {
ATH_MSG_DEBUG("E("<<calosample()<<")="<<simulstate.E(calosample())<<" #hits~"<<nhit);
}
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationBinnedChain.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationBinnedChain.cxx
index 52057ec5f5f6..efbadab2a459 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationBinnedChain.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationBinnedChain.cxx
@@ -66,7 +66,7 @@ FCSReturnCode TFCSParametrizationBinnedChain::simulate(TFCSSimulationState& simu
}
}
if(get_number_of_bins()>0) {
- int bin=get_bin(simulstate,truth,extrapol);
+ const int bin=get_bin(simulstate,truth,extrapol);
if(bin>=0 && bin<(int)get_number_of_bins()) {
for(unsigned int ichain=m_bin_start[bin];ichain<m_bin_start[bin+1];++ichain) {
ATH_MSG_DEBUG("for "<<get_variable_text(simulstate,truth,extrapol)<<" run "<<get_bin_text(bin)<<": "<<chain()[ichain]->GetName());
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationChain.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationChain.cxx
index 2487afc8074a..743ec49877af 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationChain.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationChain.cxx
@@ -17,7 +17,7 @@ void TFCSParametrizationChain::recalc_pdgid_intersect()
{
set_pdgid(m_chain[0]->pdgid());
- for(auto param: m_chain) {
+ for(const auto& param: m_chain) {
std::set< int > tmp;
std::set_intersection(pdgid().begin(), pdgid().end(),
@@ -31,7 +31,7 @@ void TFCSParametrizationChain::recalc_pdgid_union()
{
set_pdgid(chain()[0]->pdgid());
- for(auto param: chain()) {
+ for(const auto& param: chain()) {
std::set< int > tmp;
std::set_union(pdgid().begin(), pdgid().end(),
@@ -45,7 +45,7 @@ void TFCSParametrizationChain::recalc_Ekin_intersect()
{
set_Ekin(*m_chain[0]);
- for(auto param: m_chain) {
+ for(const auto& param: m_chain) {
if(param->Ekin_min()>Ekin_min()) set_Ekin_min(param->Ekin_min());
if(param->Ekin_max()<Ekin_max()) set_Ekin_max(param->Ekin_max());
if(Ekin_nominal()<Ekin_min() || Ekin_nominal()>Ekin_max()) set_Ekin_nominal(param->Ekin_nominal());
@@ -58,7 +58,7 @@ void TFCSParametrizationChain::recalc_eta_intersect()
{
set_eta(*m_chain[0]);
- for(auto param: m_chain) {
+ for(const auto& param: m_chain) {
if(param->eta_min()>eta_min()) set_eta_min(param->eta_min());
if(param->eta_max()<eta_max()) set_eta_max(param->eta_max());
if(eta_nominal()<eta_min() || eta_nominal()>eta_max()) set_eta_nominal(param->eta_nominal());
@@ -77,7 +77,7 @@ void TFCSParametrizationChain::recalc_Ekin_union()
{
set_Ekin(*m_chain[0]);
- for(auto param: m_chain) {
+ for(const auto& param: m_chain) {
if(param->Ekin_min()<Ekin_min()) set_Ekin_min(param->Ekin_min());
if(param->Ekin_max()>Ekin_max()) set_Ekin_max(param->Ekin_max());
if(Ekin_nominal()<Ekin_min() || Ekin_nominal()>Ekin_max()) set_Ekin_nominal(param->Ekin_nominal());
@@ -90,7 +90,7 @@ void TFCSParametrizationChain::recalc_eta_union()
{
set_eta(*m_chain[0]);
- for(auto param: m_chain) {
+ for(const auto& param: m_chain) {
if(param->eta_min()<eta_min()) set_eta_min(param->eta_min());
if(param->eta_max()>eta_max()) set_eta_max(param->eta_max());
if(eta_nominal()<eta_min() || eta_nominal()>eta_max()) set_eta_nominal(param->eta_nominal());
@@ -118,19 +118,19 @@ void TFCSParametrizationChain::recalc()
bool TFCSParametrizationChain::is_match_Ekin_bin(int Ekin_bin) const
{
- for(auto param : m_chain) if(!param->is_match_Ekin_bin(Ekin_bin)) return false;
+ for(const auto& param : m_chain) if(!param->is_match_Ekin_bin(Ekin_bin)) return false;
return true;
}
bool TFCSParametrizationChain::is_match_calosample(int calosample) const
{
- for(auto param : m_chain) if(!param->is_match_calosample(calosample)) return false;
+ for(const auto& param : m_chain) if(!param->is_match_calosample(calosample)) return false;
return true;
}
FCSReturnCode TFCSParametrizationChain::simulate(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState* extrapol) const
{
- for(auto param: m_chain) {
+ for(const auto& param: m_chain) {
if (simulate_and_retry(param, simulstate, truth, extrapol) != FCSSuccess) {
return FCSFatal;
}
@@ -147,7 +147,7 @@ void TFCSParametrizationChain::Print(Option_t *option) const
//bool longprint=msgLvl(MSG::DEBUG) || (msgLvl(MSG::INFO) && !shortprint);
char count='A';
- for(auto param: m_chain) {
+ for(const auto& param: m_chain) {
param->Print(opt+count+' ');
count++;
}
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationPDGIDSelectChain.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationPDGIDSelectChain.cxx
index 24365a44897f..ac6fbb6d020c 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationPDGIDSelectChain.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationPDGIDSelectChain.cxx
@@ -26,7 +26,7 @@ void TFCSParametrizationPDGIDSelectChain::recalc()
FCSReturnCode TFCSParametrizationPDGIDSelectChain::simulate(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState* extrapol) const
{
- for(auto param: chain()) {
+ for(const auto& param: chain()) {
if(param->is_match_pdgid(truth->pdgid())) {
ATH_MSG_DEBUG("pdgid="<<truth->pdgid()<<", now run: "<<param->GetName()<< ((SimulateOnlyOnePDGID()==true) ? ", abort PDGID loop afterwards" : ", continue PDGID loop afterwards"));
--
GitLab