Commit 7ee9e2ec authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'CaloSurface_private_CaloDepth' into 'master'

CaloSurfaceBuilder make CaloDepthTool private

See merge request atlas/athena!48214
parents a38f0637 bb6b5f87
......@@ -228,21 +228,24 @@ public:
private:
const CaloDetDescrManager* caloMgr() const;
std::string m_depth_choice;
Gaudi::Property<std::string> m_depth_choice{ this,
"DepthChoice",
"",
"depth choice" };
/** ID Helper
*/
const CaloCell_ID* m_calo_id;
/** ID Helper
*/
const CaloCell_ID* m_calo_id;
/** DD manager
*/
CxxUtils::CachedPointer<CaloDetDescrManager> m_calo_dd;
/** DD manager
*/
CxxUtils::CachedPointer<CaloDetDescrManager> m_calo_dd;
/** Phi range helper object
*/
CaloPhiRange m_range;
/** Phi range helper object
*/
CaloPhiRange m_range;
double m_default;
double m_default;
};
......
......@@ -38,12 +38,10 @@ CaloDepthTool::CaloDepthTool(const std::string& type,
const std::string& name,
const IInterface* parent) :
AthAlgTool(type, name, parent),
m_depth_choice(""),
m_calo_id(nullptr),
m_default(0)
{
declareInterface<CaloDepthTool>( this );
declareProperty("DepthChoice", m_depth_choice,"choice of depth paramaterisation" );
}
CaloDepthTool::~CaloDepthTool()
......
......@@ -26,6 +26,7 @@
#include "CaloIdentifier/CaloCell_ID.h"
#include "CaloGeoHelpers/CaloPhiRange.h"
#include "CaloDetDescr/CaloSubdetNames.h"
#include "CaloDetDescr/CaloDepthTool.h"
#include <mutex>
#include <vector>
......@@ -33,7 +34,6 @@
class CaloDetDescrManager;
class ICaloCoordinateTool;
class IMessageSvc;
class CaloDepthTool;
class ICaloRecoMaterialTool;
class ICaloRecoSimpleGeomTool;
class ICaloSurfaceHelper;
......@@ -162,9 +162,11 @@ private:
ToolHandle<ICaloRecoMaterialTool> m_lar_mat;
ToolHandle<ICaloRecoSimpleGeomTool> m_lar_simplegeom;
// Defines the depths for DD and User surfaces :
ToolHandle<CaloDepthTool> m_calodepth;
// Defines the depths for DD and User surfaces :
ToolHandle<CaloDepthTool> m_calodepth{ this,
"CaloDepthTool",
"CaloDepthTool/CaloDepthTool",
"CaloDepthTool to be used" };
};
inline std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > CaloSurfaceBuilder::entrySurfaces() const
......
......@@ -38,7 +38,6 @@
#include "CaloDetDescr/CaloDetDescriptor.h"
#include "CaloDetDescr/CaloDetDescrElement.h"
#include "CaloDetDescr/ICaloCoordinateTool.h"
#include "CaloDetDescr/CaloDepthTool.h"
#include "CaloDetDescr/ICaloRecoMaterialTool.h"
#include "CaloDetDescr/ICaloRecoSimpleGeomTool.h"
......@@ -65,14 +64,11 @@ CaloSurfaceBuilder::CaloSurfaceBuilder(const std::string& type,
m_calo_dd(nullptr),
m_tile_dd(nullptr),
m_lar_mat("LArRecoMaterialTool"),
m_lar_simplegeom("LArRecoSimpleGeomTool"),
m_calodepth("CaloDepthTool")
m_lar_simplegeom("LArRecoSimpleGeomTool")
{
declareInterface<ICaloSurfaceBuilder>( this );
declareProperty ("LArRecoMaterialTool", m_lar_mat);
declareProperty ("LarRecoSimpleGeometryTool", m_lar_simplegeom);
declareProperty ("CaloDepthTool", m_calodepth);
}
CaloSurfaceBuilder::~CaloSurfaceBuilder()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment