From 55675362c334bf952cde1cca9204789ca5c80a87 Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Wed, 20 Mar 2019 11:15:16 -0500
Subject: [PATCH] Fix pi usage in VOEvent building
---
gracedb/events/buildVOEvent.py | 5 +++--
gracedb/superevents/buildVOEvent.py | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gracedb/events/buildVOEvent.py b/gracedb/events/buildVOEvent.py
index ef1177b82..f6dd0c7a9 100644
--- a/gracedb/events/buildVOEvent.py
+++ b/gracedb/events/buildVOEvent.py
@@ -7,6 +7,7 @@ buildVOEvent: Creates a complex VOEvent with tables
See the VOEvent specification for details
http://www.ivoa.net/Documents/latest/VOEvent.html
"""
+import math
from VOEventLib.VOEvent import VOEvent, Who, Author, Param, How, What, Group
from VOEventLib.VOEvent import Citations, EventIVORN
@@ -375,7 +376,7 @@ def buildVOEvent(event, serial_number, voevent_type, request=None, skymap_filena
max_hrss = max(hrss_values)
# From Min-A Cho: fluence = pi*(c**3)*(freq**2)*(hrss_max**2)*(10**3)/(4*G)
# Note that hrss here actually has units of s^(-1/2)
- pi = 3.14152
+ pi = math.pi
c = 2.99792E10
G = 6.674E-8
fluence = pi * pow(c,3) * pow(event.central_freq,2)
@@ -403,7 +404,7 @@ def buildVOEvent(event, serial_number, voevent_type, request=None, skymap_filena
# Note that hrss here actually has units of s^(-1/2)
# XXX obviously need to refactor here.
try:
- pi = 3.14152
+ pi = math.pi
c = 2.99792E10
G = 6.674E-8
fluence = pi * pow(c,3) * pow(event.frequency,2)
diff --git a/gracedb/superevents/buildVOEvent.py b/gracedb/superevents/buildVOEvent.py
index 7348d9230..0e794c3be 100644
--- a/gracedb/superevents/buildVOEvent.py
+++ b/gracedb/superevents/buildVOEvent.py
@@ -7,6 +7,8 @@ buildVOEvent: Creates a complex VOEvent with tables
See the VOEvent specification for details
http://www.ivoa.net/Documents/latest/VOEvent.html
"""
+import math
+
from VOEventLib.VOEvent import VOEvent, Who, Author, Param, How, What, Group
from VOEventLib.VOEvent import Citations, EventIVORN
@@ -357,7 +359,7 @@ def construct_voevent_file(superevent, voevent, request=None,
max_hrss = max(hrss_values)
# From Min-A Cho: fluence = pi*(c**3)*(freq**2)*(hrss_max**2)*(10**3)/(4*G)
# Note that hrss here actually has units of s^(-1/2)
- pi = 3.14152
+ pi = math.pi
c = 2.99792E10
G = 6.674E-8
fluence = pi * pow(c,3) * pow(event.central_freq,2)
@@ -386,7 +388,7 @@ def construct_voevent_file(superevent, voevent, request=None,
# Note that hrss here actually has units of s^(-1/2)
# XXX obviously need to refactor here.
try:
- pi = 3.14152
+ pi = math.pi
c = 2.99792E10
G = 6.674E-8
fluence = pi * pow(c,3) * pow(event.frequency,2)
--
GitLab