From 2a141af46b34364057f595528ae28be3e498a4c3 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Sun, 24 Feb 2019 17:13:23 +0100
Subject: [PATCH] TileSimAlgs: Remove calls to set_do_checks.
Remove MT-unsafe calls to set_do_checks. They should really be useless anyhow,
as checks are disabled for standard jobs.
---
.../TileSimAlgs/TileSimAlgs/TileHitVecToCntTool.h | 5 +----
.../TileSimAlgs/src/TileHitVecToCntTool.cxx | 13 +------------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitVecToCntTool.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitVecToCntTool.h
index 6a2d564cd7b..fa3f0d05253 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitVecToCntTool.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileHitVecToCntTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//**************************************************************************
@@ -139,9 +139,6 @@ class TileHitVecToCntTool: public PileUpToolBase {
TileHitNonConstContainer* m_hits; //!< pointer to hits container
TileHitNonConstContainer* m_hits_DigiHSTruth; //!< pointer to hits container
- bool m_doChecks; //!< initial value of do_checks flag in TileID helper
- bool m_doChecksTB; //!< initial value of do_checks flag in TileTBID helper
-
int m_mbtsOffset; //<! index of first MBTS hit in m_allHits vector
static const int N_SIDE = 2;
static const int N_PHI = 8;
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
index 17ca06f668b..b78f6245c41 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//************************************************************
@@ -73,8 +73,6 @@ TileHitVecToCntTool::TileHitVecToCntTool(const std::string& type,
, m_rndmSvc("AtRndmGenSvc",name)
, m_hits(0)
, m_hits_DigiHSTruth(0)
- , m_doChecks(false)
- , m_doChecksTB(false)
, m_mbtsOffset(0)
, m_cablingSvc("TileCablingSvc", name)
, m_cabling(0)
@@ -365,12 +363,6 @@ StatusCode TileHitVecToCntTool::createContainers() {
}
- // disable checks for TileID and remember previous state
- m_doChecks = m_tileID->do_checks();
- m_tileID->set_do_checks(false);
- m_doChecksTB = m_tileTBID->do_checks();
- m_tileTBID->set_do_checks(false);
-
ATH_MSG_VERBOSE("TileHitVecToCntTool createContainers finished");
return StatusCode::SUCCESS;
@@ -942,9 +934,6 @@ StatusCode TileHitVecToCntTool::mergeEvent() {
// << " eHitTot=" << eHitTot );
}
- m_tileID->set_do_checks(m_doChecks); // set back this flag to TileID
- m_tileTBID->set_do_checks(m_doChecksTB); // set back this flag to TileTBID
-
if (m_run2) {
// Merge MBTS and E1 where it is needed.
--
GitLab