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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. SpiralMap/models_.py +19 -18
  2. {spiralmap-0.0.3.dist-info → spiralmap-0.0.4.dist-info}/METADATA +1 -1
  3. {spiralmap-0.0.3.dist-info → spiralmap-0.0.4.dist-info}/RECORD +5 -5
  4. {spiralmap-0.0.3.dist-info → spiralmap-0.0.4.dist-info}/WHEEL +0 -0
  5. {spiralmap-0.0.3.dist-info → spiralmap-0.0.4.dist-info}/licenses/LICENSE.md +0 -0
SpiralMap/models_.py CHANGED
@@ -207,9 +207,10 @@ class spiral_houhan(object):
207
207
  def __init__(self):
208
208
  self.getarmlist()
209
209
  def getarmlist(self):
210
- """Set arm names and colours"""
211
- self.arms = np.array(['Norma','Scutum-Centaurus','Sagittarius-Carina','Perseus','Local','Outer'])
212
- self.armcolour = {'Norma':'black','Scutum-Centaurus':'red','Sagittarius-Carina':'green','Perseus':'blue','Local':'purple','Outer':'gold'}
210
+ """Set arm names and colours"""
211
+ self.arms = np.array(['Arm1','Arm2','Arm3','Arm4','Arm5','Arm6'])
212
+ self.armcolour = {'Arm1':'black','Arm2':'red','Arm3':'green','Arm4':'blue','Arm5':'purple','Arm6':'gold'}
213
+
213
214
  self.armcolours= [self.armcolour[ky] for ky in self.arms ]
214
215
  def info(self):
215
216
  d = {'Arm list': self.arms, 'Colour': self.armcolours}
@@ -230,12 +231,12 @@ class spiral_houhan(object):
230
231
  :rtype: dict
231
232
  """
232
233
  params = {
233
- 'Norma': {'a': 1.1320, 'b': 0.1233, 'c': 0.003488, 'd': 0.0, 'θ_start': 40, 'θ_end': 250},
234
- 'Scutum-Centaurus': {'a': 5.8243, 'b': -1.8196, 'c': 0.2350, 'd': -0.009011, 'θ_start': 275, 'θ_end': 620},
235
- 'Sagittarius-Carina': {'a': 4.2767, 'b': -1.1507, 'c': 0.1570, 'd': -0.006078, 'θ_start': 275, 'θ_end': 575},
236
- 'Perseus': {'a': 1.1280, 'b': 0.1282, 'c': 0.002617, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
237
- 'Local': {'a': 1.7978, 'b': -0.04738, 'c': 0.01684, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
238
- 'Outer': {'a': 2.4225, 'b': -0.1636, 'c': 0.02494, 'd': 0.0, 'θ_start': 280, 'θ_end': 405}
234
+ 'Arm1': {'a': 1.1320, 'b': 0.1233, 'c': 0.003488, 'd': 0.0, 'θ_start': 40, 'θ_end': 250},
235
+ 'Arm2': {'a': 5.8243, 'b': -1.8196, 'c': 0.2350, 'd': -0.009011, 'θ_start': 275, 'θ_end': 620},
236
+ 'Arm3': {'a': 4.2767, 'b': -1.1507, 'c': 0.1570, 'd': -0.006078, 'θ_start': 275, 'θ_end': 575},
237
+ 'Arm4': {'a': 1.1280, 'b': 0.1282, 'c': 0.002617, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
238
+ 'Arm5': {'a': 1.7978, 'b': -0.04738, 'c': 0.01684, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
239
+ 'Arm6': {'a': 2.4225, 'b': -0.1636, 'c': 0.02494, 'd': 0.0, 'θ_start': 280, 'θ_end': 405}
239
240
  }
240
241
  return params
241
242
  def polynomial_log_spiral(self, θ, a, b, c, d):
@@ -311,9 +312,9 @@ class spiral_houhan_HII(object):
311
312
  def __init__(self):
312
313
  self.getarmlist()
313
314
  def getarmlist(self):
314
- """Set arm names and colours"""
315
- self.arms = np.array(['Norma','Scutum-Centaurus','Sagittarius-Carina','Perseus','Local','Outer'])
316
- self.armcolour = {'Norma':'black','Scutum-Centaurus':'red','Sagittarius-Carina':'green','Perseus':'blue','Local':'purple','Outer':'gold'}
315
+ """Set arm names and colours"""
316
+ self.arms = np.array(['Arm1','Arm2','Arm3','Arm4','Arm5','Arm6'])
317
+ self.armcolour = {'Arm1':'black','Arm2':'red','Arm3':'green','Arm4':'blue','Arm5':'purple','Arm6':'gold'}
317
318
  self.armcolours= [self.armcolour[ky] for ky in self.arms ]
318
319
  def info(self):
319
320
  d = {'Arm list': self.arms, 'Colour': self.armcolours}
@@ -335,12 +336,12 @@ class spiral_houhan_HII(object):
335
336
  """
336
337
 
