O4 RRT Table Fixes

A couple tweaks encountered during ER15

gracedb/events/templatetags/mediaviews.py

@@ -273,9 +273,14 @@ def tag_selecter(name, autoescape=None):
 def is_in_rrt_subcategory(event, rrt_subcategory):
     if rrt_subcategory == "CBC":
         if event.search:
+
             return (
                 event.group.name == "CBC"
                 and not event.search.name == "EarlyWarning"
+            ) | (
+                    event.group.name == "Burst"
+                    and event.pipeline.name =="CWB"
+                    and event.search.name == "BBH"
             )
         else:
             return (
@@ -283,7 +288,11 @@ def is_in_rrt_subcategory(event, rrt_subcategory):
             )
 
     elif rrt_subcategory == "Burst":
-        return event.group.name == "Burst"
+        return (
+            event.group.name == "Burst"
+            and not( event.pipeline.name == "CWB" and
+                 event.search.name == "BBH")
+            )
 
     elif rrt_subcategory == "EarlyWarning" and event.search:
         return event.search.name == "EarlyWarning"

gracedb/superevents/templatetags/rrt_info.py

@@ -29,7 +29,10 @@ def get_template_from_label(sevent):
     # Get filename based on label, or return the advreq message:
     if sevent.labels.filter(name='ADVOK'):
         notice_filename = '{}-initial.json'.format(sevent.superevent_id)
-        circular_filename = 'initial-circular.txt'
+        if sevent.labels.filter(name='RAVEN_ALERT'):
+            circular_filename = 'initial-emcoinc-circular.txt'
+        else:
+            circular_filename = 'initial-circular.txt'
 
     elif sevent.labels.filter(name='ADVNO'):
         notice_filename = '{}-retraction.json'.format(sevent.superevent_id)