Skip to content

Commit

Permalink
Merge branch 'gluex_centos7' into v0.07
Browse files Browse the repository at this point in the history
  • Loading branch information
markito3 committed Feb 22, 2022
2 parents 09dae3a + bf3426b commit dbe53c2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion python/rcdb/alias.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def __init__(self, name, expression, comment):
collimator_diameter != 'Blocking'""",
"Is production run with long mode data"),

ConditionSearchAlias('is_cosmic', "\"cosmic\" in run_config and beam_current < 1 and event_count > 5000",
ConditionSearchAlias('is_cosmic', '"cosmic" in run_config and beam_current < 1 and event_count > 5000',
"Is cosmic run"),

ConditionSearchAlias('is_empty_target', "target_type == 'EMPTY & Ready'", "Target is empty"),
Expand Down
12 changes: 6 additions & 6 deletions python/rcdb/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ def select_values(self, val_names=None, search_str="", run_min=0, run_max=sys.ma
compiled_search_eval = None

result_table = []

for values in result:
run = values[0]
try:
Expand All @@ -966,11 +966,11 @@ def select_values(self, val_names=None, search_str="", run_min=0, run_max=sys.ma
result_row.append(val)
result_table.append(result_row)
except Exception as ex:
message = f'Error evaluating search query.\n' \
f' Query: <<"{search_eval}">>, \n' \
f' Names: {names}, \n' \
f' Values: {values} \n' \
f' Error: {ex}'
message = 'Error evaluating search query.\n' \
+ ' Query: <<"{}">>, \n'.format(search_eval) \
+ ' Names: {}, \n'.format(names) \
+ ' Values: {} \n'.format(values) \
+ ' Error: {}'.format(ex)
raise QueryEvaluationError(msg=message)

selection_sw.stop()
Expand Down

0 comments on commit dbe53c2

Please sign in to comment.