diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx index 24f2a3fe20a54d3935dda852c6ead71987f245f9..71792e88057ac367668ab6164e8377350db0fe2e 100644 --- a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx +++ b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration */ #include "ZdcAnalysis/ZDCPulseAnalyzer.h" @@ -197,7 +197,6 @@ void ZDCPulseAnalyzer::SetDefaults() m_enablePreExcl = false; m_enablePostExcl = false; - m_haveUserFilter = false; m_timingCorrMode = NoTimingCorr; m_haveNonlinCorr = false; diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h index b0f6ad44b95774ee7e61870114ee2c69251b43e7..d11dbfd3cd0069022e71e674e56acd386453eb3a 100644 --- a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h +++ b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration */ #ifndef ZDCANALYSIS_ZDCPulseAnalyzer_h @@ -155,12 +155,6 @@ private: unsigned int m_postExclLGADCThresh{0}; unsigned int m_maxSamplesPostExcl{0}; - // Enable of a user-provided filter on the FADC samples - // - bool m_haveUserFilter{false}; - void (*m_userFilterHG)(std::vector<float>& FADCSamples, std::vector<bool> useSamples){}; - void (*m_userFilterLG)(std::vector<float>& FADCSamples, std::vector<bool> useSamples){}; - // unsigned int m_timingCorrMode{NoTimingCorr}; float m_timingCorrRefADC{500}; diff --git a/LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArOFCweightSC.h b/LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArOFCweightSC.h index 96c4f79fe401269144293da2044d52dccb74e38e..18a0a201f7a14fe4747f36e141314e884e24b1a2 100644 --- a/LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArOFCweightSC.h +++ b/LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArOFCweightSC.h @@ -6,14 +6,12 @@ #ifndef LARCOOLCONDITIONS_OFCWEIGHTSC_H #define LARCOOLCONDITIONS_OFCWEIGHTSC_H -//#include "LArElecCalib/ILArfSampl.h" #include "LArCOOLConditions/LArSingleFloatBlob.h" #include "LArCOOLConditions/LArCondSuperCellBase.h" - class CondAttrListCollection; -class LArOFCweightSC: //public ILArfSampl, +class LArOFCweightSC: public LArCondSuperCellBase, public LArSingleFloatBlob { @@ -21,7 +19,7 @@ public: LArOFCweightSC(); LArOFCweightSC(const CondAttrListCollection* attrList); - virtual ~LArOFCweightSC(); + virtual ~LArOFCweightSC() = default; bool good() const { return m_isInitialized && m_nChannels>0; } @@ -29,9 +27,6 @@ public: const float& getW(const HWIdentifier& chid) const; private: - //static const float errorcode; - const float m_null; - }; #include "AthenaKernel/CondCont.h" diff --git a/LArCalorimeter/LArCOOLConditions/src/LArOFCweightSC.cxx b/LArCalorimeter/LArCOOLConditions/src/LArOFCweightSC.cxx index a157f708c97b3ae40d60407c095d0c7123e9c34f..04509f68dcac38e5bbaef66f3aeb97d23034d674 100644 --- a/LArCalorimeter/LArCOOLConditions/src/LArOFCweightSC.cxx +++ b/LArCalorimeter/LArCOOLConditions/src/LArOFCweightSC.cxx @@ -4,20 +4,12 @@ #include "LArCOOLConditions/LArOFCweightSC.h" - -//const float LArOFCweightSC::errorcode=ILArfSampl::ERRORCODE; - LArOFCweightSC::LArOFCweightSC() - : LArCondSuperCellBase ("LArOFCweightSC"), - m_null(0.) + : LArCondSuperCellBase ("LArOFCweightSC") {} -LArOFCweightSC::~LArOFCweightSC() {} - - LArOFCweightSC::LArOFCweightSC(const CondAttrListCollection* attrList) - : LArCondSuperCellBase ("LArOFCweightSC"), - m_null(0.) + : LArCondSuperCellBase ("LArOFCweightSC") { if (initializeBase().isFailure()) return; @@ -26,8 +18,6 @@ LArOFCweightSC::LArOFCweightSC(const CondAttrListCollection* attrList) if (m_pValues.size()!=1) { ATH_MSG_ERROR( "Found unexpected number of gains (" << m_pValues.size() <<"). Expected exactly one gain." ); } - - return; }