From ecff3e4cc2effdd63e3bf2b909a20fb0aa6dcdea Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Wed, 21 Mar 2018 23:26:34 +0100
Subject: [PATCH] InDetRecExample: Fix reference to geometry flags.
A couple JO fragments were referencing the variable geoFlags without
defining it, expecting it to have been set up by another JO fragment.
But in some configurations, this variable now references something
of the wrong type --- another fragment must be clobbering it.
Explicitly import the flags object before using it.
Former-commit-id: d47790b0e6d5e7a269429414d2ebf8d243042da6
---
.../InDetRecExample/share/ConfiguredNewTrackingSiPattern.py | 5 +++--
.../InDetRecExample/share/InDetMonitoringPixel.py | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
index 3d66be08817..7114c7ea7be 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
@@ -324,8 +324,9 @@ class ConfiguredNewTrackingSiPattern:
prob1 = InDetFlags.pixelClusterSplitProb1()
prob2 = InDetFlags.pixelClusterSplitProb2()
nhitsToAllowSplitting = 9
-
- if geoFlags.Run() == 1:
+
+ from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags
+ if CommonGeometryFlags.Run() == 1:
prob1 = InDetFlags.pixelClusterSplitProb1_run1()
prob2 = InDetFlags.pixelClusterSplitProb2_run1()
nhitsToAllowSplitting = 8
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py
index a9f89fcca4a..6dbc4a66341 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py
@@ -7,7 +7,8 @@ from InDetRecExample.InDetKeys import InDetKeys
if doAllHits:
doDCS = False
- if (globalflags.DataSource() == 'data' and geoFlags.Run() == "RUN2" and conddb.dbdata == "CONDBR2"):
+ from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags
+ if (globalflags.DataSource() == 'data' and CommonGeometryFlags.Run() == "RUN2" and conddb.dbdata == "CONDBR2"):
doDCS = True
InDetPixelMainsMon=PixelMainMon(name = "InDetPixelMonitoringAllHits",
onTrack = False,
--
GitLab