Skip to content

Commit

Permalink
hltGetConfiguration: move default to ConfDB v2 for online and adg
Browse files Browse the repository at this point in the history
  • Loading branch information
fwyzard committed Jul 14, 2015
1 parent 55dd436 commit a3784ce
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions HLTrigger/Configuration/python/Tools/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def __init__(self, value):
class ConnectionHLTMenu(object):
valid_versions = 'v1', 'v2'
valid_databases = 'online', 'offline', 'adg'
compatibility = { 'hltdev': ('v1', 'offline'), 'orcoff': ('v1', 'adg') }
compatibility = { 'hltdev': ('v1', 'offline'), 'orcoff': ('v2', 'adg') }

def __init__(self, value):
self.version = None
Expand Down Expand Up @@ -102,8 +102,11 @@ def __init__(self, value):
# use the default version for the given database
if db not in self.valid_databases:
raise Exception('Invalid HLT database "%s", valid values are "%s"' % (db, '", "'.join(self.valid_databases)))
self.version = 'v1'
self.database = db
if db == 'offline' :
self.version = 'v1'
else:
self.version = 'v2'
self.name = name

# options marked with a (*) only apply when creating a whole process configuration
Expand Down

0 comments on commit a3784ce

Please sign in to comment.