SpiralMap 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

SpiralMap/models_.py

@@ -59,6 +59,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 +68,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()	
@@ -207,9 +210,10 @@ class spiral_houhan(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}
@@ -230,12 +234,12 @@ class spiral_houhan(object):
 		   :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}
 		}	
 		return params		
 	def polynomial_log_spiral(self, θ, a, b, c, d):		
@@ -311,9 +315,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 +339,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		
@@ -997,11 +1001,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]')	 

SpiralMap/test.py

@@ -325,7 +325,58 @@ if makegif:
 	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.3.dist-info → spiralmap-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SpiralMap
-Version: 0.0.3
+Version: 0.0.5
 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

{spiralmap-0.0.3.dist-info → spiralmap-0.0.5.dist-info}/RECORD

@@ -1,8 +1,8 @@
 SpiralMap/__init__.py,sha256=7F5e52HrtZpHq8kNmLG8e1jtNlf6jkufCDgoIKlKZGs,100
-SpiralMap/models_.py,sha256=_1_l1AUv39EkEE7rF2-twOBDajvfO4k7LWdUY1DaqTE,40387
+SpiralMap/models_.py,sha256=YGgqs_GVZ1XsDshwH09ljYFdcS3j0KxuSEFCj1OxqmQ,40317
 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/test.py,sha256=oE2N05eKLdcBN2yrgnEt0YSFvNJzRTNB0gqtpekmIbU,11264
 SpiralMap/version.py,sha256=G_9nHD5j8EWxdjfiRE8uUrh0l_FRWN5WAnCM9wjLIJw,78
 SpiralMap/datafiles/flim.pkl,sha256=VmwuaFXQbAc0P3ey2sPrZa3BgpXk4KSlwZrb3aoKYzU,11235
 SpiralMap/datafiles/flim_all.pkl,sha256=HWjuVpmOfdtLqsZK6eMajoGGXTdUfF9nXodRMjKYHbU,2112
@@ -27,14 +27,7 @@ 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.3.dist-info/METADATA,sha256=u7EJTmI8ZPmmgNUTQk8_Jlq1ToKCVlh2LLAxGRpl3AA,2151
-spiralmap-0.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-spiralmap-0.0.3.dist-info/licenses/LICENSE.md,sha256=5w1L9A7eVMqU0wNIsBTTZA8K2JBIK0KKbqMSaQ1z9m0,1076
-spiralmap-0.0.3.dist-info/RECORD,,
+spiralmap-0.0.5.dist-info/METADATA,sha256=3yJr-O7r9wRGOQTS3Zw4Zh0L_nWwn3XeqcAJYdv-1ms,2151
+spiralmap-0.0.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+spiralmap-0.0.5.dist-info/licenses/LICENSE.md,sha256=5w1L9A7eVMqU0wNIsBTTZA8K2JBIK0KKbqMSaQ1z9m0,1076
+spiralmap-0.0.5.dist-info/RECORD,,