Commit 1d8c30fc authored by Sarka Todorova's avatar Sarka Todorova Committed by Graeme Stewart
Browse files

memory leak fix (LArTrackingGeometry-01-00-16)

	* memory leak fix
        * tag LArTrackingGeometry-01-00-16

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

        * Tagging LArTrackingGeometry-01-00-15.
	* Fix coverity warnings.

2014-10-03 Andreas Salzburger < Andreas.Salzburger -at- cern.ch >
        * remove binning
        * tag LArTrackingGeometry-01-00-14
parent 42ad7fd6
......@@ -106,31 +106,10 @@ namespace LAr {
ToolHandle<Trk::ITrackingVolumeHelper> m_lArTrackingVolumeHelper; //!< Helper Tool to create TrackingVolumes
ToolHandle<Trk::ITrackingVolumeCreator> m_trackingVolumeCreator; //!< helper for volume creation
unsigned int m_lArBarrelMaterialBinsRz; //!< the material bins in Rz, barrel
unsigned int m_lArBarrelMaterialBinsPhi; //!< the material bins in Rz, barrel
unsigned int m_lArEndcapMaterialBinsRz; //!< the material bins in Rz, endcap
unsigned int m_lArEndcapMaterialBinsPhi; //!< the material bins in Rz, endcap
unsigned int m_lArEndcapHecMaterialBinsRz; //!< the material bins in Rz, endcap Hec
unsigned int m_lArEndcapHecMaterialBinsPhi; //!< the material bins in Rz, endcap
unsigned int m_lArEndcapFcalMaterialBinsRz; //!< the material bins in Rz, endcap Fcal
unsigned int m_lArEndcapFcalMaterialBinsPhi;//!< the material bins in Rz, endcap
unsigned int m_lArEndcapGapMaterialBinsRz; //!< the material bins in Rz, endcap Gap
unsigned int m_lArEndcapGapMaterialBinsPhi; //!< the material bins in Rz, endcap
bool m_useMeotProvider; //!< steer the meot provider
//std::vector<Trk::IMaterialEffectsOnTrackProvider*> m_meotProviders; //!< drawback of ToolHandle
//ToolHandleArray<Trk::IMaterialEffectsOnTrackProvider> m_materialEffectsOnTrackProviders; //!< MaterialEffectsOnTrackProvider for TrackingVolumes
double m_lArBarrelEnvelope; //!< envelope Cover of the Barrel
double m_lArEndcapEnvelope; //!< envelope Cover of the Endcap
unsigned int m_lArBarrelModelLayers; //!< number of model layers for LAr Barrel
unsigned int m_lArEndcapModelLayers; //!< number of model layers for LAr Endcap
unsigned int m_lArEndcapInnerGapModelLayers; //!< number of model layers for LAr Endcap
unsigned int m_lArFcalModelLayers; //!< number of model layers for the Fcal
unsigned int m_lArHecFcalCoverModelLayers; //!< number of model layers for the Hec (part that covers Fcal)
unsigned int m_lArHecModelLayers; //!< number of model layers for the Hec (part that attaches to LAr EC)
bool m_useCaloSurfBuilder; //!< if true use DetDescr based layering, if false use biequidistant layering
unsigned int m_lArLayersPerRegion; //!< if m_useCaloSurfBuilder == true, number of layers per dead material region or sampling
bool m_useCaloTrackingGeometryBounds;//!< if true use DetDescr based layering, if false use biequidistant layering
......
......@@ -15,8 +15,6 @@ from LArTrackingGeometry.LArTrackingGeometryConf import LAr__LArVolumeBuilder
class ConfiguredLArVolumeBuilder( LAr__LArVolumeBuilder ):
# constructor
def __init__(self,name = 'LArVolumeBuilder'):
#from CaloMaterialEffectsOnTrackProvider.ConfCaloMaterialEffectsOnTrackProvider import ConfCaloMaterialEffectsOnTrackProvider as ConfMEOTP
from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
......@@ -25,15 +23,6 @@ class ConfiguredLArVolumeBuilder( LAr__LArVolumeBuilder ):
if 'ToolSvc' not in dir():
ToolSvc = ToolSvc()
meotps = []
#if TrkDetFlags.LArUseMaterialEffectsOnTrackProvider() :
#from CaloMaterialEffectsOnTrackProvider.ConfCaloMaterialEffectsOnTrackProvider import ConfCaloMaterialEffectsOnTrackProvider as ConfMEOTP
#MEOTP = ConfMEOTP('CaloMaterialEffectsOnTrackProvider')
#ToolSvc += MEOTP
#meotps += [ MEOTP ]
# The volume helper
from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__TrackingVolumeHelper
LArTrackingVolumeHelper = Trk__TrackingVolumeHelper(name='TrackingVolumeHelper')
......@@ -41,20 +30,9 @@ class ConfiguredLArVolumeBuilder( LAr__LArVolumeBuilder ):
LAr__LArVolumeBuilder.__init__(self,
name,
MaterialEffectsOnTrackProviders = meotps,
UseCaloSurfBuilder = TrkDetFlags.LArUseCaloSurfBuilder(),
TrackingVolumeHelper = LArTrackingVolumeHelper,
BarrelEnvelopeCover = TrkDetFlags.LArBarrelEnvelopeCover(),
EndcapEnvelopeCover = TrkDetFlags.LArEndcapEnvelopeCover(),
BarrelMaterialBinsRz = TrkDetFlags.LArBarrelLayerMaterialBinsRz(),
BarrelMaterialBinsPhi = TrkDetFlags.LArBarrelLayerMaterialBinsPhi(),
EndcapMaterialBinsRz = TrkDetFlags.LArEndcapLayerMaterialBinsRz(),
EndcapMaterialBinsPhi = TrkDetFlags.LArEndcapLayerMaterialBinsPhi(),
EndcapHecMaterialBinsRz = TrkDetFlags.LArEndcapHecLayerMaterialBinsRz(),
EndcapHecMaterialBinsPhi = TrkDetFlags.LArEndcapHecLayerMaterialBinsPhi(),
EndcapFcalMaterialBinsRz = TrkDetFlags.LArEndcapFcalLayerMaterialBinsRz(),
EndcapFcalMaterialBinsPhi = TrkDetFlags.LArEndcapFcalLayerMaterialBinsPhi(),
EndcapGapMaterialBinsRz = TrkDetFlags.LArEndcapGapLayerMaterialBinsRz(),
EndcapGapMaterialBinsPhi = TrkDetFlags.LArEndcapGapLayerMaterialBinsPhi(),
OutputLevel = TrkDetFlags.LArBuildingOutputLevel(),
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