From 4f32126159836bb9b5898b8da107e0c7465d57ac Mon Sep 17 00:00:00 2001
From: Tulay Cuhadar Donszelmann <tcuhadar@cern.ch>
Date: Wed, 16 Oct 2019 19:45:42 +0200
Subject: [PATCH] Avoid double inclusion of PixelChargeCalibCondAlg

---
 .../PixelDigitization/python/PixelDigitizationConfig.py      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index 1739530e70d..25b89f7fafd 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -180,8 +180,9 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
     # Setup charge calibration #
     ############################
     conddb.addFolder("PIXEL_OFL", "/PIXEL/PixCalib", className="CondAttrListCollection")
-    from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeCalibCondAlg
-    condSeq += PixelChargeCalibCondAlg(name="PixelChargeCalibCondAlg", ReadKey="/PIXEL/PixCalib")
+    if not hasattr(condSeq, 'PixelChargeCalibCondAlg'):
+       from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeCalibCondAlg
+       condSeq += PixelChargeCalibCondAlg(name="PixelChargeCalibCondAlg", ReadKey="/PIXEL/PixCalib")
 
     #################
     # Setup deadmap #
-- 
GitLab