SpiralMap 0.0.22__py3-none-any.whl → 0.16__py3-none-any.whl

SpiralMap/models_.py

@@ -2,17 +2,23 @@
 # SpiralMap: a library of the Milky Way's spiral arms
 # History:  	
 # May 2025: Prusty (IISER Kolkata) & Shourya Khanna (INAF Torino)
+# Feb 2026: Following updates:
+			# 1) Missing Local arm (logarithmic) added to Hou-Han 2014 model.
+			# 2) Vallee 1995 model included. 
+			# 3) added dependencies to .toml
 #######################################################################
 
 
 #--------------------------------------------
 # import utilities package / set root 
 import os
+import version 
 from os.path import dirname
+from update_checker import update_check
 root_ = dirname(__file__)
 dataloc = root_+'/datafiles'
 exec(open(root_+"/mytools.py").read())
-
+update_check('spiralmap', version.__version__)	
 #--------------------------------------------       
 
 
@@ -59,6 +65,7 @@ class spiral_poggio_maps(object):
 		func_ = lambda s: 'yval' in s
 		yval_file = list(filter(func_,flist1))[0]
 		
+		
 		# # read overdensity contours
 		xvalues_overdens=np.load(self.loc+'/'+xval_file)
 		yvalues_overdens=np.load(self.loc+'/'+yval_file)
@@ -67,6 +74,8 @@ class spiral_poggio_maps(object):
 		Rvalues_dens=sqrtsum(ds=[xvalues_overdens, yvalues_overdens])
 		Rgcvalues_dens=sqrtsum(ds=[xvalues_overdens+xsun, yvalues_overdens])
 		
+		self.over_dens_grid = over_dens_grid
+		
 		fl = pickleread(self.loc+'/'+self.model_+'_pproj_contours.pkl')
 		self.dout = {'xhc':xvalues_overdens,'yhc':yvalues_overdens,'xgc':xvalues_overdens+xsun,'ygc':yvalues_overdens}
 		self.dout['phi4'] =fl['phi4'].copy()	
@@ -105,6 +114,177 @@ class spiral_poggio_maps(object):
 			plotattrs['linestyle'] = '.'
 			_polarproj(self,plotattrs)	
 				
