From 4f220ff5b68eeef2bc2c4d815071a6454112eda0 Mon Sep 17 00:00:00 2001
From: Rupert Tombs <rt500@cam.ac.uk>
Date: Fri, 17 Jan 2020 15:55:30 +0000
Subject: [PATCH] Do not set up PixelHitDiscCnfgAlg without an IBL

---
 .../PixelConditionsAlgorithms/python/PixelConditionsConfig.py  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index 816650ff21c..8900e4de0ca 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -349,6 +349,9 @@ def PixelDistortionAlgCfg(flags, name="PixelDistortionAlg", **kwargs):
 def PixelHitDiscCnfgAlgCfg(flags, name="PixelHitDiscCnfgAlg", **kwargs):
     """Return a ComponentAccumulator with configured PixelHitDiscCnfgAlg"""
     acc = ComponentAccumulator()
+    # not for Run-1 data/MC
+    if flags.GeoModel.IBLLayout in ("noIBL", "UNDEFINED"):
+        return acc
     if (flags.IOVDb.DatabaseInstance=="CONDBR2"):
         acc.merge(addFolders(flags, "/PIXEL/HitDiscCnfg", "PIXEL", className="AthenaAttributeList"))
     elif (flags.Input.isMC and flags.GeoModel.Run=="RUN2") or (flags.Input.isMC and flags.GeoModel.Run=="RUN3"):
-- 
GitLab