Skip to content
Snippets Groups Projects
Commit dfb97df5 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'py3.TriggerMenu-20200724' into 'master'

TriggerMenu: python 3 fixes

See merge request atlas/athena!35057
parents c7d79d27 51ec17df
No related branches found
No related tags found
No related merge requests found
...@@ -170,7 +170,7 @@ class TriggerAPI: ...@@ -170,7 +170,7 @@ class TriggerAPI:
cls.privatedbQueries[(period,cls.customGRL)] = cls.dbQueries[(period,cls.customGRL)] cls.privatedbQueries[(period,cls.customGRL)] = cls.dbQueries[(period,cls.customGRL)]
if not period & TriggerPeriod.future or TriggerPeriod.isRunNumber(period): if not period & TriggerPeriod.future or TriggerPeriod.isRunNumber(period):
#Don't pickle TM information since it can change, very cheap to retrieve anyway #Don't pickle TM information since it can change, very cheap to retrieve anyway
with open(cls.privatePickleFile, 'w') as f: with open(cls.privatePickleFile, 'wb') as f:
pickle.dump( cls.privatedbQueries , f) pickle.dump( cls.privatedbQueries , f)
else: else:
basePeriods = [tp for tp in TriggerPeriod.basePeriods() if tp & period] basePeriods = [tp for tp in TriggerPeriod.basePeriods() if tp & period]
...@@ -185,7 +185,7 @@ class TriggerAPI: ...@@ -185,7 +185,7 @@ class TriggerAPI:
for period,grl in cls.dbQueries.keys(): for period,grl in cls.dbQueries.keys():
if TriggerPeriod.isRunNumber(period) or (isinstance(period,TriggerPeriod) and period.isBasePeriod()): continue if TriggerPeriod.isRunNumber(period) or (isinstance(period,TriggerPeriod) and period.isBasePeriod()): continue
del cls.dbQueries[(period,grl)] del cls.dbQueries[(period,grl)]
with open(cls.privatePickleFile, 'w') as f: with open(cls.privatePickleFile, 'wb') as f:
pickle.dump( cls.dbQueries , f) pickle.dump( cls.dbQueries , f)
print (sorted(cls.dbQueries.keys())) print (sorted(cls.dbQueries.keys()))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment