Commit 42ad7fd6 authored by Sarka Todorova's avatar Sarka Todorova Committed by Graeme Stewart
Browse files

memory leak fix (TileTrackingGeometry-01-00-11)

	* fix memory leaks
        * tag TileTrackingGeometry-01-00-11

2014-12-03  scott snyder  <snyder@bnl.gov>

        * Tagging TileTrackingGeometry-01-00-10.
	* src/TileVolumeBuilder.cxx: Fix coverity warnings.

2014-10-03 Andreas Salzburger < Andreas.Salzburger -at- cern.ch >
        * remove binning
        * tag TileTrackingGeometry-01-00-09
parent f2bec4d2
......@@ -77,17 +77,8 @@ namespace Tile {
ToolHandle<Trk::ITrackingVolumeHelper> m_trackingVolumeHelper; //!< Helper Tool to create TrackingVolumes
ToolHandle<Trk::ITrackingVolumeCreator> m_trackingVolumeCreator; //!< Second helper for volume creation
bool m_useMeotProvider; //!< steer the meot provider
//std::vector<Trk::IMaterialEffectsOnTrackProvider*> m_meotProviders; //!< drawback of ToolHandle
//ToolHandleArray<Trk::IMaterialEffectsOnTrackProvider> m_materialEffectsOnTrackProviders; //!< MEOT providers for TrackingVolumes
double m_tileBarrelEnvelope; //!< envelope Cover of the Barrel
unsigned int m_tileBarrelModelLayers; //!< model Layers for the Barrel and ext. Barrel
unsigned int m_tileFingerModelLayers; //!< model Layers for the Finger (B && EB)
unsigned int m_tileGapModelLayers; //!< model Layers for the Gaps
bool m_useCaloSurfBuilder; //!< if true use DetDescr based layering, if false use biequidistant layering
unsigned int m_tileBarrelLayersPerSampling; //!< if m_useCaloSurfBuilder == true, number of layers per dead material region or sampling
ToolHandle<ICaloSurfaceBuilder> m_surfBuilder; //!< tool required for definition of active volumes
......
......@@ -14,6 +14,7 @@ use CaloTrackingGeometry CaloTrackingGeometry-* Calorimeter
private
use AtlasCLHEP AtlasCLHEP-* External
use CxxUtils CxxUtils-* Control
use StoreGate StoreGate-* Control
use GeoPrimitives GeoPrimitives-* DetectorDescription
......
......@@ -25,34 +25,14 @@ class ConfiguredTileVolumeBuilder( Tile__TileVolumeBuilder ):
if 'ToolSvc' not in dir():
ToolSvc = ToolSvc()
meotps = []
#if TrkDetFlags.TileUseMaterialEffectsOnTrackProvider() :
#from CaloMaterialEffectsOnTrackProvider.ConfCaloMaterialEffectsOnTrackProvider import ConfCaloMaterialEffectsOnTrackProvider as ConfMEOTP
#MEOTP = ConfMEOTP('CaloMaterialEffectsOnTrackProvider')
#ToolSvc += MEOTP
#meotps += [ MEOTP ]
# The volume helper for the Tile
from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__TrackingVolumeHelper
TileTrackingVolumeHelper = Trk__TrackingVolumeHelper(name='TrackingVolumeHelper')
ToolSvc += TileTrackingVolumeHelper
Tile__TileVolumeBuilder.__init__(self,name,
MaterialEffectsOnTrackProviders = meotps,
UseCaloSurfBuilder = TrkDetFlags.TileUseCaloSurfBuilder(),
TrackingVolumeHelper = TileTrackingVolumeHelper,
BarrelEnvelopeCover = TrkDetFlags.TileBarrelEnvelopeCover(),
BarrelMaterialBinsRz = TrkDetFlags.TileBarrelLayerMaterialBinsRz(),
BarrelMaterialBinsPhi = TrkDetFlags.TileBarrelLayerMaterialBinsPhi(),
GirderMaterialBinsRz = TrkDetFlags.TileGirderLayerMaterialBinsRz(),
GirderMaterialBinsPhi = TrkDetFlags.TileGirderLayerMaterialBinsPhi(),
FingerMaterialBinsRz = TrkDetFlags.TileFingerLayerMaterialBinsRz(),
FingerMaterialBinsPhi = TrkDetFlags.TileFingerLayerMaterialBinsPhi(),
ExtendedBarrelMaterialBinsRz = TrkDetFlags.TileExtendedBarrelLayerMaterialBinsRz(),
ExtendedBarrelMaterialBinsPhi = TrkDetFlags.TileExtendedBarrelLayerMaterialBinsPhi(),
GapMaterialBinsRz = TrkDetFlags.TileGapLayerMaterialBinsRz(),
GapMaterialBinsPhi = TrkDetFlags.TileGapLayerMaterialBinsPhi(),
OutputLevel = TrkDetFlags.TileBuildingOutputLevel(),
MagneticFieldMode = TrkDetFlags.MagneticFieldMode())
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