Commit bbfd24a4 authored by Noemi Calace's avatar Noemi Calace Committed by Graeme Stewart
Browse files

Adding config for BrlInclOptRing for PixelClusterOnTrackTool (InDetRecExample-02-06-99-32)

	* Adding configuration for InclBrl_OptRing for PixelClusterOnTrackTool
        * Tagged as InDetRecExample-02-06-99-32

2017-02-17 Nora Pettersson
	* Fixing CutSvc configuration
	* Tagged as InDetRecExample-02-06-99-31

2017-02-17 Olivier Arnaez  <Olivier.Arnaez@cern.ch>
	* Preparing tag with configuration for InclBrl_OptRing but without the
	changes from InDetRecExample-02-06-99-22
	* Tagged as InDetRecExample-02-06-99-30
parent a15046b3
......@@ -182,7 +182,7 @@ class ConfiguredVertexingCuts :
if mode == "SLHC":
self.__minPT = 500. * Units.MeV
self.__minPT = 900. * Units.MeV
self.__IPd0Max = 1.
self.__sigIPd0Max = 0.35
self.__sigIPz0Max = 2.5
......@@ -191,7 +191,7 @@ class ConfiguredVertexingCuts :
#cluster and track quality cuts
self.__nHitSct = 0
self.__nHitSi = 7
self.__nHitSi = 6
self.__useTrackQualityInfo = True
#-------------"Heavy Ion running mode"-----------------------------------
......
......@@ -139,7 +139,7 @@ if InDetFlags.loadRotCreator():
minCluster = 0
from AtlasGeoModel.InDetGMJobProperties import GeometryFlags
if ("BrlIncl4.0_ref" == GeometryFlags.GeoType() or "IBrlExt4.0ref" == GeometryFlags.GeoType()):
if ("BrlIncl4.0_ref" == GeometryFlags.GeoType() or "IBrlExt4.0ref" == GeometryFlags.GeoType() or "BrlInclOptRing4.0_ref" == GeometryFlags.GeoType()):
minCluster = 4
elif ("BrlExt4.0_ref" == GeometryFlags.GeoType() or "BrlExt3.2_ref" == GeometryFlags.GeoType()):
minCluster = 2
......@@ -1341,6 +1341,20 @@ if InDetFlags.doVertexFinding() or InDetFlags.doVertexFindingForMonitoring() or
Extrapolator = InDetExtrapolator)
ToolSvc += InDetTrackSelectorTool
if InDetFlags.doSLHC():
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from InDetTrackSelectorTool.InDetTrackSelectorToolConf import InDet__InDetTrackCutSvc
InDetTrackCutSvcPV = InDet__InDetTrackCutSvc("InDetTrackCutSvcPV")
InDetTrackCutSvcPV.MaxD0 = InDetPrimaryVertexingCuts.IPd0Max()
InDetTrackCutSvcPV.MaxZ0 = InDetPrimaryVertexingCuts.z0Max()
InDetTrackCutSvcPV.MaxEta = InDetPrimaryVertexingCuts.etaMax()
InDetTrackCutSvcPV.MinSiHits = InDetPrimaryVertexingCuts.nHitSi()
InDetTrackCutSvcPV.MinPixelHits = InDetPrimaryVertexingCuts.nHitPix()
InDetTrackCutSvcPV.MinSCTHits = InDetPrimaryVertexingCuts.nHitSct()
svcMgr += InDetTrackCutSvcPV
InDetTrackSelectorTool.TrackSelectionSvc = InDetTrackCutSvcPV
if (InDetFlags.doPrintConfigurables()):
print InDetTrackSelectorTool
......
......@@ -432,7 +432,7 @@ if InDetFlags.doStandardPlots():
doUpgrade = InDetFlags.doSLHC(),
DoTruth = InDetFlags.doTruth())
if InDetFlags.doSplitReco() :
InDetStandardPerformancePseudoTracks.TruthParticleContainerName = ["TruthEvent_PU"]
InDetStandardPerformancePseudoTracks.TruthParticleContainerName = "TruthEvent_PU"
ToolSvc += InDetStandardPerformancePseudoTracks
if (InDetFlags.doPrintConfigurables()):
print InDetStandardPerformancePseudoTracks
......@@ -535,7 +535,7 @@ if InDetFlags.doPhysValMon():
# if InDetFlags.doDBM():
# InDetPhysValMonToolDBM = InDetPhysValMonitoringTool (useTrackSelection = False,
# TrackParticleContainerName = "InDetDBMTrackParticles",
# TruthParticleContainerName = ["DBMTracksTruth"],
# TruthParticleContainerName = "DBMTracksTruth",
# TrackSelectionTool = None,
# TruthSelectionTool = None,
# jetContainerName = "")
......@@ -554,7 +554,7 @@ if InDetFlags.doPhysValMon():
if InDetFlags.doSplitReco():
InDetPhysValMonToolPU = InDetPhysValMonitoringTool (useTrackSelection = True,
TrackSelectionTool = InDetTrackSelectorTool,
TruthParticleContainerName = ["SpclMCPU"])
TruthParticleContainerName = "SpclMCPU")
ToolSvc += InDetPhysValMonToolPU
InDetPhysValMonManager.AthenaMonTools += [InDetPhysValMonToolPU]
if (InDetFlags.doPrintConfigurables()):
......
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