337
338
  params = {
338
- 'Norma': {'a': 1.1668, 'b': 0.1198, 'c': 0.002557, 'd': 0.0, 'θ_start': 40, 'θ_end': 250},
339
- 'Scutum-Centaurus': {'a': 5.8002, 'b': -1.8188, 'c': 0.2352, 'd': -0.008999, 'θ_start': 275, 'θ_end': 620},
340
- 'Sagittarius-Carina': {'a': 4.2300, 'b': -1.1505, 'c': 0.1561, 'd': -0.005898, 'θ_start': 275, 'θ_end': 570},
341
- 'Perseus': {'a': 0.9744, 'b': 0.1405, 'c': 0.003995, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
342
- 'Local': {'a': 0.9887, 'b': 0.1714, 'c': 0.004358, 'd': 0.0, 'θ_start': 280, 'θ_end': 475},
343
- 'Outer': {'a': 3.3846, 'b': -0.6554, 'c': 0.08170, 'd': 0.0, 'θ_start': 280, 'θ_end': 355}
339
+ 'Arm1': {'a': 1.1668, 'b': 0.1198, 'c': 0.002557, 'd': 0.0, 'θ_start': 40, 'θ_end': 250},
340
+ 'Arm2': {'a': 5.8002, 'b': -1.8188, 'c': 0.2352, 'd': -0.008999, 'θ_start': 275, 'θ_end': 620},
341
+ 'Arm3': {'a': 4.2300, 'b': -1.1505, 'c': 0.1561, 'd': -0.005898, 'θ_start': 275, 'θ_end': 570},
342
+ 'Arm4': {'a': 0.9744, 'b': 0.1405, 'c': 0.003995, 'd': 0.0, 'θ_start': 280, 'θ_end': 500},
343
+ 'Arm5': {'a': 0.9887, 'b': 0.1714, 'c': 0.004358, 'd': 0.0, 'θ_start': 280, 'θ_end': 475},
344
+ 'Arm6': {'a': 3.3846, 'b': -0.6554, 'c': 0.08170, 'd': 0.0, 'θ_start': 280, 'θ_end': 355}
344
345
  }
345
346
 
346
347
  return params
{spiralmap-0.0.3.dist-info → spiralmap-0.0.4.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: SpiralMap
3
- Version: 0.0.3
3
+ Version: 0.0.4
4
4
  Summary: Python Library of Milky Way's Spiral Arms
5
5
  Project-URL: Homepage, https://github.com/Abhaypru/SpiralMap
6
6
  Project-URL: Issues, https://github.com/Abhaypru/SpiralMap/issues
{spiralmap-0.0.3.dist-info → spiralmap-0.0.4.dist-info}/RECORD RENAMED
@@ -1,5 +1,5 @@
1
1
  SpiralMap/__init__.py,sha256=7F5e52HrtZpHq8kNmLG8e1jtNlf6jkufCDgoIKlKZGs,100
2
- SpiralMap/models_.py,sha256=_1_l1AUv39EkEE7rF2-twOBDajvfO4k7LWdUY1DaqTE,40387
2
+ SpiralMap/models_.py,sha256=EW7I4EYdlK6cJtugIdL1CJonkM-ATh4ks78GMjHrPbo,40204
3
3
  SpiralMap/movie_.gif,sha256=famzvY320Jz8xjKjB0FndkXdGPZ4P8pJGlVKEHQuoto,125026
4
4
  SpiralMap/mytools.py,sha256=rmUT9Wsg3NhRHTlV-RvoZ3TWvYSEs5epX3zydEonnHM,7237
5
5
  SpiralMap/test.py,sha256=C7h_h-P1FFJlVv9CHGxO_2x_Zud12j1Xf-tUmmh0tdc,9987
@@ -34,7 +34,7 @@ SpiralMap/figdir_primer/map_3png.png,sha256=J8MUzu100rOaWxd1LGvhNItXJdtvQpt_cecg
34
34
  SpiralMap/figdir_primer/map_4png.png,sha256=IBBJYP7boTzGUhIDdOnjsjK549YWeoEQgZABB7Lu7FA,84457
35
35
  SpiralMap/figdir_primer/map_5png.png,sha256=DzqQO-CBwKpq1wW75yqi4msLA5hslsUs8f3qfI-jkY4,71955
36
36
  SpiralMap/figdir_primer/map_8png.png,sha256=YNKex-pu4Vo8ULBuGKNhWXuuvNOEd6Xl_2KXtPcfAUw,74856
37
- spiralmap-0.0.3.dist-info/METADATA,sha256=u7EJTmI8ZPmmgNUTQk8_Jlq1ToKCVlh2LLAxGRpl3AA,2151
38
- spiralmap-0.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
39
- spiralmap-0.0.3.dist-info/licenses/LICENSE.md,sha256=5w1L9A7eVMqU0wNIsBTTZA8K2JBIK0KKbqMSaQ1z9m0,1076
40
- spiralmap-0.0.3.dist-info/RECORD,,
37
+ spiralmap-0.0.4.dist-info/METADATA,sha256=S-0G9efx74yll5vU35rkIKLePi7Y3X0UahHCqISGpew,2151
38
+ spiralmap-0.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
39
+ spiralmap-0.0.4.dist-info/licenses/LICENSE.md,sha256=5w1L9A7eVMqU0wNIsBTTZA8K2JBIK0KKbqMSaQ1z9m0,1076
40
+ spiralmap-0.0.4.dist-info/RECORD,,