Merge branch 'master' of ligo-vcs.phys.uwm.edu:/usr/local/git/gracedb

gracedb/alert.py

@@ -82,8 +82,11 @@ def issueEmailAlert(event, location):
         triggers = atype.trigger_set.filter(labels=None)
         for trigger in triggers:
             for recip in trigger.contacts.all():
-                bccaddresses.append(recip.email)
-
+               if not trigger.farThresh:
+                   bccaddresses.append(recip.email)
+               else:
+                   if event.far and event.far < trigger.farThresh:
+                       bccaddresses.append(recip.email)
     subject = "[gracedb] %s event. ID: %s" % (event.get_analysisType_display(), event.graceid())
     message = """
 New Event

gracedb/models.py

@@ -89,6 +89,8 @@ class Event(models.Model):
             return "T%04d" % self.id
         elif self.analysisType == "HWINJ":
             return "H%04d" % self.id
+        elif self.analysisType == "GRB":
+            return "E%04d" % self.id
         return "G%04d" % self.id
 
     def weburl(self):
@@ -150,6 +152,8 @@ class Event(models.Model):
             return e
         if (id[0] == "H") and (e.analysisType == "HWINJ"):
             return e
+        if (id[0] == "E") and (e.analysisType == "GRB"):
+            return e
         if (id[0] == "G"):
             return e
         raise cls.DoesNotExist()

gracedb/query.py

@@ -114,6 +114,12 @@ tidRange = tid + Suppress("..") + tid
 tidQ = Optional(Suppress(Keyword("tid:"))) + (tid^tidRange)
 tidQ = tidQ.setParseAction(maybeRange("tid", dbname="id"))
 
+# External trigger event id
+eid = Suppress("E")+Word("0123456789")
+eidRange = eid + Suppress("..") + eid
+eidQ = Optional(Suppress(Keyword("eid:"))) + (eid^eidRange)
+eidQ = eidQ.setParseAction(maybeRange("eid", dbname="id"))
+
 # Submitter
 submitter = QuotedString('"').setParseAction(lambda toks: Q(submitter__name=toks[0]))
 submitterQ = Optional(Suppress(Keyword("submitter:"))) + submitter
@@ -214,7 +220,7 @@ ifoQ = ifoListQ | nifoQ
 
 ###########################
 
-q = (ifoQ | hasfarQ | gidQ | hidQ | tidQ | labelQ | atypeQ | groupQ | gpsQ | createdQ | submitterQ | runQ | attributeQ).setName("query term")
+q = (ifoQ | hasfarQ | gidQ | hidQ | tidQ | eidQ | labelQ | atypeQ | groupQ | gpsQ | createdQ | submitterQ | runQ | attributeQ).setName("query term")
 
 #andTheseTags = ["attr"]
 andTheseTags = ["nevents"]

gracedb/translator.py

@@ -18,6 +18,10 @@ from glue.gracedb.utils import populate_inspiral_tables, \
                                populate_coinc_tables,    \
                                write_output_files
 
+from VOEventLib.VOEvent import *
+from VOEventLib.Vutil import *
+from utils import isoToGps
+
 def handle_uploaded_data(event, datafilename,
                          log_filename='event.log',
                          coinc_table_filename='coinc.xml'):
@@ -291,6 +295,13 @@ def handle_uploaded_data(event, datafilename,
             f.close()
         except:
             pass
+    elif event.analysisType == 'GRB':
+        # Get the event time from the VOEvent file
+        try:
+            event.gpstime = getGpsFromVOEvent(datafilename)
+        except:
+            event.gpstime = 0
+        event.save()
     else:
         # XXX should we do something here?
         pass
@@ -453,3 +464,8 @@ class CwbData(Translator):
     def writeCoincFile(self, path):
         pass
 
+def getGpsFromVOEvent(filename):
+    v = parse(filename)
+    wwd = getWhereWhen(v)
+    gpstime = isoToGps(wwd['time'])
+    return gpstime

gracedb/urls.py

@@ -13,7 +13,7 @@ urlpatterns = patterns('gracedb.views',
     url (r'^voevent/(?P<graceid>[\w\d]+)', 'voevent', name="voevent"),
     url (r'^skyalert/(?P<graceid>[\w\d]+)', 'skyalert', name="skyalert"),
     url (r'^(?P<graceid>[\w\d]+)$', 'view', name="view2"),
-    url (r'^(?P<graceid>[\w\d]+)/files/(?P<filename>.+)$', download, name="file"),
+    url (r'^(?P<graceid>[\w\d]+)/files/(?P<filename>.*)$', download, name="file"),
     url (r'^(?P<graceid>[\w\d]+)/log/(?P<num>([\d]*|preview))$', 'logentry', name="logentry"),
 
 

settings/branson.py

@@ -8,7 +8,7 @@ DATABASES = {
     'default' : {
         'NAME'     : 'branson',
         'ENGINE'   : 'django.db.backends.mysql',
-        'USER'     : 'gracedb',
+        'USER'     : 'branson',
         'PASSWORD' : 'thinglet',
     }
 }
@@ -50,5 +50,5 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    "/homebransonbmoe/gracedb/templates",
+    "/home/branson/gracedbdev/templates",
 )

userprofile/forms.py

@@ -6,6 +6,7 @@ from django.forms.models import modelformset_factory
 
 def triggerFormFactory(postdata=None, user=None):
     class TF(forms.ModelForm):
+        farThresh = forms.FloatField(label='FAR Threshold')
         class Meta:
             model = Trigger
             exclude = ['user', 'triggerType']

userprofile/models.py

@@ -46,6 +46,7 @@ class Trigger(models.Model):
     labels = models.ManyToManyField(Label, blank=True)
     atypes = models.ManyToManyField(AnalysisType, blank=True, verbose_name="Analysis Types")
     contacts = models.ManyToManyField(Contact, blank=True)
+    farThresh = models.FloatField(blank=True, null=True)
 
     def __unicode__(self):
         return ("%s: %s") % (

userprofile/views.py

@@ -31,6 +31,7 @@ def create(request):
             labels = form.cleaned_data['labels']
             atypes = form.cleaned_data['atypes']
             contacts = form.cleaned_data['contacts']
+            farThresh = form.cleaned_data['farThresh']
 
             if contacts and (labels or atypes):
                 t.save() # Need an id before relations can be set.
@@ -38,6 +39,7 @@ def create(request):
                     t.labels = labels
                     t.atypes = atypes
                     t.contacts = contacts
+                    t.farThresh = farThresh
                 except:
                     t.delete()
                 t.save()

utils/__init__.py

@@ -11,6 +11,7 @@ import pytz
 import datetime
 
 import calendar
+from time import mktime
 
 gpsEpoch = calendar.timegm((1980, 1, 6, 0,  0,  0,  0,  0,  0))
 
@@ -51,4 +52,17 @@ def gpsToUtc(gpsTime):
     t = gpsToPosixTime(gpsTime)
     return datetime.datetime.fromtimestamp(t, pytz.utc)
 
-
+def isoToGps(t):
+    # The input is a string in ISO time format: 2012-10-28T05:04:31.91
+    # First strip out whitespace, then split off the factional 
+    # second.  We'll add that back later.
+    t=t.strip()
+    ISOTime = t.split('.')[0]
+    ISOTime = datetime.datetime.strptime(ISOTime,"%Y-%m-%dT%H:%M:%S")
+    sec_substr = t.split('.')[1]
+    if sec_substr:
+        fracSec = float('0.' + sec_substr)
+    else:
+        fracSec = 0
+    posixTime = mktime(ISOTime.timetuple()) + fracSec 
+    return int(round(posixToGpsTime(posixTime)))