From a59e2607520d046fdec57987382895f6bf4432c5 Mon Sep 17 00:00:00 2001
From: adbailey <adam.bailey@cern.ch>
Date: Wed, 27 Jun 2018 16:16:20 +0200
Subject: [PATCH] Tidying up unused variables in TauPi0CreateROI, and a few
other lines in algorithm/python scripts
Former-commit-id: 5af00ff1eb10352e18a574846ea5b03a365d4388
---
Reconstruction/tauRec/python/TauAlgorithmsHolder.py | 4 +++-
Reconstruction/tauRec/python/TauRecBuilder.py | 6 +++---
Reconstruction/tauRec/src/TauProcessorAlg.cxx | 1 -
Reconstruction/tauRecTools/src/TauPi0CreateROI.cxx | 7 +------
Reconstruction/tauRecTools/src/TauPi0CreateROI.h | 6 +-----
5 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
index 6266699ce5d9..87d0f6a7782a 100644
--- a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
+++ b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
@@ -386,7 +386,9 @@ def getPi0ClusterFinder():
# CaloWeightTool = getCellWeightTool(),
# ExtrapolateToCaloTool = getExtrapolateToCaloTool(),
CellMakerTool = TauCellContainerFinalizer,
- Key_caloCellInputContainer="AllCalo", Key_tauCaloOutputContainer="TauCommonPi0Cells")
+ Key_caloCellInputContainer="AllCalo",
+ Key_tauCaloOutputContainer="TauCommonPi0Cells"
+ )
cached_instances[_name] = TauPi0CreateROI
return TauPi0CreateROI
diff --git a/Reconstruction/tauRec/python/TauRecBuilder.py b/Reconstruction/tauRec/python/TauRecBuilder.py
index 1d6354b9d64b..0f1befbb7050 100644
--- a/Reconstruction/tauRec/python/TauRecBuilder.py
+++ b/Reconstruction/tauRec/python/TauRecBuilder.py
@@ -119,9 +119,9 @@ class TauRecCoreBuilder ( TauRecConfigured ) :
#
#tools.append(taualgs.getPi0EflowCreateROI())
tools.append(taualgs.getTauShotFinder())
- #if self.doPi0Clus:
- # tools.append(taualgs.getPi0ClusterFinder())
-
+ if self.doPi0Clus:
+ tools.append(taualgs.getPi0ClusterFinder())
+
#####################################################################
## Tau Conversation Finder (found no one talking here...)
## TODO: talk with KG about the status of the new PhotonConversionFinder
diff --git a/Reconstruction/tauRec/src/TauProcessorAlg.cxx b/Reconstruction/tauRec/src/TauProcessorAlg.cxx
index 08a2b3ae168b..8f50e80dc3b7 100644
--- a/Reconstruction/tauRec/src/TauProcessorAlg.cxx
+++ b/Reconstruction/tauRec/src/TauProcessorAlg.cxx
@@ -215,7 +215,6 @@ StatusCode TauProcessorAlg::execute() {
xAOD::JetContainer::const_iterator itSE = pSeedContainer->end();
ATH_MSG_VERBOSE("Number of seeds in the container: " << pSeedContainer->size());
- ATH_MSG_INFO("TEST");
for (; itS != itSE; ++itS) {
const xAOD::Jet *pSeed = (*itS);
diff --git a/Reconstruction/tauRecTools/src/TauPi0CreateROI.cxx b/Reconstruction/tauRecTools/src/TauPi0CreateROI.cxx
index c40e5368bf8c..1740af89d440 100644
--- a/Reconstruction/tauRecTools/src/TauPi0CreateROI.cxx
+++ b/Reconstruction/tauRecTools/src/TauPi0CreateROI.cxx
@@ -38,15 +38,11 @@ TauPi0CreateROI::TauPi0CreateROI( const string& name ) :
, m_cellMakerTool("")
, m_calo_dd_man(NULL)
, m_calo_id(NULL)
- , m_caloCellContainerName("AllCalo")
, m_pPi0CellContainer(NULL)
- , m_pi0CellContainerName("TauCommonPi0Cells")
{
declareProperty("CellMakerTool", m_cellMakerTool);
- declareProperty("CaloCellContainerName", m_caloCellContainerName);
- declareProperty("Pi0CellContainerName", m_pi0CellContainerName);
}
-
+
//-------------------------------------------------------------------------
// Destructor
//-------------------------------------------------------------------------
@@ -118,7 +114,6 @@ StatusCode TauPi0CreateROI::execute(xAOD::TauJet& pTau) {
}
const CaloCellContainer *pCellContainer = NULL;
pCellContainer = caloCellInHandle.cptr();
- //ATH_MSG_INFO(" read: " << caloCellInHandle.key() << " = " << "..." );
// get only EM cells within dR<0.4
vector<CaloCell_ID::SUBCALO> emSubCaloBlocks;
diff --git a/Reconstruction/tauRecTools/src/TauPi0CreateROI.h b/Reconstruction/tauRecTools/src/TauPi0CreateROI.h
index eef7dd7d01e8..5e037e15e63f 100644
--- a/Reconstruction/tauRecTools/src/TauPi0CreateROI.h
+++ b/Reconstruction/tauRecTools/src/TauPi0CreateROI.h
@@ -53,13 +53,9 @@ private:
/** @brief calo cell navigation */
const CaloDetDescrManager* m_calo_dd_man;
const CaloCell_ID* m_calo_id;
-
- /** @brief all calo cell container name */
- std::string m_caloCellContainerName;
- /** @brief output cell container and name*/
+ /** @brief output cell container*/
CaloCellContainer *m_pPi0CellContainer;
- std::string m_pi0CellContainerName;
/** @brief hash map in order to keep track, which cells have been added to output cell container*/
std::vector<CaloCell*> m_addedCellsMap;
--
GitLab