Verified Commit 0329280e authored by Tadej Novak's avatar Tadej Novak
Browse files

Cleanup some references to SLHC

parent e6703466
Pipeline #3113371 passed with stage
in 0 seconds
......@@ -23,7 +23,7 @@ def createGeoModelConfigFlags():
gcf.addFlag("GeoModel.Run",
lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Common']['Run'])
# Based on CommonGeometryFlags.Run (InDetGeometryFlags.isSLHC replaced by GeoModel.Run=="RUN4")
# Based on CommonGeometryFlags.Run
gcf.addFlag("GeoModel.Type",
lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Common']['GeoType'])
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
# InDet GeoModel initialization
......@@ -7,7 +7,6 @@ from AthenaCommon.JobProperties import jobproperties
from AthenaCommon.DetFlags import DetFlags
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags
from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
# Treat CTB separately
......@@ -38,19 +37,9 @@ elif ( DetFlags.detdescr.ID_on() ):
GeoModelSvc.DetectorTools['PixelDetectorTool'].useDynamicAlignFolders = InDetGeometryFlags.useDynamicAlignFolders()
if ( DetFlags.detdescr.SCT_on() ):
if InDetGeometryFlags.isSLHC():
#SLHC specific code
if "GMX" == CommonGeometryFlags.StripGeoType():
from SCT_GeoModelXml.SCT_GeoModelXmlConf import SCT_GMX_DetectorTool
sctSLHCTool = SCT_GMX_DetectorTool()
else:
from SCT_SLHC_GeoModel.SCT_SLHC_GeoModelConf import SCT_SLHC_DetectorTool
sctSLHCTool = SCT_SLHC_DetectorTool()
GeoModelSvc.DetectorTools += [ sctSLHCTool ]
else:
# Current atlas specific code
from AthenaCommon import CfgGetter
GeoModelSvc.DetectorTools += [ CfgGetter.getPrivateTool("SCT_DetectorTool", checkType=True) ]
# Current atlas specific code
from AthenaCommon import CfgGetter
GeoModelSvc.DetectorTools += [ CfgGetter.getPrivateTool("SCT_DetectorTool", checkType=True) ]
GeoModelSvc.DetectorTools['SCT_DetectorTool'].useDynamicAlignFolders = InDetGeometryFlags.useDynamicAlignFolders()
......@@ -61,12 +50,7 @@ elif ( DetFlags.detdescr.ID_on() ):
GeoModelSvc.DetectorTools += [ trtDetectorTool ]
from InDetServMatGeoModel.InDetServMatGeoModelConf import InDetServMatTool
if InDetGeometryFlags.isSLHC():
#SLHC specific code
servMatTool = InDetServMatTool()
GeoModelSvc.DetectorTools += [ servMatTool ]
else:
GeoModelSvc.DetectorTools += [ InDetServMatTool() ]
GeoModelSvc.DetectorTools += [ InDetServMatTool() ]
# Make alignable
from InDetCondFolders import InDetAlignFolders # noqa: F401
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#
# InDet GeoModel initialization
......@@ -15,13 +15,13 @@ from AthenaCommon import Logging
# -------------------------------------------------------------------------------------
class GeoVersionName(JobProperty):
""" version name DC3,IBL,SLHC,... """
""" version name DC3,IBL,... """
statusOn = True
allowedTypes = ['str']
StoredValue = 'UNDEFINED'
class GeoLayout(JobProperty):
""" geometry layout Final, IBL. SLHC,... """
""" geometry layout Final, IBL,... """
statusOn = True
allowedTypes = ['str']
StoredValue = 'UNDEFINED'
......
......@@ -90,7 +90,7 @@ def createInDetConfigFlags():
icf.addFlag("InDet.doWriteTracksToESD", True) # turn track slimming on/off
icf.addFlag("InDet.doVertexFinding", True) # Turn on the primary vertex reconstruction
icf.addFlag("InDet.primaryVertexSetup", 'IterativeFinding') # string to store the type of finder/fitter for pri vertexing, possible types: 'AdaptiveMultiFinding', 'IterativeFinding', 'AdaptiveFinding', 'DefaultFastFinding', 'DefaultFullFinding', 'DefaultKalmanFinding', 'DefaultAdaptiveFinding', 'DefaultVKalVrtFinding' 'MedImgMultiFinding' 'GaussIterativeFinding' 'GaussAdaptiveMultiFinding'
icf.addFlag("InDet.primaryVertexCutSetup", 'Offline') # string to store the type of cuts to be used in PV reconstruction: 'Offline', 'IBL', 'SLHC' 'HeavyIon'
icf.addFlag("InDet.primaryVertexCutSetup", 'Offline') # string to store the type of cuts to be used in PV reconstruction: 'Offline', 'IBL', 'HeavyIon'
icf.addFlag("InDet.vertexSeedFinder", 'SlidingWindowMultiSeedFinder') # string to store the type of seed finder, possible types: 'SlidingWindowMultiSeedFinder', 'HistogrammingMultiSeedFinder', 'DivisiveMultiSeedFinder'
icf.addFlag("InDet.primaryVertexSortingSetup", 'SumPt2Sorting') # string to store the type of sorting algorithm to separate signal and pile-up vertices, possible types: 'NoReSorting','SumPt2Sorting','VxProbSorting','NNSorting'
icf.addFlag("InDet.doPrimaryVertex3DFinding", True) # will be set to false automatically if beam constraint ON, otherwise true. Control if to use 3d seeding for primary vertex finding (useful in case of poor / no knowledge of the beam spot. Will be set to false automatically if beam constraint ON, otherwise true
......
......@@ -123,22 +123,10 @@ def EndcapFEI3SimTool(name="EndcapFEI3SimTool", **kwargs):
def IdMapping():
from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat"
# ITk:
if geoFlags.isSLHC():
IdMappingDat = "ITk_Atlas_IdMapping.dat"
if "BrlIncl4.0_ref" == commonGeoFlags.GeoType():
IdMappingDat = "ITk_Atlas_IdMapping_InclBrl4.dat"
elif "IBrlExt4.0ref" == commonGeoFlags.GeoType():
IdMappingDat = "ITk_Atlas_IdMapping_IExtBrl4.dat"
elif "BrlExt4.0_ref" == commonGeoFlags.GeoType():
IdMappingDat = "ITk_Atlas_IdMapping_ExtBrl4.dat"
elif "BrlExt3.2_ref" == commonGeoFlags.GeoType():
IdMappingDat = "ITk_Atlas_IdMapping_ExtBrl32.dat"
elif not geoFlags.isIBL():
if not geoFlags.isIBL():
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping.dat"
else:
# Planar IBL
......@@ -529,18 +517,13 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
kwargs.setdefault("InputObjectName", "PixelHits")
chargeTools = []
chargeTools += ['SensorSimPlanarTool']
chargeTools += ['SensorSim3DTool']
feSimTools = []
if geoFlags.isSLHC():
chargeTools += ['SensorSimPlanarTool']
feSimTools += ['BarrelRD53SimTool']
feSimTools += ['EndcapRD53SimTool']
else:
chargeTools += ['SensorSimPlanarTool']
chargeTools += ['SensorSim3DTool']
feSimTools += ['BarrelFEI4SimTool']
feSimTools += ['DBMFEI4SimTool']
feSimTools += ['BarrelFEI3SimTool']
feSimTools += ['EndcapFEI3SimTool']
feSimTools += ['BarrelFEI4SimTool']
feSimTools += ['DBMFEI4SimTool']
feSimTools += ['BarrelFEI3SimTool']
feSimTools += ['EndcapFEI3SimTool']
kwargs.setdefault("ChargeTools", chargeTools)
kwargs.setdefault("FrontEndSimTools", feSimTools)
kwargs.setdefault("EnergyDepositionTool", "EnergyDepositionTool")
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function
from AthenaCommon import CfgMgr
......@@ -68,28 +68,17 @@ def generateTrackFastSimSensitiveDetectorList():
def generateInDetSensitiveDetectorList():
SensitiveDetectorList=[]
from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
isUpgrade = commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
isRUN2 = (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
isRUN1 = not (isRUN2 or isUpgrade)
from AthenaCommon.DetFlags import DetFlags
#if isRUN2 and DetFlags.simulation.DBM_on():
# SensitiveDetectorList += [ 'DBMSensorSD' ]
if DetFlags.simulate.pixel_on():
if isRUN1 or isRUN2:
if DetFlags.simulate.BCM_on():
SensitiveDetectorList += [ 'BCMSensorSD' ]
SensitiveDetectorList += [ 'BLMSensorSD' ]
if DetFlags.simulate.BCM_on():
SensitiveDetectorList += [ 'BCMSensorSD' ]
SensitiveDetectorList += [ 'BLMSensorSD' ]
SensitiveDetectorList += [ 'PixelSensorSD' ]
if DetFlags.simulate.SCT_on():
if isUpgrade:
SensitiveDetectorList += [ 'SLHC_SctSensorSD' ]
else:
SensitiveDetectorList += [ 'SctSensorSD' ]
if DetFlags.simulate.TRT_on() and not isUpgrade:
SensitiveDetectorList += [ 'SctSensorSD' ]
if DetFlags.simulate.TRT_on():
SensitiveDetectorList += [ 'TRTSensitiveDetector' ]
return SensitiveDetectorList
......
......@@ -67,7 +67,6 @@ def getIDETEnvelope(name="IDET", **kwargs):
from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
isUpgrade = commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
isRUN2 = (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
#isRUN1 = not (isRUN2 or isUpgrade)
kwargs.setdefault("DetectorName", "IDET")
innerRadius = 37.*mm # RUN1 default
......@@ -287,7 +286,6 @@ def getATLAS_RegionCreatorList():
regionCreatorList = []
from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
isUpgrade = commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
isRUN2 = (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
from G4AtlasApps.SimFlags import simFlags
......@@ -300,7 +298,7 @@ def getATLAS_RegionCreatorList():
regionCreatorList += ['PixelPhysicsRegionTool']
if DetFlags.SCT_on():
regionCreatorList += ['SCTPhysicsRegionTool']
if DetFlags.TRT_on() and not isUpgrade:
if DetFlags.TRT_on():
regionCreatorList += ['TRTPhysicsRegionTool']
if isRUN2:
regionCreatorList += ['TRT_ArPhysicsRegionTool'] #'TRT_KrPhysicsRegionTool'
......
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