diff --git a/GWalarm_screens.kv b/GWalarm_screens.kv index 399618fbf635d0aae233ed7b51507ffaa30752a0..cb759f0aa60a9d25dea41f1313bbd73a049a30d6 100644 --- a/GWalarm_screens.kv +++ b/GWalarm_screens.kv @@ -665,12 +665,6 @@ names:['torep','torep'] current_key:'None' current_sort:'Time Descending' - canvas.before: - Color: - rgba: [0.9,0.9,0.9,1] - Rectangle: - pos:self.pos - size:self.size GridLayout: rows:5 @@ -766,6 +760,12 @@ RV: id:rv size_hint:1,0.79 + canvas.before: + Color: + rgba: [0.9,0.9,0.9,1] + Rectangle: + pos:self.pos + size:self.size BoxLayout: padding:0,2,0,0 size_hint_y:0.08 @@ -947,12 +947,12 @@ background_color: [.2,.2,.4,1] - canvas.before: - Color: - rgba:1,1,1,1 - Rectangle: - pos:self.pos - size:self.size +# canvas.before: +# Color: +# rgba:1,1,1,1 +# Rectangle: +# pos:self.pos +# size:self.size canvas: Color: rgba:0,0,0,1 diff --git a/GWalarm_screens.py b/GWalarm_screens.py index d617c42ad96215bad7c9c75a7d85abe6cfbb16e8..e8c382e19038afd33ba5c8a468525e2becea5814 100644 --- a/GWalarm_screens.py +++ b/GWalarm_screens.py @@ -660,7 +660,7 @@ class InfoPop(Screen): self.manager.get_screen('sky').imgsource=self.rowdict['skymap'] self.manager.current = 'sky' def gloss_open(self): - descdict = {'GraceID': 'Identifier in GraceDB', 'AlertType': 'VOEvent alert type', + descdict = {'GraceID': 'Identifier in GraceDB', 'Instruments': 'List of instruments used in analysis to identify this event', 'FAR': 'False alarm rate for GW candidates with this strength or greater', 'Group': 'Data analysis working group', @@ -757,7 +757,7 @@ def statusupdate(obj): '''LED CONTROL''' if pixels: order = ['GEO 600','LIGO Livingston','LIGO Hanford','Virgo'] - statindexes = [names.index(item) for item in order] + statindexes = [names.index(item) for item in order] stats = [x for _,x in sorted(zip(statindexes,stats))] for i,stat in enumerate(stats): @@ -903,7 +903,7 @@ def plotupdate(obj): if 'img' in str(child): getattr(obj.ids,child).ids.image.reload() - waittime=360 + waittime=1800 i=0 while i < waittime: if main_flag == 1: diff --git a/gcn_test.py b/gcn_test.py index ed795e73371bdd1c4233b9c42123fa1c4725fee8..368221b76d8d1633a87b48a19fee7622292187bf 100644 --- a/gcn_test.py +++ b/gcn_test.py @@ -121,7 +121,7 @@ def process_gcn(payload, root): print(params['GraceID'] +' event adding...') h5file.close() - lookoutfor = ['BBH','BNS','MassGap','NSBH','Terrestrial'] + lookoutfor = ['BBH','BNS','NSBH','MassGap','Terrestrial'] lookoutfor2=['HasNS','HasRemnant'] order = [] order2=[] @@ -185,7 +185,7 @@ def process_gcn(payload, root): finaldist = dist + ' +- '+diststd + ' Mpc' while True: - try: + try: h5file = open_file("Event Database",mode="a",title="eventinfo") break except: @@ -206,7 +206,7 @@ def process_gcn(payload, root): table = h5file.create_table(h5file.root.events,params['GraceID'],Event,'CBC event') except: table=h5file.get_node("/events",params['GraceID']) - else: + else: try: table = h5file.create_table(h5file.root.events,'EventSimulation',Event,'Simulation') except: @@ -270,16 +270,24 @@ def process_gcn(payload, root): if sim: pass else: + #sort the pie values for correct colors + sort_ints = [] + for cat in order: + for i,item in enumerate(lookoutfor): + if cat in item: + sort_ints.append(i) + sorted_vals = [x for _,x in sorted(zip(sort_ints,vals))] + #save the pie of possibilities specindex = np.argmax(vals) fig1, ax1 = plt.subplots(figsize=(4,4)) - colors= [[202/255,214/255,235/255,1],[179/255,242/255,183/255,1], - [238/255,242/255,179/255,1],[231/255,179/255,242/255,1], - [242/255,179/255,179/255,1]] + colors= [[202,214,235,1],[179,242,183,1], + [238,242,179,1],[231,179,242,1], + [242,179,179,1]] - ax1.pie(vals,labels=None,wedgeprops=dict(width=0.5),colors=colors) + ax1.pie(sorted_vals,labels=None,wedgeprops=dict(width=0.5),colors=colors) ax1.axis('equal') # plt.text(0,0.1,'Type:',fontsize=20,transform=ax1.transAxes) # plt.text(0,0,order[specindex],fontsize=20,transform=ax1.transAxes)