Merge branch 'Gaudi' into 'master'

tauRecTools: hide executePi0CreateROI outside of Athena

See merge request atlas/athena!32465

Reconstruction/tauRecTools/Root/TauRecToolBase.cxx

@@ -158,10 +158,12 @@ StatusCode TauRecToolBase::executeShotFinder(xAOD::TauJet& /*pTau*/, xAOD::CaloC
   return StatusCode::FAILURE;
 }
 
+#ifndef XAOD_ANALYSIS
 StatusCode TauRecToolBase::executePi0CreateROI(xAOD::TauJet& /*pTau*/, CaloCellContainer& /*caloCellContainer*/, std::vector<CaloCell*>& /*map*/ ) {
   ATH_MSG_ERROR("function not implemented");
   return StatusCode::FAILURE;
 }
+#endif
 
 StatusCode TauRecToolBase::executePi0ClusterCreator(xAOD::TauJet& /*pTau*/, xAOD::PFOContainer& /*neutralPFOContainer*/, 
 					      xAOD::PFOContainer& /*hadronicPFOContainer*/, 

Reconstruction/tauRecTools/tauRecTools/ITauToolBase.h

@@ -48,7 +48,9 @@ class ITauToolBase : virtual public asg::IAsgTool
                                          const xAOD::TrackParticleContainer* trackContainer = nullptr) = 0;
   virtual StatusCode executeTrackFinder(xAOD::TauJet& pTau, const xAOD::TrackParticleContainer* trackContainer = nullptr) = 0;  
   virtual StatusCode executeShotFinder(xAOD::TauJet& pTau, xAOD::CaloClusterContainer& shotClusterContainer, xAOD::PFOContainer& PFOContainer ) = 0;
+#ifndef XAOD_ANALYSIS
   virtual StatusCode executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& caloCellContainer, std::vector<CaloCell*>& map ) = 0;
+#endif
   virtual StatusCode executePi0ClusterCreator(xAOD::TauJet& pTau, xAOD::PFOContainer& neutralPFOContainer, 
 					      xAOD::PFOContainer& hadronicPFOContainer, 
 					      xAOD::CaloClusterContainer& caloClusterContainer, 

Reconstruction/tauRecTools/tauRecTools/TauRecToolBase.h

@@ -45,7 +45,9 @@ class TauRecToolBase : public asg::AsgTool, virtual public ITauToolBase {
                                          const xAOD::TrackParticleContainer* trackContainer = nullptr) override;
   virtual StatusCode executeTrackFinder(xAOD::TauJet& pTau, const xAOD::TrackParticleContainer* trackContainer = nullptr) override;  
   virtual StatusCode executeShotFinder(xAOD::TauJet& pTau, xAOD::CaloClusterContainer& shotClusterContainer, xAOD::PFOContainer& PFOContainer ) override;
+#ifndef XAOD_ANALYSIS
   virtual StatusCode executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& caloCellContainer, std::vector<CaloCell*>& map ) override;
+#endif
   virtual StatusCode executePi0ClusterCreator(xAOD::TauJet& pTau, xAOD::PFOContainer& neutralPFOContainer, 
 					      xAOD::PFOContainer& hadronicPFOContainer, 
 					      xAOD::CaloClusterContainer& caloClusterContainer,