diff --git a/gracedb/migrations/0003_grbevent_trigger_id.py b/gracedb/migrations/0003_grbevent_trigger_id.py new file mode 100644 index 0000000000000000000000000000000000000000..c2512e5488828ea8373bb32f5e6528759598f001 --- /dev/null +++ b/gracedb/migrations/0003_grbevent_trigger_id.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('gracedb', '0002_auto_20150708_1140'), + ] + + operations = [ + migrations.AddField( + model_name='grbevent', + name='trigger_id', + field=models.CharField(max_length=25, null=True), + ), + ] diff --git a/gracedb/models.py b/gracedb/models.py index 3cce3c555f00f8846cff4ed434f06eaf5ee7ed47..032409f09bedbc42e8186f10bb8394492ca672c3 100644 --- a/gracedb/models.py +++ b/gracedb/models.py @@ -790,6 +790,7 @@ class GrbEvent(Event): t90 = models.FloatField(null=True) designation = models.CharField(max_length=20, null=True) redshift = models.FloatField(null=True) + trigger_id = models.CharField(max_length=25, null=True) class CoincInspiralEvent(Event): ifos = models.CharField(max_length=20, default="") diff --git a/gracedb/translator.py b/gracedb/translator.py index 8916692cb69d3a5ab90f0264e64cee10fbd0901a..9882dcbea2b598a8aab2aadfbca5e407f03b9789 100644 --- a/gracedb/translator.py +++ b/gracedb/translator.py @@ -645,3 +645,11 @@ def populateGrbEventFromVOEventFile(filename, event): except: pass event.trigger_duration = trigger_duration + + # try to find a trigger_id value + trigger_id = None + try: + trigger_id = findParam(v, '', 'TrigID').get_value() + except: + pass + event.trigger_id = trigger_id diff --git a/gracedb/view_utils.py b/gracedb/view_utils.py index 38e030669b10090fdbfa2a03fc07c76975826171..6d804ad45987df2271360433b690c93ff6c70f8a 100644 --- a/gracedb/view_utils.py +++ b/gracedb/view_utils.py @@ -150,6 +150,9 @@ def eventToDict(event, columns=None, request=None): "how_reference_url" : event.how_reference_url, "T90" : event.t90, "trigger_duration": event.trigger_duration, + "designation": event.designation, + "redshift": event.redshift, + "trigger_id": event.trigger_id, } except: pass diff --git a/templates/gracedb/event_detail_GRB.html b/templates/gracedb/event_detail_GRB.html index e612cf7161c44907b32349640165a081cd3010a1..1c8676d030badfce6df94e266aaa9d388b596bdc 100644 --- a/templates/gracedb/event_detail_GRB.html +++ b/templates/gracedb/event_detail_GRB.html @@ -68,6 +68,9 @@ {{object.how_description}} {% endif %} </td></tr> + {% if object.trigger_id %} + <tr><th>Trigger ID</th><td colspan="2">{{object.trigger_id}}</td></tr> + {% endif %} {% if object.trigger_duration %} <tr><th>Trigger duration</th><td colspan="2">{{object.trigger_duration}}</td></tr> {% endif %}