Skip to content

Commit f3d2a82

Browse files
committed
updated angles
1 parent 717c389 commit f3d2a82

File tree

1 file changed

+74
-24
lines changed

1 file changed

+74
-24
lines changed

quantities/units/angle.py

Lines changed: 74 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,85 @@
1+
# -*- coding: utf-8 -*-
12
"""
23
"""
34

45
from numpy import pi
56

67
from quantities.units.unitquantity import UnitAngle, UnitQuantity, dimensionless
78

8-
radian = radians = \
9-
UnitAngle('radian', 1*dimensionless)
10-
turn = turns = circle = circles = \
11-
UnitAngle('turn', 2*pi*radian)
12-
arcdeg = arcdegs = degree = degrees = angular_degree = angular_degrees = \
13-
UnitAngle('arcdeg', pi/180*radian)
14-
arcmin = arcmins = arcminute = arcminutes = angular_minute = \
15-
angular_minutes = \
16-
UnitAngle('arcmin', arcdeg/60)
17-
arcsec = arcsecs = arcseconds = arcseconds = angular_second = \
18-
angular_seconds = \
19-
UnitAngle('arcsec', arcmin/60)
20-
grade = grades = \
21-
UnitAngle('grade', 0.9*arcdeg)
9+
radian = radians = UnitAngle(
10+
'radian',
11+
1*dimensionless,
12+
symbol='rad',
13+
aliases=['radians']
14+
)
15+
turn = revolution = cycle = turns = circle = circles = UnitAngle(
16+
'turn',
17+
2*pi*radian,
18+
aliases=['turns', 'revolutions', 'circles', 'cycles']
19+
)
20+
degree = arcdeg = arcdegree = angular_degree = UnitAngle(
21+
'arcdegree',
22+
pi/180*radian,
23+
symbol='°',
24+
aliases=[
25+
'degree', 'degrees', 'arc_degree', 'arc_degrees', 'angular_degree',
26+
'angular_degrees', 'arcdegrees'
27+
]
28+
)
29+
arcminute = arcmin = arc_minute = angular_minute = UnitAngle(
30+
'arcminute',
31+
arcdeg/60,
32+
symbol='′',
33+
aliases=[
34+
'arcmin', 'arcmins', 'arcminutes', 'arc_minute', 'arc_minutes',
35+
'angular_minute', 'angular_minutes'
36+
]
37+
)
38+
arcsecond = arcsec = arc_second = angular_second = UnitAngle(
39+
'arcsec',
40+
arcmin/60,
41+
symbol='″',
42+
aliases=[
43+
'arcsec', 'arcsecs', 'arcseconds', 'arc_second', 'arc_second',
44+
'angular_second', 'angular_seconds'
45+
]
46+
)
47+
grad = grade = UnitAngle(
48+
'grad',
49+
0.9*arcdeg,
50+
aliases=['grads', 'grade', 'grades', 'gron', 'grons', 'gradian', 'gradians']
51+
)
2252

23-
degree_north = degrees_north = degree_N = degrees_N = \
24-
UnitAngle('degrees_N', arcdeg)
25-
degree_east = degrees_east = degree_E= degrees_E = \
26-
UnitAngle('degrees_E', arcdeg)
27-
degree_west = degrees_west = degree_W= degrees_W = \
28-
UnitAngle('degrees_W', arcdeg)
29-
degree_true = degrees_true = degree_T = degrees_T = \
30-
UnitAngle('degrees_T', arcdeg)
53+
degrees_north = degrees_N = UnitAngle(
54+
'degrees_north',
55+
arcdeg,
56+
symbol='°N',
57+
aliases=['degrees_N']
58+
)
59+
degrees_east = degrees_E = UnitAngle(
60+
'degrees_east',
61+
arcdeg,
62+
symbol='°E',
63+
aliases=['degrees_E']
64+
)
65+
degrees_west = degrees_W = UnitAngle(
66+
'degrees_west',
67+
arcdeg,
68+
symbol='°W',
69+
aliases=['degrees_W']
70+
)
71+
degrees_true = degrees_T = UnitAngle(
72+
'degrees_true',
73+
arcdeg,
74+
symbol='°T',
75+
aliases=['degrees_T']
76+
)
3177

32-
sr = steradian = steradians = \
33-
UnitQuantity('sr', radian**2)
78+
sr = steradian = UnitQuantity(
79+
'steradian',
80+
radian**2,
81+
symbol='sr',
82+
aliases=['steradians']
83+
)
3484

3585
del UnitQuantity

0 commit comments

Comments
 (0)