From be1ea8b191e82bab8439e65f6ee1472d9261d85b Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Fri, 2 Nov 2018 16:10:20 +0000
Subject: [PATCH] Merge branch '21.0-dq-cosmic-postprocessing' into '21.0'
Protect against failing pixel hancool code
See merge request atlas/athena!15593
(cherry picked from commit 042ba683cf91d0614525529bfcb7641cdd55eb29)
d6835309 Protect against failing pixel hancool code
---
.../AthenaConfiguration/python/iconfTool/utils/__init__.py | 0
DataQuality/DataQualityUtils/python/hancoolmod.py | 6 +++++-
2 files changed, 5 insertions(+), 1 deletion(-)
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/DataQuality/DataQualityUtils/python/hancoolmod.py b/DataQuality/DataQualityUtils/python/hancoolmod.py
index 3f6425b9194..ec729409dce 100644
--- a/DataQuality/DataQualityUtils/python/hancoolmod.py
+++ b/DataQuality/DataQualityUtils/python/hancoolmod.py
@@ -507,7 +507,11 @@ def hancool_defects(runNumber, filePath="./", dbConnection="", db_tag='HEAD', is
globname = fnames[0][0]
filename = os.path.basename(globname)
since, until = getLimits(filename)
- defects += pix_defect.execute(runNumber, globname, until-1)
+ try:
+ defects += pix_defect.execute(runNumber, globname, until-1)
+ except Exception, e:
+ logging.warning('Unable to execute pixel hancool code')
+ logging.warning('--> %s: %s' % (type(e).__name__, e))
from DQDefects import DefectsDB
ddb = DefectsDB(dbConnection, read_only=False)
--
GitLab