Fixed various problems with reports page that I forgot to update after the...

Fixed various problems with reports page that I forgot to update after the Group/Pipeline/Search related changes. Actually, these had not been updated much since ER1, apparently.

gracedb/management/commands/make_histograms.py

@@ -21,7 +21,10 @@ DEST_DIR = settings.LATENCY_REPORT_DEST_DIR
 MAX_X = settings.LATENCY_MAXIMUM_CHARTED
 
 WEB_PAGE_FILE_PATH = settings.LATENCY_REPORT_WEB_PAGE_FILE_PATH
+URL_PREFIX = settings.REPORT_INFO_URL_PREFIX
 
+# XXX Branson introduced during ER6 to clean things up a bit.
+PIPELINE_EXCLUDE_LIST = ['HardwareInjection', 'X', 'Q', 'Omega', 'Ringdown', 'LIB',]
 
 
 class Command(NoArgsCommand):
@@ -42,6 +45,8 @@ class Command(NoArgsCommand):
         # Make the histograms, save as png's.
         for pipeline in Pipeline.objects.all():
 #        for atype, atype_name in Event.ANALYSIS_TYPE_CHOICES:
+            if pipeline.name in PIPELINE_EXCLUDE_LIST:
+                continue
             pname = pipeline.name
             annotations[pname] = {}
             for start_time, time_range in time_ranges:
@@ -84,6 +89,8 @@ def writeIndex(notes, fname):
     table += "</tr>"
     for pipeline in Pipeline.objects.all():
     #for atype, atype_name in Event.ANALYSIS_TYPE_CHOICES:
+        if pipeline.name in PIPELINE_EXCLUDE_LIST:
+            continue
         pname = pipeline.name
         table += "<tr>"
         table += "<td>%s</td>" % pname
@@ -93,7 +100,7 @@ def writeIndex(notes, fname):
             extra = ""
             if n['fname'] is not None:
                 table += '<img width="400" height="300" src="%s"/>' % \
-                           os.path.basename(n['fname'])
+                           (URL_PREFIX + os.path.basename(n['fname']))
                 extra = "%d total events" % n['count']
             else:
                 extra = "No Applicable Events"

gracedb/management/commands/make_ifar.py

@@ -105,11 +105,15 @@ class Command(NoArgsCommand):
                 ifar_none(title, "No Data", filename)
         return
 
-        query = parseQuery("LowMass now yesterday .. now")
+        # XXX Branson fixing during ER6
+        #query = parseQuery("gstlal yesterday .. now")
+        query = parseQuery("gstlal now yesterday .. now")
         events = Event.objects.filter(query).distinct()
         if events.count() > 0:
-            axis_label = "GraceDB CBC LowMass ER1 events"
-            title = r"ER1 FARs from gstlal_ll_inspiral - last day"
+            axis_label = "GraceDB gstlal events"
+            # XXX Branson edited during ER6
+            # title = r"ER1 FARs from gstlal_ll_inspiral - last day"
+            title = r"FARs from gstlal - last day"
             filename = os.path.join(settings.REPORT_IFAR_IMAGE_DIR, "ifar_day.png")
             ifar_chart(events, title, axis_label, filename)
         else:
@@ -119,11 +123,12 @@ class Command(NoArgsCommand):
             except:
                 pass
 
-        query = parseQuery("LowMass a week ago .. now")
+        query = parseQuery("gstlal a week ago .. now")
         events = Event.objects.filter(query).distinct()
         if events.count() > 0:
-            axis_label = "GraceDB CBC LowMass ER1 events"
-            title = r"ER1 FARs from gstlal_ll_inspiral - last week"
+            axis_label = "GraceDB gstlal events"
+            #title = r"ER1 FARs from gstlal_ll_inspiral - last week"
+            title = r"FARs from gstlal - last week"
             filename = os.path.join(settings.REPORT_IFAR_IMAGE_DIR, "ifar_week.png")
             ifar_chart(events, title, axis_label, filename)
         else:

gracedb/reports.py

@@ -63,6 +63,7 @@ def histo(request):
              'ifar' : ifar,
              'uptime' : uptime,
              'rate' : json.dumps(rate_data(request)),
+             'url_prefix' : settings.REPORT_INFO_URL_PREFIX,
             },
             context_instance=RequestContext(request))
 

settings/default.py

@@ -105,6 +105,8 @@ LATENCY_REPORT_WEB_PAGE_FILE_PATH = LATENCY_REPORT_DEST_DIR + "/latency.inc"
 # Uptime reporting
 UPTIME_REPORT_DIR = "/home/gracedb/data/uptime"
 
+# URL prefix for serving report information (usually plots and tables)
+REPORT_INFO_URL_PREFIX = "/report_info/"
 
 # Find another way to do this.
 #
@@ -122,16 +124,29 @@ yesterday = posixToGpsTime(time.mktime(yesterday.timetuple()))
 lastweek = posixToGpsTime(time.mktime(lastweek.timetuple()))
 
 REPORT_IFAR_IMAGE_DIR = LATENCY_REPORT_DEST_DIR
+#REPORTS_IFAR = [
+#    #(query, axis_label, title, fname),
+#    ("LowMass %d..%d" % (yesterday, now),
+#     "GraceDB CBC LowMass ER1 events",
+#     "ER1 FARs from gstlal_ll_inspiral - last day",
+#     "ifar_day.png"
+#    ),
+#    ("LowMass %d..%d" % (lastweek, now),
+#     "GraceDB CBC LowMass ER1 events",
+#     "ER1 FARs from gstlal_ll_inspiral - last week",
+#     "ifar_week.png"
+#    ),
+#]
 REPORTS_IFAR = [
     #(query, axis_label, title, fname),
-    ("LowMass %d..%d" % (yesterday, now),
-     "GraceDB CBC LowMass ER1 events",
-     "ER1 FARs from gstlal_ll_inspiral - last day",
+    ("gstlal %d..%d" % (yesterday, now),
+     "GraceDB gstlal events",
+     "FARs from gstlal - last day",
      "ifar_day.png"
     ),
-    ("LowMass %d..%d" % (lastweek, now),
-     "GraceDB CBC LowMass ER1 events",
-     "ER1 FARs from gstlal_ll_inspiral - last week",
+    ("gstlal %d..%d" % (lastweek, now),
+     "GraceDB gstlal events",
+     "FARs from gstlal - last week",
      "ifar_week.png"
     ),
 ]

templates/gracedb/histogram.html

@@ -104,7 +104,7 @@ function toggle(id) {
 <div id="ifar" style="display:none;">
 {% if ifar %}
     {% for chart in ifar %}
-        <img src="{{ chart }}"><br/>
+        <img src="{{url_prefix}}{{ chart }}"><br/>
     {% endfor %}
 {% else %}
      No IFAR charts.