From 0362946a8d212bd3a3db9b6ac8861f0b889e98d4 Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Sun, 4 Nov 2018 16:43:38 +0000
Subject: [PATCH] Merge branch 'HIJR-4-11-18' into '21.0'

Fix for HIP mode (ATLHI-233)

See merge request atlas/athena!15644

(cherry picked from commit d9ee22f9279ed419a36866afb7362e7a87bc5322)

9c9f4228 Fix for HIP mode (ATLHI-233)
---
 Control/AthenaConfiguration/python/iconfTool/utils/__init__.py   | 0
 Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py | 1 +
 2 files changed, 1 insertion(+)
 mode change 100755 => 100644 Control/AthenaConfiguration/python/iconfTool/utils/__init__.py

diff --git a/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py b/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py
old mode 100755
new mode 100644
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py b/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py
index 352ee7fddf1..323392936f9 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py
+++ b/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py
@@ -1,6 +1,7 @@
 from HIJetRec.HIJetRecFlags import HIJetFlags
 from HIGlobal.HIGlobalFlags import jobproperties
 from JetRec.JetRecFlags import jetFlags
+from HIJetRec.HIJetRecConfig import *
 jetFlags.useCells.set_Value(True);
 
 
-- 
GitLab