Skip to content
Snippets Groups Projects
Commit 52bf7f33 authored by Scott Snyder's avatar Scott Snyder Committed by scott snyder
Browse files

TileConditions: Fix clang compilation and warnings.

clang compilation:
 - Need to put explicit instantiation of TileCalibData specializations after all
   member template definitions; that is, at the end of TileCalibData.cxx rather
   than in TileCalibData.h.  Otherwise, clang doesn't instantiate those members.

clang warnings:
 - Missing override keywords.
 - Unused variables and private class members.
parent 92079238
No related branches found
No related tags found
No related merge requests found
Showing
with 17 additions and 21 deletions
...@@ -59,19 +59,16 @@ class TileCalibData { ...@@ -59,19 +59,16 @@ class TileCalibData {
#include "TileCalibBlobObjs/TileCalibDrawerFlt.h" #include "TileCalibBlobObjs/TileCalibDrawerFlt.h"
typedef TileCalibData<TileCalibDrawerFlt> TileCalibDataFlt; typedef TileCalibData<TileCalibDrawerFlt> TileCalibDataFlt;
template class TileCalibData<TileCalibDrawerFlt>;
CLASS_DEF(TileCalibData<TileCalibDrawerFlt>, 111225290, 0) CLASS_DEF(TileCalibData<TileCalibDrawerFlt>, 111225290, 0)
CONDCONT_DEF(TileCalibData<TileCalibDrawerFlt>, 149264696); CONDCONT_DEF(TileCalibData<TileCalibDrawerFlt>, 149264696);
#include "TileCalibBlobObjs/TileCalibDrawerOfc.h" #include "TileCalibBlobObjs/TileCalibDrawerOfc.h"
typedef TileCalibData<TileCalibDrawerOfc> TileCalibDataOfc; typedef TileCalibData<TileCalibDrawerOfc> TileCalibDataOfc;
template class TileCalibData<TileCalibDrawerOfc>;
CLASS_DEF(TileCalibData<TileCalibDrawerOfc>, 141822674, 0) CLASS_DEF(TileCalibData<TileCalibDrawerOfc>, 141822674, 0)
CONDCONT_DEF(TileCalibData<TileCalibDrawerOfc>, 262948840); CONDCONT_DEF(TileCalibData<TileCalibDrawerOfc>, 262948840);
#include "TileCalibBlobObjs/TileCalibDrawerBch.h" #include "TileCalibBlobObjs/TileCalibDrawerBch.h"
typedef TileCalibData<TileCalibDrawerBch> TileCalibDataBch; typedef TileCalibData<TileCalibDrawerBch> TileCalibDataBch;
template class TileCalibData<TileCalibDrawerBch>;
CLASS_DEF(TileCalibData<TileCalibDrawerBch>, 88425733, 0) CLASS_DEF(TileCalibData<TileCalibDrawerBch>, 88425733, 0)
CONDCONT_DEF(TileCalibData<TileCalibDrawerBch>, 218165589); CONDCONT_DEF(TileCalibData<TileCalibDrawerBch>, 218165589);
......
...@@ -33,7 +33,7 @@ class TileCellNoiseTool: public AthAlgTool ...@@ -33,7 +33,7 @@ class TileCellNoiseTool: public AthAlgTool
virtual StatusCode initialize() override; virtual StatusCode initialize() override;
virtual StatusCode finalize() override; virtual StatusCode finalize() override;
float getCellNoise(const Identifier& cell_id, CaloGain::CaloGain caloGain) const; virtual float getCellNoise(const Identifier& cell_id, CaloGain::CaloGain caloGain) const override;
private: private:
......
...@@ -40,7 +40,7 @@ class TileCondProxyFile: public AthAlgTool, virtual public ITileCondProxy<T> { ...@@ -40,7 +40,7 @@ class TileCondProxyFile: public AthAlgTool, virtual public ITileCondProxy<T> {
* @param[out] eventRange EventIDRange during wich Tile conditions data are valid * @param[out] eventRange EventIDRange during wich Tile conditions data are valid
*/ */
virtual StatusCode fillCalibData(TileCalibData<T>& calibData, EventIDRange& eventRange) const override; virtual StatusCode fillCalibData(TileCalibData<T>& calibData, EventIDRange& eventRange) const override;
const T* getCalibDrawer(unsigned int drawerIdx) const; virtual const T* getCalibDrawer(unsigned int drawerIdx) const override;
private: private:
......
...@@ -34,8 +34,10 @@ class TileCondToolNoiseRawChn: public AthAlgTool ...@@ -34,8 +34,10 @@ class TileCondToolNoiseRawChn: public AthAlgTool
float getPileUpNoise(unsigned int drawerIdx, unsigned int channel, unsigned int adc) const; float getPileUpNoise(unsigned int drawerIdx, unsigned int channel, unsigned int adc) const;
virtual
float getNoise(unsigned int drawerIdx, unsigned int channel, unsigned int adc, float getNoise(unsigned int drawerIdx, unsigned int channel, unsigned int adc,
TileRawChannelUnit::UNIT unit = TileRawChannelUnit::ADCcounts) const { TileRawChannelUnit::UNIT unit = TileRawChannelUnit::ADCcounts) const override
{
return getElectronicNoise(drawerIdx, channel, adc, unit); return getElectronicNoise(drawerIdx, channel, adc, unit);
} }
......
...@@ -54,8 +54,6 @@ class TileCondToolOfcCool: public AthAlgTool, public ITileCondToolOfc { ...@@ -54,8 +54,6 @@ class TileCondToolOfcCool: public AthAlgTool, public ITileCondToolOfc {
int m_NPhases; int m_NPhases;
int m_NFields; int m_NFields;
int m_Phamin;
int m_Phamax;
int m_NSamples; int m_NSamples;
bool m_first = true; bool m_first = true;
}; };
......
...@@ -45,3 +45,8 @@ void TileCalibData<T>::setCalibDrawer(unsigned int drawerIdx, const T* calibDraw ...@@ -45,3 +45,8 @@ void TileCalibData<T>::setCalibDrawer(unsigned int drawerIdx, const T* calibDraw
m_calibDrawers[drawerIdx] = calibDrawer; m_calibDrawers[drawerIdx] = calibDrawer;
} }
template class TileCalibData<TileCalibDrawerFlt>;
template class TileCalibData<TileCalibDrawerOfc>;
template class TileCalibData<TileCalibDrawerBch>;
...@@ -27,8 +27,6 @@ TileCondToolOfcCool::TileCondToolOfcCool(const std::string& type, const std::str ...@@ -27,8 +27,6 @@ TileCondToolOfcCool::TileCondToolOfcCool(const std::string& type, const std::str
, m_weights(0) , m_weights(0)
, m_NPhases(0) , m_NPhases(0)
, m_NFields(0) , m_NFields(0)
, m_Phamin(0)
, m_Phamax(0)
, m_NSamples(0) , m_NSamples(0)
, m_first(true) , m_first(true)
{ {
......
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
TileDCSCondAlg::TileDCSCondAlg(const std::string& name, ISvcLocator* pSvcLocator) : TileDCSCondAlg::TileDCSCondAlg(const std::string& name, ISvcLocator* pSvcLocator) :
AthAlgorithm(name, pSvcLocator), AthAlgorithm(name, pSvcLocator),
m_condSvc("CondSvc", name), m_condSvc("CondSvc", name),
m_cabling(nullptr), m_cabling(nullptr)
m_unknownValue(-30) // should be negative
{ {
} }
......
...@@ -200,8 +200,6 @@ class TileDCSCondAlg: public AthAlgorithm { ...@@ -200,8 +200,6 @@ class TileDCSCondAlg: public AthAlgorithm {
std::map<int, std::pair<float,float> > m_knownBadHV; std::map<int, std::pair<float,float> > m_knownBadHV;
int m_unknownValue;
int m_channel2pmt[2][NUMBER_OF_HVSET_CHANNELS]; int m_channel2pmt[2][NUMBER_OF_HVSET_CHANNELS];
int m_pmt2channel[2][NUMBER_OF_HVSET_CHANNELS]; int m_pmt2channel[2][NUMBER_OF_HVSET_CHANNELS];
bool m_isChannelUsed[4][NUMBER_OF_CHANNELS]; // 0=LB, 1=EB, 2=EB without D4, 3=EB with special C10 bool m_isChannelUsed[4][NUMBER_OF_CHANNELS]; // 0=LB, 1=EB, 2=EB without D4, 3=EB with special C10
......
...@@ -52,7 +52,7 @@ class TileDCSTool: public extends<AthAlgTool, ITileDCSTool> { ...@@ -52,7 +52,7 @@ class TileDCSTool: public extends<AthAlgTool, ITileDCSTool> {
/** /**
* @copydoc ITileDCSTool::getDCSStatus(unsigned int ros, unsigned int drawer) const * @copydoc ITileDCSTool::getDCSStatus(unsigned int ros, unsigned int drawer) const
*/ */
virtual TileDCSState::TileDCSStatus getDCSStatus(unsigned int ros, unsigned int drawer) const; virtual TileDCSState::TileDCSStatus getDCSStatus(unsigned int ros, unsigned int drawer) const override;
/** /**
* @copydoc ITileDCSTool::getDCSStatus(unsigned int ros, unsigned int drawer, unsigned int channel) const * @copydoc ITileDCSTool::getDCSStatus(unsigned int ros, unsigned int drawer, unsigned int channel) const
......
...@@ -49,7 +49,6 @@ static const std::string TILE_TEST_DCS("TileTestDCS"); ...@@ -49,7 +49,6 @@ static const std::string TILE_TEST_DCS("TileTestDCS");
static const std::string TILE_TEST_TOOL_DCS("TileTestToolDCS"); static const std::string TILE_TEST_TOOL_DCS("TileTestToolDCS");
static const unsigned int ROS(2); static const unsigned int ROS(2);
static const unsigned int DRAWER(3);
static const unsigned int MAX_CHANNEL(48); static const unsigned int MAX_CHANNEL(48);
static const unsigned int DEF_DRAWER_IDX(0); static const unsigned int DEF_DRAWER_IDX(0);
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
static const std::string TILE_JO_NAME("jobOptions_TileCalibEmsTest.py"); static const std::string TILE_JO_NAME("jobOptions_TileCalibEmsTest.py");
static const std::string TILE_TEST_EMS("TileEMS_Test"); static const std::string TILE_TEST_EMS("TileEMS_Test");
static const std::string TILE_TEST_ALG_EMS("TileEMS_AlgTest"); static const std::string TILE_TEST_ALG_EMS("TileEMS_AlgTest");
static const unsigned int OBJ_VERSION(1);
static const unsigned int DEF_DRAWER_IDX(0); static const unsigned int DEF_DRAWER_IDX(0);
static const unsigned int MAX_CHANNEL(1); static const unsigned int MAX_CHANNEL(1);
...@@ -204,15 +203,17 @@ class TileCondProxyMock: public AthAlgTool, virtual public ITileCondProxy<T> { ...@@ -204,15 +203,17 @@ class TileCondProxyMock: public AthAlgTool, virtual public ITileCondProxy<T> {
return StatusCode::SUCCESS; return StatusCode::SUCCESS;
}; };
StatusCode initialize() { virtual StatusCode initialize() override {
return StatusCode::SUCCESS; return StatusCode::SUCCESS;
}; };
StatusCode finalize() { virtual StatusCode finalize() override {
return StatusCode::SUCCESS; return StatusCode::SUCCESS;
}; };
const T* getCalibDrawer(unsigned int /*drawerIdx*/ ) const { return nullptr;}; virtual const T* getCalibDrawer(unsigned int /*drawerIdx*/ ) const override {
return nullptr;
};
}; };
......
...@@ -44,7 +44,6 @@ static const std::string TILE_SAMPLE_NOISE("TileSampleNoiseTest"); ...@@ -44,7 +44,6 @@ static const std::string TILE_SAMPLE_NOISE("TileSampleNoiseTest");
static const std::string TILE_ONLINE_SAMPLE_NOISE("TileOnlineSampleNoiseTest"); static const std::string TILE_ONLINE_SAMPLE_NOISE("TileOnlineSampleNoiseTest");
static const std::string TILE_RAW_CHANNEL_NOISE("TileRawChannelNoiseTest"); static const std::string TILE_RAW_CHANNEL_NOISE("TileRawChannelNoiseTest");
static const unsigned int OBJ_VERSION(0);
static const unsigned int DEF_DRAWER_IDX(0); static const unsigned int DEF_DRAWER_IDX(0);
static const unsigned int MAX_CHANNEL(1); static const unsigned int MAX_CHANNEL(1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment