Detector 2023

rnog_analysis_tools/coordinate_system/coordinate_origins.json

@@ -1,6 +1,7 @@
 {
   "DISC": {
-    "2022": [72.58279265212887, -38.45581495328228, 3251.9489147560234]
+    "2022": [72.58279265212887, -38.45581495328228, 3251.9489147560234],
+    "2023": [72.5827855,-38.4558625, 3256.22075]
   },
   "GPS_basestation" : {
     "2021": [72.57861774524889, -38.45293492521691, 0],

rnog_analysis_tools/coordinate_system/coordinate_system.py

@@ -1,5 +1,6 @@
 import numpy as np
 import pymap3d.enu
+import pymap3d.ellipsoid
 import os.path
 import json
 
@@ -27,6 +28,7 @@ def __init__(
             os.path.dirname(os.path.realpath(__file__)),
             'coordinate_origins.json'
         )
+        self.__ellipsoid = pymap3d.ellipsoid.Ellipsoid.from_name('wgs84')
         with open(filename, 'r') as json_file:
             self.__origin = np.array(json.load(json_file)[origin][str(year)])
 
@@ -35,7 +37,7 @@ def geodetic_to_enu(
             latitude,
             longitude,
             height=3260.,
-            deg=True
+            deg=True,
     ):
         """
         Convert from geodetic coordinates (latitude, longitude, elevation)
@@ -63,7 +65,7 @@ def geodetic_to_enu(
             origin[0],
             origin[1],
             origin[2],
-            None,
+            self.__ellipsoid,
             deg
         )
 
@@ -99,7 +101,7 @@ def enu_to_geodetic(
             origin[0],
             origin[1],
             origin[2],
-            None,
+            self.__ellipsoid,
             deg
         )
 
@@ -135,7 +137,7 @@ def enu_to_enu(
             origin[0],
             origin[1],
             origin[2],
-            None,
+            self.__ellipsoid,
             deg
         )
         new_origin = np.copy(self.__origin)
@@ -148,7 +150,7 @@ def enu_to_enu(
             new_origin[0],
             new_origin[1],
             new_origin[2],
-            None,
+            self.__ellipsoid,
             deg
         )