diff --git a/gracedb/buildVOEvent.py b/gracedb/buildVOEvent.py index 3d0270e758a448ff9998398523491a937c15b34f..5305db2fa4909c16e831dbb256575abfb81304df 100755 --- a/gracedb/buildVOEvent.py +++ b/gracedb/buildVOEvent.py @@ -13,6 +13,7 @@ from gracedb.VOEventLib.Vutil import * import sys, os from gracedb.utils import gpsToUtc +from django.conf import settings def buildVOEvent(gevent): @@ -20,9 +21,9 @@ def buildVOEvent(gevent): ############ VOEvent header ############################ v = VOEvent.VOEvent(version="2.0") - v.set_ivorn("ivo://ligo.org/gracedb#%s-dev" % objid) - v.set_role("test") - v.set_Description("LIGO / Virgo trigger") + v.set_ivorn(settings.SKYALERT_IVORN_PATTERN % objid) + v.set_role(settings.SKYALERT_ROLE) + v.set_Description(settings.SKYALERT_DESCRIPTION) ############ Who ############################ w = Who() diff --git a/settings.py b/settings.py index b271128c08521c38b120c08ad62341d0c72ebb32..32772a49ae96b552d626c07551d11bda367c1500 100644 --- a/settings.py +++ b/settings.py @@ -13,8 +13,6 @@ ADMINS = ( MANAGERS = ADMINS -SKYALERT_SUBMITTERS = ['Patrick Brady', 'Brian Moe'] - ALERT_EMAIL_FROM = "GraCEDb <gracedb@archie.phys.uwm.edu>" ALERT_EMAIL_TO = [ "gracedb@listserv.ligo.org", @@ -50,6 +48,14 @@ DATABASE_HOST = '' # Set to empty string for localhost. DATABASE_PORT = '' # Set to empty string for default. +# SkyAlert + +SKYALERT_IVORN_PATTERN = "ivo://ligo.org/gracedb#%s" +SKYALERT_ROLE = "test" +SKYALERT_DESCRIPTION = "LIGO / Virgo trigger" +SKYALERT_SUBMITTERS = ['Patrick Brady', 'Brian Moe'] + + # Latency histograms. Where they go and max latency to bin. LATENCY_REPORT_DEST_DIR = "/home/gracedb/data/latency" LATENCY_MAXIMUM_CHARTED = 1800 diff --git a/settings_dev.py b/settings_dev.py index 97157756265464656eff4d4bef8df6a4ab35ed01..21410556b53a058be3e697f0f7506c2fc2294eb6 100644 --- a/settings_dev.py +++ b/settings_dev.py @@ -9,8 +9,6 @@ ADMINS = ( MANAGERS = ADMINS -SKYALERT_SUBMITTERS = ['Patrick Brady', 'Brian Moe'] - ALERT_EMAIL_FROM = "Dev Alert <root@moe.phys.uwm.edu>" ALERT_EMAIL_TO = [ "Brian Moe <bmoe@gravity.phys.uwm.edu>", @@ -37,6 +35,15 @@ DATABASE_PASSWORD = 'redrum4x' DATABASE_HOST = '' # Set to empty string for localhost. DATABASE_PORT = '' # Set to empty string for default. + +# SkyAlert + +SKYALERT_IVORN_PATTERN = "ivo://ligo.org/gracedb#%s-dev" +SKYALERT_ROLE = "test" +SKYALERT_DESCRIPTION = "LIGO / Virgo trigger" +SKYALERT_SUBMITTERS = ['Patrick Brady', 'Brian Moe'] + + # Latency histograms. Where they go and max latency to bin. LATENCY_REPORT_DEST_DIR = "/home/bmoe/django/data/latency" LATENCY_MAXIMUM_CHARTED = 1800