+
+class spiral_vallee(object):
+	"""	
+	Vallee et al (1995) logarithmic spiral arm model for the Milky Way.
+	Based on multi-tracer analysis including magnetic fields, dust, gas, and stars.
+	"""	
+
+	def __init__(self):   
+		self.getarmlist()		
+	
+	def getarmlist(self):	
+		"""Set arm names """					
+		self.arms = np.array(['Sagittarius', 'Scutum', '3-kpc', 'Perseus'])
+		self.armcolour = {
+			'Sagittarius': 'red', # red
+			'Perseus': 'orange',  # orange
+			'Scutum': 'purple', # 
+			'3-kpc': 'green' # brown
+		}
+				
+		self.getparams()
+		self.armcolours = [self.armcolour[ky] for ky in self.arms]
+		
+	def info(self):
+		d = {'Arm list': self.arms, 'Colour': self.armcolours}
+		dfmodlist = pd.DataFrame(d)			
+		print(tabulate(dfmodlist, headers='keys', tablefmt='psql'))
+	
+	def getparams(self):
+		"""		
+		Return parameters for each arm.
+		
+		Parameters from Vallee 1995:
+		- Pitch angle: 12° ± 1° (inward, absolute value used here)
+		- Number of arms: 4
+		- Arm start radius: 2.5 kpc
+		- Solar position: 8 kpc from Galactic center
+		- Arm separation: ~3 kpc near Sun
+		
+		Note: phi0 is set to produce 4 equally spaced arms starting at 2.5 kpc
+		"""
+		
+		self.arms_model = {
+			'Scutum': {'pitch': 12.5, 'phi0': 0, 'r0': 2.5},
+			'3-kpc': {'pitch': 12.5, 'phi0': 90, 'r0': 2.5},
+			'Perseus': {'pitch': 12.5, 'phi0': 180, 'r0': 2.5},
+			'Sagittarius': {'pitch': 12.5, 'phi0': 270, 'r0': 2.5}
+		}
+	 
+	def model_(self, arm_name, R_max=13, n_points=1000):
+		"""Generate logarithmic spiral coordinates for specified arm.
+		
+		Parameters
+		----------
+		arm_name : str
+			Name of arm to model
+		R_max : float, optional
+			Maximum galactocentric radius to model (kpc), default=13
+			(Vallee 1995 limits to r_gal < 13 kpc)
+		n_points : int, optional
+			Number of points to sample along the spiral, default=1000
+	
+		Returns
+		-------
+		tuple
+			(x_hc, y_hc, x_gc, y_gc) coordinate arrays where:
+			- x_hc, y_hc: Heliocentric coordinates (kpc)
+			- x_gc, y_gc: Galactocentric coordinates (kpc)
+	
+		Model limited to 3 kpc < r_gal < 13 kpc per Vallee 1995 constraints
+		"""
+		self.R0 = -self.xsun  # 8.0 kpc
+		params = self.arms_model[arm_name]
+		pitch_rad = np.radians(params['pitch'])
+		phi0_rad = np.radians(params['phi0'])
+		r0 = params['r0']
+		
+		# Calculate maximum phi to reach R_max, starting from r0
+		phi_max = phi0_rad + (np.log(R_max/r0) / np.tan(pitch_rad))
+		
+		# Generate angular range starting from phi0
+		phi = np.linspace(phi0_rad, phi_max, n_points)
+		
+		# Logarithmic spiral equation (Vallee 1995 eq. 5a)
+		R = r0 * np.exp((phi - phi0_rad) * np.tan(pitch_rad))
+		
+		# Apply Vallee 1995 constraints: exclude r_gal < 3 kpc
+		mask = R >= 3.0
+		R = R[mask]
+		phi = phi[mask]
+		
+		# Convert to Cartesian coordinates (Galactocentric)
+		x_gc = R * np.cos(phi)
+		y_gc = R * np.sin(phi)
+
+		# Convert to Heliocentric coordinates (Sun at x=8, y=0 in galactocentric)
+		# In heliocentric: x_hc = x_gc - (-8) = x_gc + 8, y_hc = y_gc - 0 = y_gc
+		x_hc = x_gc + self.R0  
+		y_hc = y_gc  # Sun at y=0 in galactocentric, so y_hc = y_gc
+	
+		return x_hc, y_hc, x_gc, y_gc
+		
+	def output_(self, arm):		
+		"""Get arm coordinates
+		
+		Parameters
+		----------
+		arm : str
+			Arm identifier (e.g., 'Sagittarius')
+		
+		Returns
+		-------
+		dict
+			Dictionary with keys:
+			- 'xhc': Heliocentric x coordinates
+			- 'yhc': Heliocentric y coordinates
+			- 'xgc': Galactocentric x coordinates
+			- 'ygc': Galactocentric y coordinates
+		"""		
+		
+		xhc, yhc, xgc, ygc = self.model_(arm)   
+		self.dout = {
+			'xhc': xhc,
+			'yhc': yhc,
+			'xgc': xgc,
+			'ygc': ygc
+		
+		}
+		return self.dout
+
+	def df_plot(self, coord='GC', R_max=13):
+		rows = []
+
+		for arm in self.arms:
+			x_hc, y_hc, x_gc, y_gc = self.model_(arm, R_max)
+
+			if coord.upper() == 'GC':
+				x, y = x_gc, y_gc
+			else:
+				x, y = x_hc, y_hc
+
+			for xi, yi in zip(x, y):
+				rows.append([arm, xi, yi])
+
+		return pd.DataFrame(rows, columns=['arm', 'x', 'y'])
+
+	def plot(self, coord='GC', R_max=13):
+		df = self.df_plot(coord, R_max)
+
+		plt.figure(figsize=(6, 6))
+
+		for arm in self.arms:
+			d = df[df['arm'] == arm]
+			plt.plot(d['x'], d['y'], color=self.armcolour[arm], label=arm)
+
+		if coord.upper() == 'GC':
+			plt.plot(0, 0, 'r*', ms=12, label='GC')
+			plt.plot(-self.R0, 0, 'o', color='orange', label='Sun')
+			plt.xlabel('X_gc [kpc]')
+			plt.ylabel('Y_gc [kpc]')
+		else:
+			plt.plot(0, 0, 'o', color='orange', label='Sun')
+			plt.xlabel('X_hc [kpc]')
+			plt.ylabel('Y_hc [kpc]')
+
+		plt.axhline(0, ls='--', lw=0.5)
+		plt.axvline(0, ls='--', lw=0.5)
+		plt.axis('equal')
+		plt.legend()
+		plt.tight_layout()
+		plt.show()
 			
 class TaylorCordesSpiral(object):		
 	"""	
@@ -203,13 +383,15 @@ class spiral_houhan(object):
 	Implements the Milky Way spiral structure model from:
 	"The spiral structure of the Milky Way from classical Cepheids" (Hou & Han 2014)
 	using polynomial-logarithmic spiral functions. Provides 6 major arm segments.	
+	Additionally, the local arm is implemented as a logarithmic spiral.
 	"""	
 	def __init__(self):			
 		self.getarmlist()	
 	def getarmlist(self):
