From 98db0a04364c4dec30df62d10cde3229d2426a1f Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 10:53:09 +0200 Subject: [PATCH 01/12] Changed SLHC- into ITkConversionTracks --- Event/xAOD/xAODTracking/xAODTracking/TrackingPrimitives.h | 4 ++-- .../InDetConfig/python/ITkTrackingSiPatternConfig.py | 2 +- .../InDetRecExample/share/ConfiguredNewTrackingSiPattern.py | 2 +- .../InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx | 4 ++-- Tracking/TrkEvent/TrkTrack/TrkTrack/TrackInfo.h | 4 ++-- Tracking/TrkEvent/TrkTrack/src/TrackInfo.cxx | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Event/xAOD/xAODTracking/xAODTracking/TrackingPrimitives.h b/Event/xAOD/xAODTracking/xAODTracking/TrackingPrimitives.h index b58d2d1b94b..00df71dd3bf 100644 --- a/Event/xAOD/xAODTracking/xAODTracking/TrackingPrimitives.h +++ b/Event/xAOD/xAODTracking/xAODTracking/TrackingPrimitives.h @@ -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 diff --git a/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py b/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py index 1ee21cc54d7..7130fbc8db9 100644 --- a/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py +++ b/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py @@ -213,7 +213,7 @@ def ITkSiTrackMaker_xkCfg(flags, name="ITkSiTrackMaker", InputCollections = None kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_HeavyIon') elif flags.ITk.Tracking.extension == "ITkConversionFinding": - kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_SLHCConversionTracks') + kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_ITkConversionTracks') elif flags.ITk.Tracking.extension == "ITkLargeD0": kwargs.setdefault("TrackPatternRecoInfo", 'SiSpacePointsSeedMaker_LargeD0') diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py index 9fe0a8baa9f..2a9dbd76043 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py @@ -33,7 +33,7 @@ class ConfiguredNewTrackingSiPattern: # # --- decide if use the association tool # - if (len(InputCollections) > 0) and (NewTrackingCuts.mode() == "LowPt" or NewTrackingCuts.mode() == "VeryLowPt" or NewTrackingCuts.mode() == "LargeD0" or NewTrackingCuts.mode() == "R3LargeD0" or NewTrackingCuts.mode() == "LowPtLargeD0" or NewTrackingCuts.mode() == "BeamGas" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "Disappearing" or NewTrackingCuts.mode() == "VeryForwardSLHCTracks" or NewTrackingCuts.mode() == "SLHCConversionFinding"): + if (len(InputCollections) > 0) and (NewTrackingCuts.mode() == "LowPt" or NewTrackingCuts.mode() == "VeryLowPt" or NewTrackingCuts.mode() == "LargeD0" or NewTrackingCuts.mode() == "R3LargeD0" or NewTrackingCuts.mode() == "LowPtLargeD0" or NewTrackingCuts.mode() == "BeamGas" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "Disappearing" or NewTrackingCuts.mode() == "VeryForwardSLHCTracks" or NewTrackingCuts.mode() == "ITkConversionFinding"): usePrdAssociationTool = True else: usePrdAssociationTool = False diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx index 8872f94f2be..848c09e9c02 100644 --- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx +++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx @@ -101,8 +101,8 @@ StatusCode InDet::SiTrackMaker_xk::initialize() m_trackinfo.setPatternRecognitionInfo(Trk::TrackInfo::SiSpacePointsSeedMaker_ForwardTracks); } else if (m_patternName == "SiSpacePointsSeedMaker_LargeD0" ) { m_trackinfo.setPatternRecognitionInfo(Trk::TrackInfo::SiSpacePointsSeedMaker_LargeD0 ); - } else if (m_patternName == "SiSpacePointsSeedMaker_SLHCConversionTracks") { - m_trackinfo.setPatternRecognitionInfo(Trk::TrackInfo::SiSpacePointsSeedMaker_SLHCConversionTracks); + } else if (m_patternName == "SiSpacePointsSeedMaker_ITkConversionTracks") { + m_trackinfo.setPatternRecognitionInfo(Trk::TrackInfo::SiSpacePointsSeedMaker_ITkConversionTracks); } else { m_trackinfo.setPatternRecognitionInfo(Trk::TrackInfo::SiSPSeededFinder ); } diff --git a/Tracking/TrkEvent/TrkTrack/TrkTrack/TrackInfo.h b/Tracking/TrkEvent/TrkTrack/TrkTrack/TrackInfo.h index 3c778d8d7fc..c041b3cf8ae 100755 --- a/Tracking/TrkEvent/TrkTrack/TrkTrack/TrackInfo.h +++ b/Tracking/TrkEvent/TrkTrack/TrkTrack/TrackInfo.h @@ -258,8 +258,8 @@ public: /** Large d0 for displaced vertex searches */ SiSpacePointsSeedMaker_LargeD0 = 49, - /** SLHCConversion Track flag */ - SiSpacePointsSeedMaker_SLHCConversionTracks = 50, + /** ITkConversion Track flag */ + SiSpacePointsSeedMaker_ITkConversionTracks = 50, /** Pseudo-tracking flag */ Pseudotracking = 51, diff --git a/Tracking/TrkEvent/TrkTrack/src/TrackInfo.cxx b/Tracking/TrkEvent/TrkTrack/src/TrackInfo.cxx index a05b1373daf..0954850fee8 100644 --- a/Tracking/TrkEvent/TrkTrack/src/TrackInfo.cxx +++ b/Tracking/TrkEvent/TrkTrack/src/TrackInfo.cxx @@ -190,8 +190,8 @@ Trk::TrackInfo::dumpInfo() const ? "SiSpacePointsSeedMaker_VeryLowMomentum; " : ""); authorInfo << (m_patternRecognition.test( - Trk::TrackInfo::SiSpacePointsSeedMaker_SLHCConversionTracks) - ? "SiSpacePointsSeedMaker_SLHCConversionTracks; " + Trk::TrackInfo::SiSpacePointsSeedMaker_ITkConversionTracks) + ? "SiSpacePointsSeedMaker_ITkConversionTracks; " : ""); authorInfo << (m_patternRecognition.test(Trk::TrackInfo::SiSpacePointsSeedMaker_LargeD0) ? "SiSpacePointsSeedMaker_LargeD0; " -- GitLab From 404308309adf701b5b547791f3495b09af910ab7 Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 11:11:52 +0200 Subject: [PATCH 02/12] Cleaned SLHC from InDetRecExample configs --- .../python/ConfiguredNewTrackingCuts.py | 73 +-------------- .../share/ConfiguredNewTrackingSiPattern.py | 39 ++------ .../share/InDetRecPreProcessingSilicon.py | 13 +-- .../share/InDetRec_jobOptions.py | 92 +------------------ 4 files changed, 14 insertions(+), 203 deletions(-) diff --git a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py index c3df29b70e6..54d98ec3358 100755 --- a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py +++ b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py @@ -1,4 +1,4 @@ -# 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 diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py index 2a9dbd76043..98d1dac28a4 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py @@ -33,7 +33,7 @@ class ConfiguredNewTrackingSiPattern: # # --- decide if use the association tool # - if (len(InputCollections) > 0) and (NewTrackingCuts.mode() == "LowPt" or NewTrackingCuts.mode() == "VeryLowPt" or NewTrackingCuts.mode() == "LargeD0" or NewTrackingCuts.mode() == "R3LargeD0" or NewTrackingCuts.mode() == "LowPtLargeD0" or NewTrackingCuts.mode() == "BeamGas" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "Disappearing" or NewTrackingCuts.mode() == "VeryForwardSLHCTracks" or NewTrackingCuts.mode() == "ITkConversionFinding"): + if (len(InputCollections) > 0) and (NewTrackingCuts.mode() == "LowPt" or NewTrackingCuts.mode() == "VeryLowPt" or NewTrackingCuts.mode() == "LargeD0" or NewTrackingCuts.mode() == "R3LargeD0" or NewTrackingCuts.mode() == "LowPtLargeD0" or NewTrackingCuts.mode() == "BeamGas" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "Disappearing"): usePrdAssociationTool = True else: usePrdAssociationTool = False @@ -78,8 +78,6 @@ class ConfiguredNewTrackingSiPattern: from SiSpacePointsSeedTool_xk.SiSpacePointsSeedTool_xkConf import InDet__SiSpacePointsSeedMaker_LowMomentum as SiSpacePointsSeedMaker elif NewTrackingCuts.mode() == "BeamGas": from SiSpacePointsSeedTool_xk.SiSpacePointsSeedTool_xkConf import InDet__SiSpacePointsSeedMaker_BeamGas as SiSpacePointsSeedMaker - elif NewTrackingCuts.mode() == "SLHC" or NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "VeryForwardSLHCTracks" : - from SiSpacePointsSeedTool_xk.SiSpacePointsSeedTool_xkConf import InDet__SiSpacePointsSeedMaker_ITK as SiSpacePointsSeedMaker else: from SiSpacePointsSeedTool_xk.SiSpacePointsSeedTool_xkConf import InDet__SiSpacePointsSeedMaker_ATLxk as SiSpacePointsSeedMaker @@ -150,14 +148,7 @@ class ConfiguredNewTrackingSiPattern: except: pass InDetSiSpacePointsSeedMaker.mindRadius = 4.0 - if NewTrackingCuts.mode() == "SLHC" or NewTrackingCuts.mode() == "SLHCConversionFinding": - InDetSiSpacePointsSeedMaker.minRadius1 = 0 - InDetSiSpacePointsSeedMaker.minRadius2 = 0 - InDetSiSpacePointsSeedMaker.minRadius3 = 0 - InDetSiSpacePointsSeedMaker.maxRadius1 =1000.*Units.mm - InDetSiSpacePointsSeedMaker.maxRadius2 =1000.*Units.mm - InDetSiSpacePointsSeedMaker.maxRadius3 =1000.*Units.mm - if NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "VeryForwardSLHCTracks": + if NewTrackingCuts.mode() == "ForwardTracks": InDetSiSpacePointsSeedMaker.checkEta = True InDetSiSpacePointsSeedMaker.etaMin = NewTrackingCuts.minEta() InDetSiSpacePointsSeedMaker.etaMax = NewTrackingCuts.maxEta() @@ -265,7 +256,7 @@ class ConfiguredNewTrackingSiPattern: ToolSvc += track_finder - useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "SLHC" or NewTrackingCuts.mode() == "DBM" + useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "DBM" from SiTrackMakerTool_xk.SiTrackMakerTool_xkConf import InDet__SiTrackMaker_xk as SiTrackMaker InDetSiTrackMaker = SiTrackMaker(name = 'InDetSiTrackMaker'+NewTrackingCuts.extension(), useSCT = NewTrackingCuts.useSCT(), @@ -295,9 +286,6 @@ class ConfiguredNewTrackingSiPattern: InputHadClusterContainerName = InDetKeys.HadCaloClusterROIContainer(), # "InDetCaloClusterROIs" UseAssociationTool = usePrdAssociationTool) - if NewTrackingCuts.mode() == "SLHC" or NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "VeryForwardSLHCTracks" : - InDetSiTrackMaker.ITKGeometry = True - if NewTrackingCuts.mode() == "DBM": InDetSiTrackMaker.MagneticFieldMode = "NoField" InDetSiTrackMaker.useBremModel = False @@ -327,15 +315,6 @@ class ConfiguredNewTrackingSiPattern: elif NewTrackingCuts.mode() == "ForwardTracks": InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_ForwardTracks' - elif NewTrackingCuts.mode() == "ForwardSLHCTracks": - InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_ForwardSLHCTracks' - - elif NewTrackingCuts.mode() == "VeryForwardSLHCTracks": - InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_VeryForwardSLHCTracks' - - elif NewTrackingCuts.mode() == "SLHCConversionFinding": - InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_SLHCConversionTracks' - elif NewTrackingCuts.mode() == "LargeD0" or NewTrackingCuts.mode() == "R3LargeD0" or NewTrackingCuts.mode() == "LowPtLargeD0": InDetSiTrackMaker.TrackPatternRecoInfo = 'SiSpacePointsSeedMaker_LargeD0' @@ -363,7 +342,7 @@ class ConfiguredNewTrackingSiPattern: from SiSPSeededTrackFinder.SiSPSeededTrackFinderConf import InDet__SiSPSeededTrackFinder - if NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "ForwardTracks": + if NewTrackingCuts.mode() == "ForwardTracks": InDetSiSPSeededTrackFinder = InDet__SiSPSeededTrackFinder(name = 'InDetSiSpTrackFinder'+NewTrackingCuts.extension(), TrackTool = InDetSiTrackMaker, @@ -445,7 +424,7 @@ class ConfiguredNewTrackingSiPattern: drift_circle_cut_tool = TrackingCommon.getInDetTRTDriftCircleCutForPatternReco() if use_parameterization else '' - if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM"): + if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM"): from InDetAmbiTrackSelectionTool.InDetAmbiTrackSelectionToolConf import InDet__InDetDenseEnvAmbiTrackSelectionTool as AmbiTrackSelectionTool else: from InDetAmbiTrackSelectionTool.InDetAmbiTrackSelectionToolConf import InDet__InDetAmbiTrackSelectionTool as AmbiTrackSelectionTool @@ -460,7 +439,7 @@ class ConfiguredNewTrackingSiPattern: UseParameterization = use_parameterization, Cosmics = InDetFlags.doCosmics(), doPixelSplitting = InDetFlags.doPixelClusterSplitting() and NewTrackingCuts.mode != "DBM") - if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM"): + if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM"): InDetAmbiTrackSelectionTool.sharedProbCut = prob1 InDetAmbiTrackSelectionTool.sharedProbCut2 = prob2 InDetAmbiTrackSelectionTool.minSiHitsToAllowSplitting = nhitsToAllowSplitting @@ -514,13 +493,13 @@ class ConfiguredNewTrackingSiPattern: # # --- load Ambiguity Processor # - useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "SLHC" + useBremMode = NewTrackingCuts.mode() == "Offline" # @TODO is the cluster split probability container needed here ? ambi_track_summary_tool = TrackingCommon.getInDetTrackSummaryTool(namePrefix = 'InDetAmbiguityProcessorSplitProb', nameSuffix = NewTrackingCuts.extension(), ClusterSplitProbabilityName= 'InDetAmbiguityProcessorSplitProb'+NewTrackingCuts.extension()) - if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM"): + if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM"): # DenseEnvironmentsAmbiguityScoreProcessorTool from TrkAmbiguityProcessor.TrkAmbiguityProcessorConf import Trk__DenseEnvironmentsAmbiguityScoreProcessorTool as ScoreProcessorTool InDetAmbiguityScoreProcessor = ScoreProcessorTool(name = 'InDetAmbiguityScoreProcessor'+NewTrackingCuts.extension(), @@ -595,7 +574,7 @@ class ConfiguredNewTrackingSiPattern: RefitPrds = True) InDetAmbiguityScoreProcessor = None - if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM") and 'NnPixelClusterSplitProbTool' in globals() : + if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM") and 'NnPixelClusterSplitProbTool' in globals() : if InDetAmbiguityScoreProcessor is not None : InDetAmbiguityScoreProcessor.sharedProbCut = prob1 InDetAmbiguityScoreProcessor.sharedProbCut2 = prob2 diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py index a7eb63b0b31..66915fc6d78 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py @@ -69,10 +69,7 @@ if InDetFlags.doPRDFormation(): # --- new NN prob tool MultiplicityContent = [1 , 1 , 1] - if InDetFlags.doSLHC(): - from SiClusterizationTool.SiClusterizationToolConf import InDet__TruthPixelClusterSplitProbTool as PixelClusterSplitProbTool - else: - from SiClusterizationTool.SiClusterizationToolConf import InDet__NnPixelClusterSplitProbTool as PixelClusterSplitProbTool + from SiClusterizationTool.SiClusterizationToolConf import InDet__NnPixelClusterSplitProbTool as PixelClusterSplitProbTool NnPixelClusterSplitProbTool=PixelClusterSplitProbTool(name = "NnPixelClusterSplitProbTool", PriorMultiplicityContent = MultiplicityContent, NnClusterizationFactory = NnClusterizationFactory, @@ -85,10 +82,7 @@ if InDetFlags.doPRDFormation(): clusterSplitProbTool = NnPixelClusterSplitProbTool # --- new NN splitter - if InDetFlags.doSLHC(): - from SiClusterizationTool.SiClusterizationToolConf import InDet__TruthPixelClusterSplitter as PixelClusterSplitter - else: - from SiClusterizationTool.SiClusterizationToolConf import InDet__NnPixelClusterSplitter as PixelClusterSplitter + from SiClusterizationTool.SiClusterizationToolConf import InDet__NnPixelClusterSplitter as PixelClusterSplitter NnPixelClusterSplitter=PixelClusterSplitter(name = "NnPixelClusterSplitter", NnClusterizationFactory = NnClusterizationFactory, ThresholdSplittingIntoTwoClusters = 0.5, # temp. @@ -246,9 +240,6 @@ if InDetFlags.doSpacePointFormation(): from SiSpacePointTool.SiSpacePointToolConf import InDet__SiSpacePointMakerTool InDetSiSpacePointMakerTool = InDet__SiSpacePointMakerTool(name = "InDetSiSpacePointMakerTool") - if InDetFlags.doSLHC(): - InDetSiSpacePointMakerTool.SCTGapParameter = 0.0015 - if InDetFlags.doCosmics() or InDetFlags.doBeamHalo(): InDetSiSpacePointMakerTool.StripLengthTolerance = 0.05 InDetSiSpacePointMakerTool.UsePerpendicularProjection = True diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py index 72e2211468e..5b118c7a7f1 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py @@ -80,8 +80,6 @@ else: InDetNewTrackingCuts = ConfiguredNewTrackingCuts("Cosmics") elif InDetFlags.doHeavyIon(): InDetNewTrackingCuts = ConfiguredNewTrackingCuts("HeavyIon") - elif InDetFlags.doSLHC(): - InDetNewTrackingCuts = ConfiguredNewTrackingCuts("SLHC") elif InDetFlags.doIBL(): InDetNewTrackingCuts = ConfiguredNewTrackingCuts("IBL") elif InDetFlags.doHighPileup(): @@ -118,12 +116,6 @@ else: InDetSpSeededTracksKey = InDetKeys.SiSpSeededDBMTracks() InDetResolvedTracksKey = InDetKeys.DBMTracks() - if InDetFlags.doSLHC(): - InDetSpSeededTracksKey = InDetKeys.SiSpSeededSLHCTracks() - InDetResolvedTracksKey = InDetKeys.ResolvedSLHCTracks() - InDetExtendedTracksKey = InDetKeys.ExtendedSLHCTracks() - InDetExtendedTracksMapKey = InDetKeys.ExtendedTracksMapSLHC() - if globalflags.InputFormat() == 'bytestream': ServiceMgr.ByteStreamCnvSvc.IsSimulation = (globalflags.DataSource() == 'geant4') @@ -637,56 +629,6 @@ else: ClusterSplitProbContainer = ClusterSplitProbContainerLargeD0 InputForwardInDetTracks +=[ InDetLargeD0TRTExtension.ForwardTrackCollection()] - if InDetFlags.doForwardTracks() and InDetFlags.doSLHC(): - if InDetFlags.doSLHCVeryForward(): - if ('InDetNewTrackingCutsForwardTracks' not in dir()): - printfunc ("InDetRec_jobOptions: InDetNewTrackingCutsForwardTracks not set before - import them now" ) - from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts - InDetNewTrackingCutsForwardTracks = ConfiguredNewTrackingCuts("VeryForwardSLHCTracks") - InDetNewTrackingCutsForwardTracks.printInfo() - # - # --- now run Si pattern for Low Pt - # - include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py") - InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputForwardInDetTracks, - InDetKeys.ResolvedForwardTracks(), - InDetKeys.SiSpSeededForwardTracks(), - InDetNewTrackingCutsForwardTracks, - TrackCollectionKeys, - TrackCollectionTruthKeys, - ClusterSplitProbContainer) - ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsForwardTracks.extension() - # for ITK, forward tracks get added to the combined collection - CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer - InputCombinedInDetTracks += [ InDetForwardTracksSiPattern.SiTrackCollection() ] - - - else: - if ('InDetNewTrackingCutsForwardTracks' not in dir()): - printfunc ("InDetRec_jobOptions: InDetNewTrackingCutsForwardTracks not set before - import them now" ) - from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts - InDetNewTrackingCutsForwardTracks = ConfiguredNewTrackingCuts("ForwardSLHCTracks") - InDetNewTrackingCutsForwardTracks.printInfo() - # - # --- now run Si pattern for Low Pt - # - include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py") - InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputForwardInDetTracks, - InDetKeys.ResolvedForwardTracks(), - InDetKeys.SiSpSeededForwardTracks(), - InDetNewTrackingCutsForwardTracks, - TrackCollectionKeys, - TrackCollectionTruthKeys, - ClusterSplitProbContainer) - ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsForwardTracks.extension() - # for ITK, forward tracks get added to the combined collection - CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer - InputCombinedInDetTracks += [ InDetForwardTracksSiPattern.SiTrackCollection() ] - - - - - elif InDetFlags.doForwardTracks(): # # --- configure cuts for forward tracklets # @@ -711,31 +653,6 @@ else: # CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer # InputCombinedInDetTracks += [ InDetForwardTracksSiPattern.SiTrackCollection() ] - if InDetFlags.doSLHCConversionFinding() and InDetFlags.doSLHC(): - # - # --- configure cuts for Low Pt tracking - # - if ('InDetNewTrackingCutsSLHCConversionFinding' not in dir()): - printfunc ("InDetRec_jobOptions: InDetNewTrackingCutsSLHCConversionFinding not set before - import them now") - from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts - InDetNewTrackingCutsSLHCConversionFinding = ConfiguredNewTrackingCuts("SLHCConversionFinding") - InDetNewTrackingCutsSLHCConversionFinding.printInfo() - # - # - include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py") - InDetSLHCConversionFindingSiPattern = ConfiguredNewTrackingSiPattern(InputCombinedInDetTracks, - InDetKeys.ResolvedSLHCConversionFindingTracks(), - InDetKeys.SiSpSeededSLHCConversionFindingTracks(), - InDetNewTrackingCutsSLHCConversionFinding, - TrackCollectionKeys, - TrackCollectionTruthKeys, - ClusterSplitProbContainer) - ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsSLHCConversionFinding.extension() - - CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer - InputCombinedInDetTracks += [ InDetKeys.ResolvedSLHCConversionFindingTracks() ] - - # ------------------------------------------------------------ # # --- Pixel Tracklets on unassociated PRDs (after standard reconstruction + forward tracking) @@ -941,9 +858,6 @@ else: MinDegreesOfFreedom = 1, MatEffects = InDetFlags.materialInteractionsType(), MinSiHits = InDetNewTrackingCuts.minClusters() ) - if InDetFlags.doForwardTracks() and InDetFlags.doSLHC(): - InDetTruthTrackBuilder.MinSiHitsForward = InDetNewTrackingCutsForwardTracks.minClusters() - InDetTruthTrackBuilder.ForwardBoundary = InDetNewTrackingCutsForwardTracks.minEta() # InDetTruthTrackBuilder.OutputLevel = VERBOSE ToolSvc += InDetTruthTrackBuilder @@ -965,7 +879,7 @@ else: InDetPRD_Provider = InDetPRD_Provider, MinimumPt = InDetNewTrackingCuts.minPT(), PRD_TruthTrajectoryManipulators = [ InDetTruthTrajectorySorter ]) - if not InDetFlags.doSLHC() and not InDetFlags.doIdealPseudoTracking(): + if not InDetFlags.doIdealPseudoTracking(): # --- the trajectory manipulator from InDetTruthTools.InDetTruthToolsConf import InDet__PRD_TruthTrajectoryManipulatorID InDetTruthTrajectoryManipulator = InDet__PRD_TruthTrajectoryManipulatorID(name='InDetTruthTrajectoryManipulator') @@ -983,7 +897,7 @@ else: # --- the (1st) trajectory selector PRD_TruthTrajectorySelector = [] - if not InDetFlags.doSLHC() and not InDetFlags.doSplitReco() : + if not InDetFlags.doSplitReco() : from InDetTruthTools.InDetTruthToolsConf import InDet__PRD_TruthTrajectorySelectorID InDetTruthTrajectorySelector = InDet__PRD_TruthTrajectorySelectorID(name='InDetTruthTrajectorySelector') ToolSvc += InDetTruthTrajectorySelector @@ -1358,8 +1272,6 @@ else: cuts = InDetNewTrackingCutsVeryLowPt elif InDetFlags.doLowPt(): cuts = InDetNewTrackingCutsLowPt - elif InDetFlags.doSLHCConversionFinding(): - cuts = InDetNewTrackingCutsSLHCConversionFinding else: cuts = InDetNewTrackingCuts include("InDetRecExample/ConfiguredInDetValidation.py") -- GitLab From c3f1b2e032a0de22bf045c54da9ed3f88682200c Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 11:28:22 +0200 Subject: [PATCH 03/12] Removed ConfiguredSLHC_InDetTrackingGeometryBuilder --- ...iguredSLHC_InDetTrackingGeometryBuilder.py | 260 ------------------ .../python/FatrasTrackingGeometrySvc.py | 30 +- .../python/ISF_FatrasServicesConfig.py | 14 +- .../python/AtlasTrackingGeometrySvc.py | 13 +- 4 files changed, 11 insertions(+), 306 deletions(-) delete mode 100644 InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredSLHC_InDetTrackingGeometryBuilder.py diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredSLHC_InDetTrackingGeometryBuilder.py b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredSLHC_InDetTrackingGeometryBuilder.py deleted file mode 100644 index 97c4b3bfd06..00000000000 --- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredSLHC_InDetTrackingGeometryBuilder.py +++ /dev/null @@ -1,260 +0,0 @@ -# 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) diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTrackingGeometrySvc.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTrackingGeometrySvc.py index 65d3478be3c..eb9b551d210 100755 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTrackingGeometrySvc.py +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTrackingGeometrySvc.py @@ -56,13 +56,7 @@ class FatrasTrackingGeometryCondAlg: print ('[ TrackingGeometrySvc ] Using Local Database: '+DataBaseConnection ) # make sure that the pool files are in the catalog #from PoolSvc.PoolSvcConf import PoolSvc - #PoolSvc.ReadCatalog += [ DataBasePath+'PoolFileCatalog.xml' ] - elif TrkDetFlags.SLHC_Geometry() : - # set the folder to the SLHC location - CoolDataBaseFolder = '/GLOBAL/TrackingGeo/SLHC_LayerMaterial' - ctag = AtlasMaterialTag+TrkDetFlags.MaterialMagicTag() - cfoldertag = CoolDataBaseFolder+' '+ctag+'' - conddb.addFolderSplitMC('GLOBAL',cfoldertag,cfoldertag) + #PoolSvc.ReadCatalog += [ DataBasePath+'PoolFileCatalog.xml' ] else : # load the right folders (preparation for calo inclusion) cfolder = CoolDataBaseFolder +'TagInfoMajor/'+AtlasMaterialTag+'/GeoAtlas' @@ -88,21 +82,13 @@ class FatrasTrackingGeometryCondAlg: # (ID) if DetFlags.ID_on() : # get hand on the ID Tracking Geometry Builder - if not TrkDetFlags.SLHC_Geometry() : - from InDetTrackingGeometry.ConfiguredInDetTrackingGeometryBuilder import ConfiguredInDetTrackingGeometryBuilder as IDGeometryBuilder - else : - from InDetTrackingGeometry.ConfiguredSLHC_InDetTrackingGeometryBuilder import ConfiguredSLHC_InDetTrackingGeometryBuilder as IDGeometryBuilder - if not TrkDetFlags.SLHC_Geometry() : - self.__InDetTrackingGeometryBuilder__ = IDGeometryBuilder(name ='InDetTrackingGeometryBuilder', - namePrefix = 'Fatras', - setLayerAssociation = False, - buildTrtStrawLayers = True) - self.__InDetTrackingGeometryBuilder__.VolumeEnclosureOuterR = 1148. - else : - self.__InDetTrackingGeometryBuilder__ = IDGeometryBuilder(name ='InDetTrackingGeometryBuilder', - namePrefix = 'Fatras', - setLayerAssociation = False) - self.__InDetTrackingGeometryBuilder__.VolumeEnclosureOuterR = 1148. + from InDetTrackingGeometry.ConfiguredInDetTrackingGeometryBuilder import ConfiguredInDetTrackingGeometryBuilder as IDGeometryBuilder + + self.__InDetTrackingGeometryBuilder__ = IDGeometryBuilder(name ='InDetTrackingGeometryBuilder', + namePrefix = 'Fatras', + setLayerAssociation = False, + buildTrtStrawLayers = True) + self.__InDetTrackingGeometryBuilder__.VolumeEnclosureOuterR = 1148. # make a public tool out of it ToolSvc += self.__InDetTrackingGeometryBuilder__ diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py index 27f151a5cf0..27014a6a1d4 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py @@ -57,13 +57,6 @@ def initialiseCoolDataBaseFolder(): # make sure that the pool files are in the catalog #from PoolSvc.PoolSvcConf import PoolSvc #PoolSvc.ReadCatalog += [ DataBasePath+'PoolFileCatalog.xml' ] - elif TrkDetFlags.SLHC_Geometry() : - # set the folder to the SLHC location - CoolDataBaseFolder = '/GLOBAL/TrackingGeo/SLHC_LayerMaterial' - ctag = AtlasMaterialTag+TrkDetFlags.MaterialMagicTag() - cfoldertag = CoolDataBaseFolder+' '+ctag+'' - conddb.addFolderSplitMC('GLOBAL',cfoldertag,cfoldertag, - className = 'Trk::LayerMaterialMap') else : # load the right folders (preparation for calo inclusion) cfolder = CoolDataBaseFolder +'TagInfoMajor/'+AtlasMaterialTag+'/GeoAtlas' @@ -93,11 +86,8 @@ def getInDetTrackingGeometryBuilder(name="ISF_InDetTrackingGeometryBuilder", **k kwargs.setdefault("namePrefix" , 'Fatras') kwargs.setdefault("setLayerAssociation" , False) #kwargs.setdefault("VolumeEnclosureOuterR" , 1148.) ### HACK: Cannot set via imput arguments. Is this right?? -kg - if not TrkDetFlags.SLHC_Geometry() : - kwargs.setdefault("buildTrtStrawLayers" , True) - from InDetTrackingGeometry.ConfiguredInDetTrackingGeometryBuilder import ConfiguredInDetTrackingGeometryBuilder as IDGeometryBuilder - else : - from InDetTrackingGeometry.ConfiguredSLHC_InDetTrackingGeometryBuilder import ConfiguredSLHC_InDetTrackingGeometryBuilder as IDGeometryBuilder + kwargs.setdefault("buildTrtStrawLayers" , True) + from InDetTrackingGeometry.ConfiguredInDetTrackingGeometryBuilder import ConfiguredInDetTrackingGeometryBuilder as IDGeometryBuilder t = IDGeometryBuilder(name, **kwargs ) t.VolumeEnclosureOuterR = 1148. #t.EnvelopeDefinitionSvc = 'ISF_EnvelopeDefSvc' diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py index 6a91eb6f2ba..a06e0744fb2 100644 --- a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py +++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py @@ -69,12 +69,7 @@ class ConfiguredTrackingGeometrySvc( Trk__TrackingGeometrySvc ) : if hasattr(ToolSvc, TrkDetFlags.InDetTrackingGeometryBuilderName()): InDetTrackingGeometryBuilder = getattr(ToolSvc, TrkDetFlags.InDetTrackingGeometryBuilderName()) else: - if not TrkDetFlags.SLHC_Geometry() and not TrkDetFlags.InDetStagedGeometryBuilder(): - from InDetTrackingGeometry.ConfiguredInDetTrackingGeometryBuilder import ConfiguredInDetTrackingGeometryBuilder as IDGeometryBuilder - elif not TrkDetFlags.SLHC_Geometry() : - from InDetTrackingGeometry.ConfiguredStagedTrackingGeometryBuilder import ConfiguredStagedTrackingGeometryBuilder as IDGeometryBuilder - else : - from InDetTrackingGeometry.ConfiguredSLHC_InDetTrackingGeometryBuilder import ConfiguredSLHC_InDetTrackingGeometryBuilder as IDGeometryBuilder + from InDetTrackingGeometry.ConfiguredStagedTrackingGeometryBuilder import ConfiguredStagedTrackingGeometryBuilder as IDGeometryBuilder InDetTrackingGeometryBuilder = IDGeometryBuilder(name ='InDetTrackingGeometryBuilder') InDetTrackingGeometryBuilder.EnvelopeDefinitionSvc = AtlasEnvelopeSvc @@ -140,12 +135,6 @@ class ConfiguredTrackingGeometrySvc( Trk__TrackingGeometrySvc ) : if TrkDetFlags.ConfigurationOutputLevel() < 3 : print ('[ TrackingGeometrySvc ] Using Local Database: '+DataBaseConnection ) # make sure that the pool files are in the catalog - elif TrkDetFlags.SLHC_Geometry() : - # set the folder to the SLHC location - CoolDataBaseFolder = '/GLOBAL/TrackingGeo/LayerMaterialITK' - ctag = AtlasMaterialTag+TrkDetFlags.MaterialMagicTag() - cfoldertag = CoolDataBaseFolder+' '+ctag+'' - conddb.addFolderSplitMC('GLOBAL',cfoldertag,cfoldertag) else : print ('[ TrackingGeometrySvc ] base material tag : ', AtlasMaterialTag) cfolder = CoolDataBaseFolder +'TagInfoMajor/'+AtlasMaterialTag+'/GeoAtlas' -- GitLab From c8f6d1269853117f5b3068c7338442b7784fbf79 Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 11:37:59 +0200 Subject: [PATCH 04/12] Changed isSLHC with isITk --- .../InDetTrackingGeometry/RobustTrackingGeometryBuilder.h | 4 ++-- .../InDetTrackingGeometry/RobustTrackingGeometryBuilderCond.h | 4 ++-- .../src/RobustTrackingGeometryBuilder.cxx | 4 ++-- .../src/RobustTrackingGeometryBuilderCond.cxx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/RobustTrackingGeometryBuilder.h b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/RobustTrackingGeometryBuilder.h index 260234bbb4c..194a8ddf50a 100644 --- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/RobustTrackingGeometryBuilder.h +++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/RobustTrackingGeometryBuilder.h @@ -1,5 +1,5 @@ /* - 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 diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/RobustTrackingGeometryBuilderCond.h b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/RobustTrackingGeometryBuilderCond.h index c2602090ff7..bde769b0f7b 100644 --- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/RobustTrackingGeometryBuilderCond.h +++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/InDetTrackingGeometry/RobustTrackingGeometryBuilderCond.h @@ -1,5 +1,5 @@ /* - 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 diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilder.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilder.cxx index 2bd6f588ca3..1a2deca5a23 100644 --- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilder.cxx +++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilder.cxx @@ -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] InDet::RobustTrackingGeome double currentCentralOuterR = 0.; double currentEndcapOuterR = 0.; - if (m_isSLHC){ + if (m_isITk){ double NextInnerRadii = ((ilb!=cylinderOuterRadii.size()-1) && cylinderInnerRadii[ilb+1] Date: Thu, 16 Sep 2021 11:41:57 +0200 Subject: [PATCH 05/12] Removed doSLHC flags --- .../python/InDetJobProperties.py | 76 ------------------- 1 file changed, 76 deletions(-) diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py index 678727dceac..0393f3b56c4 100644 --- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py +++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py @@ -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) self.checkThenSet(self.doTrackSegmentsPixel , False) @@ -1346,38 +1321,6 @@ class InDetJobProperties(JobPropertyContainer): self.checkThenSet(self.perigeeExpression , 'Vertex') #self.checkThenSet(self.doRefitInvalidCov ,True) temporarily commenting out due to ATLASRECTS-4691 - # --- special case SLHC - elif (self.doSLHC()): - print("----> InDetJobProperties for SLHC") - self.checkThenSet(self.doNewTracking , True ) - self.checkThenSet(self.doLowPt , False) - self.checkThenSet(self.doVeryLowPt , False) - self.checkThenSet(self.doSLHCConversionFinding, True ) - self.checkThenSet(self.doBeamGas , False) - self.checkThenSet(self.doBeamHalo , False) - self.checkThenSet(self.doBackTracking , False) - self.checkThenSet(self.doTRTStandalone , False) - self.checkThenSet(self.doForwardTracks , False) - self.checkThenSet(self.doR3LargeD0 , False) - self.checkThenSet(self.doVertexFinding , True) - self.checkThenSet(self.primaryVertexSetup , "IterativeFinding") - self.checkThenSet(self.primaryVertexCutSetup , "SLHC") - self.checkThenSet(self.secondaryVertexCutSetup, "PileUp") - self.checkThenSet(self.vertexSeedFinder , "SlidingWindowMultiSeedFinder") - self.checkThenSet(self.doV0Finder , False) - self.checkThenSet(self.doSimpleV0Finder , False) - self.checkThenSet(self.doConversions , False) - self.checkThenSet(self.doStatistics , False) - self.checkThenSet(self.doTrackSegmentsPixel , False) - self.checkThenSet(self.doTrackSegmentsSCT , False) - self.checkThenSet(self.doTrackSegmentsTRT , False) - self.checkThenSet(self.doSlimming , False) - self.checkThenSet(self.doSGDeletion , True ) - # TEMPORARY FIX TO STOP SEG FAULT - self.checkThenSet(self.doPixelClusterSplitting, False) - self.checkThenSet(self.doTIDE_Ambi, False) - self.checkThenSet(self.doTrackSegmentsDisappearing, False) - elif (self.doIBL()): print("----> InDetJobProperties for IBL") print("----> DEPRECATED! This should now be the default settings") @@ -1409,7 +1352,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) @@ -1437,7 +1379,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) @@ -1477,7 +1418,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) @@ -1516,7 +1456,6 @@ class InDetJobProperties(JobPropertyContainer): self.checkThenSet(self.doNewTracking , False ) self.checkThenSet(self.doLowPt , False ) self.checkThenSet(self.doVeryLowPt , False ) - self.checkThenSet(self.doSLHCConversionFinding, False) self.checkThenSet(self.doForwardTracks , False ) self.checkThenSet(self.doR3LargeD0 , False ) self.checkThenSet(self.doBeamGas , False ) @@ -1760,8 +1699,6 @@ class InDetJobProperties(JobPropertyContainer): self.doLowPt = self.doLowPt() and self.doNewTracking() and ( DetFlags.haveRIO.pixel_on() or DetFlags.haveRIO.SCT_on() ) and not self.doCosmics() # no low pt tracking if no new tracking before or if pixels are off (since low-pt tracking is pixel seeded)! self.doVeryLowPt = self.doVeryLowPt() and self.doLowPt() - # - self.doSLHCConversionFinding = self.doSLHCConversionFinding() and self.doSLHC() and self.doNewTracking() and ( DetFlags.haveRIO.pixel_on() and DetFlags.haveRIO.SCT_on() ) and not self.doCosmics() # new forward tracklets self.doForwardTracks = self.doForwardTracks() and self.doNewTracking() # @@ -2168,12 +2105,6 @@ class InDetJobProperties(JobPropertyContainer): print('*') print('* --------------------> write AOD classes for all trackers!') print('*') - if self.doSLHC() : - print('*') - print('* --------------------> Special reconstruction for SLHC !') - if self.doSLHCVeryForward(): - print('* --------------------> Including Very Forward Extension !') - print('*') if self.doIBL() : print('*') print('* --------------------> Special reconstruction for IBL !') @@ -2354,10 +2285,6 @@ class InDetJobProperties(JobPropertyContainer): if self.doVeryLowPt() : print('* and VeryLowPtTracking is ON') # ----------------------------------------- - if self.doSLHCConversionFinding() : - print('*') - print('* SLHCConversionFinding is ON') - # ----------------------------------------- if self.doForwardTracks(): print('*') print('* Forward Tracklets are ON') @@ -2647,7 +2574,6 @@ _list_InDetJobProperties = [Enabled, doTRT_PRDFormation, doSpacePointFormation, doRefit, - doSLHC, doIBL, doHighPileup, doMinimalReco, @@ -2658,7 +2584,6 @@ _list_InDetJobProperties = [Enabled, doBackTracking, doLowPt, doVeryLowPt, - doSLHCConversionFinding, doForwardTracks, doLowPtLargeD0, doLargeD0, @@ -2798,7 +2723,6 @@ _list_InDetJobProperties = [Enabled, ForceCoraCool, ForceCoolVectorPayload, doTrackSegmentsDisappearing, - doSLHCVeryForward, doTRTGlobalOccupancy, doNNToTCalibration, useNNTTrainedNetworks, -- GitLab From 73df2ce23710541d6c1f0e048a51d1a77b8b3bb1 Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 11:48:23 +0200 Subject: [PATCH 06/12] Removed SLHC flags in InDetPrepRawDaaToxAOD configs --- .../InDetPrepRawDataToxAOD/python/InDetDxAODUtils.py | 3 +-- .../InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py | 3 --- .../InDetEventCnv/InDetPrepRawDataToxAOD/share/PixelxAOD.py | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODUtils.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODUtils.py index 40086cc2934..06ee5df4e4e 100644 --- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODUtils.py +++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODUtils.py @@ -1,7 +1,6 @@ # 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 ) ) diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py index 8cfb63cd758..4b8576c8cf9 100644 --- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py +++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py @@ -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 diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/PixelxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/PixelxAOD.py index d842bd5408e..420b3821065 100644 --- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/PixelxAOD.py +++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/PixelxAOD.py @@ -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): -- GitLab From d3fbb73b976d15084fa3e4a85f2cc7509e9c8add Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 11:51:50 +0200 Subject: [PATCH 07/12] Removed SLHC collections from InDetKeys --- .../InDetRecExample/python/InDetKeys.py | 45 +------------------ 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py index 9fe123b801b..dd0178ec3cb 100644 --- a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py +++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration ## ## @file InDetRecExample/python/InDetKeys.py @@ -404,12 +404,6 @@ class ExtendedTracksMapPhase(JobProperty): allowedTypes = ['str'] StoredValue = 'ExtendedTracksMapPhase' -class ExtendedTracksMapSLHC(JobProperty): - """ Storegate key for new-tracking SLHC extended tracks map""" - statusOn = True - allowedTypes = ['str'] - StoredValue = 'ExtendedTracksMapSLHC' - class ExtendedTracksMapLowPt(JobProperty): """ Storegate key for new-tracking low Pt extended tracks map""" statusOn = True @@ -440,12 +434,6 @@ class ExtendedTracksPhase(JobProperty): allowedTypes = ['str'] StoredValue = 'ExtendedTracksPhase' -class ExtendedSLHCTracks(JobProperty): - """ Storegate key for new-tracking extended SLHC tracks""" - statusOn = True - allowedTypes = ['str'] - StoredValue = 'ExtendedSLHCTracks' - class ExtendedLowPtTracks(JobProperty): """ Storegate key for new-tracking extended low Pt tracks""" statusOn = True @@ -628,13 +616,6 @@ class SiSPSeedSegments(JobProperty): allowedTypes = ['str'] StoredValue = 'SiSPSeedSegments' - -class SiSpSeededSLHCTracks(JobProperty): - """ Storegate key for new-tracking SP seeded SLHC tracks""" - statusOn = True - allowedTypes = ['str'] - StoredValue = 'SiSPSeededSLHCTracks' - class SiSpSeededLowPtTracks(JobProperty): """ Storegate key for new-tracking SP seeded low Pt tracks""" statusOn = True @@ -653,12 +634,6 @@ class SiSpSeededForwardTracks(JobProperty): allowedTypes = ['str'] StoredValue = 'SiSpSeededForwardTracks' -class SiSpSeededSLHCConversionFindingTracks(JobProperty): - """ Storegate key for new-tracking SP seeded SLHC conversion finding tracks""" - statusOn = True - allowedTypes = ['str'] - StoredValue = 'SiSpSeededSLHCConversionFindingTracks' - class SiSpSeededBeamGasTracks(JobProperty): """ Storegate key for new-tracking SP seeded beam gas tracks""" statusOn = True @@ -677,12 +652,6 @@ class ResolvedTracks(JobProperty): allowedTypes = ['str'] StoredValue = 'ResolvedTracks' -class ResolvedSLHCTracks(JobProperty): - """ Storegate key for new-tracking resolved SLHC tracks""" - statusOn = True - allowedTypes = ['str'] - StoredValue = 'ResolvedSLHCTracks' - class ResolvedLowPtTracks(JobProperty): """ Storegate key for new-tracking resolved low Pt tracks""" statusOn = True @@ -695,12 +664,6 @@ class ResolvedForwardTracks(JobProperty): allowedTypes = ['str'] StoredValue = 'ResolvedForwardTracks' -class ResolvedSLHCConversionFindingTracks(JobProperty): - """ Storegate key for new-tracking resolved SLHC Conversion tracks""" - statusOn = True - allowedTypes = ['str'] - StoredValue = 'ResolvedSLHCConversionFindingTracks' - class ResolvedForwardTracksTruth(JobProperty): """ Storegate key for new-tracking resolved very forward tracks truth""" statusOn = True @@ -1088,13 +1051,11 @@ jobproperties.InDetContainerKeys.add_JobProperty(DetailedTracksTruth) jobproperties.InDetContainerKeys.add_JobProperty(TracksTruth) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracksMap) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracksMapPhase) -jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracksMapSLHC) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracksMapLowPt) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracksMapBeamGas) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracksMapLargeD0) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracks) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracksPhase) -jobproperties.InDetContainerKeys.add_JobProperty(ExtendedSLHCTracks) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedLowPtTracks) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedBeamGasTracks) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedLargeD0Tracks) @@ -1128,21 +1089,17 @@ jobproperties.InDetContainerKeys.add_JobProperty(TRTTracks) jobproperties.InDetContainerKeys.add_JobProperty(TRTTracks_NewT) jobproperties.InDetContainerKeys.add_JobProperty(SiSpSeededTracks) jobproperties.InDetContainerKeys.add_JobProperty(SiSPSeedSegments) -jobproperties.InDetContainerKeys.add_JobProperty(SiSpSeededSLHCTracks) jobproperties.InDetContainerKeys.add_JobProperty(SiSpSeededLowPtTracks) jobproperties.InDetContainerKeys.add_JobProperty(SiSpSeededVeryLowPtTracks) jobproperties.InDetContainerKeys.add_JobProperty(SiSpSeededForwardTracks) -jobproperties.InDetContainerKeys.add_JobProperty(SiSpSeededSLHCConversionFindingTracks) jobproperties.InDetContainerKeys.add_JobProperty(SiSpSeededBeamGasTracks) jobproperties.InDetContainerKeys.add_JobProperty(SiSpSeededLargeD0Tracks) jobproperties.InDetContainerKeys.add_JobProperty(ResolvedTracks) -jobproperties.InDetContainerKeys.add_JobProperty(ResolvedSLHCTracks) jobproperties.InDetContainerKeys.add_JobProperty(ResolvedLowPtTracks) jobproperties.InDetContainerKeys.add_JobProperty(ResolvedVeryLowPtTracks) jobproperties.InDetContainerKeys.add_JobProperty(ResolvedForwardTracks) jobproperties.InDetContainerKeys.add_JobProperty(ResolvedForwardTracksTruth) jobproperties.InDetContainerKeys.add_JobProperty(ResolvedForwardTrackParticles) -jobproperties.InDetContainerKeys.add_JobProperty(ResolvedSLHCConversionFindingTracks) jobproperties.InDetContainerKeys.add_JobProperty(ResolvedForwardTrackParticlesTruth) jobproperties.InDetContainerKeys.add_JobProperty(ResolvedBeamGasTracks) jobproperties.InDetContainerKeys.add_JobProperty(ResolvedLargeD0Tracks) -- GitLab From d4a406111d9bd24da7ff17d71d10f8bace6cb23e Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 12:10:41 +0200 Subject: [PATCH 08/12] More SLHC cleaning in InDetRecExample --- .../InDetRecExample/python/TrackingCommon.py | 28 +++---------------- .../share/InDetRecConditionsAccess.py | 4 --- .../share/InDetRecLoadTools.py | 2 +- .../InDetRecExample/share/InDetxAODCreator.py | 2 +- .../InDetRecExample/share/WriteInDetAOD.py | 5 ++-- .../InDetRecExample/share/WriteInDetESD.py | 5 ++-- 6 files changed, 10 insertions(+), 36 deletions(-) diff --git a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py index 5e6cba4a78f..bedfef9a274 100644 --- a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py +++ b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py @@ -121,8 +121,6 @@ def getInDetNewTrackingCuts() : InDetNewTrackingCuts = ConfiguredNewTrackingCuts("Cosmics") elif InDetFlags.doHeavyIon(): InDetNewTrackingCuts = ConfiguredNewTrackingCuts("HeavyIon") - elif InDetFlags.doSLHC(): - InDetNewTrackingCuts = ConfiguredNewTrackingCuts("SLHC") elif InDetFlags.doIBL(): InDetNewTrackingCuts = ConfiguredNewTrackingCuts("IBL") elif InDetFlags.doHighPileup(): @@ -386,9 +384,9 @@ def getInDetPixelClusterOnTrackToolBase(name, **kwargs) : kwargs = setDefaults(kwargs, DisableDistortions = (InDetFlags.doFatras() or InDetFlags.doDBMstandalone()), applyNNcorrection = ( InDetFlags.doPixelClusterSplitting() and - InDetFlags.pixelClusterSplittingType() == 'NeuralNet' and not InDetFlags.doSLHC()), + InDetFlags.pixelClusterSplittingType() == 'NeuralNet'), NNIBLcorrection = ( InDetFlags.doPixelClusterSplitting() and - InDetFlags.pixelClusterSplittingType() == 'NeuralNet' and not InDetFlags.doSLHC()), + InDetFlags.pixelClusterSplittingType() == 'NeuralNet'), SplitClusterAmbiguityMap = InDetKeys.SplitClusterAmbiguityMap() + split_cluster_map_extension, RunningTIDE_Ambi = InDetFlags.doTIDE_Ambi() ) @@ -1015,7 +1013,7 @@ def getInDetTRT_dEdxTool(name = "InDetTRT_dEdxTool", **kwargs) : the_name = makeName( name, kwargs) from AthenaCommon.DetFlags import DetFlags from InDetRecExample.InDetJobProperties import InDetFlags - if not DetFlags.haveRIO.TRT_on() or InDetFlags.doSLHC() or InDetFlags.doHighPileup() \ + if not DetFlags.haveRIO.TRT_on() or InDetFlags.doHighPileup() \ or InDetFlags.useExistingTracksAsInput(): # TRT_RDOs (used by the TRT_LocalOccupancy tool) are not present in ESD return None @@ -1032,7 +1030,7 @@ def getInDetTRT_ElectronPidTool(name = "InDetTRT_ElectronPidTool", **kwargs) : the_name = makeName( name, kwargs) from AthenaCommon.DetFlags import DetFlags from InDetRecExample.InDetJobProperties import InDetFlags - if not DetFlags.haveRIO.TRT_on() or InDetFlags.doSLHC() or InDetFlags.doHighPileup() \ + if not DetFlags.haveRIO.TRT_on() or InDetFlags.doHighPileup() \ or InDetFlags.useExistingTracksAsInput(): # TRT_RDOs (used by the TRT_LocalOccupancy tool) are not present in ESD return None @@ -1570,8 +1568,6 @@ def combinedClusterSplitProbName() : InDetNewTrackingCuts = ConfiguredNewTrackingCuts("Cosmics") elif InDetFlags.doHeavyIon(): InDetNewTrackingCuts = ConfiguredNewTrackingCuts("HeavyIon") - elif InDetFlags.doSLHC(): - InDetNewTrackingCuts = ConfiguredNewTrackingCuts("SLHC") elif InDetFlags.doIBL(): InDetNewTrackingCuts = ConfiguredNewTrackingCuts("IBL") elif InDetFlags.doHighPileup(): @@ -1626,22 +1622,6 @@ def combinedClusterSplitProbName() : CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer if InDetFlags.doTRTStandalone(): CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer - if InDetFlags.doForwardTracks() and InDetFlags.doSLHC(): - if InDetFlags.doSLHCVeryForward(): - if ('InDetNewTrackingCutsForwardTracks' not in dir()): - InDetNewTrackingCutsForwardTracks = ConfiguredNewTrackingCuts("VeryForwardSLHCTracks") - ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsForwardTracks.extension() - CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer - else: - if ('InDetNewTrackingCutsForwardTracks' not in dir()): - InDetNewTrackingCutsForwardTracks = ConfiguredNewTrackingCuts("ForwardSLHCTracks") - ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsForwardTracks.extension() - CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer - if InDetFlags.doSLHCConversionFinding() and InDetFlags.doSLHC(): - if ('InDetNewTrackingCutsSLHCConversionFinding' not in dir()): - InDetNewTrackingCutsSLHCConversionFinding = ConfiguredNewTrackingCuts("SLHCConversionFinding") - ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsSLHCConversionFinding.extension() - CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer if InDetFlags.doBeamGas(): if ('InDetNewTrackingCutsBeamGas' not in dir()): InDetNewTrackingCutsBeamGas = ConfiguredNewTrackingCuts("BeamGas") diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py index 4066006a93b..ab234e905c1 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py @@ -329,10 +329,6 @@ if DetFlags.haveRIO.SCT_on(): if InDetFlags.useSctDCS(): InDetSCT_ConditionsSummaryTool.ConditionsTools += [ InDetSCT_DCSConditionsTool ] - - # switch conditions off for SLHC usage - elif InDetFlags.doSLHC(): - InDetSCT_ConditionsSummaryTool.ConditionsTools= [] else : InDetSCT_ConditionsSummaryTool.ConditionsTools= [ InDetSCT_ConfigurationConditionsTool, diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py index cfe1ba96f25..61d4f9a187a 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py @@ -19,7 +19,7 @@ if use_broad_cluster_sct is None : use_broad_cluster_any = use_broad_cluster_pix or use_broad_cluster_sct # load common NN tools for clustering and ROT creation -if InDetFlags.doPixelClusterSplitting() and not InDetFlags.doSLHC(): +if InDetFlags.doPixelClusterSplitting(): # # --- Neutral Network version ? diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py index abdbf0ec4ba..0f353bc5aa4 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py @@ -204,7 +204,7 @@ if not InDetFlags.doVertexFinding(): topSequence += xAODVertexCnvAlgDBM #For forward tracks, no separate collection for ITK, since they are already merged -if (InDetFlags.doForwardTracks() and InDetFlags.doParticleCreation() and not InDetFlags.doSLHC()) or doConversion: +if (InDetFlags.doForwardTracks() and InDetFlags.doParticleCreation()) or doConversion: if doCreation : createTrackParticles(InDetKeys.ResolvedForwardTracks(), InDetKeys.ResolvedForwardTracksTruth(), InDetKeys.xAODForwardTrackParticleContainer(),topSequence) if doConversion : diff --git a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py index 81c00fe125d..1b2b2cf3da5 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py @@ -38,9 +38,8 @@ if InDetFlags.doxAOD(): prefix=extractCollectionPrefix(col) InDetAODList+=['xAOD::TrackParticleContainer#'+prefix+'TrackParticles'] InDetAODList+=['xAOD::TrackParticleAuxContainer#'+prefix+'TrackParticlesAux.' + excludedAuxData] - if not InDetFlags.doSLHC(): - InDetAODList+=['xAOD::TrackParticleContainer#'+InDetKeys.xAODForwardTrackParticleContainer()] - InDetAODList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.xAODForwardTrackParticleContainer()+'Aux.' + excludedAuxData] + InDetAODList+=['xAOD::TrackParticleContainer#'+InDetKeys.xAODForwardTrackParticleContainer()] + InDetAODList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.xAODForwardTrackParticleContainer()+'Aux.' + excludedAuxData] InDetAODList+=['xAOD::VertexContainer#'+InDetKeys.xAODVertexContainer()] InDetAODList+=['xAOD::VertexAuxContainer#'+InDetKeys.xAODVertexContainer()+'Aux.' + excludedVertexAuxData] InDetAODList+=['xAOD::VertexContainer#'+InDetKeys.xAODV0VertexContainer()] diff --git a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py index 193050b5696..8bea0665f00 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py @@ -160,9 +160,8 @@ if InDetFlags.doxAOD(): InDetESDList+=['xAOD::TrackParticleContainer#'+InDetKeys.SiSPSeedSegments()+"TrackParticle"] InDetESDList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.SiSPSeedSegments()+"TrackParticle"+'Aux.' + excludedAuxData] - if not InDetFlags.doSLHC(): - InDetESDList+=['xAOD::TrackParticleContainer#'+InDetKeys.xAODForwardTrackParticleContainer()] - InDetESDList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.xAODForwardTrackParticleContainer()+'Aux.' + excludedAuxData ] + InDetESDList+=['xAOD::TrackParticleContainer#'+InDetKeys.xAODForwardTrackParticleContainer()] + InDetESDList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.xAODForwardTrackParticleContainer()+'Aux.' + excludedAuxData ] InDetESDList+=['xAOD::VertexContainer#'+InDetKeys.xAODVertexContainer()] InDetESDList+=['xAOD::VertexAuxContainer#'+InDetKeys.xAODVertexContainer()+'Aux.' + excludedVertexAuxData] -- GitLab From 6a4ea3d6b51b2e2cb8813b9a64d4b2f76272f3b5 Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 12:26:53 +0200 Subject: [PATCH 09/12] Cleaned SLHC configs in SiSPSeededTracksStandalone --- .../share/SiSPSeededTracksStandalone.py | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py index b2067d50e3c..16742c41b77 100644 --- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py +++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py @@ -192,18 +192,7 @@ if doPixel: IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat" if (globalflags.DataSource()=='geant4'): - # 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 (geoFlags.isIBL() == False): + if (geoFlags.isIBL() == False): IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping.dat" else: # Planar IBL @@ -560,10 +549,7 @@ if (NewTrackingCuts.mode() == "LowPt" or NewTrackingCuts.mode() == "LowPtLargeD0" or NewTrackingCuts.mode() == "BeamGas" or NewTrackingCuts.mode() == "ForwardTracks" or - NewTrackingCuts.mode() == "ForwardSLHCTracks" or - NewTrackingCuts.mode() == "Disappearing" or - NewTrackingCuts.mode() == "VeryForwardSLHCTracks" or - NewTrackingCuts.mode() == "SLHCConversionFinding"): + NewTrackingCuts.mode() == "Disappearing"): usePrdAssociationTool = True @@ -646,9 +632,9 @@ if doPixel: LorentzAngleTool = ToolSvc.PixelLorentzAngleTool, DisableDistortions = (InDetFlags.doFatras() or InDetFlags.doDBMstandalone()), applyNNcorrection = ( InDetFlags.doPixelClusterSplitting() and - InDetFlags.pixelClusterSplittingType() == "NeuralNet" and not InDetFlags.doSLHC()), + InDetFlags.pixelClusterSplittingType() == "NeuralNet"), NNIBLcorrection = ( InDetFlags.doPixelClusterSplitting() and - InDetFlags.pixelClusterSplittingType() == "NeuralNet" and not InDetFlags.doSLHC()), + InDetFlags.pixelClusterSplittingType() == "NeuralNet"), SplitClusterAmbiguityMap = InDetKeys.SplitClusterAmbiguityMap(), RunningTIDE_Ambi = InDetFlags.doTIDE_Ambi()) PixelClusterOnTrackTool.NnClusterizationFactory = NnClusterizationFactory @@ -691,7 +677,7 @@ InDetSiComTrackFinder = InDet__SiCombinatorialTrackFinder_xk(name # Set up SiTrackMaker_xk (private) # Taken from InDetRecExample/share/ConfiguredNewTrackingSiPattern.py -# useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "SLHC" +# useBremMode = NewTrackingCuts.mode() == "Offline" useBremMode = False ### InDetFlags.doCaloSeededBrem.set_Value_and_Lock(False) ### InDetFlags.doHadCaloSeededSSS.set_Value_and_Lock(False) ### -- GitLab From c6fb37e135a4168a47003b941a752ffb5791411f Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 12:28:22 +0200 Subject: [PATCH 10/12] Cleaned SLHC configs in SiSPSeededTracksStandalone --- .../SiSPSeededTracksStandaloneFromESD.py | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py index af051fe6330..ef7fefe5587 100644 --- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py +++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration ############################################################### # @@ -183,18 +183,7 @@ if doPixel: IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_2016.dat" if (globalflags.DataSource()=='geant4'): - # 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 (geoFlags.isIBL() == False): + if (geoFlags.isIBL() == False): IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping.dat" else: # Planar IBL @@ -454,10 +443,7 @@ if (NewTrackingCuts.mode() == "LowPt" or NewTrackingCuts.mode() == "LowPtLargeD0" or NewTrackingCuts.mode() == "BeamGas" or NewTrackingCuts.mode() == "ForwardTracks" or - NewTrackingCuts.mode() == "ForwardSLHCTracks" or - NewTrackingCuts.mode() == "Disappearing" or - NewTrackingCuts.mode() == "VeryForwardSLHCTracks" or - NewTrackingCuts.mode() == "SLHCConversionFinding"): + NewTrackingCuts.mode() == "Disappearing"): usePrdAssociationTool = True @@ -540,9 +526,9 @@ if doPixel: LorentzAngleTool = ToolSvc.PixelLorentzAngleTool, DisableDistortions = (InDetFlags.doFatras() or InDetFlags.doDBMstandalone()), applyNNcorrection = ( InDetFlags.doPixelClusterSplitting() and - InDetFlags.pixelClusterSplittingType() == "NeuralNet" and not InDetFlags.doSLHC()), + InDetFlags.pixelClusterSplittingType() == "NeuralNet"), NNIBLcorrection = ( InDetFlags.doPixelClusterSplitting() and - InDetFlags.pixelClusterSplittingType() == "NeuralNet" and not InDetFlags.doSLHC()), + InDetFlags.pixelClusterSplittingType() == "NeuralNet"), SplitClusterAmbiguityMap = InDetKeys.SplitClusterAmbiguityMap(), RunningTIDE_Ambi = InDetFlags.doTIDE_Ambi()) PixelClusterOnTrackTool.NnClusterizationFactory = NnClusterizationFactory @@ -583,7 +569,7 @@ InDetSiComTrackFinder = InDet__SiCombinatorialTrackFinder_xk(name # Set up SiTrackMaker_xk (private) # Taken from InDetRecExample/share/ConfiguredNewTrackingSiPattern.py -# useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "SLHC" +# useBremMode = NewTrackingCuts.mode() == "Offline" useBremMode = False ### InDetFlags.doCaloSeededBrem.set_Value_and_Lock(False) ### InDetFlags.doHadCaloSeededSSS.set_Value_and_Lock(False) ### -- GitLab From fa77336874c677c61cf937c3054d7d7fd594ed1e Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 12:36:04 +0200 Subject: [PATCH 11/12] More SLHC cleaning --- .../run/PhysValITk_jobOptions.py | 236 ------------------ .../PrimaryDPDMaker/share/DAOD_IDNCB.py | 5 - .../python/EMBremCollectionBuilder.py | 2 +- 3 files changed, 1 insertion(+), 242 deletions(-) delete mode 100644 InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysValITk_jobOptions.py diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysValITk_jobOptions.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysValITk_jobOptions.py deleted file mode 100644 index 9879c95e338..00000000000 --- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysValITk_jobOptions.py +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration - -# $Id: PhysVal_jobOptions.py 714189 2015-12-11 17:33:02Z sroe $ - -#----------------------------------------------------------------------- -# set up the input file: -# set up for reading pool.root format files (AOD,ESD,IDTRKVALDAOD) -import AthenaPoolCnvSvc.ReadAthenaPool - -# read single file: warious options -#....................................................................... -# FNAME=[ "AOD.pool.root" ] -# runDAOD = False # set to False for AOD/ESD and True for IDTRKVALDAOD -#....................................................................... -# FNAME=[ "ESD.pool.root" ] -# runDAOD = False # set to False for AOD/ESD and True for IDTRKVALDAOD -#....................................................................... -# FNAME=[ "IDTRKVALDAOD.pool.root" ] -# runDAOD = True # set to False for AOD/ESD and True for IDTRKVALDAOD -#....................................................................... -# uncomment this for testing: step 1.7, mu=0 single muon with pt=1GeV samples: -FNAME=[ "root://eosatlas.cern.ch//eos/atlas/atlasgroupdisk/perf-idtracking/dq2/rucio/mc15_14TeV/33/e7/DAOD_IDTRKVALID.10847851._000001.pool.root.1", - "root://eosatlas.cern.ch//eos/atlas/atlasgroupdisk/perf-idtracking/dq2/rucio/mc15_14TeV/51/39/DAOD_IDTRKVALID.10847851._000002.pool.root.1" ] -runDAOD = True # these are DAOD-s -#....................................................................... -# uncomment to read multiple files: -#import glob -#FNAME=glob.glob('indir/*pool.root*') -#runDAOD = True # set to False for AOD/ESD and True for IDTRKVALDAODs -#....................................................................... -# uncomment this to process samples as in ascii (1 sample / line): -# with open('samples.txt','r') as inSamp: -# FNAME = [line.rstrip('\n') for line in inSamp] -# runDAOD = True # set to False for AOD/ESD and True for IDTRKVALDAODs -#....................................................................... -#----------------------------------------------------------------------- - -# make AthenaCommonFlags aware of which file we are using -# AthenaCommonFlags are used run-time configuration (MetaReader) -from AthenaCommon.AthenaCommonFlags import athenaCommonFlags -svcMgr.EventSelector.InputCollections = FNAME -athenaCommonFlags.FilesInput = svcMgr.EventSelector.InputCollections - -#----------------------------------------------------------------------- -# pre- and post- includes files needed to read input files -from AthenaCommon.GlobalFlags import globalflags -#globalflags.DetGeo = 'atlas' - -from PyUtils.MetaReaderPeeker import metadata -globalflags.DataSource = 'data' if metadata['eventTypes'][0] == "IS_DATA" else 'geant4' -globalflags.DetDescrVersion = metadata['GeoAtlas'] - -# if you are running with a geometry not yet included in xmlTags: -# add your Geometry and Layout below. -# than x-check with: -# GetTfCommand.py --AMI your-recodigi-tag -# that pre- and post- includes we schedule are the right ones -xmlTags = [ ["ATLAS-P2-SFCAL-01-05-01","ExtBrl_32"], - ["ATLAS-P2-SFCAL-01-06-01","ExtBrl_4"], - ["ATLAS-P2-SFCAL-01-07-01","IExtBrl_4"], - ["ATLAS-P2-SFCAL-01-08-01","InclBrl_4"], - ["ATLAS-P2-ITK-10-00-00","InclBrl_4"], - ["ATLAS-P2-ITK-09-00-00","ExtBrl_4"], - ["ATLAS-P2-ITK-10-00-01","InclBrl_4"], - ["ATLAS-P2-ITK-09-00-01","ExtBrl_4"], - ["ATLAS-P2-ITK-11-00-01","ExtBrl_4_33mm"], - ["ATLAS-P2-ITK-12-00-01","IExtBrl_4"], - # step 1.6 with BCL - ["ATLAS-P2-ITK-10-04-01","InclBrl_4"], - # step 1.6 with all long strips - ["ATLAS-P2-ITK-10-03-01","InclBrl_4"], - # step 1.7 - ["ATLAS-P2-ITK-09-00-03","ExtBrl_4"], - ["ATLAS-P2-ITK-10-00-03","InclBrl_4"], - # step 1.8 - ["ATLAS-P2-ITK-13-00-00","InclBrl_4_OptRing"] ] - -for geoTag, layoutDescr in xmlTags: - if (globalflags.DetDescrVersion().startswith(geoTag)): - print "preIncludes for ",layoutDescr, " layout" - from InDetRecExample.InDetJobProperties import InDetFlags - include('InDetSLHC_Example/preInclude.SLHC.SiliconOnly.Reco.py') - include('InDetSLHC_Example/preInclude.SLHC_Setup_'+layoutDescr+'.py') - include('InDetSLHC_Example/preInclude.SLHC_Setup_Strip_GMX.py') - if geoTag=="ATLAS-P2-ITK-10-00-00" or geoTag=="ATLAS-P2-ITK-09-00-00" : - include('InDetSLHC_Example/SLHC_Setup_Reco_TrackingGeometry.py') - else: - include('InDetSLHC_Example/SLHC_Setup_Reco_TrackingGeometry_GMX.py') - break - -# Just turn on the detector components we need -from AthenaCommon.DetFlags import DetFlags -DetFlags.detdescr.all_setOff() -DetFlags.detdescr.SCT_setOn() -DetFlags.detdescr.BField_setOn() -DetFlags.detdescr.pixel_setOn() - -# Set up geometry and BField -include("RecExCond/AllDet_detDescr.py") - -from InDetSLHC_Example.SLHC_JobProperties import SLHC_Flags -SLHC_Flags.SLHC_Version = '' - - -from AthenaCommon.GlobalFlags import jobproperties -DetDescrVersion = jobproperties.Global.DetDescrVersion() - -for geoTag, layoutDescr in xmlTags: - if (globalflags.DetDescrVersion().startswith(geoTag)): - print "postInclude for ",layoutDescr, " layout" - include('InDetSLHC_Example/postInclude.SLHC_Setup_'+layoutDescr+'.py') - break - -#----------------------------------------------------------------------- - -# Access the algorithm sequence: -from AthenaCommon.AlgSequence import AlgSequence -topSequence = AlgSequence() - -# include xml file with histogram definitions -from InDetPhysValMonitoring.InDetPhysValMonitoringConf import HistogramDefinitionSvc -ToolSvc = ServiceMgr.ToolSvc -ServiceMgr+=HistogramDefinitionSvc() -ServiceMgr.HistogramDefinitionSvc.DefinitionSource="../share/InDetPVMPlotDefITK.xml" -ServiceMgr.HistogramDefinitionSvc.DefinitionFormat="text/xml" - -# this fills some extra histograms when not running over DAOD -# when running over DAOD, decorators should be off to prevent crashes -if not runDAOD : - import InDetPhysValMonitoring.InDetPhysValDecoration - for decorator in InDetPhysValMonitoring.InDetPhysValDecoration.getDecorators() : - topSequence += decorator - -from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager -monMan = AthenaMonManager( "PhysValMonManager" ) -monMan.ManualDataTypeSetup = True -monMan.DataType = "monteCarlo" -monMan.Environment = "altprod" -monMan.ManualRunLBSetup = True -monMan.Run = 1 -monMan.LumiBlock = 1 -monMan.FileKey = "MyPhysVal" -topSequence += monMan - -#------------------------------------------------------------- -# Set up track selection tool -#------------------------------------------------------------- -from InDetTrackSelectionTool.InDetTrackSelectionToolConf import InDet__InDetTrackSelectionTool -InDetTrackSelectorTool = InDet__InDetTrackSelectionTool("InDetTrackSelectorTool") -##### DO NOT USE THESE !!!!! !!!! !!! ################ -##### DO NOT COMMENT THEM OUT !!!!! ################## -InDetTrackSelectorTool.minPt = 400 # Mev -InDetTrackSelectorTool.maxD0 = 2 # mm -InDetTrackSelectorTool.maxZ0 = 250 # mm -InDetTrackSelectorTool.minNSiHits = 6 # Pixel + SCT -InDetTrackSelectorTool.maxNPixelHoles = 2 # Pixel only -InDetTrackSelectorTool.OutputLevel = INFO -#eta dependant hit cut below -#InDetTrackSelectorTool.vecEtaCutoffsForSiHitsCut = [0,1.0,1.2,1.8,2.2] -#InDetTrackSelectorTool.vecMinNSiHitsAboveEta = [11,11,11,13,10] - -##### Temporary cuts - Will be fixed in 20.20.8.X ###### -############################################ USE THESE ONES!!!! ################################# -######### IF THE CUT YOU NEED IS NOT DEFINED BELOW, ADD IT TO InDetTrackSelectorTool. ABOVE ##### -from InDetTrackSelectorTool.InDetTrackSelectorToolConf import InDet__InDetTrackCutSvc -InDetTrackCutSvcIDPVM = InDet__InDetTrackCutSvc("InDetTrackCutSvcIDPVM") -InDetTrackCutSvcIDPVM.MaxD0 = 2. #mm -InDetTrackCutSvcIDPVM.MaxZ0 = 250. #mm -InDetTrackCutSvcIDPVM.MaxEta = 4.0 -InDetTrackCutSvcIDPVM.MinSiHits = 6 # Pixel + SCT -#InDetTrackCutSvcIDPVM.MinPixelHits = 0 -#InDetTrackCutSvcIDPVM.MinSCTHits = 0 - - -svcMgr += InDetTrackCutSvcIDPVM -InDetTrackSelectorTool.TrackSelectionSvc = InDetTrackCutSvcIDPVM - -ToolSvc += InDetTrackSelectorTool -##### Temporary cuts - Will be fixed in 20.20.8.X ###### - -print "Set Up InDetTrackSelectorTool" - -#------------------------------------------------------------- -# Set up truth selection tool -#------------------------------------------------------------- -from InDetPhysValMonitoring.InDetPhysValMonitoringConf import AthTruthSelectionTool -TrackTruthSelectionTool = AthTruthSelectionTool() -# todo: manually adapt this acc. to the fiducial acceptance of your detector -# ie in case of eta range 3.2, that's where you want your maxEta cut to be -TrackTruthSelectionTool.maxEta = 4.0 -TrackTruthSelectionTool.maxPt = -1 -TrackTruthSelectionTool.minPt = 900 # default 400 MeV -TrackTruthSelectionTool.maxBarcode = int(200e3) -TrackTruthSelectionTool.pdgId = -1 -TrackTruthSelectionTool.requireCharged = True -TrackTruthSelectionTool.requireStatus1 = True -TrackTruthSelectionTool.maxProdVertRadius = 260. #max prod. vertex radius of secondaries [mm] -# to select particle within BCL acceptance -#TrackTruthSelectionTool.radiusCylinder = 857 #BCL approximate radius -#TrackTruthSelectionTool.minZCylinder = 1167 #BCL min z -#TrackTruthSelectionTool.maxZCylinder = 1361 #BCL min z -TrackTruthSelectionTool.OutputLevel = INFO -ToolSvc += TrackTruthSelectionTool - -#------------------------------------------------------------- -# Set up InDetPhysValMonitoring tool -#------------------------------------------------------------- -from InDetPhysValMonitoring.InDetPhysValMonitoringConf import InDetPhysValMonitoringTool -InDetPhysValMonitoringTool = InDetPhysValMonitoringTool("InDetPhysValMonitoringTool") -InDetPhysValMonitoringTool.useTrackSelection = True -InDetPhysValMonitoringTool.TrackSelectionTool = InDetTrackSelectorTool -#InDetPhysValMonitoringTool.TruthSelectionTool = TrackTruthSelectionTool -InDetPhysValMonitoringTool.TruthParticleContainerName = "TruthParticles" -# this will run over hardscatter tracks only: -#InDetPhysValMonitoringTool.PileupSwitch = "HardScatter" -InDetPhysValMonitoringTool.OutputLevel = INFO -#ToolSvc += InDetPhysValMonitoringTool - -monMan.AthenaMonTools += [InDetPhysValMonitoringTool] - -# set up output file -from GaudiSvc.GaudiSvcConf import THistSvc -ServiceMgr += THistSvc() -svcMgr.THistSvc.Output += ["MyPhysVal DATAFILE='MyPhysVal.root' OPT='RECREATE'"] - -# set out message verbosity -from AthenaCommon.AppMgr import theApp -ServiceMgr.MessageSvc.OutputLevel = WARNING -ServiceMgr.MessageSvc.defaultLimit = 10000 - -# max. number of events to process -theApp.EvtMax = -1 - -# dump configuration -from AthenaCommon.ConfigurationShelve import saveToAscii -saveToAscii("config.txt") diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDNCB.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDNCB.py index 3495b8aad70..d53907ff9e4 100644 --- a/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDNCB.py +++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDNCB.py @@ -45,9 +45,6 @@ if (globalflags.DataSource == 'geant4'): if ( 'dumpTruthInfo' in dir() ): dumpTruthInfo = dumpTruthInfo and isIdTrkDxAODSimulation -if InDetFlags.doSLHC(): - dumpTrtInfo=False - ## Other settings # Prefix for decoration, if any prefixName = "" @@ -138,8 +135,6 @@ if dumpPixInfo: xAOD_PixelPrepDataToxAOD.WriteNNinformation = False #xAOD_PixelPrepDataToxAOD.WriteSDOs = True #xAOD_PixelPrepDataToxAOD.WriteSiHits = True # if available - if InDetFlags.doSLHC(): - xAOD_PixelPrepDataToxAOD.WriteNNinformation=False topSequence += xAOD_PixelPrepDataToxAOD if (printIdTrkDxAODConf): diff --git a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py index 47161cdaf1b..c7bcdaf6fa4 100644 --- a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py +++ b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py @@ -72,7 +72,7 @@ class egammaBremCollectionBuilder (egammaAlgsConf.EMBremCollectionBuilder): # TRT_ElectronPidTool # GSFBuildTRT_ElectronPidTool = None - if DetFlags.haveRIO.TRT_on() and not InDetFlags.doSLHC( + if DetFlags.haveRIO.TRT_on()( ) and not InDetFlags.doHighPileup(): GSFBuildTRT_ElectronPidTool = ( TrackingCommon.getInDetTRT_ElectronPidTool( -- GitLab From 60c6b06d4b1c744acca86270ec65a9e85b76ad7a Mon Sep 17 00:00:00 2001 From: tstreble Date: Thu, 16 Sep 2021 19:36:29 +0200 Subject: [PATCH 12/12] Fixes in EMBremCollectionBuilder --- .../egamma/egammaAlgs/python/EMBremCollectionBuilder.py | 3 +-- .../HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py index c7bcdaf6fa4..b13d9565e10 100644 --- a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py +++ b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py @@ -72,8 +72,7 @@ class egammaBremCollectionBuilder (egammaAlgsConf.EMBremCollectionBuilder): # TRT_ElectronPidTool # GSFBuildTRT_ElectronPidTool = None - if DetFlags.haveRIO.TRT_on()( - ) and not InDetFlags.doHighPileup(): + if DetFlags.haveRIO.TRT_on() and not InDetFlags.doHighPileup(): GSFBuildTRT_ElectronPidTool = ( TrackingCommon.getInDetTRT_ElectronPidTool( name="GSFBuildTRT_ElectronPidTool", diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py index 96977bf0e89..90afce49675 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py @@ -68,8 +68,7 @@ class TrigEgammaBremCollectionBuilder (egammaAlgsConf.EMBremCollectionBuilder): # TRT_ElectronPidTool (private =True) # GSFBuildTRT_ElectronPidTool = None - if DetFlags.haveRIO.TRT_on() and not InDetFlags.doSLHC( - ) and not InDetFlags.doHighPileup(): + if DetFlags.haveRIO.TRT_on() and not InDetFlags.doHighPileup(): from TrigInDetConfig.InDetTrigCollectionKeys import TrigTRTKeys from AthenaCommon.GlobalFlags import globalflags -- GitLab