discminer 0.1.0__tar.gz → 0.2.0__tar.gz

{discminer-0.1.0 → discminer-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: discminer
-Version: 0.1.0
+Version: 0.2.0
 Summary: Python package for parametric modelling of intensity channel maps from gas discs
 Home-page: https://github.com/andizq/discminer
 Author: Andres F. Izquierdo

{discminer-0.1.0 → discminer-0.2.0}/_mining/make_channels.py

@@ -104,7 +104,7 @@ plt.savefig('channel_maps_model.png', bbox_inches = 'tight', dpi=200)
 plt.close()
 
 #RESIDUAL CHANNELS
-noise_mean, mask = get_noise_mask(datacube.data)
+noise_mean, mask = get_noise_mask(datacube)
 
 residualscube = Cube(datacube.data-modelcube.data, datacube.header, datacube.vchannels, dpc, beam=datacube.beam)
 residualscube.filename = 'cube_residuals_%s.fits'%tag

{discminer-0.1.0 → discminer-0.2.0}/_mining/plot_attributes_model.py

@@ -1,7 +1,5 @@
-from discminer.core import Data
-from discminer.disc2d import General2d
 from discminer.plottools import use_discminer_style, make_up_ax
-import discminer.cart as cart
+from utils import init_data_and_model, get_noise_mask
 
 import numpy as np
 import matplotlib.pyplot as plt
@@ -27,39 +25,16 @@ custom = pars['custom']
 #****************
 file_data = meta['file_data']
 tag = meta['tag']
-au_to_m = u.au.to('m')
 
-dpc = meta['dpc']*u.pc
 Rmax = 1.1*best['intensity']['Rout']*u.au #Max model radius, 10% larger than disc Rout
 
-#*********
-#LOAD DATA
-#*********
-datacube = Data(file_data, dpc) # Read data and convert to Cube object
-vchannels = datacube.vchannels
-
-#****************************
-#INIT MODEL AND PRESCRIPTIONS
-#****************************
-model = General2d(datacube, Rmax, Rmin=0, prototype=True)
-
-model.z_upper_func = cart.z_upper_exp_tapered
-model.z_lower_func = cart.z_lower_exp_tapered
-model.velocity_func = model.keplerian_vertical # vrot = sqrt(GM/r**3)*R
-model.line_profile = model.line_profile_bell
-
-if 'I2pwl' in meta['kind']:
-    model.intensity_func = cart.intensity_powerlaw_rbreak
-elif 'I2pwlnosurf' in meta['kind']:
-    model.intensity_func = cart.intensity_powerlaw_rbreak_nosurf    
-else:
-    model.intensity_func = cart.intensity_powerlaw_rout
+#*******************
+#LOAD DATA AND MODEL
+#*******************
+datacube, model = init_data_and_model()
 
-#**************
-#PROTOTYPE PARS
-#**************
-model.params = copy.copy(best)
-model.params['intensity']['I0'] /= meta['downsamp_factor']
+noise_mean, mask = get_noise_mask(datacube, thres=2)
+vchannels = datacube.vchannels
 model.make_model()
 
 #**************

{discminer-0.1.0 → discminer-0.2.0}/_mining/plot_azimuthal_profiles.py

@@ -1,10 +1,7 @@
-from discminer.core import Data
+from discminer.rail import Rail, Contours
 from discminer.plottools import (get_discminer_cmap,
                                  make_up_ax, mod_major_ticks,
                                  use_discminer_style, mod_nticks_cbars)
-from discminer.rail import Rail, Contours
-from discminer.disc2d import General2d
-import discminer.cart as cart
 
 import numpy as np
 import matplotlib.pyplot as plt
@@ -16,7 +13,7 @@ import copy
 import sys
 
 from argparse import ArgumentParser
-from utils import get_1d_plot_decorators
+from utils import init_data_and_model, get_noise_mask, get_1d_plot_decorators
 
 use_discminer_style()
 
@@ -40,6 +37,7 @@ custom = pars['custom']
 
 vsys = best['velocity']['vsys']
 incl = best['orientation']['incl']
+Rout = best['intensity']['Rout']
 
 clabel, clabel_res, clim0, clim0_res, clim1, clim1_res, unit = get_1d_plot_decorators(args.moment, tag=args.kind)
 
@@ -53,58 +51,22 @@ if args.moment=='velocity':
         clabel = r'Velocity %s %s'%(args.kind, unit)
     else:
         clabel = r'Deprojected Velocity %s %s'%(args.kind, unit)        
-    
-#****************
-#SOME DEFINITIONS
-#****************
-file_data = meta['file_data']
-tag = meta['tag']
-au_to_m = u.au.to('m')
-
-dpc = meta['dpc']*u.pc
-Rout = best['intensity']['Rout']
-Rmax = 1.1*Rout*u.au #Max model radius, 10% larger than disc Rout
-
-#**********
-#LOAD DATA
-#**********
-datacube = Data(file_data, dpc) # Read data and convert to Cube object
-noise = np.std( np.append(datacube.data[:5,:,:], datacube.data[-5:,:,:], axis=0), axis=0)
-mask = np.max(datacube.data, axis=0) < 4*np.mean(noise)
-vchannels = datacube.vchannels
 
-#****************************
-#INIT MODEL AND PRESCRIPTIONS
-#****************************
-model = General2d(datacube, Rmax, Rmin=0, prototype=True)
-
-model.z_upper_func = cart.z_upper_exp_tapered
-model.z_lower_func = cart.z_lower_exp_tapered
-model.velocity_func = model.keplerian_vertical
-model.line_profile = model.line_profile_bell
-
-if 'I2pwl' in meta['kind']:
-    model.intensity_func = cart.intensity_powerlaw_rbreak
-elif 'I2pwlnosurf' in meta['kind']:
-    model.intensity_func = cart.intensity_powerlaw_rbreak_nosurf    
-else:
-    model.intensity_func = cart.intensity_powerlaw_rout
-  
-#**************
-#PROTOTYPE PARS
-#**************
-model.params = copy.copy(best)
-model.params['intensity']['I0'] /= meta['downsamp_factor']
+#*******************
+#LOAD DATA AND MODEL
+#*******************
+datacube, model = init_data_and_model()
 
-#**************************
-#MAKE MODEL (2D ATTRIBUTES)
-#**************************
-model.make_model() #Make model, just needed to load disc geometry
+noise_mean, mask = get_noise_mask(datacube, thres=2)
+vchannels = datacube.vchannels
+model.make_model()
 
 #*************************
 #LOAD MOMENT MAPS
 moment_data = fits.getdata('%s_gaussian_data.fits'%args.moment)
 moment_model = fits.getdata('%s_gaussian_model.fits'%args.moment) 
+#moment_data = fits.getdata('%s_up_doublebell_mask_data.fits'%args.moment)
+#moment_model = fits.getdata('%s_up_doublebell_mask_model.fits'%args.moment) 
 
 #**************************
 #MASK AND COMPUTE RESIDUALS
@@ -125,7 +87,7 @@ if args.kind!='residuals' and args.moment=='velocity': #deproject velocity field
 beam_au = datacube.beam_size.to('au').value
 R_prof = np.arange(2*beam_au, 0.8*Rout, beam_au/4)
 
-color_bounds = np.array([0.33, 0.66, 1.0])*Rout
+color_bounds = np.array([0.5, 1.0])*Rout
 
 rail = Rail(model, map2d, R_prof)
 

{discminer-0.1.0 → discminer-0.2.0}/_mining/plot_moment+offset.py

@@ -23,9 +23,6 @@ use_discminer_style()
 
 parser = ArgumentParser(prog='plot moment maps', description='Plot moment map [velocity, linewidth, [peakintensity, peakint]?')
 args = add_parser_args(parser, moment=True, kind=True, surface=True)
-
-if args.moment=='peakint':
-     args.moment = 'peakintensity'
      
 #**********************
 #JSON AND PARSER STUFF
@@ -46,7 +43,6 @@ ctitle, clabel, clim, cfmt, cmap_mom, cmap_res, levels_im, levels_cc, unit = get
 #****************
 file_data = meta['file_data']
 tag = meta['tag']
-au_to_m = u.au.to('m')
 
 dpc = meta['dpc']*u.pc
 Rmax = 1.1*Rout*u.au #Max model radius, 10% larger than disc Rout
@@ -55,7 +51,7 @@ Rmax = 1.1*Rout*u.au #Max model radius, 10% larger than disc Rout
 #LOAD DATA AND GRID
 #********************
 datacube = Data(file_data, dpc) # Read data and convert to Cube object
-noise_mean, mask = get_noise_mask(datacube.data)
+noise_mean, mask = get_noise_mask(datacube)
 
 #Useful definitions for plots
 with open('grid_extent.json') as json_file:
@@ -117,7 +113,7 @@ for axi in ax[1:]:
     axi.grid(color='k', ls='--')
     
 for i,axi in enumerate(ax):
-    Contours.emission_surface(axi, R, phi, extent=extent, R_lev=np.linspace(0.1, 1.0, 10)*Rout*au_to_m, which=mtags['surf'])
+    Contours.emission_surface(axi, R, phi, extent=extent, R_lev=np.linspace(0.1, 1.0, 10)*Rout*u.au.to('m'), which=mtags['surf'])
      
 patch = Rectangle([-zoomwidth]*2, 2*zoomwidth, 2*zoomwidth, edgecolor=zoomcolor, facecolor='none',
                   lw=2.0, ls=(0, (1,1.5)), capstyle='round')

{discminer-0.1.0 → discminer-0.2.0}/_mining/plot_moment+residuals.py

@@ -22,9 +22,6 @@ use_discminer_style()
 
 parser = ArgumentParser(prog='plot moment maps', description='Plot moment map [velocity, linewidth, [peakintensity, peakint]?')
 args = add_parser_args(parser, moment=True, kind=True, surface=True)
-
-if args.moment=='peakint':
-     args.moment = 'peakintensity'
      
 #**********************
 #JSON AND PARSER STUFF
@@ -45,7 +42,6 @@ ctitle, clabel, clim, cfmt, cmap_mom, cmap_res, levels_im, levels_cc, unit = get
 #****************
 file_data = meta['file_data']
 tag = meta['tag']
-au_to_m = u.au.to('m')
 
 dpc = meta['dpc']*u.pc
 Rmax = 1.1*Rout*u.au #Max model radius, 10% larger than disc Rout
@@ -54,7 +50,7 @@ Rmax = 1.1*Rout*u.au #Max model radius, 10% larger than disc Rout
 #LOAD DATA AND GRID
 #********************
 datacube = Data(file_data, dpc) # Read data and convert to Cube object
-noise_mean, mask = get_noise_mask(datacube.data)
+noise_mean, mask = get_noise_mask(datacube)
 
 #Useful definitions for plots
 with open('grid_extent.json') as json_file:
@@ -129,7 +125,7 @@ for axi in ax:
 for axi in ax[1:]: axi.tick_params(labelleft=False)
 
 for i,axi in enumerate(ax):
-    Contours.emission_surface(axi, R, phi, extent=extent, R_lev=np.linspace(0.1, 1.0, 10)*Rout*au_to_m, which=mtags['surf'])
+    Contours.emission_surface(axi, R, phi, extent=extent, R_lev=np.linspace(0.1, 1.0, 10)*Rout*u.au.to('m'), which=mtags['surf'])
                               
     
 plt.savefig('moment+residuals_%s.png'%mtags['base'], bbox_inches='tight', dpi=200)

{discminer-0.1.0 → discminer-0.2.0}/_mining/plot_peak_residuals.py

@@ -1,10 +1,7 @@
-from discminer.core import Data
 from discminer.plottools import (get_discminer_cmap, append_sigma_panel,
                                  make_up_ax, mod_minor_ticks, mod_major_ticks,
                                  use_discminer_style, mod_nticks_cbars,
                                  make_substructures, make_round_map)
-from discminer.disc2d import General2d
-import discminer.cart as cart
 from discminer.pick import Pick
 from discminer.rail import Contours
 
@@ -15,7 +12,12 @@ from astropy import units as u
 import json
 import copy
 
-from utils import add_parser_args, get_2d_plot_decorators, load_moments
+from utils import (init_data_and_model,
+                   get_noise_mask,
+                   add_parser_args,
+                   get_2d_plot_decorators,
+                   load_moments)
+
 from argparse import ArgumentParser
 
 use_discminer_style()
@@ -24,9 +26,6 @@ parser = ArgumentParser(prog='Identify and show peak residuals', description='Id
 parser.add_argument('-c', '--clean_thres', default=np.inf, type=float, help="Threshold above which peak residuals will be rejected.")
 args = add_parser_args(parser, moment=True, kind=True, surface=True, fold=True, projection=True, Rinner=True, Router=True)
 
-if args.moment=='peakint':
-     args.moment = 'peakintensity'
-
 #**********************
 #JSON AND PARSER STUFF
 #**********************
@@ -59,40 +58,13 @@ au_to_m = u.au.to('m')
 dpc = meta['dpc']*u.pc
 Rmax = 1.1*Rout*u.au #Max model radius, 10% larger than disc Rout
 
-#********
-#LOAD DATA
-#********
-datacube = Data(file_data, dpc) # Read data and convert to Cube object
-noise = np.std( np.append(datacube.data[:5,:,:], datacube.data[-5:,:,:], axis=0), axis=0)
-mask = np.max(datacube.data, axis=0) < 4*np.mean(noise)
-vchannels = datacube.vchannels
-
-#****************************
-#INIT MODEL AND PRESCRIPTIONS
-#****************************
-model = General2d(datacube, Rmax, Rmin=0, prototype=True)
-
-model.z_upper_func = cart.z_upper_exp_tapered
-model.z_lower_func = cart.z_lower_exp_tapered
-model.velocity_func = model.keplerian_vertical # vrot = sqrt(GM/r**3)*R
-model.line_profile = model.line_profile_bell
-
-if 'I2pwl' in meta['kind']:
-    model.intensity_func = cart.intensity_powerlaw_rbreak
-elif 'I2pwlnosurf' in meta['kind']:
-    model.intensity_func = cart.intensity_powerlaw_rbreak_nosurf    
-else:
-    model.intensity_func = cart.intensity_powerlaw_rout
-
-#**************
-#PROTOTYPE PARS
-#**************
-model.params = copy.copy(best)
-model.params['intensity']['I0'] /= meta['downsamp_factor']
+#*******************
+#LOAD DATA AND MODEL
+#*******************
+datacube, model = init_data_and_model()
 
-#**************************
-#MAKE MODEL (2D ATTRIBUTES)
-#**************************
+noise_mean, mask = get_noise_mask(datacube, thres=2)
+vchannels = datacube.vchannels
 model.make_model()
 
 #*************************
@@ -177,23 +149,23 @@ if args.projection=='cartesian':
     levels_resid = np.linspace(-clim, clim, 32)
     
     if args.surface in ['up', 'upper']:
-        z_func = cart.z_upper_exp_tapered
+        z_func = model.z_upper_func
         z_pars = best['height_upper']
 
     elif args.surface in ['low', 'lower']:
-        z_func = cart.z_lower_exp_tapered
+        z_func = model.z_lower_func
         z_pars = best['height_lower']
     
     fig, ax = make_round_map(folded_map, levels_resid, pick.X*u.au, pick.Y*u.au, R_prof[-1]*u.au,
                              z_func=z_func, z_pars=z_pars, incl=incl, PA=PA, xc=xc, yc=yc,
-                             cmap=cmap_res, unit=unit, fmt=cfmt, 
+                             cmap=cmap_res, clabel=unit, fmt=cfmt, 
                              rings=rings,
                              mask_wedge=(90, 270)*u.deg,
                              mask_inner=R_prof[0]*u.au)
     ax.scatter(lev*cos_peak, lev*sin_peak, edgecolors='none', facecolors=color, alpha=0.2, s=100)
     ax.scatter(lev*cos_peak, lev*sin_peak, edgecolors='none', facecolors=color, alpha=1.0, s=10)
     ax.scatter(lev*cos_peak, lev*sin_peak, edgecolors='0.3', facecolors='none', alpha=1.0, s=100)
-    ax.set_title('%s, folded map'%ctitle, fontsize=12, color='k')
+    ax.set_title('%s, folded map'%ctitle, fontsize=16, color='k')
     
 
 plt.savefig('folded_residuals_deproj_%s_%s.png'%(mtags['base'], args.projection), bbox_inches='tight', dpi=200)

{discminer-0.1.0 → discminer-0.2.0}/_mining/plot_radial_profiles.py

@@ -1,30 +1,33 @@
-from discminer.core import Data
-from discminer.plottools import (get_discminer_cmap,
+from discminer.plottools import (get_discminer_cmap, make_substructures,
                                  make_up_ax, mod_minor_ticks, mod_major_ticks,
                                  use_discminer_style, mod_nticks_cbars)
 from discminer.rail import Rail, Contours
-from discminer.disc2d import General2d
-import discminer.cart as cart
 
 import numpy as np
 import matplotlib.pyplot as plt
 from scipy.signal import savgol_filter
+from scipy.interpolate import interp1d
 
 from astropy import units as u
 from astropy.io import fits
 import json
 import copy
 
-from utils import get_1d_plot_decorators, load_moments, add_parser_args
+from utils import (init_data_and_model,
+                   get_noise_mask,
+                   get_1d_plot_decorators,
+                   load_moments,
+                   load_disc_grid,
+                   add_parser_args,
+                   make_1d_legend,
+                   MEDIUM_SIZE)
+
 from argparse import ArgumentParser
 
 use_discminer_style()
 
 parser = ArgumentParser(prog='plot radial profiles', description='Plot radial profiles from moments and residuals [velocity, linewidth, [peakintensity, peakint]?')
-args = add_parser_args(parser, moment=True, kind=True, surface=True, writetxt=True, mask_ang=True)
-
-if args.moment=='peakint':
-     args.moment = 'peakintensity'
+args = add_parser_args(parser, moment=True, kind=True, surface=True, writetxt=True, mask_minor=True, mask_major=True, Rinner=True, Router=True)
 
 #**********************
 #JSON AND PARSER STUFF
@@ -39,65 +42,38 @@ custom = pars['custom']
 Mstar = best['velocity']['Mstar']
 vsys = best['velocity']['vsys']
 vel_sign = best['velocity']['vel_sign']
+Rout = best['intensity']['Rout']
 incl = best['orientation']['incl']
 
 gaps = custom['gaps']
 rings = custom['rings']
-kinks = custom['kinks']
+Rmax = 1.1*Rout*u.au #Max model radius, 10% larger than disc Rout
 
 clabel, clabel_res, clim0, clim0_res, clim1, clim1_res, unit = get_1d_plot_decorators(args.moment)
 
-#****************
-#SOME DEFINITIONS
-#****************
-file_data = meta['file_data']
-tag = meta['tag']
-au_to_m = u.au.to('m')
-
-dpc = meta['dpc']*u.pc
-Rmax = 1.1*best['intensity']['Rout']*u.au #Max model radius, 10% larger than disc Rout
-
-#********
-#LOAD DATA
-#********
-datacube = Data(file_data, dpc) # Read data and convert to Cube object
-noise = np.std( np.append(datacube.data[:5,:,:], datacube.data[-5:,:,:], axis=0), axis=0)
-mask = np.max(datacube.data, axis=0) < 4*np.mean(noise)
-vchannels = datacube.vchannels
-
-#****************************
-#INIT MODEL AND PRESCRIPTIONS
-#****************************
-model = General2d(datacube, Rmax, Rmin=0, prototype=True)
+#*******************
+#LOAD DATA AND MODEL
+#*******************
+datacube, model = init_data_and_model()
 
-model.z_upper_func = cart.z_upper_exp_tapered
-model.z_lower_func = cart.z_lower_exp_tapered
-model.velocity_func = model.keplerian_vertical # vrot = sqrt(GM/r**3)*R
-model.line_profile = model.line_profile_bell
+noise_mean, mask = get_noise_mask(datacube, thres=2)
+vchannels = datacube.vchannels
+model.make_model()
 
-if 'I2pwl' in meta['kind']:
-    model.intensity_func = cart.intensity_powerlaw_rbreak
-elif 'I2pwlnosurf' in meta['kind']:
-    model.intensity_func = cart.intensity_powerlaw_rbreak_nosurf    
-else:
-    model.intensity_func = cart.intensity_powerlaw_rout
+#*************************
+#LOAD DISC GEOMETRY
+R, phi, z = load_disc_grid()
 
-#**************
-#PROTOTYPE PARS
-#**************
-model.params = copy.copy(best)
-model.params['intensity']['I0'] /= meta['downsamp_factor']
-
-#**************************
-#MAKE MODEL (2D ATTRIBUTES)
-#**************************
-model.make_model()
+R_s = R[args.surface]*u.m.to('au')
+phi_s = phi[args.surface]
 
 #*************************
 #LOAD MOMENT MAPS
 moment_data, moment_model, mtags = load_moments(args)
 if mtags['surf']=='both':
     surf_ref = 'upper'
+else:
+    surf_ref = args.surface
 tag_base = mtags['base']
 
 #**************************
@@ -112,7 +88,7 @@ if args.moment=='velocity':
 #**************************
 #MAKE PLOTS
 beam_au = datacube.beam_size.to('au').value
-R_prof = np.arange(1*beam_au, 0.9*best['intensity']['Rout'], beam_au/4)
+R_prof = np.arange(args.Rinner*beam_au, args.Router*Rout, beam_au/5)
 xlim0, xlim1 = 0.5*R_prof[0], 1.05*R_prof[-1]
 
 def writetxt(arr, tag=''):
@@ -144,17 +120,20 @@ def make_savgol(prof):
 
 
 if args.moment=='velocity':
-    mask_ang = args.mask_ang #+-mask around disc minor axis
+    mask_ang = args.mask_minor #+-mask around disc minor axis
     #*******************
     #VELOCITY COMPONENTS
     #*******************    
+
+    #VZ
     rail_vz = Rail(model, moment_residuals, R_prof)
     vel_z, vel_z_error = rail_vz.get_average(mask_ang=mask_ang, surface=surf_ref)
     div_factor_z = get_normalisation(mask_ang, component='z')
 
     vel_z /= div_factor_z
     vel_z_error /= div_factor_z 
-    
+
+    #DVPHI
     rail_phi = Rail(model, moment_residuals_abs, R_prof)
     vel_phi, vel_phi_error = rail_phi.get_average(mask_ang=mask_ang, surface=surf_ref)
     div_factor_phi = get_normalisation(mask_ang, component='phi')
@@ -162,19 +141,46 @@ if args.moment=='velocity':
     vel_phi /= div_factor_phi
     vel_phi_error /= div_factor_phi 
 
-    fig, ax = plt.subplots(ncols=1, nrows=1, figsize=(14,4))
-    ysav_z, ysav_z_deriv = make_savgol(vel_z)
-        
-    ax.plot(R_prof, ysav_z, c='k', lw=3, label=r'$z$-component', zorder=12)
-    ax.fill_between(R_prof, vel_z+vel_z_error, vel_z-vel_z_error, color='k', alpha=0.15, zorder=9)
+    #VPHI
+    rail_phi = Rail(model, np.abs(moment_data-vsys), R_prof)
+    vel_rot, _ = rail_phi.get_average(mask_ang=mask_ang, surface=surf_ref)
+    vel_rot /= div_factor_phi
+    vel_rot_error = vel_phi_error
 
+    #VR
+    mask_r = mask | (np.abs(phi_s) < np.radians(args.mask_major)) | (np.abs(phi_s) > np.radians(180-args.mask_major))
+    moment_data_r = np.where(mask_r, np.nan, moment_data) 
+
+    f_vp = interp1d(R_prof, vel_rot)
+    f_vz = interp1d(R_prof, vel_z)
+    R_interp = np.where((R_s>R_prof[0]) & (R_s<R_prof[-1]), R_s, R_prof[0])
+
+    vr = -1/(np.sin(phi_s)*np.sin(incl)) * (moment_data_r - vsys - vel_sign*f_vp(R_interp)*np.cos(phi_s)*np.sin(incl) + f_vz(R_interp)*np.cos(incl))
+
+    rail_vr = Rail(model, vr, R_prof)
+    vel_r, vel_r_error = rail_vr.get_average(mask_ang=0.0, surface=surf_ref, av_func=np.nanmedian)
+
+    #WRITE?
     if args.writetxt: writetxt([R_prof, vel_z, vel_z_error], tag='vz')
+    if args.writetxt: writetxt([R_prof, vel_r, vel_r_error], tag='vr')
     if args.writetxt: writetxt([R_prof, vel_phi, vel_phi_error], tag='vphi')
+    if args.writetxt: writetxt([R_prof, vel_rot, vel_phi_error], tag='rotationcurve')
     
+    #PLOT 3D VELOCITIES
+    fig, ax = plt.subplots(ncols=1, nrows=1, figsize=(14,4))
+        
     ysav_phi, ysav_phi_deriv = make_savgol(vel_phi)
-    ax.plot(R_prof, ysav_phi, c='dodgerblue', lw=3, label=r'$\phi$-component', zorder=12)
+    ax.plot(R_prof, ysav_phi, c='dodgerblue', lw=3, label=r'$\Delta\upsilon_\phi$', zorder=12)
     ax.fill_between(R_prof, vel_phi+vel_phi_error, vel_phi-vel_phi_error, color='dodgerblue', alpha=0.15, zorder=9)
 
+    ysav_z, ysav_z_deriv = make_savgol(vel_z)    
+    ax.plot(R_prof, ysav_z, c='k', lw=3, label=r'$\upsilon_{\rm z}$', zorder=8)
+    ax.fill_between(R_prof, vel_z+vel_z_error, vel_z-vel_z_error, color='k', alpha=0.15, zorder=8)
+        
+    ysav_r, ysav_r_deriv = make_savgol(vel_r)
+    ax.plot(R_prof, ysav_r, c='#FFB000', lw=3, label=r'$\upsilon_{\rm R}$', zorder=7)
+    ax.fill_between(R_prof, vel_r+vel_r_error, vel_r-vel_r_error, color='#FFB000', alpha=0.15, zorder=7)
+
     ax.axhline(0, lw=2, ls='--', color='0.7')
     
     ax.set_xlabel('Radius [au]')
@@ -183,9 +189,9 @@ if args.moment=='velocity':
     ax.set_ylim(clim0_res, clim1_res)
     mod_major_ticks(ax, axis='x', nbins=10)
     mod_minor_ticks(ax)
-    ax.legend(frameon=False, fontsize=12)
-
-    Contours.make_substructures(ax, gaps=gaps, rings=rings, kinks=kinks)
+    make_1d_legend(ax, fontsize=MEDIUM_SIZE+1)
+    
+    make_substructures(ax, gaps=gaps, rings=rings, label_gaps=True, label_rings=True)
     
     plt.savefig('velocity_components_%s.png'%tag_base, bbox_inches='tight', dpi=200)
     plt.show()
@@ -193,30 +199,24 @@ if args.moment=='velocity':
     #*******************
     #ROTATION CURVE
     #*******************
-    fig, ax = plt.subplots(ncols=1, nrows=1, figsize=(14,4))
-    
-    #DATA CURVE
-    rail_phi = Rail(model, np.abs(moment_data-vsys), R_prof)
-    vel_rot, _ = rail_phi.get_average(mask_ang=mask_ang, surface=surf_ref)
-    vel_rot /= div_factor_phi
+    fig, ax = plt.subplots(ncols=1, nrows=1, figsize=(14,4))        
 
+    #DATA CURVE
     ysav_rot, ysav_rot_deriv = make_savgol(vel_rot)
-    ax.plot(R_prof, ysav_rot, c='tomato', lw=3.5, label=r'Data curve', zorder=12)
-    ax.fill_between(R_prof, vel_rot+vel_phi_error, vel_rot-vel_phi_error, color='tomato', alpha=0.15, zorder=9)
-
-    if args.writetxt: writetxt([R_prof, vel_rot, vel_phi_error], tag='rotationcurve')    
-
+    ax.plot(R_prof, ysav_rot, c='tomato', lw=3.5, label=r'Data', zorder=12)
+    ax.fill_between(R_prof, vel_rot+vel_rot_error, vel_rot-vel_rot_error, color='tomato', alpha=0.15, zorder=9)
+    
     #r"""
     #MODEL CURVE
     rail_phi = Rail(model, np.abs(moment_model-vsys), R_prof)
     vel_phi, _ = rail_phi.get_average(mask_ang=mask_ang, surface=surf_ref)
     vel_phi /= div_factor_phi
     ysav_phi, ysav_phi_deriv = make_savgol(vel_phi)
-    ax.plot(R_prof, ysav_phi, c='0.7', lw=4.0, label=r'Model curve', zorder=11)
+    ax.plot(R_prof, ysav_phi, c='0.7', lw=4.0, label=r'Model', zorder=11)
     #"""
     
     #PERFECT KEPLERIAN
-    coords = {'R': R_prof*au_to_m}
+    coords = {'R': R_prof*u.au.to('m')}
     velocity_upper = model.get_attribute_map(coords, 'velocity', surface=surf_ref) * vel_sign
     ax.plot(R_prof, velocity_upper, c='k', lw=2.5, ls='--', label=r'Keplerian (%.2f Msun)'%Mstar, zorder=13)
 
@@ -229,9 +229,9 @@ if args.moment=='velocity':
     ax.set_ylim(clim0, 1.2*np.nanmax(vel_phi))
     mod_major_ticks(ax, axis='x', nbins=10)
     mod_minor_ticks(ax)    
-    ax.legend(frameon=False, fontsize=12)
+    make_1d_legend(ax)
 
-    Contours.make_substructures(ax, gaps=gaps, rings=rings, kinks=kinks)
+    make_substructures(ax, gaps=gaps, rings=rings, label_gaps=True, label_rings=True)  
     
     plt.savefig('rotation_curve_%s.png'%tag_base, bbox_inches='tight', dpi=200)
     plt.show()
@@ -257,7 +257,7 @@ else:
     vel_phi, vel_phi_error = rail_phi.get_average(**kw_avg)
 
     ysav_phi, ysav_phi_deriv = make_savgol(vel_phi)    
-    ax.plot(R_prof, ysav_phi, c='tomato', lw=4.0, label=r'Data curve', zorder=12)
+    ax.plot(R_prof, ysav_phi, c='tomato', lw=4.0, label=r'Data', zorder=12)
     ax.fill_between(R_prof, vel_phi+vel_phi_error, vel_phi-vel_phi_error, color='tomato', alpha=0.15, zorder=9)
 
     if args.writetxt: writetxt([R_prof, vel_phi, vel_phi_error], tag='data')
@@ -267,7 +267,7 @@ else:
     vel_phi, vel_phi_error = rail_phi.get_average(**kw_avg)
 
     ysav_phi, ysav_phi_deriv = make_savgol(vel_phi)    
-    ax.plot(R_prof, ysav_phi, c='dodgerblue', lw=3.5, label=r'Model curve', zorder=11)
+    ax.plot(R_prof, ysav_phi, c='dodgerblue', lw=3.5, label=r'Model', zorder=11)
 
     if args.writetxt: writetxt([R_prof, vel_phi, vel_phi_error], tag='model')
     
@@ -280,9 +280,9 @@ else:
     ax.set_ylim(clim0, clim1)
     mod_major_ticks(ax, axis='x', nbins=10)
     mod_minor_ticks(ax)
-    ax.legend(frameon=False, fontsize=12)
+    make_1d_legend(ax)
 
-    Contours.make_substructures(ax, gaps=gaps, rings=rings, kinks=kinks)
+    make_substructures(ax, gaps=gaps, rings=rings, label_gaps=True, label_rings=True)  
     
     plt.savefig('radial_profile_%s.png'%tag_base, bbox_inches='tight', dpi=200)
     plt.show()
@@ -311,7 +311,7 @@ else:
     mod_major_ticks(ax, axis='x', nbins=10)
     mod_minor_ticks(ax)
 
-    Contours.make_substructures(ax, gaps=gaps, rings=rings, kinks=kinks)
+    make_substructures(ax, gaps=gaps, rings=rings, label_gaps=True, label_rings=True)
         
     plt.savefig('radial_profile_residuals_%s.png'%tag_base, bbox_inches='tight', dpi=200)
     plt.show()