Switched to using degrees for orbital element angles

MintonGroup · Aug 20, 2021 · 5365d6e · 5365d6e
1 parent f9e1ebe
commit 5365d6e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/python/swiftest/swiftest/init_cond.py b/python/swiftest/swiftest/init_cond.py
@@ -174,17 +174,17 @@ def solar_system_horizons(plname, idval, param, ephemerides_start_date, ds):
             p6.append(pldata[key].vectors()['vz'][0] * VCONV)
             p7.append(pldata[key].elements()['a'][0] * DCONV)
             p8.append(pldata[key].elements()['e'][0])
-            p9.append(pldata[key].elements()['incl'][0] * np.pi / 180.0)
-            p10.append(pldata[key].elements()['Omega'][0] * np.pi / 180.0)
-            p11.append(pldata[key].elements()['w'][0] * np.pi / 180.0)
-            p12.append(pldata[key].elements()['M'][0] * np.pi / 180.0)
+            p9.append(pldata[key].elements()['incl'][0])
+            p10.append(pldata[key].elements()['Omega'][0])
+            p11.append(pldata[key].elements()['w'][0])
+            p12.append(pldata[key].elements()['M'][0])
         elif param['OUT_FORM'] == 'EL':
             p1.append(pldata[key].elements()['a'][0] * DCONV)
             p2.append(pldata[key].elements()['e'][0])
-            p3.append(pldata[key].elements()['incl'][0] * np.pi / 180.0)
-            p4.append(pldata[key].elements()['Omega'][0] * np.pi / 180.0)
-            p5.append(pldata[key].elements()['w'][0] * np.pi / 180.0)
-            p6.append(pldata[key].elements()['M'][0] * np.pi / 180.0)
+            p3.append(pldata[key].elements()['incl'][0])
+            p4.append(pldata[key].elements()['Omega'][0])
+            p5.append(pldata[key].elements()['w'][0])
+            p6.append(pldata[key].elements()['M'][0])
             p7.append(pldata[key].vectors()['x'][0] * DCONV)
             p8.append(pldata[key].vectors()['y'][0] * DCONV)
             p9.append(pldata[key].vectors()['z'][0] * DCONV)

diff --git a/python/swiftest/swiftest/tool.py b/python/swiftest/swiftest/tool.py
@@ -8,10 +8,10 @@
 """
 
 def wrap_angle(angle):
-    while np.any(angle >= 2 * np.pi):
-        angle[angle >= 2 * np.pi] -= 2 * np.pi
+    while np.any(angle >= 360.0 ):
+        angle[angle >= 360.0] -= 360.0
     while np.any(angle < 0.0):
-        angle[angle < 0.0] += 2 * np.pi
+        angle[angle < 0.0] += 360.0
     return angle
 
 def follow_swift(ds, ifol=None, nskp=None):
@@ -50,15 +50,9 @@ def follow_swift(ds, ifol=None, nskp=None):
         intxt = input('Input the print frequency\n')
         nskp = int(intxt)
 
-    dr = 180.0 / np.pi
     fol['obar'] = fol['capom'] + fol['omega']
     fol['obar'] = fol['obar'].fillna(0)
     fol['obar'] = wrap_angle(fol['obar'])
-    fol['obar'] = fol['obar'] * dr
-    fol['inc'] = fol['inc'] * dr
-    fol['capom'] = fol['capom'] * dr
-    fol['omega'] = fol['omega'] * dr
-    fol['capm'] = fol['capm'] * dr
     fol['peri'] = fol['a'] * (1.0 - fol['e'])
     fol['apo']  = fol['a'] * (1.0 + fol['e'])