From 8b67dadd307a5564c20cf4582a8b7b54fd3798bd Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Tue, 7 Sep 2021 18:13:32 -0400 Subject: [PATCH] LArGeoEndcap: Remove EndcapPresamplerGeometryHelper. Remove unused (and thread-unsafe) class EndcapPresamplerGeometryHelper. --- .../EndcapPresamplerGeometryHelper.h | 59 ------------- .../src/EndcapPresamplerGeometryHelper.cxx | 85 ------------------- 2 files changed, 144 deletions(-) delete mode 100755 LArCalorimeter/LArGeoModel/LArGeoEndcap/LArGeoEndcap/EndcapPresamplerGeometryHelper.h delete mode 100755 LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerGeometryHelper.cxx diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/LArGeoEndcap/EndcapPresamplerGeometryHelper.h b/LArCalorimeter/LArGeoModel/LArGeoEndcap/LArGeoEndcap/EndcapPresamplerGeometryHelper.h deleted file mode 100755 index 3031eb28baec..000000000000 --- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/LArGeoEndcap/EndcapPresamplerGeometryHelper.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -// EndcapPresamplerGeometryHelper.h -// Prepared 16-Jul-2003 Bill Seligman - -// This is a separate geometry helper class for the endcap presampler. -// It provides any separate calculations or constants for the endcap -// presampler geometry. - -#ifndef LARGEOENDCAP_ENDCAPPRESAMPLERGEOMETRYHELPER_H -#define LARGEOENDCAP_ENDCAPPRESAMPLERGEOMETRYHELPER_H - -namespace LArGeo { - - // Forward declarations. - class VDetectorParameters; - - class EndcapPresamplerGeometryHelper - { - public: - - // Accessor for pointer to the singleton. - static EndcapPresamplerGeometryHelper* GetInstance(); - - // "zShift" is the z-distance (cm) that the EM endcap is shifted - // (due to cabling, etc.) - float zShift() const { return m_zShift; } - - // 15-Jan-2002 WGS: A "lookup" functions for detector measurements, - // sizes, and other values. - enum kValue { - rMinEndcapPresampler, - rMaxEndcapPresampler, - zEndcapPresamplerFrontFace, - zEndcapPresamplerBackFace, - EndcapPresamplerHalfThickness, - EndcapPresamplerZpositionInMother - }; - double GetValue(const kValue); - - protected: - // The constructor is protected according to the singleton design - // pattern. - EndcapPresamplerGeometryHelper(); - - private: - - // Pointer to source of detector parameters. - VDetectorParameters* m_parameters; - - // Store the endcap offset from the description: - float m_zShift; - }; - -} // namespace LArGeo - -#endif // __EndcapPresamplerGeometryHelper_H__ diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerGeometryHelper.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerGeometryHelper.cxx deleted file mode 100755 index f10e0d28d8b3..000000000000 --- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerGeometryHelper.cxx +++ /dev/null @@ -1,85 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -// EndcapPresamplerGeometryHelper -// 27-Dec-2002 Bill Seligman - -// This singleton class provides detector-description information and -// calculations for the Geant4 simulation. - -// 2-July-2003 Mikhail Leltchouk: local coordinates for determination -// of etaBin, phiBin at any Endcap Presamplerposition. - -#include "GaudiKernel/SystemOfUnits.h" -#include "LArGeoEndcap/EndcapPresamplerGeometryHelper.h" -#include "LArGeoCode/VDetectorParameters.h" - -#include <cmath> -#include <string> -#include <iostream> - - -// Standard implementation of a singleton pattern. - -LArGeo::EndcapPresamplerGeometryHelper* LArGeo::EndcapPresamplerGeometryHelper::GetInstance() -{ - static EndcapPresamplerGeometryHelper instance; - return &instance; -} - - -LArGeo::EndcapPresamplerGeometryHelper::EndcapPresamplerGeometryHelper() -{ - // Constructor initializes the geometry helper information. - - // Access source of detector parameters. - m_parameters = VDetectorParameters::GetInstance(); - - // Get the endcap shift and out-of-time cut from the detector - // parameters routine. - m_zShift = m_parameters->GetValue("LArEMECZshift"); -} - - -double LArGeo::EndcapPresamplerGeometryHelper::GetValue(const kValue a_valueType) -{ - // Look up a value based on name. - switch (a_valueType) - { - case rMinEndcapPresampler: - //return 1231.74 * mm; - return m_parameters->GetValue("LArEMECPreMinRadius"); - break; - case rMaxEndcapPresampler: - //return 1701.98 * mm; - return m_parameters->GetValue("LArEMECPreMaxRadius"); - break; - // At nominal (zShift=0) endcap position absolute z-coordinates: - // of the faces of the EndcapPresampler - case zEndcapPresamplerFrontFace: - //return 3622. * mm; - return (m_parameters->GetValue("LArEMECPreNomPos") - - GetValue(EndcapPresamplerHalfThickness)); - break; - case zEndcapPresamplerBackFace: - //return 3626. * mm; - return (m_parameters->GetValue("LArEMECPreNomPos") - + GetValue(EndcapPresamplerHalfThickness)); - break; - case EndcapPresamplerHalfThickness: - //return ( GetValue(zEndcapPresamplerBackFace) - GetValue(zEndcapPresamplerFrontFace) ) / 2.; - return (m_parameters->GetValue("LArEMECPreThickness")/2.); - break; - case EndcapPresamplerZpositionInMother: - // between cold wall center and presampler center which is at - // 3624 Gaudi::Units::mm nominal (zShift=0) absolute position - return 30.5 * Gaudi::Units::mm; - break; - default: - std::cerr << "EndcapPresamplerGeometryHelper::GetValue -- type '" - << a_valueType - << "' not recognized; using zero" << std::endl; - return 0.; - } -} -- GitLab