diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloLCWeightTool.h b/Calorimeter/CaloUtils/CaloUtils/CaloLCWeightTool.h index 7f3e89cbf8689ef3700e4d9b098617b03b4b99f5..3afa5b9a09e29ad3a08ffb9eac164b3fe09202fc 100644 --- a/Calorimeter/CaloUtils/CaloUtils/CaloLCWeightTool.h +++ b/Calorimeter/CaloUtils/CaloUtils/CaloLCWeightTool.h @@ -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 */ #ifndef CALOUTILS_CALOLCWEIGHTTOOL_H @@ -29,7 +29,6 @@ #include "GaudiKernel/EventContext.h" class CaloCell_ID; -class ICalorimeterNoiseTool; class CaloCluster; class CaloLCWeightTool : public AthAlgTool, virtual public IClusterCellWeightTool diff --git a/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx b/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx index dbfacf77e0c1ca325d185003af0da36423c09e5e..7d8d83de537d61303c56ef7ec1cb3e62a754374b 100644 --- a/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx +++ b/Calorimeter/CaloUtils/src/CaloLCDeadMaterialTool.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ #undef DEBUG_DMTHINGS @@ -558,7 +558,6 @@ CaloLCDeadMaterialTool::prepare_for_cluster float energy = thisCell->e(); float weight = itrCell.weight(); - //float sigma = m_noiseTool->getNoise(thisCell,ICalorimeterNoiseTool::ELECTRONICNOISE); cls_unweighted_energy += energy; Cell cell; diff --git a/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx b/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx index 30121eb400727a59f70865f48b9cd0d0125c229f..eb7645757f6603dead9f386579c384288bebc01b 100644 --- a/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx +++ b/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ @@ -106,24 +106,11 @@ StatusCode CaloTopoTowerBuilderTool::execute(const EventContext& ctx, ATH_MSG_DEBUG("Energy cuts " << minimumCellEnergy << " " << minimumClusterEnergy << " " << useCellWeights); - // Noise tool stuff - bool useNoiseTool = theTowers->GetUseNoiseTool(); - bool usePileUpNoise = theTowers->GetUsePileUpNoise(); float noiseSigma0 = theTowers->GetNoiseSigma(); float cellESignificanceThreshold = theTowers->GetCellESignificanceThreshold(); - if (useNoiseTool) { - ATH_MSG_WARNING( " Using noise tool in CaloTopoTowerBuilderTool no supported. give up => No CaloTopoTowers are made" ); - if(delete_cellToClusterMap){ - ATH_MSG_DEBUG("Deleting cellToClusterMap Pointer"); - delete cellToClusterMap; - ATH_MSG_DEBUG("Deleting cellToClusterMap Pointer Finished"); - } - - return StatusCode::SUCCESS; - } - ATH_MSG_DEBUG("Noise cuts "<< noiseSigma0 << " " << cellESignificanceThreshold << " " << useNoiseTool << " " << usePileUpNoise); + ATH_MSG_DEBUG("Noise cuts "<< noiseSigma0 << " " << cellESignificanceThreshold); // List of calorimeters from which to use cells std::vector<CaloCell_ID::SUBCALO> caloIndices = theTowers->GetCaloIndices();