From 3bd9f6184ebb11b7cbfa905e7aa5415a9a891f69 Mon Sep 17 00:00:00 2001 From: Jessie Thwaites Date: Sun, 23 Jul 2023 11:13:36 -0500 Subject: [PATCH] O4 realtime (#50) * updating public webpages * document if on realtime * don't label events if not 1000s tw * look in albert home while lvk_dropbox is down * new script to convert multiorder maps * pointing back to dropbox * nside checks, 512 for 1000s followup * nside arg for moc conversion script * public webpage labels for sig and subthr * return if real event in heartbeat mode * Merge branch 'master' of github.com:icecube/FastResponseAnalysis into o4_realtime * load up to 5000s to check for events in realtime * add internal public webpage fxn * event time def earlier * get gcn in case p<0.1 * try for pickle load * index at 1 instead of 0 for events on skymap * add a try to convert from moc * add email/sms notif * internal alerts pub webpage updates * formatting for alerts webpage * increment versioning * dont send most prob direction if no coinc events * change header for public wp * make plots w file modification time * precomp gw bg trials --- .gitignore | 5 +- fast_response/FastResponseAnalysis.py | 2 +- fast_response/GWFollowup.py | 17 ++-- .../MonitoringAndMocks/Data_Display.py | 15 ++- fast_response/listeners/gcn_listener.py | 2 +- fast_response/listeners/gw_gcn_listener.py | 47 ++++++--- .../precomputed_background/precompute_ts.py | 2 + .../submit_precomputed_trials.py | 23 +++-- fast_response/reports/ReportGenerator.py | 2 +- .../scripts/combine_results_kafka.py | 32 ++++-- .../scripts/convert_moc_to_healpix.py | 2 + fast_response/scripts/push_internal_public.py | 35 +++++++ fast_response/web_utils.py | 98 +++++++++++++++++-- html/gw_pub_templ_base.html | 4 +- setup.py | 2 +- 15 files changed, 226 insertions(+), 62 deletions(-) mode change 100644 => 100755 fast_response/scripts/convert_moc_to_healpix.py create mode 100644 fast_response/scripts/push_internal_public.py diff --git a/.gitignore b/.gitignore index e5635e9..ae8b0c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ *.pyc -*.fits +*.fit* *.xml *.json *.txt @@ -21,4 +21,5 @@ fast_response/results_dataframe_bkup.pkl fast_response/scripts/make_call.py cascade_skymaps/ *.png -fast_response/test_plotting* +fast_response/tests/ +fast_response/slack_posters/lvk_email_sms_notif.py diff --git a/fast_response/FastResponseAnalysis.py b/fast_response/FastResponseAnalysis.py index 134fd09..4591a7b 100644 --- a/fast_response/FastResponseAnalysis.py +++ b/fast_response/FastResponseAnalysis.py @@ -602,7 +602,7 @@ def plot_skymap(self, with_contour=False, contour_files=None, label_events=False hp.projscatter(theta,phi,c=cols,marker='x',label='GFU Event',coord='C', zorder=5) if label_events: for j in range(len(theta)): - hp.projtext(theta[j], phi[j]-0.11, '{}'.format(j), color='red', fontsize=18, zorder=6) + hp.projtext(theta[j], phi[j]-0.11, '{}'.format(j+1), color='red', fontsize=18, zorder=6) handles.append(Line2D([0], [0], marker='x', ls='None', label='GFU Event')) if (self.stop - self.start) <= 0.5: #Only plot contours if less than 2 days diff --git a/fast_response/GWFollowup.py b/fast_response/GWFollowup.py index 4af2024..a7291bf 100644 --- a/fast_response/GWFollowup.py +++ b/fast_response/GWFollowup.py @@ -9,7 +9,6 @@ mpl.use('agg') import matplotlib.pyplot as plt import pickle -from astropy.time import Time from .FastResponseAnalysis import PriorFollowup from .reports import GravitationalWaveReport @@ -75,9 +74,9 @@ def run_background_trials(self, month=None, ntrials=1000): self.duration * 86400., closest_rate, self.duration * 86400.)) #check for nside mismatch - if hp.pixelfunc.get_nside(pre_ts_array.shape[1]) != self.nside: - print('Error! Analysis uses nside of %i '.format(self.nside)+ - 'while precomputed BG is nside %i'.format(hp.pixelfunc.get_nside(pre_ts_array.shape[1]))) + #if hp.pixelfunc.get_nside(pre_ts_array.shape[1]) != self.nside: + # print('Error! Analysis uses nside of %i '.format(self.nside)+ + # 'while precomputed BG is nside %i'.format(hp.pixelfunc.get_nside(pre_ts_array.shape[1]))) ts_norm = np.log(np.amax(self.skymap)) ts_prior = pre_ts_array.copy() @@ -136,10 +135,10 @@ def check_events_after(self): check_passed = False if there are no events after (should re-load!) ''' t1 = Time(datetime.datetime.utcnow()).mjd - if ((t1-self.stop)*86400.)>1000.: + if ((t1-self.stop)*86400.)>5000.: #if it's been long enough, only load 1000s - print('Loading 1000s of data after the time window') - t1 = self.stop + 1000./86400. + print('Loading 2000s of data after the time window') + t1 = self.stop + 2000./86400. exp_long, livetime_long, grl_long = self.dset.livestream( self.start, t1, @@ -327,12 +326,12 @@ def write_circular(self): except: noticeID = 'NOTICEID' - if pvalue > 0.01: + if pvalue > 0.1: template_path = os.path.join(base, 'circular_templates/gw_gcn_template_low.txt') else: template_path = os.path.join(base, 'circular_templates/gw_gcn_template_high.txt') - if pvalue>0.01: + if pvalue>0.1: with open(template_path, 'r') as gcn_template: gcn = gcn_template.read() diff --git a/fast_response/MonitoringAndMocks/Data_Display.py b/fast_response/MonitoringAndMocks/Data_Display.py index ff09b50..2ca5b69 100755 --- a/fast_response/MonitoringAndMocks/Data_Display.py +++ b/fast_response/MonitoringAndMocks/Data_Display.py @@ -56,7 +56,7 @@ def dial_up(who="jessie"): all_dictionary['Name'].append(file) for file in all_dictionary["Name"]: date_format = "%Y-%m-%d" - c_timestamp = os.path.getctime(file) + c_timestamp = os.path.getmtime(file) c_datestamp = datetime.datetime.utcfromtimestamp(c_timestamp) all_dictionary['Time_Stamp'].append(c_datestamp) print('Finished loading all latencies.') @@ -83,7 +83,7 @@ def dial_up(who="jessie"): Quality_Pickles = [] for file in Pickle_Files: - c_timestamp = os.path.getctime(file) + c_timestamp = os.path.getmtime(file) c_datestamp = datetime.datetime.fromtimestamp(c_timestamp) if (c_datestamp >= datetime.datetime.strptime('2022-12-05', date_format)): Quality_Pickles.append(file) @@ -113,7 +113,7 @@ def dial_up(who="jessie"): First_Batch['Name'].append(file) for file in First_Batch["Name"]: date_format = "%Y-%m-%d" - c_timestamp = os.path.getctime(file) + c_timestamp = os.path.getmtime(file) c_datestamp = datetime.datetime.fromtimestamp(c_timestamp) First_Batch['Time_Stamp'].append(c_datestamp) print('Finished loading 1st map latencies.') @@ -158,7 +158,7 @@ def dial_up(who="jessie"): Last_Batch['Name'].append(file) for file in Last_Batch["Name"]: date_format = "%Y-%m-%d" - c_timestamp = os.path.getctime(file) + c_timestamp = os.path.getmtime(file) c_datestamp = datetime.datetime.fromtimestamp(c_timestamp) Last_Batch['Time_Stamp'].append(c_datestamp) print('Finished loading last map latencies') @@ -662,6 +662,7 @@ def outlier_name(outlier_list, outlier_names): save_path='/home/mromfoe/public_html/O4_followup_monitoring/ReportsPerDay_liveupdate.png' +plt.tight_layout() fig.savefig(save_path) fig.savefig("ReportsPerDay.png") @@ -746,7 +747,11 @@ def make_bg_pval_dist(fontsize=15, lower_y_bound=-3.5): print('Loading %i mocks (may take a while)'%(len(saved_mock_pkl))) for mock in saved_mock_pkl: with open(mock,'rb') as f: - result=pickle.load(f) + try: + result=pickle.load(f) + except: + print('skipped {}'.format(mock)) + continue all_mocks[result['name']]=result['p'] print('Done loading mocks.') diff --git a/fast_response/listeners/gcn_listener.py b/fast_response/listeners/gcn_listener.py index 6dfbc55..665f74f 100644 --- a/fast_response/listeners/gcn_listener.py +++ b/fast_response/listeners/gcn_listener.py @@ -35,6 +35,7 @@ def process_gcn(payload, root): for elem in root.iterfind('.//Param')} stream = params['Stream'] + eventtime = root.find('.//ISOTime').text if stream == '26': print("Detected cascade type alert, running cascade followup. . . ") alert_type='cascade' @@ -52,7 +53,6 @@ def process_gcn(payload, root): event_id = params['event_id'] run_id = params['run_id'] - eventtime = root.find('.//ISOTime').text event_mjd = Time(eventtime, format='isot').mjd try: bot.send_message(f'Listener found {alert_type} type alert, {event_name} \n'+ diff --git a/fast_response/listeners/gw_gcn_listener.py b/fast_response/listeners/gw_gcn_listener.py index b08be02..7bd03f8 100755 --- a/fast_response/listeners/gw_gcn_listener.py +++ b/fast_response/listeners/gw_gcn_listener.py @@ -109,28 +109,43 @@ def process_gcn(payload, root): skymap = params['skymap_fits'] - # Skymap distributed is a different format than previous, but previous is available. - # Download correct format from GraceDB + # Multiorder Coverage (MOC) map links are distributed over the GCNs. + # Download flattened (normal healpy) map from GraceDB if 'multiorder' in skymap: time.sleep(6.) #if we don't wait, the old format isn't uploaded - try: - #HERE: added .fits but not impl yet. need to keep baystar/bilby naming? - bayestar_map=skymap.replace('multiorder.','').split(',') - if len(bayestar_map)==1: + try: + #Try to get flat-res healpy map + flat_map=skymap.replace('multiorder.','').split(',') + if len(flat_map)==1: suffix='.gz' else: - suffix = '.gz,'+ bayestar_map[1] - new_map = bayestar_map[0]+suffix - map_type= bayestar_map[0].split('/')[-1] - - wget.download(new_map, out=os.environ.get('FAST_RESPONSE_OUTPUT')+f'skymaps/{name}_{map_type}{suffix}') - skymap=os.environ.get('FAST_RESPONSE_OUTPUT')+f'skymaps/{name}_{map_type}{suffix}' + suffix = '.gz,'+ flat_map[1] + new_map = flat_map[0]+suffix + map_type= flat_map[0].split('/')[-1] + + wget.download(new_map, out=os.path.join(os.environ.get('FAST_RESPONSE_OUTPUT'),f'skymaps/{name}_{map_type}{suffix}')) + skymap=os.path.join(os.environ.get('FAST_RESPONSE_OUTPUT'),f'skymaps/{name}_{map_type}{suffix}') except: - print('Failed to download skymap in correct format! \nDownload skymap and then re-run script with') - print(f'args: --time {event_mjd} --name {name} --skymap PATH_TO_SKYMAP') + print('Failed to download flat-resolution skymap. Trying to convert MOC map') log_file.flush() - return - #TODO: add make_call to me here if this fails + + try: + filename=skymap.split('/')[-1] + new_output = os.path.join(os.environ.get('FAST_RESPONSE_OUTPUT'),f'skymaps/{name}_{filename}') + wget.download(skymap, out=new_output) + subprocess.call([os.path.join(analysis_path, 'convert_moc_to_healpix.py'), + '--skymap', new_output]) + if os.path.exists(new_output.replace('multiorder','converted')): + skymap = new_output.replace('multiorder','converted') + print('Successfully converted map: {}'.format(skymap)) + log_file.flush() + else: + raise Exception('Failed to convert map.') + except: + print('Failed to get skymap in correct format! \nDownload skymap and then re-run script with') + print(f'args: --time {event_mjd} --name {name} --skymap PATH_TO_SKYMAP') + log_file.flush() + return if root.attrib['role'] != 'observation': name=name+'_test' diff --git a/fast_response/precomputed_background/precompute_ts.py b/fast_response/precomputed_background/precompute_ts.py index 990555f..aaf9ee4 100644 --- a/fast_response/precomputed_background/precompute_ts.py +++ b/fast_response/precomputed_background/precompute_ts.py @@ -35,6 +35,8 @@ outdir = os.environ.get('FAST_RESPONSE_OUTPUT') except: outdir = './' +else: + outdir = args.outdir if not os.path.exists(outdir+'/trials/'): os.mkdir(outdir+'/trials/') outdir=outdir+'/trials/' diff --git a/fast_response/precomputed_background/submit_precomputed_trials.py b/fast_response/precomputed_background/submit_precomputed_trials.py index 748e88a..320257a 100644 --- a/fast_response/precomputed_background/submit_precomputed_trials.py +++ b/fast_response/precomputed_background/submit_precomputed_trials.py @@ -18,8 +18,8 @@ '--seed_start', type=int,default=0, help='Seed to start with when running trials') parser.add_argument( - '--n_per_batch', default=50, type=int, - help='Number of trials to run in each set (default: 50)') + '--n_per_batch', default=500, type=int, + help='Number of trials to run in each set (default: 500)') args = parser.parse_args() username = pwd.getpwuid(os.getuid())[0] @@ -53,16 +53,19 @@ 'when_to_transfer_output = ON_EXIT'] ) -prev_trials = glob.glob('/data/user/jthwaites/FastResponseAnalysis/output/trials/*.npz') +#prev_trials = glob.glob('/data/user/jthwaites/FastResponseAnalysis/output/trials/*.npz') for bg_rate in [6.0, 6.2, 6.4, 6.6, 6.8, 7.0, 7.2]: - for seed in range(args.seed_start, int(args.ntrials/100)):#int(args.ntrials/args.n_per_batch)): + for seed in range(args.seed_start, int(args.ntrials/args.n_per_batch)): seed = seed*100 - if f'/data/user/jthwaites/FastResponseAnalysis/output/trials/gw_{bg_rate}_mHz_seed_{seed}_delta_t_1.2e+06.npz' not in prev_trials: - #deltaT {args.tw} --ntrials 100 --seed {seed} --bkg {bg} - job.add_arg('--deltaT %s --ntrials %i --seed %i --bkg %s' - %(args.tw, args.n_per_batch, seed, bg_rate)) - job.add_arg('--deltaT %s --ntrials %i --seed %i --bkg %s' - %(args.tw, args.n_per_batch, seed+50, bg_rate)) + job.add_arg('--deltaT %s --ntrials %i --seed %i --bkg %s --outdir %s --type gw' + %(args.tw, args.n_per_batch, seed, bg_rate, + '/data/user/jthwaites/new_processing/normal_1000/')) +#dagman = pycondor.Dagman( +# 'fra_1000s_precompbg', +# submit=submit, verbose=2) + +#dagman.add_job(job) +#dagman.build_submit() job.build_submit() diff --git a/fast_response/reports/ReportGenerator.py b/fast_response/reports/ReportGenerator.py index bf74de2..80c57a9 100644 --- a/fast_response/reports/ReportGenerator.py +++ b/fast_response/reports/ReportGenerator.py @@ -232,7 +232,7 @@ def make_coinc_events_table(self, f): )] else: event_table+=[ - ('{}'.format(i), + ('{}'.format(i+1), '{:.0f}'.format((event['time']-self.source['trigger_mjd'])*86400.), "{:3.2f}\degree".format(np.rad2deg(event['ra'])), '{:3.2f}\degree'.format(np.rad2deg(event['dec'])), diff --git a/fast_response/scripts/combine_results_kafka.py b/fast_response/scripts/combine_results_kafka.py index cc873d1..ccf2ff4 100644 --- a/fast_response/scripts/combine_results_kafka.py +++ b/fast_response/scripts/combine_results_kafka.py @@ -8,7 +8,7 @@ import matplotlib as mpl mpl.use('agg') import matplotlib.pyplot as plt -import io, time, os, glob +import io, time, os, glob, subprocess import urllib.request, urllib.error, urllib.parse import argparse import json, pickle @@ -301,15 +301,12 @@ def parse_notice(record, wait_for_llama=False, heartbeat=False): collected_results['observation_livetime'] = 1000 ### COLLECT RESULTS ### - #additional_website_params = {} + send_notif = False + if uml_results_finished: with open(uml_results_path, 'rb') as f: uml_results = pickle.load(f) - #for key in ['skymap_path', 'analysisid']: - # if key in uml_results.keys(): - # additional_website_params[key] = uml_results[key] - if llama_results_finished: with open(llama_results_path, 'r') as f: llama_results = json.load(f) @@ -323,6 +320,9 @@ def parse_notice(record, wait_for_llama=False, heartbeat=False): if uml_results_finished and llama_results_finished: collected_results['pval_generic'] = round(uml_results['p'],4) collected_results['pval_bayesian'] = round(llama_results['p_value'],4) + if (collected_results['pval_generic']<0.01) or (collected_results['pval_bayesian']<0.01): + send_notif=True + if (collected_results['pval_generic']<0.1) or (collected_results['pval_bayesian']<0.1): uml_ontime = format_ontime_events_uml(uml_results['coincident_events'], event_mjd) llama_ontime = format_ontime_events_llama(llama_results['single_neutrino']) @@ -351,6 +351,9 @@ def parse_notice(record, wait_for_llama=False, heartbeat=False): elif uml_results_finished: collected_results['pval_generic'] = round(uml_results['p'],4) collected_results['pval_bayesian'] = 'null' + if collected_results['pval_generic']<0.01: + send_notif=True + if collected_results['pval_generic'] <0.1: uml_ontime = format_ontime_events_uml(uml_results['coincident_events'], event_mjd) coinc_events=[] @@ -383,6 +386,9 @@ def parse_notice(record, wait_for_llama=False, heartbeat=False): elif llama_results_finished: collected_results['pval_generic'] = 'null' collected_results['pval_bayesian'] = round(llama_results['p_value'],4) + if collected_results['pval_bayesian']<0.01: + send_notif=True + if collected_results['pval_bayesian']<0.1: llama_ontime = format_ontime_events_llama(llama_results['single_neutrino']) coinc_events=[] @@ -410,6 +416,9 @@ def parse_notice(record, wait_for_llama=False, heartbeat=False): if (collected_results['n_events_coincident'] == 0) and ('coincident_events' in collected_results.keys()): c = collected_results.pop('coincident_events') + if ('most_likely_direction' in collected_results.keys()): + if (collected_results['n_events_coincident'] == 0): + c = collected_results.pop('most_likely_direction') if ('most_likely_direction' in collected_results.keys()): try: if (collected_results['pval_generic']>0.1): @@ -458,6 +467,17 @@ def parse_notice(record, wait_for_llama=False, heartbeat=False): except: logger.warning('Failed to push to public webpage.') + if send_notif: + sender_script = os.path.join(os.environ.get('FAST_RESPONSE_SCRIPTS'), + '../slack_posters/lvk_email_sms_notif.py') + try: + subprocess.call([sender_script, '--path_to_gcn', + os.path.join(save_location, f'{name}_collected_results.json')]) + logger.info('Sent alert to ROC for p<0.01') + except: + logger.warning('Failed to send email/SMS notification.') + else: + logger.info('p>0.01: no email/sms sent') else: with open(os.path.join(save_location, f'mocks/{name}_collected_results.json'),'w') as f: json.dump(collected_results, f, indent = 6) diff --git a/fast_response/scripts/convert_moc_to_healpix.py b/fast_response/scripts/convert_moc_to_healpix.py old mode 100644 new mode 100755 index 9c29c18..74537d6 --- a/fast_response/scripts/convert_moc_to_healpix.py +++ b/fast_response/scripts/convert_moc_to_healpix.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import numpy as np import matplotlib as mpl mpl.use('agg') diff --git a/fast_response/scripts/push_internal_public.py b/fast_response/scripts/push_internal_public.py new file mode 100644 index 0000000..d41de1c --- /dev/null +++ b/fast_response/scripts/push_internal_public.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python + +import pandas as pd +from fast_response.web_utils import update_internal_public +import argparse, glob, os, sys + +parser = argparse.ArgumentParser(description='Fast Response Followup') +parser.add_argument('--alert_gcn', type=int, default=None, + help='GCN circular number for the initial alert, or (run_id, event_id) to link notice') +parser.add_argument('--fra_circular', type=int, default=None, + help='GCN circular number for FRA circular') +parser.add_argument('--alert_name', type=str, default=None, + help='Alert identifier. Format - track: IceCube-YYMMDDA, cascade: IceCube-Cascade YYMMDDA') +parser.add_argument('--save_location', type=str, default=None, + help='Path to saved FRA results (default uses FAST_RESPONSE_OUTPUT env variable)') +args = parser.parse_args() + +output = os.environ.get('FAST_RESPONSE_OUTPUT') if args.save_location is None else args.save_location +name = args.alert_name.replace(' ','_') + +results_1000s = glob.glob(os.path.join(output, '*{}_1.0e+03_s/*.pickle'.format(name))) +results_2d = glob.glob(os.path.join(output, '*{}_1.7e+05_s/*.pickle'.format(name))) + +if len(results_1000s) != 1 or len(results_2d) != 1: + print('Results pickle files not found. Check output location and re-run') + sys.exit() + +with open(results_1000s[0], 'rb') as f: + analysis_1000 = pd.read_pickle(f) +with open(results_2d[0], 'rb') as fi: + analysis_2d = pd.read_pickle(fi) + +update_internal_public(analysis_1000, analysis_2d, + alert_gcn=args.alert_gcn, fra_circular=args.fra_circular) +print('done.') diff --git a/fast_response/web_utils.py b/fast_response/web_utils.py index e3369a7..e5e6862 100644 --- a/fast_response/web_utils.py +++ b/fast_response/web_utils.py @@ -13,6 +13,7 @@ import matplotlib.pyplot as plt import fast_response import dateutil.parser +from astropy.time import Time username = pwd.getpwuid(os.getuid())[0] if username == 'realtime': username='jthwaites' @@ -165,7 +166,7 @@ def createFastResponsePage(analysis, gw=False): for line in new_f: f.write(line) -def updateFastResponseTable(analysis, gw=False): +def updateFastResponseTable(analysis): r''' Push information from this analysis to overall tables, include new entries where applicable @@ -460,13 +461,94 @@ def createGWEventPage(analysis): for line in new_f: f.write(line) -def sync_to_roc(): - #subprocess.Popen('rsync -a /home/apizzuto/public_html/FastResponse/webpage/ apizzuto@roc.icecube.wisc.edu:/mnt/roc/www/internal/fast_response') - env = dict(os.environ) - subprocess.call(['rsync', '-a', f'/home/{username}/public_html/FastResponse/webpage/', - f'{username}@roc.icecube.wisc.edu:/mnt/roc/www/internal/fast_response'], - env = env - ) +def update_internal_public(analysis_1000, analysis_2d, alert_gcn=None, fra_circular=None): + r''' + Push information from this analysis to summary tables + on PUBLIC FRA followup webpage + Parameters: + ----------- + analysis: dictionary of results + alert_gcn: either a single int (Circular number) or tuple (run id, event id) if linking to notice + fra_circular: GCN circular number for FRA followup + ''' + event_name = analysis_2d['name'].replace(' 1.7e+05 s','') + cascade=True if 'Cascade' in event_name else False + + if type(alert_gcn) == int: + #link to circular for alert event + alert_link = 'href=https://gcn.nasa.gov/circulars/{}'.format(alert_gcn, event_name) + elif type(alert_gcn) == list or type(alert_gcn)==tuple: + if len(alert_gcn)!=2: + print('If linking to notice, need both run id and event id!') + if cascade: + alert_link = 'href=https://gcn.gsfc.nasa.gov/notices_amon_icecube_cascade/{}_{}.amon'.format(alert_gcn[0],alert_gcn[1]) + else: + alert_link = 'href=https://gcn.gsfc.nasa.gov/notices_amon_g_b/{}_{}.amon'.format(alert_gcn[0],alert_gcn[1]) + else: + alert_link='' + print('Link to alert GCN missing!') + event_link = '{}'.format(alert_link, event_name) + + if fra_circular is not None: + fra_link = '{}'.format(fra_circular,fra_circular) + else: + fra_link=' ' + + if '{:.1e}'.format(analysis_1000['sens_range'][0]) == '{:.1e}'.format(analysis_1000['sens_range'][1]): + sens_range_1000 = f'{analysis_1000["sens_range"][0]:.1e}' + else: + sens_range_1000 = f'[{analysis_1000["sens_range"][0]:.1e}, {analysis_1000["sens_range"][1]:.1e}]' + + if '{:.1e}'.format(analysis_2d['sens_range'][0]) == '{:.1e}'.format(analysis_2d['sens_range'][1]): + sens_range_2d = f'{analysis_2d["sens_range"][0]:.1e}' + else: + sens_range_2d = f'[{analysis_2d["sens_range"][0]:.1e}, {analysis_2d["sens_range"][1]:.1e}]' + + tag = ''' + + {} + {} + {} + {} + {} + 1000 seconds + {} + 2.5 + {} + + {} + 2 days + {} + + + '''.format('' if cascade else '', + event_link, fra_link, Time(analysis_2d['start']+1, format='mjd').iso, + 'Cascade' if cascade else 'Track', sens_range_1000, + f'[{analysis_1000["energy_range"][0]:.0e}, {analysis_1000["energy_range"][1]:.0e}]', + '' if cascade else '', + sens_range_2d) + + with open(f"/home/{username}/public_html/public_FRA/internal_alerts_webpage/index.html", "r") as f: + lines = f.readlines() + ind = None + for i in range(len(lines)): + if '' in lines[i]: + ind = i + lines[ind+1:ind+1] = [t + '\n' for t in tag.split('\n')] + with open(f"/home/{username}/public_html/public_FRA/internal_alerts_webpage/index.html", 'w') as f: + for line in lines: + if line == '\n': + continue + else: + f.write(line) + +#def sync_to_roc(): +# #subprocess.Popen('rsync -a /home/apizzuto/public_html/FastResponse/webpage/ apizzuto@roc.icecube.wisc.edu:/mnt/roc/www/internal/fast_response') +# env = dict(os.environ) +# subprocess.call(['rsync', '-a', f'/home/{username}/public_html/FastResponse/webpage/', +# f'{username}@roc.icecube.wisc.edu:/mnt/roc/www/internal/fast_response'], +# env = env +# ) def format_dec_str(dec): if dec < 0: diff --git a/html/gw_pub_templ_base.html b/html/gw_pub_templ_base.html index 9ce7365..a246579 100644 --- a/html/gw_pub_templ_base.html +++ b/html/gw_pub_templ_base.html @@ -3,13 +3,13 @@
-

IceCube Fast Response Analysis: ANALYSISNAME

+

IceCube Follow-up: ANALYSISNAME

Page generated (UTC):ANALYSISCREATIONTIME
- Home + Home

Analysis Results

diff --git a/setup.py b/setup.py index 1b5fb82..2227739 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ import setuptools long_message = 'Fast Response Analysis' -version = "1.1.1" +version = "1.1.3" setuptools.setup( name="fast_response",