Skip to content
Snippets Groups Projects
Commit 377960fa authored by Deep Chatterjee's avatar Deep Chatterjee
Browse files

determine ext events from group name; fix #567

parent 3c4272f9
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,9 @@ Changelog ...@@ -8,6 +8,9 @@ Changelog
- Do not remove PE run directory after the run completes or fails. - Do not remove PE run directory after the run completes or fails.
- Filter external events based on ``External`` group in ``superevents.py``,
instead of logic based on substring matching.
2.0.4 "Skunk Ape" (2023-03-28) 2.0.4 "Skunk Ape" (2023-03-28)
------------------------------ ------------------------------
......
...@@ -390,7 +390,7 @@ def select_pipeline_preferred_event(events): ...@@ -390,7 +390,7 @@ def select_pipeline_preferred_event(events):
pipeline, graceid pairs pipeline, graceid pairs
""" """
g_events = list( g_events = list(
filterfalse(lambda x: x['graceid'].startswith('E'), events)) filterfalse(lambda x: x['group'] == "External", events))
g_events_by_pipeline = groupby( g_events_by_pipeline = groupby(
sorted(g_events, key=lambda x: x['pipeline']), sorted(g_events, key=lambda x: x['pipeline']),
key=lambda x: x['pipeline'] key=lambda x: x['pipeline']
...@@ -411,9 +411,8 @@ def select_preferred_event(events): ...@@ -411,9 +411,8 @@ def select_preferred_event(events):
list of event dictionaries list of event dictionaries
""" """
# FIXME: Requires robust determination of an External event
g_events = list( g_events = list(
filterfalse(lambda x: x['graceid'].startswith('E'), events)) filterfalse(lambda x: x['group'] == "External", events))
return max(g_events, key=keyfunc) return max(g_events, key=keyfunc)
......
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