Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Roberto DePietri
gwcelery
Commits
f2ac7bca
Commit
f2ac7bca
authored
Dec 10, 2019
by
Brandon Piotrzkowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch `EM_SENT` to `RAVEN_ALERT`
parent
051a48a2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
gwcelery/tasks/raven.py
gwcelery/tasks/raven.py
+4
-4
gwcelery/tasks/superevents.py
gwcelery/tasks/superevents.py
+2
-2
gwcelery/tests/test_tasks_raven.py
gwcelery/tests/test_tasks_raven.py
+2
-2
gwcelery/tests/test_tasks_superevents.py
gwcelery/tests/test_tasks_superevents.py
+7
-7
No files found.
gwcelery/tasks/raven.py
View file @
f2ac7bca
...
...
@@ -309,10 +309,10 @@ def trigger_raven_alert(coinc_far_json, superevent, gracedb_id,
coinc_far_f
=
coinc_far
*
trials_factor
*
(
trials_factor
-
1.
)
pass_far_threshold
=
coinc_far_f
<=
far_threshold
no_previous_alert
=
{
'
EM_SEN
T'
}.
isdisjoint
(
no_previous_alert
=
{
'
RAVEN_ALER
T'
}.
isdisjoint
(
gracedb
.
get_labels
(
superevent_id
))
# If publishable, trigger an alert by applying `
EM_SEN
T` label to
# If publishable, trigger an alert by applying `
RAVEN_ALER
T` label to
# preferred event
messages
=
[]
if
pass_far_threshold
and
not
is_ext_subthreshold
:
...
...
@@ -324,9 +324,9 @@ def trigger_raven_alert(coinc_far_json, superevent, gracedb_id,
messages
.
append
(
'Triggering RAVEN alert for %s'
%
(
preferred_gwevent_id
))
(
gracedb
.
create_label
.
si
(
'
EM_SEN
T'
,
superevent_id
)
gracedb
.
create_label
.
si
(
'
RAVEN_ALER
T'
,
superevent_id
)
|
gracedb
.
create_label
.
si
(
'
EM_SEN
T'
,
preferred_gwevent_id
)
gracedb
.
create_label
.
si
(
'
RAVEN_ALER
T'
,
preferred_gwevent_id
)
).
delay
()
if
not
pass_far_threshold
:
messages
.
append
((
'RAVEN: publishing criteria not met for %s,'
...
...
gwcelery/tasks/superevents.py
View file @
f2ac7bca
...
...
@@ -59,7 +59,7 @@ def handle(payload):
if
alert_type
==
'label_added'
:
label
=
payload
[
'data'
][
'name'
]
group
=
payload
[
'object'
][
'group'
].
lower
()
if
label
==
'
EM_SEN
T'
:
if
label
==
'
RAVEN_ALER
T'
:
log
.
info
(
'Label %s added to %s'
,
label
,
gid
)
elif
label
not
in
REQUIRED_LABELS_BY_GROUP
[
group
]:
return
...
...
@@ -406,7 +406,7 @@ def _should_publish(event):
trials_factor
=
app
.
conf
[
'preliminary_alert_trials_factor'
][
group
]
far_threshold
=
app
.
conf
[
'preliminary_alert_far_threshold'
][
group
]
far
=
trials_factor
*
event
[
'far'
]
raven_coincidence
=
(
'
EM_SEN
T'
in
event
[
'labels'
])
raven_coincidence
=
(
'
RAVEN_ALER
T'
in
event
[
'labels'
])
return
not
event
[
'offline'
],
(
far
<=
far_threshold
or
raven_coincidence
)
...
...
gwcelery/tests/test_tasks_raven.py
View file @
f2ac7bca
...
...
@@ -313,8 +313,8 @@ def test_trigger_raven_alert(mock_create_label, mock_update_superevent,
superevent_id
,
em_type
=
ext_id
,
coinc_far
=
coinc_far
)
label_calls
=
[
call
(
'
EM_SEN
T'
,
superevent_id
),
call
(
'
EM_SEN
T'
,
preferred_id
)]
label_calls
=
[
call
(
'
RAVEN_ALER
T'
,
superevent_id
),
call
(
'
RAVEN_ALER
T'
,
preferred_id
)]
mock_create_label
.
assert_has_calls
(
label_calls
)
else
:
mock_create_label
.
assert_not_called
()
gwcelery/tests/test_tasks_superevents.py
View file @
f2ac7bca
...
...
@@ -129,7 +129,7 @@ G000003_RESPONSE = {
},
"offline"
:
False
,
"gpstime"
:
1000000
,
"labels"
:
[
"
EM_SEN
T"
,
"PASTRO_READY"
,
"labels"
:
[
"
RAVEN_ALER
T"
,
"PASTRO_READY"
,
"EMBRIGHT_READY"
,
"SKYMAP_READY"
]
}
...
...
@@ -320,9 +320,9 @@ def test_update_preferred_event(superevent_labels, new_event_labels,
@
pytest
.
mark
.
parametrize
(
'labels'
,
[[
'PASTRO_READY'
,
'
EM_SEN
T'
],
[[
'PASTRO_READY'
,
'
RAVEN_ALER
T'
],
[
'SKYMAP_READY'
,
'EMBRIGHT_READY'
,
'PASTRO_READY'
,
'
EM_SEN
T'
]])
'PASTRO_READY'
,
'
RAVEN_ALER
T'
]])
@
patch
(
'gwcelery.tasks.gracedb.create_label.run'
)
@
patch
(
'gwcelery.tasks.gracedb.get_superevent'
,
s100response
)
def
test_raven_alert
(
mock_create_label
,
labels
):
...
...
@@ -360,7 +360,7 @@ def test_raven_alert(mock_create_label, labels):
},
},
"data"
:
{
"name"
:
"
EM_SEN
T"
"name"
:
"
RAVEN_ALER
T"
}
}
superevents
.
handle
(
payload
)
...
...
@@ -475,11 +475,11 @@ def test_upload_same_event():
[
'Burst'
,
'cwb'
,
False
,
1e-15
,
'H1,L1'
,
[
'SKYMAP_READY'
],
True
],
[
'Burst'
,
'cwb'
,
False
,
1e-15
,
'H1,L1'
,
[],
False
],
[
'Burst'
,
'cwb'
,
True
,
1e-30
,
'H1,L1,V1'
,
[],
False
],
[
'CBC'
,
'gstlal'
,
False
,
1.e-6
,
'H1,L1,V1'
,
[
'
EM_SEN
T'
],
False
],
[
'CBC'
,
'gstlal'
,
False
,
1.e-6
,
'H1,L1,V1'
,
[
'
RAVEN_ALER
T'
],
False
],
[
'CBC'
,
'gstlal'
,
False
,
1.e-6
,
'H1,L1,V1'
,
[
'PASTRO_READY'
,
'SKYMAP_READY'
,
'EMBRIGHT_READY'
,
'
EM_SEN
T'
],
True
],
'PASTRO_READY'
,
'SKYMAP_READY'
,
'EMBRIGHT_READY'
,
'
RAVEN_ALER
T'
],
True
],
[
'CBC'
,
'gstlal'
,
False
,
1.e-15
,
'H1,L1,V1'
,
[
'PASTRO_READY'
,
'SKYMAP_READY'
,
'EMBRIGHT_READY'
,
'
EM_SEN
T'
],
True
]])
'PASTRO_READY'
,
'SKYMAP_READY'
,
'EMBRIGHT_READY'
,
'
RAVEN_ALER
T'
],
True
]])
def
test_should_publish
(
group
,
pipeline
,
offline
,
far
,
instruments
,
labels
,
expected_result
):
event
=
dict
(
graceid
=
'G123456'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment