diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx
index d6b0b27e861e811b3b56fd1cd22d8113a17b2787..692050b903d7daf2e0de16b38f8603dacfe00551 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileLaserTimingTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Athena includes
@@ -354,9 +354,6 @@ StatusCode TileLaserTimingTool::execute() {
int Nconnected;
float ChannelOffset;
- // accumulated vals
- float totene = 0.0;
-
DrawerData *ddata = 0;
unsigned frag;
@@ -446,7 +443,6 @@ StatusCode TileLaserTimingTool::execute() {
pmtdata.eneHisto.Fill(pmtdata.energy);
pmtdata.gainHisto.Fill(gain);
#endif
- if (pmtdata.energy > 0.1) totene += pmtdata.energy;
// pulse data-->
#ifdef TileLaserTimingMonPulse
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx
index 0e67a8c983c114e473a4a2afbe4b85c60f2faaef..9b0df2ad4d427cf9a999c279a3eb5528f2f0d4d7 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileOFC2DBAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
//=== IOVDbTest includes
@@ -281,7 +281,6 @@ StatusCode TileOFC2DBAlg::execute() {
<< " phase = " << phase );
double w_a_sum = 0, w_b_sum = 0, w_c_sum = 0;
- double w_ag_sum = 0, w_bg_sum = 0;
for (int isam = 0; isam < ndig; isam++) {
if (m_of2) {
ATH_MSG_DEBUG( " sampling " << isam
@@ -301,8 +300,6 @@ StatusCode TileOFC2DBAlg::execute() {
w_a_sum += weights.w_a[isam];
w_b_sum += weights.w_b[isam];
w_c_sum += weights.w_c[isam];
- w_ag_sum += weights.w_a[isam] * weights.g[isam];
- w_bg_sum += weights.w_b[isam] * weights.g[isam];
drawerOfc->setOfc(0, drawerIdx, gain, channel, isam, weights.w_a[isam]);
drawerOfc->setOfc(1, drawerIdx, gain, channel, isam, weights.w_b[isam]);
diff --git a/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx b/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx
index ac20d0f18d6239fc1d3d93391499e4dbbd2b9765..bc79eb787056d6cd2103f3201bb230e23e7fdcf2 100755
--- a/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TileAtlasFactory.h"
@@ -151,8 +151,6 @@ void TileAtlasFactory::create(GeoPhysVol *world)
//unsigned int ienv_size = 6;
// set default finger length
- double PosEnvThickness =0;
- double NegEnvThickness =0;
double BFingerLength =0;
double BFingerLengthNeg =0;
double BFingerLengthPos =0;
@@ -267,14 +265,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
BFingerRmin = dbManager->TILBrmax()*Gaudi::Units::cm;
dbManager->SetCurrentSection(TileDddbManager::TILE_EBARREL);
EFingerRmin = dbManager->TILBrmax()*Gaudi::Units::cm;
-
- /** calculation PosEnvThickness enlarge mother volume by extra distance between barrel and positive ext.barrel */
- dbManager->SetCurrentEnvByType(3);
- PosEnvThickness += dbManager->GetEnvDZ()*dbManager->GetEnvSide();
- /** enlarge mother volume by extra distance between barrel and negative ext.barrel */
+ // ??? Is this needed?
dbManager->SetCurrentEnvByType(2);
- NegEnvThickness += dbManager->GetEnvDZ()*dbManager->GetEnvSide();
//
diff --git a/TileCalorimeter/TileRecUtils/src/TileFilterTester.cxx b/TileCalorimeter/TileRecUtils/src/TileFilterTester.cxx
index fea7417cf9ba9523d0f6b4000e79955d4b418cc9..c8515326142f483dafd47d7cb191f2b1ecf0fed5 100644
--- a/TileCalorimeter/TileRecUtils/src/TileFilterTester.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileFilterTester.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// **************************************************************************************************
@@ -106,17 +106,13 @@ void TileFilterTester::genEvents(int nEvent) {
}
double Dsum = 0.;
double D2sum = 0.;
- double Esum = 0.;
double E2sum = 0.;
int Nrecg = 0;
double Dsumg = 0.;
double D2sumg = 0.;
- double Esumg = 0.;
double E2sumg = 0.;
int Nrecb = 0;
- double Dsumb = 0.;
double D2sumb = 0.;
- double Esumb = 0.;
double E2sumb = 0.;
int Nover = 0;
int Nunder = 0;
@@ -284,7 +280,6 @@ void TileFilterTester::genEvents(int nEvent) {
if (icode >= 0) ncode[icode] += 1;
Dsum += diff_ch;
D2sum += diff_ch * diff_ch;
- Esum += err;
E2sum += err * err;
if (lconfigOK) {
@@ -292,7 +287,6 @@ void TileFilterTester::genEvents(int nEvent) {
if (icode >= 0) ncodeg[icode] += 1;
Dsumg += diff_ch;
D2sumg += diff_ch * diff_ch;
- Esumg += err;
E2sumg += err * err;
} else {
Nrecb += 1;
@@ -300,9 +294,7 @@ void TileFilterTester::genEvents(int nEvent) {
if (ncrrec < ncrgen) Nunder += 1;
if (ncrrec == ncrgen) Nmixed += 1;
if (icode >= 0) ncodeb[icode] += 1;
- Dsumb += diff_ch;
D2sumb += diff_ch * diff_ch;
- Esumb += err;
E2sumb += err * err;
} // end of ievent loop.
@@ -323,7 +315,6 @@ void TileFilterTester::genEvents(int nEvent) {
int den = Nrec ? Nrec : 1;
double rm = Dsum / den;
- //double errm = Esum/den;
double errsig = pow(E2sum / den, 0.5);
double rsig = pow(D2sum / den, 0.5);
@@ -332,7 +323,6 @@ void TileFilterTester::genEvents(int nEvent) {
if (Nrecg) {
double rmg = Dsumg / Nrecg;
- //double errmg = Esumg/Nrecg;
double errsigg = pow(E2sumg / Nrecg, 0.5);
double rsigg = pow(D2sumg / Nrecg, 0.5);
@@ -342,7 +332,6 @@ void TileFilterTester::genEvents(int nEvent) {
if (Nrecb) {
double rmb = Dsumg / Nrecb;
- //double errmb = Esumb/Nrecb;
double errsigb = pow(E2sumb / Nrecb, 0.5);
double rsigb = pow(D2sumb / Nrecb, 0.5);
diff --git a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
index 538865020fb41618bcac4c464ca2c5b5a63c470a..d9bc0abc0743782aa5e5727e00fabcc769f63691 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
@@ -1097,12 +1097,6 @@ StatusCode TileDigitsMaker::fillDigitCollection(const TileHitCollection* hitColl
std::vector<bool> &signal_in_channel, const TileEMScale* emScale,
const TilePulse& pulse) const{
- // Zero sums for monitoring.
- int nChSum = 0;
- double HitSum = 0.;
- double EneSum = 0.;
- double RChSum = 0.;
-
constexpr int nchMax = 48; // number of channels per drawer
std::array<int, nchMax> ntot_ch; ntot_ch.fill(0);
std::array<double, nchMax> ech_tot; ech_tot.fill(0.0);
@@ -1134,9 +1128,7 @@ StatusCode TileDigitsMaker::fillDigitCollection(const TileHitCollection* hitColl
for (int ihit = 0; ihit < n_hits; ++ihit) {
e_hit += tileHit->energy(ihit);
}
- HitSum += e_hit;
e_hit *= m_tileInfo->HitCalib(pmt_id);
- EneSum += e_hit;
ech_tot[ich] += e_hit;
ntot_ch[ich] += n_hits;
ATH_MSG_VERBOSE("BAD Overlay digits - skip hit in channel " << m_tileHWID->to_string(channel_id,-1));
@@ -1176,10 +1168,6 @@ StatusCode TileDigitsMaker::fillDigitCollection(const TileHitCollection* hitColl
if (fabs(t_hit) < 50.0) // ene within +/- 50 ns, used for filtered digits cut
ech_int[ich] += ech_sub * mbts_extra_factor;
ntot_ch[ich] += 1;
- nChSum += 1;
- HitSum += e_hit;
- EneSum += ech_sub;
- RChSum += amp_ch;
// Assume time is in nanoseconds, use fine-grain shaping:
int ishiftHi = (int) (t_hit / m_timeStepHi + 0.5);
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
index 786fb0114cbfc8344da9495a1ab51ed8e3e17aef..e7efed02bcbec8ed6f94619bc78f1fbe3aa33e6e 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
@@ -970,13 +970,7 @@ StatusCode TileHitVecToCntTool::mergeEvent(const EventContext& ctx) {
pHit->scale(scaleFactor);
if(m_doDigiTruth){
- double ehit_DigiHSTruth = 0.0;
TileHit *pHit_DigiHSTruth = (*hitItr_DigiHSTruth);
- int hitsize_DigiHSTruth = pHit_DigiHSTruth->size();
- for (int i = 0; i < hitsize_DigiHSTruth; ++i) {
- double thit = pHit_DigiHSTruth->time(i);
- if (fabs(thit) < m_photoStatisticsWindow) ehit_DigiHSTruth += pHit_DigiHSTruth->energy(i);
- }
pHit_DigiHSTruth->scale(scaleFactor);
++hitItr_DigiHSTruth;
diff --git a/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx b/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
index 0e243263e2a23d7f3ad74ebcad60465a83e4a390..bc3a336befe6a5c0463140185a623e3470c00155 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
@@ -166,7 +166,6 @@ StatusCode TileMuonReceiverDecision::execute(const EventContext &ctx) const {
float energy_d5 = 0.0;
float energy_d6 = 0.0;
float energy_d5d6 = 0.0;
- float time_d5 = 0.0;
float time_d6 = 0.0;
float time_d5d6 = 0.0;
@@ -237,7 +236,6 @@ StatusCode TileMuonReceiverDecision::execute(const EventContext &ctx) const {
}
if ( TMDBchan==0 || TMDBchan==1 ) { /* choose d5 cell */
energy_d5 += energy;
- time_d5 += time;
++jch5;
}
@@ -273,7 +271,6 @@ StatusCode TileMuonReceiverDecision::execute(const EventContext &ctx) const {
if (jch56>1) {
time_d5d6 /= jch56;
if (jch6>1) time_d6 /= jch6;
- if (jch5>1) time_d5 /= jch5;
}
// A. Above threshold(s)