-		"""Set arm names and colours"""
-		self.arms = np.array(['Norma','Scutum-Centaurus','Sagittarius-Carina','Perseus','Local','Outer'])
-		self.armcolour = {'Norma':'black','Scutum-Centaurus':'red','Sagittarius-Carina':'green','Perseus':'blue','Local':'purple','Outer':'gold'}
+		"""Set arm names and colours"""		
+		self.arms = np.array(['Arm1','Arm2','Arm3','Arm4','Arm5','Arm6','local'])
+		self.armcolour = {'Arm1':'black','Arm2':'red','Arm3':'green','Arm4':'blue','Arm5':'purple','Arm6':'gold','local':'cyan'}
+		
 		self.armcolours= [self.armcolour[ky]  for ky in self.arms  ]	
 	def info(self):		
 		d = {'Arm list': self.arms, 'Colour': self.armcolours}
@@ -218,25 +400,30 @@ class spiral_houhan(object):
 		
 	def getparams(self):						
 		"""			
-		   Load spiral parameters from Hou & Han (2014) Table 4 (vcirc=239, Z =0.16), all tracers.
-		   
+		   Load spiral parameters from Hou & Han (2014) Table 4 (vcirc=239, Z =0.17), all tracers.
+		   		   
 		   :return: params ( Nested dictionary containing for each arm).
 		   
 	   				a, b, c, d: Polynomial coefficients.
 	   				
 					θ_start: Start angle in degrees (Galactic longitude).
 					
-					θ_end: End angle in degrees.		   		   
+					θ_end: End angle in degrees.		
+					
+					ri,thetai,psi,ymin,ymax: logarithmic spiral (local arm only)   		   
 		   :rtype: dict 
 		"""			
 		params = {
-			'Norma': {'a': 1.1320, 'b': 0.1233, 'c': 0.003488, 'd': 0.0, 'θ_start': 40, 'θ_end': 250},
-			'Scutum-Centaurus': {'a': 5.8243, 'b': -1.8196, 'c': 0.2350, 'd': -0.009011, 'θ_start': 275, 'θ_end': 620},
-			'Sagittarius-Carina': {'a': 4.2767, 'b': -1.1507, 'c': 0.1570, 'd': -0.006078, 'θ_start': 275, 'θ_end': 575},
-			'Perseus': {'a': 1.1280, 'b': 0.1282, 'c': 0.002617, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
-			'Local': {'a': 1.7978, 'b': -0.04738, 'c': 0.01684, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
-			'Outer': {'a': 2.4225, 'b': -0.1636, 'c': 0.02494, 'd': 0.0, 'θ_start': 280, 'θ_end': 405}
+			'Arm1': {'a': 1.1320, 'b': 0.1233, 'c': 0.003488, 'd': 0.0, 'θ_start': 40, 'θ_end': 250},
+			'Arm2': {'a': 5.8243, 'b': -1.8196, 'c': 0.2350, 'd': -0.009011, 'θ_start': 275, 'θ_end': 620},
+			'Arm3': {'a': 4.2767, 'b': -1.1507, 'c': 0.1570, 'd': -0.006078, 'θ_start': 275, 'θ_end': 575},
+			'Arm4': {'a': 1.1280, 'b': 0.1282, 'c': 0.002617, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
+			'Arm5': {'a': 1.7978, 'b': -0.04738, 'c': 0.01684, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
+			'Arm6': {'a': 2.4225, 'b': -0.1636, 'c': 0.02494, 'd': 0.0, 'θ_start': 280, 'θ_end': 405},			
+			'local': {'ri': 8.17, 'thetai': 57.8, 'psi':2.84,'ymin':-4.,'ymax':7.5}			
 		}	
+		
+		
 		return params		
 	def polynomial_log_spiral(self, θ, a, b, c, d):		
 		"""Calculate radius using polynomial-logarithmic spiral equation.
@@ -264,19 +451,31 @@ class spiral_houhan(object):
 	def model_(self, arm_name, n_points=500):
 		
 		params_ = self.getparams()
-		params = params_[arm_name]
-		
-		
-		θ = np.linspace(params['θ_start'], params['θ_end'], n_points)
-		R = self.polynomial_log_spiral(θ, params['a'], params['b'], params['c'], params['d'])
-				
+		params = params_[arm_name]	
+		
+		if arm_name == 'local':
+			θ = np.linspace(0., 180., n_points)
+			tmp1 = np.radians(θ - params['thetai'])
+			tmp2 = np.tan(np.radians(params['psi']))
+			R = params['ri']*np.exp( tmp1*tmp2 )
+		else:						
+			θ = np.linspace(params['θ_start'], params['θ_end'], n_points)
+			R = self.polynomial_log_spiral(θ, params['a'], params['b'], params['c'], params['d'])
+					
 		# Convert to Cartesian coordinates (Galactocentric)
 		y_gc = R*np.cos(np.radians(θ))
 		x_gc = -R * np.sin(np.radians(θ))
 		
 		# Convert to Heliocentric coordinates
 		x_hc = (x_gc + self.R0)
-	
+		
+		if arm_name == 'local':
+			ind_mask = np.where((y_gc < params['ymin'])|(y_gc > params['ymax']))[0]
+			y_gc[ind_mask] = np.nan	
+			x_gc[ind_mask] = np.nan	
+			x_hc[ind_mask] = np.nan	
+			
+			
 		return x_hc, y_gc, x_gc, y_gc
 	
 	def output_(self, arm):			
@@ -311,9 +510,9 @@ class spiral_houhan_HII(object):
 	def __init__(self):			
 		self.getarmlist()	
 	def getarmlist(self):
-		"""Set arm names and colours"""
-		self.arms = np.array(['Norma','Scutum-Centaurus','Sagittarius-Carina','Perseus','Local','Outer'])
-		self.armcolour = {'Norma':'black','Scutum-Centaurus':'red','Sagittarius-Carina':'green','Perseus':'blue','Local':'purple','Outer':'gold'}
+		"""Set arm names and colours"""		
+		self.arms = np.array(['Arm1','Arm2','Arm3','Arm4','Arm5','Arm6'])
+		self.armcolour = {'Arm1':'black','Arm2':'red','Arm3':'green','Arm4':'blue','Arm5':'purple','Arm6':'gold'}					
 		self.armcolours= [self.armcolour[ky]  for ky in self.arms  ]	
 	def info(self):		
 		d = {'Arm list': self.arms, 'Colour': self.armcolours}
@@ -335,12 +534,12 @@ class spiral_houhan_HII(object):
 		"""			
 
 		params = {
-			'Norma': {'a': 1.1668, 'b': 0.1198, 'c': 0.002557, 'd': 0.0, 'θ_start': 40, 'θ_end': 250},
-			'Scutum-Centaurus': {'a': 5.8002, 'b': -1.8188, 'c': 0.2352, 'd': -0.008999, 'θ_start': 275, 'θ_end': 620},
-			'Sagittarius-Carina': {'a': 4.2300, 'b': -1.1505, 'c': 0.1561, 'd': -0.005898, 'θ_start': 275, 'θ_end': 570},
-			'Perseus': {'a': 0.9744, 'b': 0.1405, 'c': 0.003995, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
-			'Local': {'a': 0.9887, 'b': 0.1714, 'c': 0.004358, 'd': 0.0, 'θ_start': 280, 'θ_end': 475},
-			'Outer': {'a': 3.3846, 'b': -0.6554, 'c': 0.08170, 'd': 0.0, 'θ_start': 280, 'θ_end': 355}
+			'Arm1': {'a': 1.1668, 'b': 0.1198, 'c': 0.002557, 'd': 0.0, 'θ_start': 40, 'θ_end': 250},
+			'Arm2': {'a': 5.8002, 'b': -1.8188, 'c': 0.2352, 'd': -0.008999, 'θ_start': 275, 'θ_end': 620},
+			'Arm3': {'a': 4.2300, 'b': -1.1505, 'c': 0.1561, 'd': -0.005898, 'θ_start': 275, 'θ_end': 570},
+			'Arm4': {'a': 0.9744, 'b': 0.1405, 'c': 0.003995, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
+			'Arm5': {'a': 0.9887, 'b': 0.1714, 'c': 0.004358, 'd': 0.0, 'θ_start': 280, 'θ_end': 475},
+			'Arm6': {'a': 3.3846, 'b': -0.6554, 'c': 0.08170, 'd': 0.0, 'θ_start': 280, 'θ_end': 355}
 		}	
 
 		return params		
@@ -925,7 +1124,7 @@ class main_(object):
 		   	Constructs dictionaries to initialise individual model classes
 		"""	
 		   		
-		self.models = ['Taylor_Cordes_1992','Drimmel_NIR_2000',
+		self.models = ['Taylor_Cordes_1992','Vallee_1995','Drimmel_NIR_2000',
 					   'Levine_2006','Hou_Han_2014','Hou_Han_HII_2014','Reid_2019',
 					   'Poggio_cont_2021','GaiaPVP_cont_2022','Drimmel_Ceph_2024']        
 		self.models_class = {'Reid_2019':reid_spiral(),
@@ -936,9 +1135,10 @@ class main_(object):
 							 'Taylor_Cordes_1992':TaylorCordesSpiral(),
 							 'Hou_Han_2014':spiral_houhan(),
 							 'Hou_Han_HII_2014':spiral_houhan_HII(),
+							 'Vallee_1995':spiral_vallee(),
 							 'Drimmel_Ceph_2024':spiral_drimmel_cepheids()}
 							 
-		self.models_desc = 	['HII','NIR emission',
+		self.models_desc = 	['HII','Bfield/Dust/gas','NIR emission',
 					   'HI','HII/GMC/Masers','HII','MASER parallax',
 					   'Upper main sequence (map)','OB stars (map)','Cepheids']  			 							 
 	def getinfo(self,model='',print_=True):	
@@ -997,11 +1197,11 @@ class main_(object):
 		if plotattrs_['plot'] and plotattrs_['polarproj']==False :							
 			plt.plot(spimod.dout['x'+plotattrs_['coordsys'].lower()],
 			         spimod.dout['y'+plotattrs_['coordsys'].lower()],
-			         plotattrs_['linestyle'],color=plotattrs_['armcolour'])			
+			         plotattrs_['linestyle'],linewidth=plotattrs_['linewidth'],color=plotattrs_['armcolour'])			
 			if 'xhc_ex' in 	spimod.dout.keys():
 				plt.plot(spimod.dout['x'+plotattrs_['coordsys'].lower()+'_ex'],
 				         spimod.dout['y'+plotattrs_['coordsys'].lower()+'_ex'],
-				         '--',color=plotattrs_['armcolour'])	
+				         '--',linewidth=plotattrs_['linewidth'],color=plotattrs_['armcolour'])	
 				                							
 			plt.xlabel('X$_{'+plotattrs_['coordsys']+'}$ [Kpc]')
 			plt.ylabel('Y$_{'+plotattrs_['coordsys']+'}$ [Kpc]')	 
@@ -1234,4 +1434,4 @@ class _make_supportfiles(object):
 	
 
 
-# # _make_supportfiles()
+# _make_supportfiles()

SpiralMap/mytools.py

@@ -221,3 +221,4 @@ def polar_style(ax,title='',rticks=[3., 6.,9.,12,15.,20.]):
 
 
 
+

SpiralMap/test.py

@@ -44,8 +44,35 @@ if initialise_:
 	spirals.getinfo(model=use_model)
 	plotattrs = {'plot':False}
 	spirals.readout(plotattrs,model=use_model,arm='Sag-Car')
+
+
+impl_vallee_ = False
+if impl_vallee_ :
+
+
+	# spirals = sp.main_(Rsun=Rsun)
+	# spirals.getinfo()
+	# spirals.getinfo(model='Vallee_1995')
+	# spirals.plotattrs_default
+
+
+	#################
 	
+	spirals = sp.main_(Rsun=Rsun)	
+	use_model = 'Vallee_1995'
+	spirals.getinfo(model=use_model)
+	plotattrs = {'plot':True,'coordsys':'GC'}
+	spirals.readout(plotattrs,model=use_model,arm='all')	
+
+	plt.savefig(figdir_primer+'/test_vallee_gc.png')	
 
+
+	plt.close('all')
+	plotattrs = {'plot':True,'coordsys':'HC'}
+	spirals.readout(plotattrs,model=use_model,arm='all')	
+
+	plt.savefig(figdir_primer+'/test_vallee_hc.png')	
+		
 single_model_single_arm = False
 if single_model_single_arm:
 
@@ -81,7 +108,8 @@ if single_model_all_arms:
 		
 	Rsun=8.277
 	spirals = sp.main_(Rsun=Rsun)
-	use_model =  'Drimmel_Ceph_2024' 
+	# use_model =  'Drimmel_Ceph_2024' 
+	use_model =  'Vallee_1995' 
 	use_arm = 'all' 
 	spirals.getinfo(model=use_model)
 				
@@ -162,7 +190,7 @@ if single_model_polar_hou:
 	Rsun=8.277
 	spirals = sp.main_(Rsun=Rsun)
 	use_model = 'Hou_Han_2014'
-	use_arm = 'Sagittarius-Carina'
+	use_arm = 'Arm2'
 		
 	spirals.getinfo(model=use_model)				
 	
@@ -260,7 +288,7 @@ if hou_han_test:
 	Rsun=8.277
 	spirals = sp.main_(Rsun=Rsun)
 	use_model = 'Hou_Han_2014'
-	use_model3 = 'Hou_Han__HII_2014'
+	use_model3 = 'Hou_Han_2014'
 	use_arm = 'all'
 	use_model2 = 'Poggio_cont_2021'
 
@@ -273,11 +301,11 @@ if hou_han_test:
 	
 	ax = plt.subplot(121, projection='polar')		
 
-	plotattrs = {'plot':True,'coordsys':'GC','markersize':15,'markSunGC':True,'polarproj':True,'linewidth':5}
+	plotattrs = {'plot':True,'coordsys':'HC','markersize':15,'markSunGC':True,'polarproj':True,'linewidth':5}
 	spirals.readout(plotattrs,model=use_model,arm=use_arm)	
-	plotattrs = {'plot':True,'coordsys':'GC','markersize':3,'polarproj':True}	
+	plotattrs = {'plot':True,'coordsys':'HC','markersize':3,'polarproj':True}	
 	spirals.readout(plotattrs,model=use_model2,arm='all')	
-	polar_style(ax,title=use_model+' (GC)')
+	polar_style(ax,title=use_model+' (HC)')
 	
 	ax = plt.subplot(122, projection='polar')		
 
@@ -292,7 +320,7 @@ if hou_han_test:
 
 	plt.savefig(figdir_primer+'/test_houhan.png')
 
-makegif = False
+makegif = True
 if makegif:
 
 	plt.close('all')
@@ -318,14 +346,64 @@ if makegif:
 			spirals.readout(plotattrs,model=use_model2,arm=use_arm)	
 			polar_style(ax,title=use_model+' (GC)')
 			ax.set_ylim([0.,15])	
-			
+			plt.legend()
 			plt.savefig(figdir_primer+'/map_'+str(inum)+'png')
 
 	import mytools
 	curdir = os.getcwd()
 	mytools.png2movie(figdir_primer,curdir,flname='movie_',duration=3.5,fmt='gif')
 	
+		
+
+templot = False
+if templot:
+
+	# grab data	(poggio and ceph)
+	plotattrs = {'plot':False,'coordsys':'GC','markersize':3,'polarproj':True,'armcolour':''}
+	pg = spiral_poggio_maps()
+	pg.xsun = 8.277
+	pg.output_(plotattrs)	
+	xvalues = pg.dout['xhc']
+	yvalues = pg.dout['yhc']
+	overdens_grid = pg.over_dens_grid
+	
+
+	plotattrs = {'plot':True,'coordsys':'HC','markersize':5,'linewidth':4,'linestyle':'-','polargrid':False}
+	Rsun=8.277
+	spirals = sp.main_(Rsun=Rsun)
+	use_model2 = 'Drimmel_Ceph_2024' 
+	use_arm = 'all'	
+	
+	plt.close('all')
+	
+	fgsize=(6.5,5.)
+	fig = plt.figure(figsize=fgsize, dpi=150)
+	
+	ax = fig.gca()
+	
+	iniz=-1.18
+	fin=1.18
+	N_levels=50
+	levels=np.linspace(iniz,fin,N_levels)
+	cset1 = ax.contourf(xvalues, yvalues,overdens_grid.T, levels=levels, cmap='seismic',vmin=-1.18,vmax=1.18)
+	
+	cbar=plt.colorbar(mappable=cset1,orientation="vertical",ticks=[-1,-0.5, 0,  0.5, 1])
+	
+	cbar.set_label('Overdensity', fontsize=18)
+	cbar.ax.tick_params(labelsize=18) 
+
+	spirals.readout(plotattrs,model=use_model2,arm=use_arm)	
+	
+	ax.set_xlabel('X (kpc)', fontsize=18)
+	ax.set_ylabel('Y (kpc)', fontsize=18)
+	
+	ax.set_xlim([-5.5,5.1])
+	ax.set_ylim([-5.8,5.5])
+	ax.tick_params(axis="x", labelsize=15)
+	ax.tick_params(axis="y", labelsize=15)
+	plt.tight_layout()
 	
+	# # plt.show()	
 	
 	
 	

{spiralmap-0.0.22.dist-info → spiralmap-0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SpiralMap
-Version: 0.0.22
+Version: 0.16
 Summary: Python Library of Milky Way's Spiral Arms
 Project-URL: Homepage, https://github.com/Abhaypru/SpiralMap
 Project-URL: Issues, https://github.com/Abhaypru/SpiralMap/issues
@@ -10,6 +10,13 @@ License-File: LICENSE.md
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
+Requires-Dist: astropy
+Requires-Dist: matplotlib
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: scipy
+Requires-Dist: tabulate
+Requires-Dist: update-checker
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme; extra == 'docs'
@@ -24,16 +31,18 @@ A Python library of the Milky Way's spiral arms.
 
 The detailed documentation is hosted on [Read the docs](https://spiralmap.readthedocs.io/en/latest/#api-docs).
 
-For a quickstart please refer to the accompanying [Jupyter notebook](https://github.com/Abhaypru/SpiralMap/blob/main/demo_spiralmap.ipynb)
+For a quickstart please refer to the accompanying [Jupyter notebook](https://github.com/Abhaypru/SpiralMap/blob/main/demo_spiralmap.ipynb).
 
+Read the preprint at [arxiv](https://www.arxiv.org/abs/2506.11383).
 ## Features
-+ Access 8 independent spiral arm models from literature. We are open to requests for including other spiral arm models. 
++ Access 9 independent spiral arm models from literature. We are open to requests for including other spiral arm models. 
 + Extract the 2D trace of individual or all spiral arms from a particular model.
 + Directly overplot spiral arms with choice of Cartesian or Polar coordinates, and in Heliocentric or Galactocentric frames.
 
-![image info](src/SpiralMap/movie_.gif).
-
-Shown above is a gallery of the spiral models & maps included in the current version. 
+## Updates
++ Missing Local arm (logarithmic) added to Hou-Han 2014 model.
++ Vallee 1995 model included. 
++ Dependencies included
 
 Installation
 -------------

{spiralmap-0.0.22.dist-info → spiralmap-0.16.dist-info}/RECORD

@@ -1,11 +1,11 @@
 SpiralMap/__init__.py,sha256=7F5e52HrtZpHq8kNmLG8e1jtNlf6jkufCDgoIKlKZGs,100
-SpiralMap/models_.py,sha256=_1_l1AUv39EkEE7rF2-twOBDajvfO4k7LWdUY1DaqTE,40387
-SpiralMap/movie_.gif,sha256=famzvY320Jz8xjKjB0FndkXdGPZ4P8pJGlVKEHQuoto,125026
-SpiralMap/mytools.py,sha256=rmUT9Wsg3NhRHTlV-RvoZ3TWvYSEs5epX3zydEonnHM,7237
-SpiralMap/test.py,sha256=C7h_h-P1FFJlVv9CHGxO_2x_Zud12j1Xf-tUmmh0tdc,9987
+SpiralMap/models_.py,sha256=fCyGsioaW3Ul2Iff5sjOKIA2jUlzqTtckcyAZGgkB6c,45881
+SpiralMap/movie_.gif,sha256=E6-0Gzo9IgcfrsgGUTnj47a2Fw2WApD6AmjcnwzHXEQ,260591
+SpiralMap/mytools.py,sha256=-IxDcNZwBb6k6VpqSjgXo8yvoGptF9jhppg9LhTyNjs,7238
+SpiralMap/test.py,sha256=GgjSEStYWHEfbOodkVlq41sVZge8wSyukmtQgbCKRiI,11888
 SpiralMap/version.py,sha256=G_9nHD5j8EWxdjfiRE8uUrh0l_FRWN5WAnCM9wjLIJw,78
-SpiralMap/datafiles/flim.pkl,sha256=VmwuaFXQbAc0P3ey2sPrZa3BgpXk4KSlwZrb3aoKYzU,11235
-SpiralMap/datafiles/flim_all.pkl,sha256=HWjuVpmOfdtLqsZK6eMajoGGXTdUfF9nXodRMjKYHbU,2112
+SpiralMap/datafiles/flim.pkl,sha256=STMsqda-8G046xAa3t-BcA-EhS3mfKjXLSTLXkyBYdA,12210
+SpiralMap/datafiles/flim_all.pkl,sha256=iBo9l30ky9F0m-ckBl6fHzdBEaFvx42QdtSOLE9AM7w,2362
 SpiralMap/datafiles/spiral.bib,sha256=tOAgtQcbd4uFfcf-8twiEjpZGXjdV_ZE7VvlMLDn_jk,13614
 SpiralMap/datafiles/Drimmel2024_cepheids/ArmAttributes_dyoungW1_bw025.pkl,sha256=F4pUfUSEg7_BBC9jpMjFeuWFHj4dYKszrpMt8wKW0ds,6571
 SpiralMap/datafiles/Drimmel_NIR/Drimmel2armspiral.fits,sha256=jJ2k0yddyIUbMxGRGszD6cwlleUrGMtkrMByc_hU5bA,14400
@@ -27,14 +27,15 @@ SpiralMap/datafiles/Poggio_cont_2021/Poggio_cont_2021_pproj_contours.pkl,sha256=
 SpiralMap/datafiles/Poggio_cont_2021/overdens_grid_locscale03.npy,sha256=peM4jyLQsE8X4bMTCCe-7UD3Hayi2qmRcOQzCudBfHM,117256
 SpiralMap/datafiles/Poggio_cont_2021/xvalues.npy,sha256=uhY3STTfBhTer8pWNAkLezyu4o94VmNZgft0RZPFcTk,1096
 SpiralMap/datafiles/Poggio_cont_2021/yvalues.npy,sha256=uhY3STTfBhTer8pWNAkLezyu4o94VmNZgft0RZPFcTk,1096
-SpiralMap/figdir_primer/map_0png.png,sha256=OMkJAkxqk9a9rvwphY6cvboY7RmYylApkKXINLiQtUs,75636
-SpiralMap/figdir_primer/map_1png.png,sha256=tA2OgSICQlC0N7VxypEZDucHvCKq3HsFStgo0eq95rM,83668
-SpiralMap/figdir_primer/map_2png.png,sha256=kBvhJb4KZJ5We6wnLo0YdnWQHmys1BF-kaXweQCYto8,71296
-SpiralMap/figdir_primer/map_3png.png,sha256=J8MUzu100rOaWxd1LGvhNItXJdtvQpt_cecgebSDxOI,86123
-SpiralMap/figdir_primer/map_4png.png,sha256=IBBJYP7boTzGUhIDdOnjsjK549YWeoEQgZABB7Lu7FA,84457
-SpiralMap/figdir_primer/map_5png.png,sha256=DzqQO-CBwKpq1wW75yqi4msLA5hslsUs8f3qfI-jkY4,71955
-SpiralMap/figdir_primer/map_8png.png,sha256=YNKex-pu4Vo8ULBuGKNhWXuuvNOEd6Xl_2KXtPcfAUw,74856
-spiralmap-0.0.22.dist-info/METADATA,sha256=67HYgoq7yV1yUT6W_BaU3H_-JjSpXzv6MZ3DbvmnV14,2281
-spiralmap-0.0.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-spiralmap-0.0.22.dist-info/licenses/LICENSE.md,sha256=5w1L9A7eVMqU0wNIsBTTZA8K2JBIK0KKbqMSaQ1z9m0,1076
-spiralmap-0.0.22.dist-info/RECORD,,
+SpiralMap/figdir_primer/map_0png.png,sha256=1IKLOY9V19QdEZmu2ivwHb5G6tkooYPc7npQckNAots,76129
+SpiralMap/figdir_primer/map_1png.png,sha256=NgFySlWjEtO3NX2zROgBfqryxQ1wZt25IAX6hIkAXj4,87154
+SpiralMap/figdir_primer/map_2png.png,sha256=1kncc1jc3tk90Fjq97_qJrvJVgh1KwrTwet2nlqVMm8,84220
+SpiralMap/figdir_primer/map_3png.png,sha256=C2KygHiWyW3allmSX5Fn-gg2wK_4RkjjSaIOx7VUGFc,71840
+SpiralMap/figdir_primer/map_4png.png,sha256=2cSJXNZNkwNmzCiki8NqZAwpIWn0ZDZt6aPqRbgfO60,87668
+SpiralMap/figdir_primer/map_5png.png,sha256=2HTSFtUpg1SiP4tWhwqOCLma36hQKoB-khqgzsnPTVE,85117
+SpiralMap/figdir_primer/map_6png.png,sha256=_11fChqGIz8cEpLsLSMwJPeO2ivR8XYOAOHR2oeCvQk,72499
+SpiralMap/figdir_primer/map_9png.png,sha256=IQ6x6lgFZEwEcGja4Hn_XT_8t3PjY6c84-Bc6KazU9U,75444
+spiralmap-0.16.dist-info/METADATA,sha256=UwKTxZOy7oAU8gVG8UqAetr75KkytTId3nLhvNfaNH8,2515
+spiralmap-0.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+spiralmap-0.16.dist-info/licenses/LICENSE.md,sha256=5w1L9A7eVMqU0wNIsBTTZA8K2JBIK0KKbqMSaQ1z9m0,1076
+spiralmap-0.16.dist-info/RECORD,,