From c51fde27c1cb475e5374f99e12771714725ea979 Mon Sep 17 00:00:00 2001
From: Walter Lampl <Walter.Lampl@cern.ch>
Date: Thu, 4 Jul 2019 10:56:05 +0200
Subject: [PATCH] global replacement 'PixelNnClusterNnCondAlg'->
'PixelClusterNnCondAlg' and 'PixelNnClusterNnWithTrackCondAlg' ->
'PixelClusterNnWithTrackCondAlg' to fix ATLASRECTS-5013
---
.../InDetExample/InDetRecExample/share/InDetRecLoadTools.py | 4 ++--
.../InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py | 4 ++--
.../SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py | 4 ++--
.../share/SiSPSeededTracksStandaloneFromESD.py | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
index bbd47ac9020..7f4dfc53c35 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
@@ -60,8 +60,8 @@ if InDetFlags.doPixelClusterSplitting() and not InDetFlags.doSLHC():
from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as geoFlags
do_runI = geoFlags.Run() not in ["RUN2", "RUN3"]
from InDetRecExample.TrackingCommon import createAndAddCondAlg,getPixelClusterNnCondAlg,getPixelClusterNnWithTrackCondAlg
- createAndAddCondAlg( getPixelClusterNnCondAlg, 'PixelNnClusterNnCondAlg', GetInputsInfo = do_runI)
- createAndAddCondAlg( getPixelClusterNnWithTrackCondAlg,'PixelNnClusterNnWithTrackCondAlg', GetInputsInfo = do_runI)
+ createAndAddCondAlg( getPixelClusterNnCondAlg, 'PixelClusterNnCondAlg', GetInputsInfo = do_runI)
+ createAndAddCondAlg( getPixelClusterNnWithTrackCondAlg,'PixelClusterNnWithTrackCondAlg', GetInputsInfo = do_runI)
if do_runI :
NnClusterizationFactory = InDet__NnClusterizationFactory( name = "NnClusterizationFactory",
PixelLorentzAngleTool = ToolSvc.PixelLorentzAngleTool,
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
index e5e9ca4fa21..76bed4eb7dd 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
@@ -89,8 +89,8 @@ if InDetTrigFlags.loadRotCreator():
from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as geoFlags
do_runI = geoFlags.Run() not in ["RUN2", "RUN3"]
from InDetRecExample.TrackingCommon import createAndAddCondAlg,getPixelClusterNnCondAlg,getPixelClusterNnWithTrackCondAlg
- createAndAddCondAlg( getPixelClusterNnCondAlg, 'PixelNnClusterNnCondAlg', GetInputsInfo = do_runI)
- createAndAddCondAlg( getPixelClusterNnWithTrackCondAlg,'PixelNnClusterNnWithTrackCondAlg', GetInputsInfo = do_runI)
+ createAndAddCondAlg( getPixelClusterNnCondAlg, 'PixelClusterNnCondAlg', GetInputsInfo = do_runI)
+ createAndAddCondAlg( getPixelClusterNnWithTrackCondAlg,'PixelClusterNnWithTrackCondAlg', GetInputsInfo = do_runI)
if do_runI :
TrigNnClusterizationFactory = InDet__NnClusterizationFactory( name = "TrigNnClusterizationFactory",
PixelLorentzAngleTool = TrigPixelLorentzAngleTool,
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
index 1990f005f92..afc8e037cf7 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
@@ -203,8 +203,8 @@ if doPixel:
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
# Takne from InDetRecExample/share/InDetRecLoadTools.py
from InDetRecExample.TrackingCommon import createAndAddCondAlg,getPixelClusterNnCondAlg,getPixelClusterNnWithTrackCondAlg
- createAndAddCondAlg( getPixelClusterNnCondAlg, "PixelNnClusterNnCondAlg", GetInputsInfo = do_runI)
- createAndAddCondAlg( getPixelClusterNnWithTrackCondAlg,"PixelNnClusterNnWithTrackCondAlg", GetInputsInfo = do_runI)
+ createAndAddCondAlg( getPixelClusterNnCondAlg, "PixelClusterNnCondAlg", GetInputsInfo = do_runI)
+ createAndAddCondAlg( getPixelClusterNnWithTrackCondAlg,"PixelClusterNnWithTrackCondAlg", GetInputsInfo = do_runI)
# Set up SCT conditions
SCT_ConditionsSummaryTool = None
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
index 85306b300c6..92cf9b9559f 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
@@ -190,8 +190,8 @@ if doPixel:
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
# Takne from InDetRecExample/share/InDetRecLoadTools.py
from InDetRecExample.TrackingCommon import createAndAddCondAlg,getPixelClusterNnCondAlg,getPixelClusterNnWithTrackCondAlg
- createAndAddCondAlg( getPixelClusterNnCondAlg, "PixelNnClusterNnCondAlg", GetInputsInfo = do_runI)
- createAndAddCondAlg( getPixelClusterNnWithTrackCondAlg,"PixelNnClusterNnWithTrackCondAlg", GetInputsInfo = do_runI)
+ createAndAddCondAlg( getPixelClusterNnCondAlg, "PixelClusterNnCondAlg", GetInputsInfo = do_runI)
+ createAndAddCondAlg( getPixelClusterNnWithTrackCondAlg,"PixelClusterNnWithTrackCondAlg", GetInputsInfo = do_runI)
# Set up SCT conditions
SCT_ConditionsSummaryTool = None
--
GitLab