update sp3, clk parser docs

Author: betaBison

.gitignore

@@ -25,11 +25,15 @@ results/*
 
 # Ignore downloaded precise ephimerides files by default
 *.sp3
+*.SP3
 *.clk
+*.CLK
 
 # Include unit test files for precise ephimerides
 !data/unit_test/*/*.sp3
+!data/unit_test/*/*.SP3
 !data/unit_test/*/*.clk
+!data/unit_test/*/*.CLK
 
 # Ignore NMEA files by default
 *.nmea

gnss_lib_py/parsers/clk.py

@@ -65,29 +65,13 @@ def __init__(self, input_path):
         with open(input_path, 'r', encoding="utf-8") as infile:
             clk = infile.readlines()
 
-        line = 0
-        while True:
-            if 'OF SOLN SATS' not in clk[line]:
-                del clk[line]
-            else:
-                line +=1
-                break
-
-        line = 0
-        while True:
-            if 'END OF HEADER' not in clk[line]:
-                line +=1
-            else:
-                del clk[0:line+1]
-                break
-
         for  clk_val in clk:
 
-            if len(clk_val) == 0 or clk_val[0:2]!='AS':
-                continue
-
             timelist_val = clk_val.split()
 
+            if len(timelist_val) == 0 or timelist_val[0] != 'AS':
+                continue
+
             gnss_sv_id = timelist_val[1]
 
             curr_time = datetime(year = int(timelist_val[2]), \

notebooks/tutorials/parsers.ipynb

@@ -498,14 +498,14 @@
    "outputs": [],
    "source": [
     "# download .sp3 data file\n",
-    "!wget https://raw.githubusercontent.com/Stanford-NavLab/gnss_lib_py/main/data/unit_test/sp3/grg21553_short.sp3 --quiet -O \"grg21553_short.sp3\"\n",
+    "!wget https://raw.githubusercontent.com/Stanford-NavLab/gnss_lib_py/main/data/unit_test/sp3/COD0MGXFIN_20211180000_01D_05M_ORB.SP3 --quiet -O \"COD0MGXFIN_20211180000_01D_05M_ORB.SP3\"\n",
     "# Specify .sp3 file path to extract precise ephemerides\n",
-    "sp3_path = \"grg21553_short.sp3\"\n",
+    "sp3_path = \"COD0MGXFIN_20211180000_01D_05M_ORB.SP3\"\n",
     "\n",
     "# download .clk data file\n",
-    "!wget https://raw.githubusercontent.com/Stanford-NavLab/gnss_lib_py/main/data/unit_test/clk/grg21553_short.clk --quiet -O \"grg21553_short.clk\"\n",
+    "!wget https://raw.githubusercontent.com/Stanford-NavLab/gnss_lib_py/main/data/unit_test/clk/COD0MGXFIN_20211180000_01D_30S_CLK.CLK --quiet -O \"COD0MGXFIN_20211180000_01D_30S_CLK.CLK\"\n",
     "# Specify .clk file path to extract precise ephemerides\n",
-    "clk_path = \"grg21553_short.clk\""
+    "clk_path = \"COD0MGXFIN_20211180000_01D_30S_CLK.CLK\""
    ]
   },
   {
@@ -548,8 +548,8 @@
    "outputs": [],
    "source": [
     "# Update derived_data class with satellite information computed via precise ephemerides\n",
-    "derived_gps_glonass = derived_data.where(\"gnss_id\",(\"gps\",\"glonass\"))\n",
-    "derived_multi_gnss = glp.add_sv_states_sp3_and_clk(derived_gps_glonass, sp3_path, \\\n",
+    "# derived_gps_glonass = derived_data.where(\"gnss_id\",(\"gps\",\"glonass\"))\n",
+    "derived_multi_gnss = glp.add_sv_states_sp3_and_clk(derived_data, sp3_path, \\\n",
     "                                                         clk_path, verbose = False)"
    ]
   },
@@ -562,13 +562,12 @@
    "source": [
     "# Check that all the desired fields related to satellite information have useful\n",
     "# information, and norm of computed satellite position matches the altitude of GNSS constellation\n",
-    "sat_alt = np.linalg.norm(np.transpose([derived_multi_gnss[SV_KEYS[0]][0:2],\n",
-    "                                        derived_multi_gnss[SV_KEYS[1]][0:2], \n",
-    "                                        derived_multi_gnss[SV_KEYS[2]][0:2]]), axis=1)\n",
-    "print('Distance of two satellites from the center of the Earth (expected around 26000000 m):', derived_multi_gnss[\"gnss_id\"][0:2], sat_alt)\n",
-    "print(\"Extracted values for same satellites: \")\n",
-    "for sv in SV_KEYS:\n",
-    "    print(sv, ':', derived_multi_gnss[sv][0:2])"
+    "sat_alt = np.linalg.norm(derived_multi_gnss[[\"x_sv_m\",\"y_sv_m\",\"z_sv_m\"],9:12],axis=0)\n",
+    "print('Distance of two satellites from the center of the Earth (expected around 26000000 m)')\n",
+    "print(\"Three GPS SVs calculated to be at:\", sat_alt,\"\\n\")\n",
+    "\n",
+    "print(\"Small section of calculated positions:\")\n",
+    "print(derived_multi_gnss.copy(cols=[2,3,4,5],rows=[\"gnss_id\"]+SV_KEYS))"
    ]
   },
   {