diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/VertexCaloIsolation.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/VertexCaloIsolation.h index 50e7b4d252dac51a57027e9609ec8b3f2d3cf8d3..2c76c17885742c5a191fae213030dba48f999eff 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/VertexCaloIsolation.h +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/VertexCaloIsolation.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// @@ -36,7 +36,6 @@ #include "RecoToolInterfaces/ICaloTopoClusterIsolationTool.h" //#include "TrackToCalo/CaloCellCollector.h" -//#include "CaloInterface/ICaloNoiseTool.h" #include "xAODBPhys/BPhysHelper.h" //#include "xAODPrimitives/IsolationType.h" // @@ -72,9 +71,6 @@ namespace DerivationFramework { std::vector<std::string> m_passFlags; - // ToolHandle <ICaloNoiseTool> m_caloNoiseTool; //Removed to reduce requirements - //Rec::CaloCellCollector m_cellCollector; //Seems to be a plain class, so no need for handles - /// Number of sigma for calo cell noise cut float m_sigmaCaloNoiseCut; diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/VertexCaloIsolation.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/VertexCaloIsolation.cxx index c47d71389e39718bf5666da94454221654b946ad..fbd4b01ae82a7784b79cc4e6a3c79823b09610fd 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/VertexCaloIsolation.cxx +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/VertexCaloIsolation.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ // VertexCaloIsolation.cxx by Matteo Bedognetti @@ -43,7 +43,6 @@ //#include "InDetTrackSelectionTool/InDetTrackSelectionTool.h" #include "CaloEvent/CaloCell.h" //Is used (though shown as auto) //#include "TrkParameters/TrackParameters.h" -#include "CaloInterface/ICaloNoiseTool.h" #include "TrkCaloExtension/CaloExtension.h" //#include "CaloUtils/CaloClusterStoreHelper.h" //#include "CaloUtils/CaloCellList.h" @@ -67,19 +66,9 @@ namespace DerivationFramework { m_caloClusterContainerName("CaloCalTopoClusters"), m_muonContainerName("Muons"), m_caloExtTool("Trk::ParticleCaloExtensionTool/ParticleCaloExtensionTool"), - //m_caloNoiseTool(""), m_cones(), m_sigmaCaloNoiseCut(3.4), m_vertexType(7) - - - // m_cellCollector("") - - -// m_caloExtTool -// m_caloNoiseTool, m_applyCaloNoiseCut, m_sigmaCaloNoiseCut -// m_cellCollector - { ATH_MSG_DEBUG("in constructor"); declareInterface<DerivationFramework::IAugmentationTool>(this); @@ -124,11 +113,6 @@ namespace DerivationFramework { m_cones.push_back(xAOD::Iso::etcone20); } - //if(m_applyCaloNoiseCut){ - //ATH_MSG_ERROR("No handle to a caloNoiseTool is kept in this tool, "); - //return StatusCode::FAILURE; - //} - return StatusCode::SUCCESS; } @@ -393,7 +377,7 @@ namespace DerivationFramework { if(cl.size() != 0){ //Maybe two muons have a full cluster overlap?? ATH_MSG_DEBUG("Cells in this cluster: "<< cl.size()); - cellCollector.collectEtCore( cl, etcore, nullptr, m_sigmaCaloNoiseCut ); //Note an empty handle to ICaloNoiseTool is passed + cellCollector.collectEtCore( cl, etcore, nullptr, m_sigmaCaloNoiseCut ); coreCorr += etcore[Rec::CaloCellCollector::ET_Core]; ATH_MSG_DEBUG("Their core-energy: "<< etcore[Rec::CaloCellCollector::ET_Core]);