Merge branch 'cherry-pick-056bc1a9c6-master' into 'master'

Sweeping !4623 from 21.0 to master.
Fix minor build warnings in build of HitAnalysis package

See merge request !4688

Simulation/Tools/HitAnalysis/src/CaloHitAnalysis.cxx

@@ -54,6 +54,8 @@ CaloHitAnalysis::CaloHitAnalysis(const std::string& name, ISvcLocator* pSvcLocat
    , h_calib_eEsc(0)
    , h_calib_eTot(0)
    , h_calib_eTotpartID(0)
+   , m_tileID(0)
+   , m_tileMgr(0)
    , m_cell_eta(0)
    , m_cell_phi(0)
    , m_cell_x(0)
@@ -74,8 +76,6 @@ CaloHitAnalysis::CaloHitAnalysis(const std::string& name, ISvcLocator* pSvcLocat
    , m_calib_partID(0)
    , m_expert("off")
    , m_calib("off")
-   , m_tileID(0)
-   , m_tileMgr(0)
      
    , m_tree(0)
    , m_ntupleFileName("/CaloHitAnalysis/")

Simulation/Tools/HitAnalysis/src/TRTHitAnalysis.cxx

@@ -45,8 +45,8 @@ TRTHitAnalysis::TRTHitAnalysis(const std::string& name, ISvcLocator* pSvcLocator
    , m_TRT_barcode(0)
      
    , m_tree(0)
-   , m_ntupleFileName("/TRTHitAnalysis/")
    , m_path("/TRTHitAnalysis/")
+   , m_ntupleFileName("/TRTHitAnalysis/")
    , m_thistSvc("THistSvc", name)
 {
   declareProperty("NtupleFileName", m_ntupleFileName);