diff --git a/rfinder/main.py b/rfinder/main.py index 3986eac..3eb6e36 100644 --- a/rfinder/main.py +++ b/rfinder/main.py @@ -351,6 +351,7 @@ def go(self,cfg_par): 1: 2d plot of RFI flagged by frequency and baseline lenght (plot_rfi_im) 2: 1d plot of RFI flagged by frequency channel (baselines_from_ms) 3: 1d plot of noise increase by frequency channel (for long and short baselines) (priors_flag) + 4: 1d plot of overall RFI flagged by scan, antenna and correlation. If cfg_par['rfi']['chunks']['time_chunks'] is enabled 1: executes 'rfi' and 'plots' procedure dividing the observation in time-steps given by cfg_par['rfi']['chunks']['time_step'] 2: collects the info about the % of RFI for each time step in Alt/Az plots @@ -427,8 +428,28 @@ def go(self,cfg_par): self.logger.warning("------ End of RFI analysis ------\n") task = 'plots' + + if self.cfg_par[task]['plot_summary']['enable']==True: + summary_results = {} + if not self.cfg_par['rfi']['rfi_enable']: + rfi.load_from_ms(self.cfg_par,0,0) + + for axis in self.cfg_par[task]['plot_summary']['axis']: + flag_stats = rfiST.get_flags_summary_stats(self.cfg_par, axis) + summary_results[axis] = dict(flag_stats) + self.logger.warning(f" ------ Plotting {axis} summary plots ------\n") + rfiPL.plot_summary_stats(flag_stats, self.cfg_par, axis) + self.logger.info("------ Summary plot done ------\n") + + if summary_results: + json_file = cfg_par['general']['rfidir'] + f'summary.json' + with open(json_file, 'w') as f: + json.dump(summary_results, f) + + rfiFL.write_html_summaryreport(self.cfg_par) + if self.cfg_par[task]['plot_enable']==True: - + if self.cfg_par['rfi']['chunks']['time_enable']==True: times, start, end = rfiST.time_chunk(self.cfg_par) diff --git a/rfinder/rfi.py b/rfinder/rfi.py index fed0cd3..f718e33 100644 --- a/rfinder/rfi.py +++ b/rfinder/rfi.py @@ -60,6 +60,14 @@ def load_from_ms(self,cfg_par,times=0,counter=0): Chan_width, Chan_freq ''' + STOKES_TYPES = { + 0: "Undefined", 1: "I", 2: "Q", 3: "U", 4: "V", + 5: "RR", 6: "RL", 7: "LR", 8: "LL", + 9: "XX", 10: "XY", 11: "YX", 12: "YY", + 13: "RX", 14: "RY", 15: "LX", 16: "LY", + 17: "XR", 18: "XL", 19: "YR", 20: "YL", + 21: "PP", 22: "PQ", 23: "QP", 24: "QQ" + } if counter == 0 : self.logger.warning("\t ... Field, Antenna & Bandwidth Info ...\n") @@ -82,9 +90,11 @@ def load_from_ms(self,cfg_par,times=0,counter=0): antennas = tables.table(self.msfile +'/ANTENNA') self.ant_pos = np.array(antennas.getcol('POSITION')) - self.ant_wsrtnames = np.array(antennas.getcol('NAME')) + self.ant_names = np.array(antennas.getcol('NAME')) + + #self.ant_wsrtnames = np.array(antennas.getcol('NAME')) - self.ant_names = np.arange(0,self.ant_wsrtnames.shape[0],1) + #self.ant_names = np.arange(0,self.ant_wsrtnames.shape[0],1) self.nant = len(self.ant_names) #logging @@ -96,11 +106,14 @@ def load_from_ms(self,cfg_par,times=0,counter=0): self.logger.warning("\tAntenna names:\t\t"+str(self.ant_names)) antennas.close() + self.ant_names = np.arange(0,self.ant_names.shape[0],1) + spw=tables.table(self.msfile+'/SPECTRAL_WINDOW') self.channelWidths=spw.getcol('CHAN_WIDTH') self.channelFreqs=spw.getcol('CHAN_FREQ') + cfg_par['rfi']['freqs'] = self.channelFreqs[0] cfg_par['rfi']['chan_widths'] = self.channelWidths[0][0] cfg_par['rfi']['lowfreq'] = float(self.channelFreqs[0][0]) cfg_par['rfi']['highfreq'] = float(self.channelFreqs[-1][-1]) @@ -119,6 +132,12 @@ def load_from_ms(self,cfg_par,times=0,counter=0): t=tables.table(self.msfile) + if counter == 0 : + cfg_par['rfi']['scans'] = list(set(t.getcol('SCAN_NUMBER'))) + corr = tables.table(self.msfile +'/POLARIZATION') + corr_types = corr.getcol('CORR_TYPE')[0] + cfg_par['rfi']['corrs'] = [STOKES_TYPES[corr_type] for corr_type in corr_types] + if counter !=0: value_end = times[1] value_start = times[0] @@ -169,9 +188,6 @@ def load_from_ms(self,cfg_par,times=0,counter=0): if cfg_par['rfi']['RFInder_mode'] == 'rms_clip': self.logger.warning('\t Correct noise_measure_edges in rfi of parameter file ###') empty_table=1 - - - t.close() if not self.aperfi_badant: nrbadant =len(int(self.aperfi_badant)) @@ -188,11 +204,13 @@ def load_from_ms(self,cfg_par,times=0,counter=0): rfiST.predict_noise(cfg_par,self.channelWidths,self.interval,self.flag) cfg_par['rfi']['vis_alltimes_baseline'] = self.flag.shape[0]/nrBaseline + t.close() self.logger.info("\t ... info from MS file loaded \n\n") return empty_table + def baselines_from_ms(self,cfg_par): ''' Reads which baselines were used in the observations diff --git a/rfinder/rfinder_default.yml b/rfinder/rfinder_default.yml index 094d6eb..cb6bfc3 100644 --- a/rfinder/rfinder_default.yml +++ b/rfinder/rfinder_default.yml @@ -1,34 +1,47 @@ general: __helpstr: General INPUT directories and filenames - workdir: /home/ramaila/working/PicA/msdir/ #full path to working directory - outdir: results/ #full path to working directory - outlabel: results_3 #label of output directory: rfi_stokes_label - msname: PicA-calibs.ms #name of input ms file - field: 2 #field ID of target of file - telescope: meerkat #telescope of the observations (needed for antenna diameter) - cleanup_enable: true + workdir: /home/username/working/Project1/data/ #full path to working directory + outdir: results/ #full path to working output directory + outlabel: out_0 #label of output directory: rfi_stokes_label + msname: example.ms #name of input ms file + field: 0 #field ID of target of file + cleanup_enable: true #remove intermediate results + ncpu: 4 #number of cpu to get the total flagged data + telescope: #telescope of the observations (needed for antenna diameter) + __helpstr: Telescope of the observations, needed for determining sefd and alt/az + name: meerkat #name of the telescope for auto-completion of the following info. Available choices [meerkat, wsrt, apertif] + diameter: #diameter of the telescope in meters + tsyseff: #effective system temperature in Kelvin + long: #longitude of the telescope + lat: #latitude of the telescope + height: #height/altitude of location rfi: __helpstr: Find RFI in msfile over threshold - rfi_enable: true #if True this module is enabled - polarization: 'q' #xx, yy, xy, yx, q (also in CAPS) - bad_antenna: '[]' #list of bad antennas: for no antennas try '[]' - RFInder_mode: 'use_flags' #uses RFI clip method or simply reads the FLAG column 'use_flags' / 'rms_clip' - rms_clip: 5 #Threshold for RFI identification - noise_measure_edges: [1.400e9, 1.420e9] #min frequency and maximum frequency where to measure average std of visibilities - baseline_cut: 2000 #Cutoff baseline lenght: < = Short, > = Long (615m midpoint of baselines of WSRT) + rfi_enable: true #if True this module is enabled + polarization: 'q' #xx, yy, xy, yx, q (also in CAPS) + bad_antenna: '[]' #list of bad antennas: for no antennas try '[]' + RFInder_mode: 'use_flags' #uses RFI clip method or simply reads the FLAG column 'use_flags' / 'rms_clip' + rms_clip: 5 #Threshold for RFI identification + noise_measure_edges: [1.400e9, 1.420e9] #min frequency and maximum frequency where to measure average std of visibilities + baseline_cut: 200 #Cutoff baseline lenght: < = Short, > = Long (615m midpoint of baselines of WSRT) chunks: __helpstr: separate visibilities in small time intervals and/or larger spectral windows time_enable: true - time_step: 60 #time chunks in minutes + time_step: 60 #time chunks in minutes spw_enable: true - spw_width: 200 #channel width of rebinned output table [MHz] + spw_width: 200 #channel width of rebinned output table [MHz] plots: __helpstr: plot rfi over different axes plot_enable: true - plot_noise: 'rfi' #choose to plot % of RFI, 'rfi', or noise, 'noise', or factor of noise increase, 'noise_factor' in 1D plots - plot_long_short: true #plot all baselines, or only the short and the long + plot_noise: 'rfi' #choose to plot % of RFI, 'rfi', or noise, 'noise', or factor of noise increase, 'noise_factor' in 1D plots + plot_long_short: true #plot all baselines, or only the short and the long + plot_summary: + __helpstr: plot total % flagged visibilities + enable: true + axis: [ant, scan, corr] # Avalable choices [ant, corr, scan] + report: true movies: __helpstr: make movies of output plots 2d_gif: true diff --git a/rfinder/rfinder_files.py b/rfinder/rfinder_files.py index 65eb29f..7742954 100644 --- a/rfinder/rfinder_files.py +++ b/rfinder/rfinder_files.py @@ -317,7 +317,7 @@ def write_html_fullreport(cfg_par): polnum = cfg_par['rfi']['polnum'], noise = np.round(cfg_par['rfi']['theo_rms'][0]*1e3,5), img_tag1 = ''.format(data_uri1), - video_tag1 = ''.format(video_encoded1.decode()), + video_tag1 = ''.format(video_encoded1.decode()), img_tag3 = ''.format(data_uri3), #video_tag1 = ''.format(video_encoded1), #video_tag1 = ''.format(video_encoded1), @@ -348,7 +348,7 @@ def write_html_fullreport(cfg_par): polnum = cfg_par['rfi']['polnum'], noise = np.round(cfg_par['rfi']['theo_rms'][0]*1e3,5), img_tag1 = ''.format(data_uri1), - video_tag1 = ''.format(data_uri2), + video_tag1 = ''.format(data_uri2), img_tag3 = ''.format(data_uri3), )) @@ -411,9 +411,10 @@ def write_html_timereport(cfg_par): exptime = np.round(cfg_par['rfi']['exptime']*60.,2), polnum = cfg_par['rfi']['polnum'], noise = np.round(cfg_par['rfi']['theo_rms'][0]*1e3,5), - video_tag1 = ''.format(video_encoded1.decode()), + video_tag1 = ''.format(video_encoded1.decode()), video_tag2 = ''.format(video_encoded2.decode()), - video_tag3 = ''.format(video_encoded3.decode()) + video_tag3 = ''.format(video_encoded3.decode()), + #video_tag4 = ''.format(video_encoded3.decode()) )) elif cfg_par['plots']['movies']['movies_in_report'] == False: @@ -426,6 +427,73 @@ def write_html_timereport(cfg_par): return 0 + +def write_html_summaryreport(cfg_par): + + # Configure Jinja and ready the template + env = Environment( + loader=FileSystemLoader(cfg_par['general']['template_folder']) + ) + template = env.get_template('summary_template.html') + + #base_template = env.get_template('report.html') + # Content to be published + title = 'RFI summary report: {0:s}'.format(cfg_par['general']['msname']) + + #imagename1 = '/Users/maccagni/Projects/RFI/rfinder_test/rfi/plots/altaz/AltAZ_rfi1297-1317MHz.png' + #data_uri1 = open(imagename1, 'rb').read().encode('base64').replace('\n', '') + image_name1 = cfg_par['general']['plotdir'] + 'ant-summary.png' + if os.path.exists(image_name1): + #video_encoded1 = open(video_name1, "rb").read().encode("base64") + image_encoded1 = base64.b64encode(open(image_name1, "rb").read()) + else: + image_encoded1 = None + + image_name2 = cfg_par['general']['plotdir'] + 'scan-summary.png' + if os.path.exists(image_name2): + image_encoded2 = base64.b64encode(open(image_name2, "rb").read()) + else: + image_encoded2 = None + + image_name3 = cfg_par['general']['plotdir'] + 'corr-summary.png' + if os.path.exists(image_name3): + image_encoded3 = base64.b64encode(open(image_name3, "rb").read()) + else: + image_encoded3 = None + + if cfg_par['plots']['plot_summary']['report'] == True: + + with open(cfg_par['general']['rfidir']+'summary_report.html', "w") as f: +# lenghts = np.array([cfg_par['rfi']['baseline_lenghts']])+0. + f.write(template.render( + title=title, + fieldname=cfg_par['general']['fieldname'], + field=cfg_par['general']['field'], + totchans = int(cfg_par['rfi']['total_channels']), + chan_widths=round(cfg_par['rfi']['chan_widths']/1e3,4), + lowfreq=round(cfg_par['rfi']['lowfreq']/1e6,3), + highfreq=round(cfg_par['rfi']['highfreq']/1e6,3), + startdate = ('{0:%y}{0:%b}{0:%d} {0:%X}'.format(cfg_par['rfi']['startdate'].datetime)), + enddate = ('{0:%y}{0:%b}{0:%d} {0:%X}'.format(cfg_par['rfi']['enddate'].datetime)), + nant = cfg_par['rfi']['nant'], + ant_names = cfg_par['rfi']['ant_names'], + # maxbase = str(np.round(lenghts[0][-1],0)), + # minbase = str(np.round(lenghts[0][0],0)), + # totbase = cfg_par['rfi']['number_baseline'], + exptime = np.round(cfg_par['rfi']['exptime']*60.,2), + polnum = cfg_par['rfi']['polnum'], + noise = np.round(cfg_par['rfi']['theo_rms'][0]*1e3,5), + video_tag1 = ''.format(image_encoded1.decode()), + video_tag2 = ''.format(image_encoded2.decode()), + video_tag3 = ''.format(image_encoded3.decode()), + #video_tag4 = ''.format(image_encoded3.decode()) + )) + + + logger.info('---- Html summary report done ----\n') + + return 0 + def find_altaz_plots(cfg_par): tmp_arr=[] diff --git a/rfinder/rfinder_plots.py b/rfinder/rfinder_plots.py index 5e1142b..cb8f821 100644 --- a/rfinder/rfinder_plots.py +++ b/rfinder/rfinder_plots.py @@ -136,7 +136,7 @@ def plot_rfi_imshow(self,cfg_par,time_step=-1): idx = (np.abs(freqs_plot_bin[i]-freqs)).argmin() freqs_plot_idx[i]=idx - tele= cfg_par['general']['telescope'] + tele= cfg_par['general']['telescope']['name'] if tele == 'meerkat' or tele == 'MeerKAT' or tele == 'meerKAT' or tele == 'meer': input_baselines = np.zeros(6) for i in range (0,len(input_baselines)): @@ -201,7 +201,7 @@ def plot_rfi_imshow(self,cfg_par,time_step=-1): #box_y = [left_h, bottom, 0.12, height] #box_cbar = [left_h+0.13, bottom, 0.05, height] - fig = plt.figure(1, figsize=(12,8)) + fig = plt.figure(1, figsize=(25,10)) ax = plt.axes(box_centre) @@ -313,13 +313,13 @@ def plot_noise_frequency(self,cfg_par,time_step=-1): #open file if os.path.exists(rfi_table) == False: + print(rfi_table) self.logger.error('### Table of RFI results does not exist ###') else: t = fits.open(rfi_table) data_vec = t[1].data cols = t[1].columns - freqs = np.array(data_vec['frequency'],dtype=float) flags = np.array(data_vec['percentage_flags'],dtype=float) noise_factor = np.array(data_vec['noise_factor'],dtype=float) @@ -390,7 +390,7 @@ def plot_noise_frequency(self,cfg_par,time_step=-1): box_centre = [left, bottom, width, height] # initialize figure - fig = plt.figure(1, figsize=(12,8)) + fig = plt.figure(1, figsize=(18,8)) plt.rc('xtick', labelsize=20) # Initialize subplots @@ -520,6 +520,7 @@ def plot_altaz(self,cfg_par,number_chunks): self.logger.info("\t ... Plotting Alt/Az for binned dataset ... \n") if os.path.exists(cfg_par['general']['timetabledir']) == False: + print(cfg_par['general']['timetabledir']) self.logger.error("\t Folder with time subsets missing") table_tmp = str.split(cfg_par['general']['msname'][0],'.MS') @@ -564,6 +565,7 @@ def plot_altaz(self,cfg_par,number_chunks): #open file if os.path.exists(rfi_table) == False: + print(rfi_table) self.logger.error('### Table of RFI results does not exist ###') continue else: @@ -879,7 +881,60 @@ def plot_altaz_short(self,cfg_par): self.logger.info(('\t ... ALT/AZ for {0:s} ...\n').format(cfg_par['general']['fieldname'])) return 0 - + + def plot_summary_stats(self, flag_stats, cfg_par, key='corr'): + + summaryplot = cfg_par['general']['plotdir'] + f'{key}-summary.png' + + # initialize plotting parameters + params = {'font.family' :' serif', + 'font.style' : 'normal', + 'font.weight' : 'book', + 'font.size' : 20.0, + 'axes.linewidth' : 1, + 'lines.linewidth' : 1, + 'xtick.labelsize' : 16, + 'ytick.labelsize' : 16, + 'xtick.direction' :'in', + 'ytick.direction' :'in', + 'xtick.major.size' : 4, + 'xtick.major.width' : 1, + 'xtick.minor.size' : 2, + 'xtick.minor.width' : 1, + 'ytick.major.size' : 4, + 'ytick.major.width' : 1, + 'ytick.minor.size' : 2, + 'ytick.minor.width' : 1, + 'text.usetex' : False, + } + plt.rcParams.update(params) + fig, ax = plt.subplots(figsize=(16,9)) + + plt.ylim(0, 100.0) + antenna_plot = ax.bar(flag_stats.keys(), flag_stats.values(), color="orange", ec="red", align='center') + + if key in ["antenna", "ant"]: + plt.title("Antenna flags") + plt.xlabel("Antenna") + plt.ylabel("% flagged visibilities") + plt.xticks(rotation=90) + plt.savefig(summaryplot) + elif key in ["scan"]: + plt.title("Scan flags") + plt.xlabel("Scan Number") + plt.ylabel("% flagged visibilities") + plt.savefig(summaryplot) + elif key in ["correlation", "corr"]: + plt.title("Correlation flags") + plt.xlabel("Correlation") + plt.ylabel("Flagged percentage (%)") + plt.ylabel("% flagged visibilities") + plt.savefig(summaryplot) + self.logger.info(f" ------ Saving: {summaryplot} ------\n") + plt.close() + + return 0 + def gif_me_up(self,cfg_par,filenames,outmovie): @@ -892,7 +947,7 @@ def gif_me_up(self,cfg_par,filenames,outmovie): for filename in filenames: images.append(io.imread(filename)) - io.mimsave(outmovie,images,duration=1.5) + io.mimsave(outmovie,images,duration=1000,loop=1000) self.logger.info(('\t ... Movie written to file ...\n')) diff --git a/rfinder/rfinder_stats.py b/rfinder/rfinder_stats.py index 456ba69..ee87ef3 100644 --- a/rfinder/rfinder_stats.py +++ b/rfinder/rfinder_stats.py @@ -8,6 +8,7 @@ import glob import casacore.tables as tables import logging +import multiprocessing from astropy.time import Time @@ -151,7 +152,7 @@ def predict_noise(self,cfg_par,channelWidths,interval,flag): polnum = 2 cfg_par['rfi']['polnum'] = polnum - tele= cfg_par['general']['telescope'] + tele= cfg_par['general']['telescope']['name'] if tele == 'meerkat' or tele == 'MeerKAT' or tele == 'meerKAT' or tele == 'meer': tsyseff = 30. # Tsys/eff(K) @@ -160,9 +161,9 @@ def predict_noise(self,cfg_par,channelWidths,interval,flag): tsyseff = 93. diam = 25. else: - self.logger.error('\t Telescope not known or not specified, will use WSRT instead') - tsyseff = 93. - diam = 25. + self.logger.warning(f'\t Telescope {tele} not known or not specified, will use provided telescope info') + tsyseff = cfg_par['general']['telescope']['tsyseff'] + diam = cfg_par['general']['telescope']['diameter'] Aant=np.pi*(diam/2)**2 # collecting area of 1 antenna (m^2) SEFD=2*kB*tsyseff/Aant # frequency independent system equivalent flux density (Jy) @@ -200,7 +201,7 @@ def alt_az(self,cfg_par,time): self.logger.info("\t ... Altitude/Azimuth info ... \n") #open miriad observation - tele= cfg_par['general']['telescope'] + tele= cfg_par['general']['telescope']['name'] coord = cfg_par['rfi']['coords'] if tele == 'meerkat' or tele == 'MeerKAT' or tele == 'meerKAT' or tele == 'meer': @@ -209,7 +210,11 @@ def alt_az(self,cfg_par,time): # Set position of Westerbork (source: http://www.sonel.org/spip.php?page=gps&idStation=884) telescope = EarthLocation(lat= 52.91460037*u.deg, lon=6.60449982*u.deg, height=82.2786*u.m) else: - self.logger.error('\t Observing location unknown, impossible to estimate Alt/Az') + self.logger.warning('\t Observing location unknown, will use provided info to estimate Alt/Az') + lon = cfg_par['general']['telescope']['lat']*u.deg + lat = cfg_par['general']['telescope']['long']*u.deg + height = cfg_par['general']['telescope']['height']*u.m + telescope = EarthLocation(lat=lat, lon=lon, height=height) time = Time(time/3600./24.,format='mjd',scale='utc') frame = AltAz(obstime=time, location=telescope) @@ -223,3 +228,99 @@ def alt_az(self,cfg_par,time): ##self.logger.info("\t ... Alt/Az done ... \n") return obs_altaz + + + def get_flags_summary_stats(self, cfg_par, axis): + """Get total flagged visibilities per given axis value""" + + def data_query(t, taql, name, axis='ant'): + """Query table for flagged data """ + flagtab = t.query(query=taql, columns='DATA_DESC_ID,FLAG') + cell_shape = flagtab.getcell('FLAG', 0).shape + flag_col = np.empty((flagtab.nrows(), cell_shape[0], cell_shape[1]), dtype=bool) + flagtab.getcolnp('FLAG', flag_col) + ddid_col = flagtab.getcol('DATA_DESC_ID') + flagtab.done() + + if axis in ['corr']: + # For this we need to index that data appropriately + vals,counts = np.unique(flag_col[:,:,name],return_counts=True) + name = cfg_par['rfi']['corrs'][name] + else: + vals,counts = np.unique(flag_col,return_counts=True) + name = str(name) + + if len(vals) == 1: + flag_percent = 100.0 if vals[0] else 0.0 + else: + flag_percent = round(100.0*float(counts[1])/float(np.sum(counts)),2) + + self.flag_percents[name] = flag_percent + + def flag_bars(flag_stats, key): + """Displays output directly to the screen console or logfile + https://github.com/IanHeywood/ms_info/blob/master/ms_flags.py + """ + self.logger.info('') + self.logger.info(f'Flagged percentages per {key}:') + self.logger.info('') + self.logger.info(' 0% 20% 40% 60% 80% 100%') + self.logger.info(' | | | | | |') + for fs in flag_stats.items(): + name = fs[0] + average_pc = fs[1] + length = int(average_pc / 2.0) + self.logger.info(' %-9s %-7s %s'% (name,str(round(average_pc,1))+'%','∎' * length)) + self.logger.info('') + + ncpu = cfg_par['general']['ncpu'] + self.logger.info("\t ... Observing time Info ... \n") + self.msfile = cfg_par['general']['msfullpath'] + t=tables.table(self.msfile) + t = t.query(query=f"FIELD_ID=={cfg_par['general']['field']}") + self.flag_percents = multiprocessing.Manager().dict() + processes = [] + if axis in ['ant', 'antenna']: + for index, ant_name in enumerate(cfg_par['rfi']['ant_names']): + taql = f"ANTENNA1=={index} || ANTENNA2=={index}" + p = multiprocessing.Process(target=data_query, args=(t, taql, ant_name)) + p.start() + processes.append(p) + if len(processes) == ncpu: + for p in processes: + p.join() + processes = [] + if len(processes) > 1: + for p in processes: + p.join() + if axis in ['scan']: + scan_ids = list(set(t.getcol('SCAN_NUMBER'))) + for index, scan_id in enumerate(scan_ids): + taql = f'SCAN_NUMBER=={str(scan_id)}' + p = multiprocessing.Process(target=data_query, args=(t, taql, scan_id)) + p.start() + processes.append(p) + if len(processes) == ncpu: + for p in processes: + p.join() + processes = [] + if len(processes) > 1: + for p in processes: + p.join() + if axis in ['corr']: + for index, corr_type in enumerate(cfg_par['rfi']['corrs']): + taql = f'' + p = multiprocessing.Process(target=data_query, args=(t, taql, index, axis)) + p.start() + processes.append(p) + if len(processes) == ncpu: + for p in processes: + p.join() + processes = [] + if len(processes) > 1: + for p in processes: + p.join() + t.close() + flag_bars(self.flag_percents, axis) + + return self.flag_percents diff --git a/rfinder/templates/full_template.html b/rfinder/templates/full_template.html index 7d2c446..6aa19c3 100644 --- a/rfinder/templates/full_template.html +++ b/rfinder/templates/full_template.html @@ -10,7 +10,7 @@ img.a{ position:absolute; top: 75px; - left: 580px; + left: 520px; height:400px; width: 600px; font-family: Veranda; @@ -26,7 +26,7 @@ img.c{ position:absolute; top: 525px; - left: 580px; + left: 520px; height:372px; width: 585px; font-family: Veranda; @@ -55,10 +55,31 @@ width: 580px; font-family: Veranda; } + img.g{ + position:absolute; + top: 525px; + left: 1120px; + height:372px; + width: 585px; + font-family: Veranda; + } + img.h{ + position:absolute; + top: 75px; + left: 1120px; + height:400px; + width: 600px; + font-family: Veranda; + } + p{ + font-family: monospace; + width: 500px; + font-size: 14px; + }

