Commit b6e83706 authored by Thomas Strebler's avatar Thomas Strebler Committed by Edward Moyse
Browse files

SLHC cleaning

parent 8594a3d5
......@@ -181,8 +181,8 @@ namespace xAOD {
SiSPSeededFinderSimple = 48,
// Large d0 for displaced vertex searches
SiSpacePointsSeedMaker_LargeD0 = 49,
// SLHCConversion Track flag
SiSpacePointsSeedMaker_SLHCConversionTracks = 50,
// ITkConversion Track flag
SiSpacePointsSeedMaker_ITkConversionTracks = 50,
// Pseudotracking
Pseudotracking = 51,
///maximum number of enums
......
......@@ -212,7 +212,7 @@ def ITkSiTrackMaker_xkCfg(flags, name="ITkSiTrackMaker", InputCollections = None
kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_HeavyIon')
elif flags.ITk.Tracking.extension == "ConversionFinding":
kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_SLHCConversionTracks')
kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_ITkConversionTracks')
elif flags.ITk.Tracking.extension == "LargeD0":
kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_LargeD0')
......
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
......@@ -137,7 +137,7 @@ namespace InDet {
std::string m_namespace; //!< identificaton namespace
// ID container
std::string m_exitVolume; //!< the final ID container
bool m_isSLHC; //!< changes volume boundary calculation for SLHC layouts
bool m_isITk; //!< changes volume boundary calculation for ITk layouts
};
} // end of namespace
......
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
......@@ -139,7 +139,7 @@ namespace InDet {
std::string m_namespace; //!< identificaton namespace
// ID container
std::string m_exitVolume; //!< the final ID container
bool m_isSLHC; //!< changes volume boundary calculation for SLHC layouts
bool m_isITk; //!< changes volume boundary calculation for ITk layouts
};
} // end of namespace
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
######################################################
# ConfiguredSLHC_InDetTrackingGeometry module
#
# it inherits from StagedTrackingGeometryBuilderConf and performs
# standard configuration
#
######################################################
# import the Extrapolator configurable
from InDetTrackingGeometry.InDetTrackingGeometryConf import InDet__StagedTrackingGeometryBuilder
# define the class
class ConfiguredSLHC_InDetTrackingGeometryBuilder( InDet__StagedTrackingGeometryBuilder ):
# constructor
def __init__(self,name = 'InDetTrackingGeometryBuilder',
namePrefix = '',
setLayerAssociation = True):
# get the ToolSvc
from AthenaCommon.AppMgr import ToolSvc, ServiceMgr
from AthenaCommon.DetFlags import DetFlags
# the Detector flags to be imported
from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
# beampipe
from InDetTrackingGeometry.InDetTrackingGeometryConf import InDet__BeamPipeBuilder
BeamPipeBuilder = InDet__BeamPipeBuilder(name=namePrefix+'BeamPipeBuilder')
BeamPipeBuilder.BeamPipeRadius = TrkDetFlags.BeamPipeRadius()
BeamPipeBuilder.BeamPipeThickness = TrkDetFlags.BeamPipeThickness()
BeamPipeBuilder.BeamPipeMaterialBinsZ = TrkDetFlags.BeamPipeLayerMaterialBinsZ()
BeamPipeBuilder.OutputLevel = TrkDetFlags.InDetBuildingOutputLevel()
# the binning type of the layers
BeamPipeBinning = 2
# where to build it from
BeamPipeBuilder.BeamPipeFromGeoModel = TrkDetFlags.BeamPipeFromGeoModel()
BeamPipeBuilder.BeamPipeEnvelope = TrkDetFlags.BeamPipeEnvelope()
if not TrkDetFlags.BeamPipeFromGeoModel():
BeamPipeBuilder.BeamPipeOffsetX = TrkDetFlags.BeamPipeOffsetX()
BeamPipeBuilder.BeamPipeOffsetY = TrkDetFlags.BeamPipeOffsetY()
BeamPipeBuilder.BeamPipeRadius = TrkDetFlags.BeamPipeRadius()
ToolSvc += BeamPipeBuilder
# the layer providers
from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__LayerProvider
BeamPipeProvider = Trk__LayerProvider(name=namePrefix+'BeamPipeProvider')
BeamPipeProvider.LayerBuilder = BeamPipeBuilder
ToolSvc += BeamPipeProvider
# the layer builders
layerProviders = [ BeamPipeProvider ]
binningsCenter = [ BeamPipeBinning ]
binningsEndcap = [ BeamPipeBinning ]
colors = [ 2 ]
# PIXEL building
from InDetTrackingGeometry.InDetTrackingGeometryConf import InDet__SiLayerBuilder
PixelLayerBuilder = InDet__SiLayerBuilder(name=namePrefix+'PixelLayerBuilder')
PixelLayerBuilder.PixelCase = True
PixelLayerBuilder.Identification = 'Pixel1'
PixelLayerBuilder.SiDetManagerLocation = 'Pixel'
# The pixel split mode
PixelLayerBuilder.SplitMode = TrkDetFlags.PixelSplitMode()
# Pixel barrel specifications
PixelLayerBuilder.BarrelLayerBinsZ = TrkDetFlags.PixelBarrelLayerMaterialBinsZ()
PixelLayerBuilder.BarrelLayerBinsPhi = TrkDetFlags.PixelBarrelLayerMaterialBinsPhi()
PixelLayerBuilder.EndcapLayerBinsR = TrkDetFlags.PixelEndcapLayerMaterialBinsR()
PixelLayerBuilder.EndcapLayerBinsPhi = TrkDetFlags.PixelEndcapLayerMaterialBinsPhi()
# set the layer association
PixelLayerBuilder.SetLayerAssociation = setLayerAssociation
# output level
PixelLayerBuilder.OutputLevel = TrkDetFlags.PixelBuildingOutputLevel()
# the binning type of the layers
PixelLayerBinning = 2
# add it to tool service
ToolSvc += PixelLayerBuilder
# put them to the caches
PixelLayerProvider = Trk__LayerProvider(name=namePrefix+'PixelLayerProvider')
PixelLayerProvider.LayerBuilder = PixelLayerBuilder
ToolSvc += PixelLayerProvider
layerProviders += [ PixelLayerProvider ]
binningsCenter += [ PixelLayerBinning ]
binningsEndcap += [ PixelLayerBinning ]
colors += [ 3 ]
# check if the pixel split mode is one
if TrkDetFlags.PixelSplitMode() != 0:
# set split mode to pixel layer builder
print ("[SLHC_GeometryBuilder] Building Pixel layers in split mode")
# change the identificaiton of the first one
PixelLayerBuilder.Identification = 'Pixel1'
# and now configure the second one
PixelLayerBuilder2 = InDet__SiLayerBuilder(name=namePrefix+'PixelLayerBuilder2')
PixelLayerBuilder2.PixelCase = True
PixelLayerBuilder2.SplitMode = TrkDetFlags.PixelSplitMode()
PixelLayerBuilder2.Identification = 'Pixel2'
PixelLayerBuilder2.SiDetManagerLocation = 'Pixel'
# Pixel barrel specifications
PixelLayerBuilder2.BarrelLayerBinsZ = TrkDetFlags.PixelBarrelLayerMaterialBinsZ()
PixelLayerBuilder2.BarrelLayerBinsPhi = TrkDetFlags.PixelBarrelLayerMaterialBinsPhi()
PixelLayerBuilder2.EndcapLayerBinsR = TrkDetFlags.PixelEndcapLayerMaterialBinsR()
PixelLayerBuilder2.EndcapLayerBinsPhi = TrkDetFlags.PixelEndcapLayerMaterialBinsPhi()
# set the layer association
PixelLayerBuilder2.SetLayerAssociation = setLayerAssociation
# output level
PixelLayerBuilder2.OutputLevel = TrkDetFlags.PixelBuildingOutputLevel()
# add it to tool service
ToolSvc += PixelLayerBuilder2
# the layer providers
PixelLayerProvider2 = Trk__LayerProvider(name=namePrefix+'PixelLayerProvider2')
PixelLayerProvider2.LayerBuilder = PixelLayerBuilder2
ToolSvc += PixelLayerProvider2
# put them to the caches
layerProviders += [ PixelLayerProvider2 ]
binningsCenter += [ PixelLayerBinning ]
binningsEndcap += [ PixelLayerBinning ]
colors += [ 3 ]
if DetFlags.SCT_on() :
# SCT building
SCT_LayerBuilder = InDet__SiLayerBuilder(name=namePrefix+'SCT_LayerBuilder')
SCT_LayerBuilder.PixelCase = False
SCT_LayerBuilder.Identification = 'SCT1'
SCT_LayerBuilder.SiDetManagerLocation = 'SCT'
# general steering
SCT_LayerBuilder.SplitMode = TrkDetFlags.SCT_SplitMode()
# SCT barrel specifications
SCT_LayerBuilder.BarrelLayerBinsZ = TrkDetFlags.SCT_BarrelLayerMaterialBinsZ()
SCT_LayerBuilder.BarrelLayerBinsPhi = TrkDetFlags.SCT_BarrelLayerMaterialBinsPhi()
# SCT endcap specifications
SCT_LayerBuilder.EndcapLayerBinsR = TrkDetFlags.SCT_EndcapLayerMaterialBinsR()
SCT_LayerBuilder.EndcapLayerBinsPhi = TrkDetFlags.SCT_EndcapLayerMaterialBinsPhi()
# SCT_LayerBuilder.EndcapComplexRingBinning = TrkDetFlags.SCT_EndcapLayerDynamicRings()
# set the layer association
SCT_LayerBuilder.SetLayerAssociation = setLayerAssociation
# output level
SCT_LayerBuilder.OutputLevel = TrkDetFlags.SCT_BuildingOutputLevel()
# the binning type of the layer
SCT_LayerBinning = 2
# SCT -> ToolSvc
ToolSvc += SCT_LayerBuilder
# the layer providers
SCT_LayerProvider = Trk__LayerProvider(name=namePrefix+'SCT_LayerProvider')
SCT_LayerProvider.LayerBuilder = SCT_LayerBuilder
ToolSvc += SCT_LayerProvider
# put them to the caches
layerProviders += [ SCT_LayerProvider ]
binningsCenter += [ SCT_LayerBinning ]
binningsEndcap += [ SCT_LayerBinning ]
colors += [ 4 ]
# the split and the second SCT layer builder is needed if the SCT outer barrel
# spans over the full width
if TrkDetFlags.SCT_SplitMode() != 0 :
print ("[SLHC_GeometryBuilder] Building SCT layers in split mode")
from InDetTrackingGeometry.InDetTrackingGeometryConf import InDet__SiLayerBuilder
SCT_LayerBuilder2 = InDet__SiLayerBuilder(name=namePrefix+'SCT_LayerBuilder2')
# switch of the pixel case
SCT_LayerBuilder2.PixelCase = False
SCT_LayerBuilder2.SiDetManagerLocation = 'SCT'
# set the general parameters
SCT_LayerBuilder2.OutputLevel = 2
SCT_LayerBuilder2.SplitMode = TrkDetFlags.SCT_SplitMode()
SCT_LayerBuilder2.Identification = "SCT2"
# SCT barrel specifications
SCT_LayerBuilder2.BarrelLayerBinsZ = TrkDetFlags.SCT_BarrelLayerMaterialBinsZ()
SCT_LayerBuilder2.BarrelLayerBinsPhi = TrkDetFlags.SCT_BarrelLayerMaterialBinsPhi()
# SCT endcap specifications
SCT_LayerBuilder2.EndcapLayerBinsR = TrkDetFlags.SCT_EndcapLayerMaterialBinsR()
SCT_LayerBuilder2.EndcapLayerBinsPhi = TrkDetFlags.SCT_EndcapLayerMaterialBinsPhi()
# set the layer association
SCT_LayerBuilder2.SetLayerAssociation = setLayerAssociation
# output level
SCT_LayerBuilder2.OutputLevel = TrkDetFlags.SCT_BuildingOutputLevel()
ToolSvc += SCT_LayerBuilder2
# the layer providers
SCT_LayerProvider2 = Trk__LayerProvider(name=namePrefix+'SCT_LayerProvider2')
SCT_LayerProvider2.LayerBuilder = SCT_LayerBuilder2
ToolSvc += SCT_LayerProvider2
# put them to the caches
layerProviders += [ SCT_LayerProvider2 ]
binningsCenter += [ SCT_LayerBinning ]
binningsEndcap += [ SCT_LayerBinning ]
colors += [ 5 ]
# helpers for the InDetTrackingGeometry Builder : layer array creator
from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__LayerArrayCreator
InDetLayerArrayCreator = Trk__LayerArrayCreator(name = 'InDetLayerArrayCreator')
InDetLayerArrayCreator.EmptyLayerMode = 2 # deletes empty material layers from arrays
InDetLayerArrayCreator.OutputLevel = TrkDetFlags.InDetBuildingOutputLevel()
# add to ToolSvc
ToolSvc += InDetLayerArrayCreator
# helpers for the InDetTrackingGeometry Builder : volume array creator
from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__TrackingVolumeArrayCreator
InDetTrackingVolumeArrayCreator = Trk__TrackingVolumeArrayCreator(name = 'InDetTrackingVolumeArrayCreator')
InDetTrackingVolumeArrayCreator.OutputLevel = TrkDetFlags.InDetBuildingOutputLevel()
# add to ToolSvc
ToolSvc += InDetTrackingVolumeArrayCreator
# helpers for the InDetTrackingGeometry Builder : tracking voluem helper for glueing
from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__TrackingVolumeHelper
InDetTrackingVolumeHelper = Trk__TrackingVolumeHelper(name ='InDetTrackingVolumeHelper')
InDetTrackingVolumeHelper.OutputLevel = TrkDetFlags.InDetBuildingOutputLevel()
# the material bins
InDetTrackingVolumeHelper.BarrelLayerBinsZ = TrkDetFlags.InDetPassiveLayerMaterialBinsRz()
InDetTrackingVolumeHelper.BarrelLayerBinsPhi = TrkDetFlags.InDetPassiveLayerMaterialBinsPhi()
InDetTrackingVolumeHelper.EndcapLayerBinsR = TrkDetFlags.InDetPassiveLayerMaterialBinsRz()
InDetTrackingVolumeHelper.EndcapLayerBinsPhi = TrkDetFlags.InDetPassiveLayerMaterialBinsPhi()
# add to ToolSvc
ToolSvc += InDetTrackingVolumeHelper
# helpers for the InDetTrackingGeometry Builder : cylinder volume creator
from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__CylinderVolumeCreator
InDetCylinderVolumeCreator = Trk__CylinderVolumeCreator(name = 'InDetCylinderVolumeCreator')
# give him the layer array creator
InDetCylinderVolumeCreator.LayerArrayCreator = InDetLayerArrayCreator
InDetCylinderVolumeCreator.TrackingVolumeArrayCreator = InDetTrackingVolumeArrayCreator
InDetCylinderVolumeCreator.TrackingVolumeHelper = InDetTrackingVolumeHelper
# specifiy the binning, passive layers, entry layers
InDetCylinderVolumeCreator.PassiveLayerThickness = TrkDetFlags.InDetPassiveLayerThickness()
InDetCylinderVolumeCreator.PassiveLayerBinsPhi = TrkDetFlags.InDetPassiveLayerMaterialBinsPhi()
InDetCylinderVolumeCreator.PassiveLayerBinsRZ = TrkDetFlags.InDetPassiveLayerMaterialBinsRz()
# output level
InDetCylinderVolumeCreator.OutputLevel = TrkDetFlags.InDetBuildingOutputLevel()
# add to ToolSvc
ToolSvc += InDetCylinderVolumeCreator
# the envelope definition service
from SubDetectorEnvelopes.SubDetectorEnvelopesConf import DetDescrDBEnvelopeSvc
AtlasEnvelopeSvc = DetDescrDBEnvelopeSvc('AtlasEnvelopeSvcDefinitionSvc')
# set the output level for the Envelope service
AtlasEnvelopeSvc.OutputLevel = TrkDetFlags.InDetBuildingOutputLevel()
# add to SvcMgr
ServiceMgr += AtlasEnvelopeSvc
# the tracking geometry builder
InDet__StagedTrackingGeometryBuilder.__init__(self,namePrefix+name,\
BeamPipeBuilder = BeamPipeBuilder,\
LayerBuilders = layerProviders,
LayerBinningTypeCenter = binningsCenter,
LayerBinningTypeEndcap = binningsEndcap,
ColorCodes = colors,
EnvelopeDefinitionSvc = AtlasEnvelopeSvc,
# VolumeEnclosureDiscPositions = [ 3000., 3450. ],
TrackingVolumeCreator = InDetCylinderVolumeCreator,
LayerArrayCreator = InDetLayerArrayCreator,
BuildBoundaryLayers = True,
# ReplaceAllJointBoundaries = TrkDetFlags.InDetBuildMaterialBoundaries(),
OutputLevel = TrkDetFlags.InDetBuildingOutputLevel(),
ExitVolumeName = TrkDetFlags.InDetContainerName(),
MagneticFieldMode = TrkDetFlags.MagneticFieldMode(),
isSLHC = True)
......@@ -71,7 +71,7 @@ InDet::RobustTrackingGeometryBuilder::RobustTrackingGeometryBuilder(const std::s
// volume namespace & contaienr name
declareProperty("VolumeNamespace", m_namespace);
declareProperty("ExitVolumeName", m_exitVolume);
declareProperty("isSLHC", m_isSLHC=false);
declareProperty("isITk", m_isITk=false);
}
// destructor
......@@ -389,7 +389,7 @@ const Trk::TrackingGeometry* InDet::RobustTrackingGeometryBuilder::trackingGeome
double currentCentralOuterR = 0.;
double currentEndcapOuterR = 0.;
if (m_isSLHC){
if (m_isITk){
double NextInnerRadii = ((ilb!=cylinderOuterRadii.size()-1) && cylinderInnerRadii[ilb+1]<discInnerRadii[ilb+1]) ? cylinderInnerRadii[ilb+1] : discInnerRadii[ilb+1];
currentCentralOuterR = (ilb!=cylinderOuterRadii.size()-1) ? 0.5*(NextInnerRadii+cylinderOuterRadii[ilb]) : overallRmax;
currentEndcapOuterR = (ilb!=discOuterRadii.size()-1) ? 0.5*(NextInnerRadii+discOuterRadii[ilb]) : overallRmax;
......
......@@ -72,7 +72,7 @@ InDet::RobustTrackingGeometryBuilderCond::RobustTrackingGeometryBuilderCond(cons
// volume namespace & contaienr name
declareProperty("VolumeNamespace", m_namespace);
declareProperty("ExitVolumeName", m_exitVolume);
declareProperty("isSLHC", m_isSLHC=false);
declareProperty("isITk", m_isITk=false);
}
// destructor
......@@ -401,7 +401,7 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> InDet::RobustTrackingGeome
double currentCentralOuterR = 0.;
double currentEndcapOuterR = 0.;
if (m_isSLHC){
if (m_isITk){
double NextInnerRadii = ((ilb!=cylinderOuterRadii.size()-1) && cylinderInnerRadii[ilb+1]<discInnerRadii[ilb+1]) ? cylinderInnerRadii[ilb+1] : discInnerRadii[ilb+1];
currentCentralOuterR = (ilb!=cylinderOuterRadii.size()-1) ? 0.5*(NextInnerRadii+cylinderOuterRadii[ilb]) : overallRmax;
currentEndcapOuterR = (ilb!=discOuterRadii.size()-1) ? 0.5*(NextInnerRadii+discOuterRadii[ilb]) : overallRmax;
......
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from InDetPrepRawDataToxAOD.InDetDxAODJobProperties import InDetDxAODFlags
from InDetRecExample.TrackingCommon import setDefaults
from InDetRecExample.InDetJobProperties import InDetFlags
import InDetRecExample.TrackingCommon as TrackingCommon
from AthenaCommon.GlobalFlags import globalflags
from PrimaryDPDMaker.PrimaryDPDFlags import jobproperties
......@@ -50,7 +49,7 @@ def getPixelPrepDataToxAOD(name='xAOD_PixelPrepDataToxAOD', **kwargs) :
OutputLevel = INFO,
UseTruthInfo = (add_IDTIDE_content and isIdTrkDxAODSimulation),
WriteRDOinformation = InDetDxAODFlags.DumpPixelRdoInfo() or add_IDTIDE_content,
WriteNNinformation = (InDetDxAODFlags.DumpPixelNNInfo() or add_IDTIDE_content) and not InDetFlags.doSLHC(),
WriteNNinformation = InDetDxAODFlags.DumpPixelNNInfo() or add_IDTIDE_content,
# ,WriteSDOs = True
# ,WriteSiHits = True # if available
) )
......
......@@ -72,9 +72,6 @@ pixelClusterThinningExpression = InDetDxAODFlags.PixelClusterThinningExpression(
if ( 'dumpTruthInfo' in dir() ):
dumpTruthInfo = dumpTruthInfo and isIdTrkDxAODSimulation
if InDetFlags.doSLHC():
dumpTrtInfo=False
if isIdTrkDxAODSimulation:
# should only be used for data
TrtZSel=False
......
......@@ -96,8 +96,6 @@ xAOD_PixelPrepDataToxAOD.WriteRDOinformation = True
xAOD_PixelPrepDataToxAOD.WriteNNinformation = InDetDxAODFlags.DumpPixelNNInfo()
#xAOD_PixelPrepDataToxAOD.WriteSDOs = True
#xAOD_PixelPrepDataToxAOD.WriteSiHits = True # if available
if InDetFlags.doSLHC():
xAOD_PixelPrepDataToxAOD.WriteNNinformation=False
IDDerivationSequence += xAOD_PixelPrepDataToxAOD
if (printIdTrkDxAODConf):
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#########################################################################
# ConfiguredNewtrackingCuts class
......@@ -272,22 +272,6 @@ class ConfiguredNewTrackingCuts :
self.__minSiNotShared = 5
self.__rejectShortExtensions = False
# --- SLHC setup
if mode == "SLHC":
self.__extension = "SLHC"
# --- higher pt cut and impact parameter cut
self.__minPT = 0.9 * Units.GeV
self.__maxPrimaryImpact = 2.0 * Units.mm # highlumi
self.__maxZImpact = 250.0 * Units.mm
# --- cluster cuts
self.__minClusters = 9
self.__minSiNotShared = 8
# --- also tighten pattern cuts
self.__radMax = 1000. * Units.mm
# --- IBL setup
if mode == "IBL" :
self.__extension = "IBL"
......@@ -421,23 +405,6 @@ class ConfiguredNewTrackingCuts :
self.__maxPT = 1000000 * Units.GeV # Won't accept None *NEEDS FIXING*
self.__maxPrimaryImpact = 100.0 * Units.mm
if mode == "SLHCConversionFinding":
self.__extension = "SLHCConversionFinding" # this runs parallel to NewTracking
self.__minPT = 0.9 * Units.GeV
self.__maxPrimaryImpact = 10.0 * Units.mm
self.__maxZImpact = 150.0 * Units.mm
self.__minClusters = 6
self.__minSiNotShared = 4
self.__maxHoles = 0
# --- also tighten pattern cuts
self.__radMax = 1000. * Units.mm
self.__radMin = 0. * Units.mm # not turn on this cut for now
# --- turn on Z Boundary seeding
self.__doZBoundary = False #
# --- change defaults for very low pt tracking
if mode == "VeryLowPt":
self.__extension = "VeryLowPt" # this runs parallel to NewTracking
......@@ -478,44 +445,6 @@ class ConfiguredNewTrackingCuts :
self.__useTRT = False # no TRT for forward tracks
if mode == "ForwardSLHCTracks":
self.__extension = "ForwardSLHCTracks" # this runs parallel to NewTracking
self.__minEta = 2.4 # restrict to minimal eta
self.__maxEta = 3.0
self.__minPT = 0.9 * Units.GeV
self.__minClusters = 5
self.__minSiNotShared = 3
self.__maxShared = 1
self.__minPixel = 3
self.__maxHoles = 1
self.__maxPixelHoles = 1
self.__maxSctHoles = 1
self.__maxDoubleHoles = 0
self.__nHolesMax = self.__maxHoles
self.__nHolesGapMax = self.__maxHoles
self.__radMax = 600. * Units.mm
self.__useTRT = False # no TRT for forward tracks
if mode == "VeryForwardSLHCTracks":
self.__extension = "VeryForwardSLHCTracks" # this runs parallel to NewTracking
self.__minEta = 2.4 # restrict to minimal eta
self.__maxEta = 4.0
self.__minPT = 0.9 * Units.GeV
self.__minClusters = 5
self.__minSiNotShared = 3
self.__maxShared = 1
self.__minPixel = 3
self.__maxHoles = 1
self.__maxPixelHoles = 1
self.__maxSctHoles = 0
self.__maxDoubleHoles = 0
self.__nHolesMax = self.__maxHoles
self.__nHolesGapMax = self.__maxHoles
self.__radMax = 600. * Units.mm
self.__useTRT = False # no TRT for forward tracks
# --- change defauls for beam gas tracking
if mode == "BeamGas":
self.__extension = "BeamGas" # this runs parallel to NewTracking
......
......@@ -177,12 +177,6 @@ class doRefit(InDetFlagsJobProperty):
allowedTypes = ['bool']
StoredValue = False
class doSLHC(InDetFlagsJobProperty):
"""Turn running of SLHC reconstruction on and off"""
statusOn = True
allowedTypes = ['bool']
StoredValue = False
class doIBL(InDetFlagsJobProperty):
"""Turn running of IBL reconstruction on and off"""
statusOn = True
......@@ -256,12 +250,6 @@ class doVeryLowPt(InDetFlagsJobProperty):
allowedTypes = ['bool']
StoredValue = False
class doSLHCConversionFinding(InDetFlagsJobProperty):
"""Turn running of doSLHCConversionFinding second pass on and off"""
statusOn = True
allowedTypes = ['bool']
StoredValue = False
class doForwardTracks(InDetFlagsJobProperty):
"""Turn running of doForwardTracks pass on and off"""
statusOn = True
......@@ -1114,12 +1102,6 @@ class doTrackSegmentsDisappearing(InDetFlagsJobProperty):
allowedTypes = ['bool']
StoredValue = True
class doSLHCVeryForward(InDetFlagsJobProperty):
"""Turn running of SLHC reconstruction for Very Forward extension on and off"""
statusOn = True
allowedTypes = ['bool']
StoredValue = False
class doTRTGlobalOccupancy(InDetFlagsJobProperty):
"""Turn running of Event Info TRT Occupancy Filling Alg on and off (also whether it is used in TRT PID calculation)"""
statusOn = True
......@@ -1253,16 +1235,11 @@ class InDetJobProperties(JobPropertyContainer):
if self.doHIP300 :
self.checkThenSet(self.doRejectInvalidCov ,True)
if self.doSLHCVeryForward():
self.checkThenSet(self.doSLHC , True)
self.checkThenSet(self.doForwardTracks , True)
if (jobproperties.Beam.beamType()=="singlebeam"):
self.checkThenSet(self.useHVForSctDCS , True)
self.checkThenSet(self.doNewTracking , False)
self.checkThenSet(self.doLowPt , False)
self.checkThenSet(self.doVeryLowPt , False)
self.checkThenSet(self.doSLHCConversionFinding, False)
self.checkThenSet(self.doBeamGas , True )
self.checkThenSet(self.doBeamHalo , True )
self.checkThenSet(self.doParticleCreation , True )
......@@ -1285,7 +1262,6 @@ class InDetJobProperties(JobPropertyContainer):
self.checkThenSet(self.doNewTracking , True )
self.checkThenSet(self.doLowPt , False)
self.checkThenSet(self.doVeryLowPt , False)
self.checkThenSet(self.doSLHCConversionFinding, False)
self.checkThenSet(self.doBeamGas , False)
self.checkThenSet(self.doBeamHalo , False)
self.checkThenSet(self.doBackTracking , False)
......@@ -1318,7 +1294,6 @@ class InDetJobProperties(JobPropertyContainer):
self.checkThenSet(self.useZvertexTool , True )
self.checkThenSet(self.doLowPt , False)
self.checkThenSet(self.doVeryLowPt , False)
self.checkThenSet(self.doSLHCConversionFinding, False)
self.checkThenSet(self.doBackTracking , False)
self.checkThenSet(self.doTRTStandalone , False)