From dc4abbe4214bf6957522f4a674b6676ed9764c93 Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Mon, 23 Jan 2017 10:37:08 -0600
Subject: [PATCH] fix to new FAR display for cases where far is None
---
gracedb/views.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/gracedb/views.py b/gracedb/views.py
index 23b0703ae..0e5689768 100644
--- a/gracedb/views.py
+++ b/gracedb/views.py
@@ -355,11 +355,14 @@ def view(request, event):
# Calculate easy-to-understand FAR for display purposes.
# Display as 1 per X years if X > 1 or 1/X per year if X <= 1.
- far_yr = display_far * (86400*365.25) # yr^-1
- if (far_yr < 1):
- display_far_yr = "1 per {0:0.5g} years".format(1.0/far_yr)
- else:
- display_far_yr = "{0:0.5g} per year".format(far_yr)
+ display_far_yr = display_far
+ # Make sure far is not None (handle case of External events)
+ if display_far:
+ far_yr = display_far * (86400*365.25) # yr^-1
+ if (far_yr < 1):
+ display_far_yr = "1 per {0:0.5g} years".format(1.0/far_yr)
+ else:
+ display_far_yr = "{0:0.5g} per year".format(far_yr)
context['display_far_yr'] = display_far_yr
# Does the user have permission to sign off on the event as the control room operator?
--
GitLab