{{ title }}

-

Observation specs

+

Observation Specifications

Field: {{fieldname}} ( ID = {{field}})
Start Date = {{startdate}} {{img_tag1}} {{video_tag2}}
End Date = {{enddate}}

diff --git a/rfinder/templates/fullshort_template.html b/rfinder/templates/fullshort_template.html index b80a706..08684f1 100644 --- a/rfinder/templates/fullshort_template.html +++ b/rfinder/templates/fullshort_template.html @@ -10,7 +10,7 @@ img.a{ position:absolute; top: 75px; - left: 580px; + left: 520px; height:400px; width: 600px; font-family: Veranda; @@ -26,7 +26,7 @@ img.c{ position:absolute; top: 525px; - left: 580px; + left: 520px; height:372px; width: 585px; font-family: Veranda; @@ -55,10 +55,31 @@ width: 580px; font-family: Veranda; } + img.g{ + position:absolute; + top: 525px; + left: 1120px; + height:372px; + width: 585px; + font-family: Veranda; + } + img.h{ + position:absolute; + top: 75px; + left: 1120px; + height:400px; + width: 600px; + font-family: Veranda; + } + p{ + font-family: monospace; + width: 500px; + font-size: 14px; + }

{{ title }}

-

Observation specs

+

Observation Specifications

Field: {{fieldname}} ( ID = {{field}})
Start Date = {{startdate}} {{img_tag1}}
End Date = {{enddate}}

diff --git a/rfinder/templates/summary_template.html b/rfinder/templates/summary_template.html new file mode 100644 index 0000000..4689119 --- /dev/null +++ b/rfinder/templates/summary_template.html @@ -0,0 +1,87 @@ + + + + + {{ title }} + + + + +

{{ title }}

+

Observation Specifications

+

Field: {{fieldname}} ( ID = {{field}})
+Start Date = {{startdate}} {{video_tag2}}
+End Date = {{enddate}}

+ Spectral window
+Number of channels = {{totchans}}
+Channel Width [kHz]= {{chan_widths}}
+Start Frequency [GHz]= {{lowfreq}}
+End Frequency [GHz]= {{highfreq}}

+ Antennas
+Number of Antennas = {{nant}}
+Antenna Names = {{ant_names}}

+ Natural noise predictions
+Time scan on source = {{exptime}} minutes for {{polnum}} polarizations
+Stokes I natural r.m.s. [mJy/b]= {{noise}}
+{{video_tag1}} {{video_tag3}} {{video_tag4}}
+

+RFInder automatically generated this report. +

+ + diff --git a/rfinder/templates/time_template.html b/rfinder/templates/time_template.html index bab5c47..01991d7 100644 --- a/rfinder/templates/time_template.html +++ b/rfinder/templates/time_template.html @@ -10,7 +10,7 @@ img.a{ position:absolute; top: 75px; - left: 580px; + left: 520px; height:400px; width: 600px; font-family: Veranda; @@ -26,16 +26,45 @@ img.c{ position:absolute; top: 525px; - left: 580px; + left: 520px; height:372px; width: 585px; font-family: Veranda; + } + img.d{ + position:absolute; + top: 525px; + left: 1200px; + height:372px; + width: 585px; + font-family: Veranda; + } + img.g{ + position:absolute; + top: 525px; + left: 1120px; + height:372px; + width: 585px; + font-family: Veranda; + } + img.h{ + position:absolute; + top: 75px; + left: 1120px; + height:400px; + width: 600px; + font-family: Veranda; + } + p{ + font-family: monospace; + width: 500px; + font-size: 14px; }

{{ title }}

-

Observation specs

+

Observation Specifications

Field: {{fieldname}} ( ID = {{field}})
Start Date = {{startdate}} {{video_tag2}}
End Date = {{enddate}}

@@ -53,9 +82,9 @@

Observation specs

Natural noise predictions
Time scan on source = {{exptime}} minutes for {{polnum}} polarizations
Stokes I natural r.m.s. [mJy/b]= {{noise}}
-{{video_tag1}} {{video_tag3}}
+{{video_tag1}} {{video_tag3}} {{video_tag4}}


RFInder automatically generated this report.

- \ No newline at end of file + diff --git a/tutorials/T1_rfinder_basic.ipynb b/tutorials/T1_rfinder_basic.ipynb index 4196d89..12e146d 100644 --- a/tutorials/T1_rfinder_basic.ipynb +++ b/tutorials/T1_rfinder_basic.ipynb @@ -52,7 +52,7 @@ "\n", "import rfinder as rfinder\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { @@ -97,11 +97,11 @@ } ], "source": [ - "print '\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+'\n", + "print('\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+')\n", "\n", "rfi_par = rfinder.rfinder()\n", "\n", - "print '\\t+------+\\n\\t Parameters Loaded \\n\\t+------+'\n", + "print('\\t+------+\\n\\t Parameters Loaded \\n\\t+------+')\n", "\n", "#print parameter file \n", "#print(json.dumps(rfi_par.cfg_par, indent=4, sort_keys=True))\n" @@ -150,7 +150,7 @@ "\n", "\n", "\n", - "print '\\t+------+\\n\\t Parameters modified \\n\\t+------+'\n" + "print('\\t+------+\\n\\t Parameters modified \\n\\t+------+')\n" ] }, { @@ -277,7 +277,7 @@ "rfi_pl.rfi_frequency(rfi_par.cfg_par,-1)\n", "\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'\n" + "print('\\t+------+\\n\\t Done \\n\\t+------+')\n" ] }, { @@ -433,7 +433,7 @@ "rfi_pl.plot_noise_frequency(rfi_par.cfg_par,-1)\n", "\n", "\n", - "print '\\t+------+\\n\\t Plots done \\n\\t+------+'\n" + "print('\\t+------+\\n\\t Plots done \\n\\t+------+)'\n" ] }, { @@ -534,7 +534,7 @@ "#create FLAG column in copy of MS file\n", "#rfi.rfi_flag(rfi_par.cfg_par)\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { @@ -564,7 +564,7 @@ "rfi.rfi_flag(rfi_par.cfg_par)\n", "beam = rfi_beam.make_psf(rfi_par.cfg_par)\n", "\n", - "print '\\t+------+\\n\\t Spectra extracted \\n\\t+------+'\n" + "print('\\t+------+\\n\\t Spectra extracted \\n\\t+------+')\n" ] }, { diff --git a/tutorials/T2_rfinder_automated.ipynb b/tutorials/T2_rfinder_automated.ipynb index 2c455d8..264ed27 100644 --- a/tutorials/T2_rfinder_automated.ipynb +++ b/tutorials/T2_rfinder_automated.ipynb @@ -124,7 +124,7 @@ "\n", "help(rfinder)\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { @@ -589,11 +589,11 @@ } ], "source": [ - "print '\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+'\n", + "print('\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+')\n", "\n", "rfi_par = rfinder.rfinder('/Users/maccagni/notebooks/rfinder/rfinder_default.yml')\n", "\n", - "print '\\t+------+\\n\\t Parameters Loaded \\n\\t+------+'\n", + "print('\\t+------+\\n\\t Parameters Loaded \\n\\t+------+')\n", "\n", "#print parameter file \n", "\n", @@ -611,14 +611,14 @@ "\n", "rfi_par.set_dirs()\n", "# Options\n", - "print rfi_par.cfg_par\n", - "print '\\t+------+\\n\\t Parameters modified \\n\\t+------+'\n", + "print(rfi_par.cfg_par)\n", + "print('\\t+------+\\n\\t Parameters modified \\n\\t+------+')\n", "\n", "\n", "run = rfi_par.go(rfi_par.cfg_par)\n", "\n", "if run == 0: \n", - " print '\\t+------+\\n\\t Done \\n\\t+------+'" + " print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { diff --git a/tutorials/T3_rfinder_time_chunks.ipynb b/tutorials/T3_rfinder_time_chunks.ipynb index 8159504..7735621 100644 --- a/tutorials/T3_rfinder_time_chunks.ipynb +++ b/tutorials/T3_rfinder_time_chunks.ipynb @@ -39,7 +39,7 @@ "\n", "import rfinder as rfinder\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { @@ -84,11 +84,11 @@ } ], "source": [ - "print '\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+'\n", + "print('\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+')\n", "\n", "rfi_par = rfinder.rfinder()\n", "\n", - "print '\\t+------+\\n\\t Parameters Loaded \\n\\t+------+'\n", + "print('\\t+------+\\n\\t Parameters Loaded \\n\\t+------+')\n", "\n", "#print parameter file \n", "#print(json.dumps(rfi_par.cfg_par, indent=4, sort_keys=True))\n" @@ -148,7 +148,7 @@ "rfi_par.set_dirs()\n", "\n", "\n", - "print '\\t+------+\\n\\t Parameters modified \\n\\t+------+'\n" + "print('\\t+------+\\n\\t Parameters modified \\n\\t+------+')\n" ] }, { @@ -7075,8 +7075,8 @@ " start = rfi_par.cfg_par['rfi']['startdate']+time_del\n", " end = start+time_delta_plus\n", "\n", - " print \" ------ Working on chunk #{0:d}:\".format(i)\n", - " print \"\\t \\t between {0:%d}{0:%b}{0:%y}: {0:%H}:{0:%M} - {1:%H}:{1:%M}\".format(start.datetime,end.datetime)\n", + " print(" ------ Working on chunk #{0:d}:\".format(i))\n", + " print("\\t \\t between {0:%d}{0:%b}{0:%y}: {0:%H}:{0:%M} - {1:%H}:{1:%M}\".format(start.datetime,end.datetime))\n", "\n", " rfi.load_from_ms(rfi_par.cfg_par,timez)\n", "\n", @@ -7103,7 +7103,7 @@ " \n", "rfiPL.plot_altaz(rfi_par.cfg_par,i)\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { diff --git a/tutorials/T4_rfinder_gifs.ipynb b/tutorials/T4_rfinder_gifs.ipynb index fce662a..103835c 100644 --- a/tutorials/T4_rfinder_gifs.ipynb +++ b/tutorials/T4_rfinder_gifs.ipynb @@ -47,7 +47,7 @@ "from matplotlib import rc\n", "\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { @@ -92,11 +92,11 @@ } ], "source": [ - "print '\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+'\n", + "print('\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+')\n", "\n", "rfi_par = rfinder.rfinder()\n", "\n", - "print '\\t+------+\\n\\t Parameters Loaded \\n\\t+------+'\n", + "print('\\t+------+\\n\\t Parameters Loaded \\n\\t+------+')\n", "\n", "#print parameter file \n", "#print(json.dumps(rfi_par.cfg_par, indent=4, sort_keys=True))\n" @@ -141,7 +141,7 @@ "#plotting options\n", "rfi_par.cfg_par['plots']['altaz_gif'] = True\n", "\n", - "print '\\t+------+\\n\\t Parameters modified \\n\\t+------+'\n" + "print('\\t+------+\\n\\t Parameters modified \\n\\t+------+')\n" ] }, { @@ -211,7 +211,7 @@ " \n", "io.mimsave(out_animation,images,duration=1.5)\n", " \n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { @@ -268,7 +268,7 @@ " images.append(io.imread(filename))\n", "io.mimsave(out_animation,images,duration=1.5)\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { @@ -396,7 +396,7 @@ "\n", "\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { diff --git a/tutorials/T5_rfi_report.ipynb b/tutorials/T5_rfi_report.ipynb index 21a93f6..6f9af71 100644 --- a/tutorials/T5_rfi_report.ipynb +++ b/tutorials/T5_rfi_report.ipynb @@ -36,7 +36,7 @@ "\n", "import rfinder as rfinder\n", "\n", - "print '\\t+------+\\n\\t Done \\n\\t+------+'" + "print('\\t+------+\\n\\t Done \\n\\t+------+')" ] }, { @@ -67,7 +67,7 @@ } ], "source": [ - "print '\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+'\n", + "print('\\t+------+\\n\\t RFInder \\n\\t Parameter File \\n\\t+------+')\n", "\n", "\n", "import rfi\n", @@ -77,7 +77,7 @@ "\n", "\n", "\n", - "print '\\t+------+\\n\\t Parameters Loaded \\n\\t+------+'" + "print('\\t+------+\\n\\t Parameters Loaded \\n\\t+------+')" ] }, { @@ -129,7 +129,7 @@ "\n", "rfi_par.set_dirs()\n", "\n", - "print '\\t+------+\\n\\t Parameters modified \\n\\t+------+'" + "print('\\t+------+\\n\\t Parameters modified \\n\\t+------+')" ] }, { @@ -227,7 +227,7 @@ "rfi.load_from_ms(rfi_par.cfg_par,0)\n", "rfi.baselines_from_ms(rfi_par.cfg_par)\n", "\n", - "print '\\t+------+\\n\\t Html stuff loaded \\n\\t+------+'" + "print('\\t+------+\\n\\t Html stuff loaded \\n\\t+------+')" ] }, { @@ -307,7 +307,7 @@ " video_tag3 = ''.format(video_encoded3) \n", " ))\n", "\n", - "print '\\t+------+\\n\\t Html stuff loaded \\n\\t+------+'" + "print('\\t+------+\\n\\t Html stuff loaded \\n\\t+------+')" ] }, {