diff --git a/Calo/CaloReco/src/CaloClusterCovarianceAlg.cpp b/Calo/CaloReco/src/CaloClusterCovarianceAlg.cpp index 556e339a452cd9ceec375843ab478cb61fe97c38..052ba343495a9a5257b296b3349373ac5b5e5ce7 100755 --- a/Calo/CaloReco/src/CaloClusterCovarianceAlg.cpp +++ b/Calo/CaloReco/src/CaloClusterCovarianceAlg.cpp @@ -35,13 +35,10 @@ CaloClusterCovarianceAlg::CaloClusterCovarianceAlg ( const std::string& name, ISvcLocator* pSvcLocator) : GaudiAlgorithm ( name , pSvcLocator ) - , m_copy ( false ) , m_covType ( "ClusterCovarianceMatrixTool" ) , m_covName () - , m_cov ( NULL ) , m_spreadType ( "ClusterSpreadTool" ) , m_spreadName () - , m_spread ( NULL ) , m_inputData () , m_taggerE () , m_taggerP () diff --git a/Calo/CaloReco/src/CaloClusterCovarianceAlg.h b/Calo/CaloReco/src/CaloClusterCovarianceAlg.h index 252e1981402fa3c4aaa5be6735745a05d64340b5..21ce90571436d1e7196619057b8c22c9e4f777bc 100755 --- a/Calo/CaloReco/src/CaloClusterCovarianceAlg.h +++ b/Calo/CaloReco/src/CaloClusterCovarianceAlg.h @@ -1,4 +1,3 @@ -// $Id: CaloClusterCovarianceAlg.h,v 1.6 2009-02-12 10:59:37 cattanem Exp $ // =========================================================================== #ifndef CALORECO_CALOCLUSTERCOVARIANCEALG_H #define CALORECO_CALOCLUSTERCOVARIANCEALG_H 1 @@ -90,18 +89,18 @@ private: private: - bool m_copy ; /// copy flag + bool m_copy = false ; /// copy flag // tool used for covariance matrix calculation - std::string m_covType ; ///< type - std::string m_covName ; ///< name - ICaloClusterTool* m_cov ; ///< tool - SubClusterSelectorTool* m_tagger ; + std::string m_covType ; ///< type + std::string m_covName ; ///< name + ICaloClusterTool* m_cov = NULL ; ///< tool + SubClusterSelectorTool* m_tagger = NULL ; // tool used for cluster spread estimation - std::string m_spreadType ; ///< type - std::string m_spreadName ; ///< name - ICaloClusterTool* m_spread ; ///< tool + std::string m_spreadType ; ///< type + std::string m_spreadName ; ///< name + ICaloClusterTool* m_spread = NULL ; ///< tool std::string m_outputData; std::string m_inputData; diff --git a/Calo/CaloReco/src/CaloCorrectionBase.cpp b/Calo/CaloReco/src/CaloCorrectionBase.cpp index 71e6373db22fd1a9d05543241da77c1374d63b23..9e68595bcbbceb60b7d867c74e0c047b2b09a8ad 100644 --- a/Calo/CaloReco/src/CaloCorrectionBase.cpp +++ b/Calo/CaloReco/src/CaloCorrectionBase.cpp @@ -190,7 +190,7 @@ StatusCode CaloCorrectionBase::updParams(){ } m_update = true; checkParams(); - counter("Parameters update") += 1; + return StatusCode::SUCCESS; } diff --git a/Calo/CaloReco/src/CaloCorrectionBase.h b/Calo/CaloReco/src/CaloCorrectionBase.h index c1a685fc467803167e4c7bf1f1751f9d399d7d92..417c09b9c6db4610c3aaeddb4d57f82e3d0ba71c 100644 --- a/Calo/CaloReco/src/CaloCorrectionBase.h +++ b/Calo/CaloReco/src/CaloCorrectionBase.h @@ -19,7 +19,6 @@ #include "CaloUtils/Calo2Track.h" #include "Relations/IRelationWeighted2D.h" #include "Event/Track.h" -#include "CaloCorrectionBase.h" #include "CaloInterfaces/ICaloRelationsGetter.h" #include "GaudiKernel/IIncidentListener.h" #include "GaudiKernel/IIncidentSvc.h" diff --git a/Calo/CaloReco/src/CaloMergedPi0.cpp b/Calo/CaloReco/src/CaloMergedPi0.cpp index 3aec181f25517d4e5092eacbfe1985fa9c066a22..5397bcfc94424083b42ec301f2eb185f83ec0e75 100644 --- a/Calo/CaloReco/src/CaloMergedPi0.cpp +++ b/Calo/CaloReco/src/CaloMergedPi0.cpp @@ -34,12 +34,8 @@ DECLARE_ALGORITHM_FACTORY( CaloMergedPi0 ) , m_splitPhotons ( LHCb::CaloHypoLocation:: SplitPhotons ) , m_splitClusters ( LHCb::CaloClusterLocation:: EcalSplit ) , m_etCut ( 1500 * Gaudi::Units::MeV ) - , m_iter ( 25 ) , m_photonTools () , m_pi0Tools () - , m_oTool (NULL) - , m_cov (NULL) - , m_spread(NULL) , m_taggerE() , m_taggerP() , m_det (DeCalorimeterLocation::Ecal) @@ -158,7 +154,7 @@ StatusCode CaloMergedPi0::execute(){ */ LHCb::CaloClusters* splitclusters = new LHCb::CaloClusters(); - int level = outputLevel(); // store outputLevel + int level = msgLevel(); // store outputLevel try{ //setOutputLevel(MSG::ALWAYS); // suppress FATAL message - setOuputLevel no longer exist in Gaudi setProperty("OutputLevel", MSG::ALWAYS ).ignore(); diff --git a/Calo/CaloReco/src/CaloMergedPi0.h b/Calo/CaloReco/src/CaloMergedPi0.h index b23628d54ac03570c44ce35cefe64b9309ececa5..392f048daed2c7d5680efd50d1bad95e00b0c501 100644 --- a/Calo/CaloReco/src/CaloMergedPi0.h +++ b/Calo/CaloReco/src/CaloMergedPi0.h @@ -49,7 +49,7 @@ private: std::string m_splitPhotons; std::string m_splitClusters; double m_etCut; - int m_iter ; + int m_iter = 25 ; bool m_createClusterOnly; // tools name @@ -59,14 +59,14 @@ private: // tools interfaces std::vector<ICaloHypoTool*> m_gTools ; std::vector<ICaloHypoTool*> m_pTools ; - ICaloShowerOverlapTool* m_oTool ; - ICaloClusterTool* m_cov ; - ICaloClusterTool* m_spread ; - SubClusterSelectorTool* m_tagger ; + ICaloShowerOverlapTool* m_oTool = NULL ; + ICaloClusterTool* m_cov = NULL ; + ICaloClusterTool* m_spread = NULL ; + SubClusterSelectorTool* m_tagger = NULL ; std::vector<std::string> m_taggerE ; std::vector<std::string> m_taggerP ; std::string m_det; - DeCalorimeter* m_detector; + DeCalorimeter* m_detector = NULL ; bool m_verbose; double m_minET; std::map<std::string,std::vector<double> > m_covParams; diff --git a/Calo/CaloReco/src/CaloMergedPi0Alg.cpp b/Calo/CaloReco/src/CaloMergedPi0Alg.cpp index d9396d41a55a48781b1b9cca00f3a219f848d963..745cfee07ccb5d40dcce05fe54440b1011df7d5c 100755 --- a/Calo/CaloReco/src/CaloMergedPi0Alg.cpp +++ b/Calo/CaloReco/src/CaloMergedPi0Alg.cpp @@ -616,13 +616,13 @@ StatusCode CaloMergedPi0Alg::execute() // long mxiter=16; long iter=0; - double Ene3x3[2]; for( long iterat = 0 ; iterat < mxiter ; ++iterat){ // SubClusters X/Y/Z barycenter iter++; double Etemp[3][3]; + double Ene3x3[2]={0.,0.}; for(int is=0;is<2;++is){ - const LHCb::CaloDigit* digit = SubClus[is][1][1]; + const LHCb::CaloDigit* digit = SubClus[is][1][1]; if( 0 == SubClus[is][1][1]) { continue ; } ///< CONTINUE! const LHCb::CaloCellID idigit = digit->cellID() ; SubSize[is] = m_det->cellSize( idigit ) ; @@ -630,7 +630,6 @@ StatusCode CaloMergedPi0Alg::execute() SubY[is] = m_det->cellY ( idigit ) ; SubZ[is] = m_det->cellZ ( idigit ) ; unsigned int area = idigit.area(); - Ene3x3[is]=0; for(int ir=0;ir<3;++ir){ for(int ic=0;ic<3;++ic){ Etemp[ir][ic]=Ework[is][ir][ic]; @@ -718,6 +717,7 @@ StatusCode CaloMergedPi0Alg::execute() // double PosX[2]; // double PosY[2]; + double Ene3x3[2]={0.,0.}; for(int is=0;is<2;++is){ const LHCb::CaloDigit* digit = SubClus[is][1][1];; if( 0 == SubClus[is][1][1]) { continue ; } ///< CONTINUE! @@ -728,7 +728,6 @@ StatusCode CaloMergedPi0Alg::execute() SubY[is] = m_det->cellY ( idigit ) ; SubZ[is] = m_det->cellZ ( idigit ) ; double Etemp[3][3]; - Ene3x3[is]=0; for(int ir=0;ir<3;++ir){ for(int ic=0;ic<3;++ic){ Etemp[ir][ic]=Ework[is][ir][ic]; diff --git a/Calo/CaloReco/src/CaloMergedPi0Alg.h b/Calo/CaloReco/src/CaloMergedPi0Alg.h index 84c93dfdf5a4fec6b98317301f87336568a4e14f..d40327188a55a8e439e608bf7d20ec9da6026d14 100755 --- a/Calo/CaloReco/src/CaloMergedPi0Alg.h +++ b/Calo/CaloReco/src/CaloMergedPi0Alg.h @@ -122,14 +122,14 @@ private: bool m_createClusterOnly; private: - CaloCorrectionBase* m_trSh; - CaloCorrectionBase* m_sCor; - CaloCorrectionBase* m_lCor; + CaloCorrectionBase* m_trSh = NULL ; + CaloCorrectionBase* m_sCor = NULL ; + CaloCorrectionBase* m_lCor = NULL ; double m_eT_Cut ; int m_mX_Iter ; - DeCalorimeter* m_det; - ICaloClusterTool* m_cov ; ///< tool - ICaloClusterTool* m_spread ; ///< tool + DeCalorimeter* m_det = NULL ; + ICaloClusterTool* m_cov = NULL ; ///< tool + ICaloClusterTool* m_spread = NULL ; ///< tool /// configuration of covarinace tool double m_a ; ///< calorimeter resolution diff --git a/Calo/CaloReco/src/CaloShowerOverlap.h b/Calo/CaloReco/src/CaloShowerOverlap.h index bc36dd8780623a530d1782e98a3124dc101d5591..d6c964e03fd7593c7df1c7291298cc55e886395b 100644 --- a/Calo/CaloReco/src/CaloShowerOverlap.h +++ b/Calo/CaloReco/src/CaloShowerOverlap.h @@ -39,8 +39,8 @@ private: std::vector<std::string> m_taggerP ; std::vector<std::string> m_taggerE ; std::string m_det; - const DeCalorimeter* m_detector; - ICaloShowerOverlapTool* m_oTool; - SubClusterSelectorTool* m_tagger ; + const DeCalorimeter* m_detector = NULL ; + ICaloShowerOverlapTool* m_oTool = NULL ; + SubClusterSelectorTool* m_tagger = NULL ; }; #endif // CALOSHOWEROVERLAP_H diff --git a/Calo/CaloReco/src/CaloShowerOverlapTool.h b/Calo/CaloReco/src/CaloShowerOverlapTool.h index 1b402377af047dcf583669a4b47a400d5cf5621a..6aec4bbfe50aa91baccd6e7c3f7157b39b06be08 100644 --- a/Calo/CaloReco/src/CaloShowerOverlapTool.h +++ b/Calo/CaloReco/src/CaloShowerOverlapTool.h @@ -45,12 +45,12 @@ private: int m_s1; int m_s2; std::string m_detLoc; - const DeCalorimeter* m_det; + const DeCalorimeter* m_det = NULL; std::string m_pcond; std::string m_type; - ICaloHypoTool* m_stool; - ICaloHypoTool* m_ltool; - CaloCorrectionBase* m_shape; + ICaloHypoTool* m_stool = NULL; + ICaloHypoTool* m_ltool = NULL; + CaloCorrectionBase* m_shape = NULL; std::map<const LHCb::CaloCellID,double> m_weights; bool m_verbose; unsigned int m_minSize; diff --git a/Calo/CaloReco/src/CellularAutomatonAlg.cpp b/Calo/CaloReco/src/CellularAutomatonAlg.cpp index d833f4872d6ac32c46d8958be3587ed650a95c7c..b7a9450c22c3b316a60a100f134d90ae40c2cca5 100755 --- a/Calo/CaloReco/src/CellularAutomatonAlg.cpp +++ b/Calo/CaloReco/src/CellularAutomatonAlg.cpp @@ -1,4 +1,3 @@ -// $Id: CellularAutomatonAlg.cpp,v 1.8 2010-03-08 01:19:40 odescham Exp $ // ============================================================================ // Include files // ============================================================================ @@ -43,9 +42,6 @@ CellularAutomatonAlg::CellularAutomatonAlg ( const std::string& name , ISvcLocator* pSvcLocator ) : GaudiAlgorithm ( name , pSvcLocator ) - , m_sort ( true ) - , m_sortByET ( false ) - , m_tool(0) { declareProperty ( "InputData" , m_inputData = LHCb::CaloDigitLocation::Ecal); diff --git a/Calo/CaloReco/src/CellularAutomatonAlg.h b/Calo/CaloReco/src/CellularAutomatonAlg.h index c86ce73d6c7b2586fbb71014ab8ac169ccb221a5..c43059c4522a9ea1d8b38438e740fe6eeeb82eb6 100755 --- a/Calo/CaloReco/src/CellularAutomatonAlg.h +++ b/Calo/CaloReco/src/CellularAutomatonAlg.h @@ -1,4 +1,3 @@ -// $Id: CellularAutomatonAlg.h,v 1.2 2008-09-22 01:41:23 odescham Exp $ #ifndef CELLULARAUTOMATONALG_H #define CELLULARAUTOMATONALG_H 1 @@ -33,13 +32,13 @@ private: std::string m_inputData; std::string m_outputData; std::string m_detData; - const DeCalorimeter* m_detector; + const DeCalorimeter* m_detector = NULL; - bool m_sort ; - bool m_sortByET ; + bool m_sort = true; + bool m_sortByET = false; std::string m_toolName; - ICaloClusterization* m_tool; + ICaloClusterization* m_tool = NULL; unsigned int m_neig_level; unsigned long m_passMin , m_passMax; diff --git a/Calo/CaloReco/src/ClusterCovarianceMatrixTool.cpp b/Calo/CaloReco/src/ClusterCovarianceMatrixTool.cpp index 83cc229c0ab96a4f3717e2c69c222ecb84710415..bbafcfdb81bf246211365412b79cb0bc9cf2d670 100755 --- a/Calo/CaloReco/src/ClusterCovarianceMatrixTool.cpp +++ b/Calo/CaloReco/src/ClusterCovarianceMatrixTool.cpp @@ -33,8 +33,6 @@ ClusterCovarianceMatrixTool::ClusterCovarianceMatrixTool , m_estimator ( ) , m_parameters ( ) , m_detData ( ) - , m_det(0) - , m_useDB(true) , m_source(){ // interface! declareInterface<ICaloClusterTool> (this); diff --git a/Calo/CaloReco/src/ClusterCovarianceMatrixTool.h b/Calo/CaloReco/src/ClusterCovarianceMatrixTool.h index 39f97b88997cd4fdaffb6d57e3315d7e1335effa..7188d6262774f71eeadb98b9fca205ea1004f757 100755 --- a/Calo/CaloReco/src/ClusterCovarianceMatrixTool.h +++ b/Calo/CaloReco/src/ClusterCovarianceMatrixTool.h @@ -1,5 +1,3 @@ -// $Id: ClusterCovarianceMatrixTool.h,v 1.5 2010-03-08 01:19:40 odescham Exp $ -// ============================================================================ #ifndef CLUSTERCOVARIANCEMATRIXTOOL_H #define CLUSTERCOVARIANCEMATRIXTOOL_H 1 // Include files @@ -91,9 +89,9 @@ private: CovarianceEstimator m_estimator ; CaloCovariance::ParameterMap m_parameters; std::string m_detData; - const DeCalorimeter* m_det; - bool m_useDB; - CaloCorrectionBase* m_dbAccessor; + const DeCalorimeter* m_det = NULL; + bool m_useDB = true; + CaloCorrectionBase* m_dbAccessor = NULL; std::string m_conditionName; std::map<unsigned int,std::string> m_source; }; ///< end of class ClusterCovarianceMatrixTool diff --git a/Calo/CaloReco/src/SubClusterSelector2x2.h b/Calo/CaloReco/src/SubClusterSelector2x2.h index f762b51506eb7893cd07a83698efa555da5a5792..98392150c692a762fe56839bc39931479834f43e 100755 --- a/Calo/CaloReco/src/SubClusterSelector2x2.h +++ b/Calo/CaloReco/src/SubClusterSelector2x2.h @@ -1,4 +1,3 @@ -// $Id: SubClusterSelector3x3.h,v 1.5 2010-03-08 01:19:40 odescham Exp $ #ifndef CALORECO_SUBCLUSTERSELECTOR2x2_H #define CALORECO_SUBCLUSTERSELECTOR2x2_H 1 // Include files @@ -29,7 +28,7 @@ protected: virtual ~SubClusterSelector2x2(); private: - const DeCalorimeter* m_det; + const DeCalorimeter* m_det = NULL; CellMatrix2x2 m_matrix; };