diff --git a/Calorimeter/CaloTools/CMakeLists.txt b/Calorimeter/CaloTools/CMakeLists.txt index 5303595e74db143fb0c780888df4a3d0548b8e75..cd2fdca298b3e9de168107dcabdb10768c7b4556 100644 --- a/Calorimeter/CaloTools/CMakeLists.txt +++ b/Calorimeter/CaloTools/CMakeLists.txt @@ -1,4 +1,4 @@ -# $Id: CMakeLists.txt 740702 2016-04-15 18:23:00Z ssnyder $ +# $Id: CMakeLists.txt 740701 2016-04-15 18:22:55Z ssnyder $ ################################################################################ # Package: CaloTools ################################################################################ diff --git a/Calorimeter/CaloTools/src/CaloAffectedTool.cxx b/Calorimeter/CaloTools/src/CaloAffectedTool.cxx index eefdbc52b5186547d24273e6c1e533a1ce9e37cd..6feed8e9bef20701d34b611bfe759e41a7d12358 100644 --- a/Calorimeter/CaloTools/src/CaloAffectedTool.cxx +++ b/Calorimeter/CaloTools/src/CaloAffectedTool.cxx @@ -16,6 +16,7 @@ CaloAffectedTool::CaloAffectedTool (const std::string& type, const std::string& name, const IInterface* parent) : AthAlgTool(type, name, parent), + m_read(false), m_readRaw(true) { m_affectedRegions=0; diff --git a/Calorimeter/CaloTools/src/CaloCellPacker_400_500.cxx b/Calorimeter/CaloTools/src/CaloCellPacker_400_500.cxx index 292436b8e1c9417e99eef13f794cad92162ba561..75bc2318e8b20ba7a0d715bb34eecb4acec1cbbe 100644 --- a/Calorimeter/CaloTools/src/CaloCellPacker_400_500.cxx +++ b/Calorimeter/CaloTools/src/CaloCellPacker_400_500.cxx @@ -868,6 +868,7 @@ void CaloCellPacker_400_500::unpack // Convert the header. pars500 pars; pars.m_status = 0; + pars.m_seq_tile = 0; { const int* headerbeg = &*vheader.begin(); diff --git a/Calorimeter/CaloTools/src/CaloLumiBCIDTool.cxx b/Calorimeter/CaloTools/src/CaloLumiBCIDTool.cxx index 529617fd7b9e674994de75be7b02b495914d2d00..45394d097e18724975c2f12f9724c3ae6dbb72e3 100644 --- a/Calorimeter/CaloTools/src/CaloLumiBCIDTool.cxx +++ b/Calorimeter/CaloTools/src/CaloLumiBCIDTool.cxx @@ -21,6 +21,9 @@ CaloLumiBCIDTool::CaloLumiBCIDTool (const std::string& type, m_OFCTool("LArOFCTool"), m_lumiTool("LuminosityTool"), m_bunchCrossingTool("BunchCrossingTool"), + m_lar_on_id(nullptr), + m_caloIdMgr(nullptr), + m_calocell_id(nullptr), m_isMC(false), m_keyShape("LArShape"), m_keyMinBiasAverage("LArPileupAverage"),m_keyOFC("LArOFC"), m_bcidMax(3564), @@ -29,7 +32,8 @@ CaloLumiBCIDTool::CaloLumiBCIDTool (const std::string& type, m_firstSampleEMB(0), m_firstSampleEMEC(0), m_firstSampleHEC(1), - m_firstSampleFCAL(0) + m_firstSampleFCAL(0), + m_cacheValid(false) { declareInterface<ICaloLumiBCIDTool>(this); declareProperty("LArOFCTool",m_OFCTool,"Tool handle for OFC"); diff --git a/Calorimeter/CaloTools/src/CaloMBAverageTool.cxx b/Calorimeter/CaloTools/src/CaloMBAverageTool.cxx index abbfe78fe586a671b6391f81012ada82ab6e8f9b..e2028f6c6eb9f4cf79d15b552e325ee6ffd11e16 100644 --- a/Calorimeter/CaloTools/src/CaloMBAverageTool.cxx +++ b/Calorimeter/CaloTools/src/CaloMBAverageTool.cxx @@ -16,7 +16,9 @@ CaloMBAverageTool::CaloMBAverageTool (const std::string& type, const IInterface* parent) : AthAlgTool(type, name, parent), m_OFCTool("LArOFCTool"), - m_Nminbias(-1),m_deltaBunch(1),m_keyShape("LArShape"), m_keyfSampl("LArfSampl"), m_keyMinBiasAverage("LArMinBiasAverage") + m_calo_id(nullptr), + m_Nminbias(-1),m_deltaBunch(1),m_keyShape("LArShape"), m_keyfSampl("LArfSampl"), m_keyMinBiasAverage("LArMinBiasAverage"), + m_ncell(0) { declareInterface<ICaloMBAverageTool>(this); declareProperty("NMinBias",m_Nminbias); diff --git a/Calorimeter/CaloTools/src/CaloNoiseTool.cxx b/Calorimeter/CaloTools/src/CaloNoiseTool.cxx index 3d3d882bdb914813bda135e40d7f9afffef78c1e..0daf5e269b8be032fdd295d7a56d1a15e37355b4 100644 --- a/Calorimeter/CaloTools/src/CaloNoiseTool.cxx +++ b/Calorimeter/CaloTools/src/CaloNoiseTool.cxx @@ -31,16 +31,44 @@ CaloNoiseTool::CaloNoiseTool(const std::string& type, const std::string& name, const IInterface* parent) : AthAlgTool(type, name, parent), - m_WithOF(true), m_cablingService("LArCablingService"), + m_CachedGetNoiseCDDE(nullptr), + m_CachedGetNoiseCELL(nullptr), + m_highestGain(), + m_WithOF(true), + m_atlas_id(nullptr), + m_calo_id_man(nullptr), + m_lar_em_id(nullptr), + m_lar_hec_id(nullptr), + m_lar_fcal_id(nullptr), + m_tile_id(nullptr), + m_calo_dd_man(nullptr), + m_calocell_id(nullptr), + m_cablingService("LArCablingService"), m_tileInfoName("TileInfo"), - m_adc2mevTool("LArADC2MeVTool"),m_OFCTool("LArOFCTool"), - m_Nminbias(-1), m_WorkMode(1), + m_tileInfo(nullptr), + m_Adc2MeVFactor(0), + m_AdcPerMev(0), + m_adc2mevTool("LArADC2MeVTool"), + m_SigmaNoise(0), + m_CNoise(0), + m_useRMSpedestal(false), + m_RMSpedestal(0), + m_OFCTool("LArOFCTool"), + m_nsamples(0), + m_fSampl(0), + m_MinBiasRMS(0), + m_Nminbias(-1), + m_Nminbias_usedForCache(0), + m_WorkMode(1), + m_NormalizeAutoCorr(false), m_UseLAr(true),m_UseTile(true),m_UseSymmetry(true), m_DumpDatabaseHG(false),m_DumpDatabaseMG(false),m_DumpDatabaseLG(false), m_isMC(true), m_keyNoise("LArNoise"), m_keyPedestal("LArPedestal"), m_keyADC2GeV("LArADC2MeV"), m_keyOFShape("LArOFC_Shape"), m_keyAutoCorr("LArAutoCorr"), m_keyShape("LArShape"), m_keyfSampl("LArfSampl"), m_keyMinBias("LArMinBias"), + m_Nmessages_forTilePileUp(0), + m_noiseOK(false), m_DiagnosticHG(true),m_DiagnosticMG(true),m_DiagnosticLG(true), m_cacheValid(false),m_deltaBunch(1),m_firstSample(0) diff --git a/Calorimeter/CaloTools/src/CaloNoiseToolDB.cxx b/Calorimeter/CaloTools/src/CaloNoiseToolDB.cxx index f631ad433f82851537ce93159a133c3025f82d72..4e1dadd179a35da625e9f48218137fe251b208f1 100644 --- a/Calorimeter/CaloTools/src/CaloNoiseToolDB.cxx +++ b/Calorimeter/CaloTools/src/CaloNoiseToolDB.cxx @@ -36,7 +36,14 @@ CaloNoiseToolDB::CaloNoiseToolDB(const std::string& type, const std::string& name, const IInterface* parent) : AthAlgTool(type, name, parent), + m_cached(), + m_CachedGetNoiseCDDE(nullptr), + m_CachedGetNoiseCELL(nullptr), + m_ncell(0), + m_highestGain(), + m_Nminbias(0), m_cacheValid(false), + m_calo_id(nullptr), m_cacheUpdateCounter(0) { declareInterface<ICaloNoiseTool>(this); diff --git a/Calorimeter/CaloTools/src/SimpleNoiseToolFromTextFile.cxx b/Calorimeter/CaloTools/src/SimpleNoiseToolFromTextFile.cxx index 1838ff8fcf3c13c3ccaec8d38a2009f2fb615d24..dab9b1c6ea75a9705fedb55cd745bafbff9397fa 100644 --- a/Calorimeter/CaloTools/src/SimpleNoiseToolFromTextFile.cxx +++ b/Calorimeter/CaloTools/src/SimpleNoiseToolFromTextFile.cxx @@ -26,6 +26,8 @@ SimpleNoiseToolFromTextFile::SimpleNoiseToolFromTextFile(const std::string& type const std::string& name, const IInterface* parent) : AthAlgTool(type,name,parent) + , m_caloDDM(nullptr) + , m_caloIDH(nullptr) , m_cellNoiseFileName("") , m_cellNoiseUnits(MeV) , m_cellNoiseDefault(100.*MeV)