- added L6 archive for doy46

- updated reference position for doy46 - HAS: E29 excluded for doy46
hirokawa · Feb 25, 2025 · 2a8fc8d · 2a8fc8d
1 parent e76099e
commit 2a8fc8d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 18 deletions.
diff --git a/data/doy2025-046/2025046R.l6 b/data/doy2025-046/2025046R.l6
diff --git a/samples/test_pppbds.py b/samples/test_pppbds.py
@@ -42,9 +42,9 @@
     file_bds = '../data/doy2023-223/223v_bdsb2b.txt'
 elif dataset == 2:
     ep = [2025, 2, 15, 17, 0, 0]
-    xyz_ref = [-3962108.6726, 3381309.4719, 3668678.6264]
+    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
     navfile = '../data/doy2025-046/046r_rnx.nav'
-    obsfile = '../data/doy2025-046/046r_rnx.obs'  # PolaRX5
+    obsfile = '../data/doy2025-046/046r_rnx.obs'  # SEPT MOSAIC-X5
     file_bds = '../data/doy2025-046/046r_bdsb2b.txt'
 
 time = epoch2time(ep)

diff --git a/samples/test_ppphas.py b/samples/test_ppphas.py
@@ -14,7 +14,7 @@
 import cssrlib.gnss as gn
 from cssrlib.gnss import ecef2pos, Nav
 from cssrlib.gnss import time2gpst, time2doy, time2str, timediff, epoch2time
-from cssrlib.gnss import rSigRnx
+from cssrlib.gnss import rSigRnx, prn2sat, uGNSS
 from cssrlib.gnss import sys2str
 from cssrlib.peph import atxdec, searchpcv
 from cssrlib.cssr_has import cssr_has
@@ -25,7 +25,7 @@
 # Select test case
 #
 dataset = 2
-
+excl_sat = []
 # Start epoch and number of epochs
 #
 fromSbfConvert = False
@@ -48,6 +48,7 @@
     navfile = '../data/doy2025-046/046r_rnx.nav'  # Mosaic-X5
     obsfile = '../data/doy2025-046/046r_rnx.obs'  # Mosaic-X5
     file_has = '../data/doy2025-046/046r_gale6.txt'
+    excl_sat = [prn2sat(uGNSS.GAL, 29)]  # E29
 
 # Convert epoch and user reference position
 #
@@ -100,6 +101,9 @@
 #
 nav.pmode = 0
 
+if len(excl_sat) > 0:
+    nav.excl_sat = excl_sat
+
 # Decode RINEX NAV data
 #
 nav = rnx.decode_nav(navfile, nav)

diff --git a/samples/test_pppmdc.py b/samples/test_pppmdc.py
@@ -43,9 +43,9 @@
     file_l6 = '../data/doy2023-223/223v_qzsl6.txt'
 elif dataset == 2:
     ep = [2025, 2, 15, 17, 0, 0]
-    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]    
-    navfile = '../data/doy2025-046/046r_rnx.nav'  # Mosaic-X5
-    obsfile = '../data/doy2025-046/046r_rnx.obs'  # Mosaic-X5
+    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
+    navfile = '../data/doy2025-046/046r_rnx.nav'  #
+    obsfile = '../data/doy2025-046/046r_rnx.obs'  # SEPT MOSAIC-X5
     file_l6 = '../data/doy2025-046/046r_qzsl6.txt'
 
 time = epoch2time(ep)
@@ -66,7 +66,7 @@
 # Define signals to be processed
 #
 gnss = "GE"
-#gnss = "GEJR"
+# gnss = "GEJR"
 sigs = []
 if 'G' in gnss:
     sigs.extend([rSigRnx("GC1C"), rSigRnx("GC2W"),

diff --git a/samples/test_ppppvs.py b/samples/test_ppppvs.py
@@ -47,9 +47,9 @@
 
     ep = [2025, 2, 15, 17, 0, 0]
     navfile = '../data/doy2025-046/046r_rnx.nav'
-    obsfile = '../data/doy2025-046/046r_rnx.obs'  # PolaRX5
+    obsfile = '../data/doy2025-046/046r_rnx.obs'  # SEPT MOSAIC-X5
     file_pvs = '../data/doy2025-046/046r_sbas.txt'
-    xyz_ref = [-3962108.6726, 3381309.4719, 3668678.6264]
+    xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
 
 
 time = epoch2time(ep)

diff --git a/samples/test_ppprtk.py b/samples/test_ppprtk.py
@@ -19,15 +19,32 @@
 l6_mode = 0  # 0: from receiver log, 1: from archive on QZSS
 dataset = 2
 
-if l6_mode == 1:
+if l6_mode == 1:  # from archive
 
-    ep = [2021, 3, 19, 12, 0, 0]
-    xyz_ref = [-3962108.673, 3381309.574, 3668678.638]
-    navfile = '../data/doy2021-078/SEPT078M.21P'
-    obsfile = '../data/doy2021-078/SEPT078M.21O'
-    l6file = '../data/doy2021-078/2021078M.l6'
+    if dataset == 1:
 
-else:
+        ep = [2021, 3, 19, 12, 0, 0]
+        xyz_ref = [-3962108.673, 3381309.574, 3668678.638]
+        navfile = '../data/doy2021-078/SEPT078M.21P'
+        obsfile = '../data/doy2021-078/SEPT078M.21O'
+        l6file = '../data/doy2021-078/2021078M.l6'
+
+    elif dataset == 2:
+        ep = [2025, 2, 15, 17, 0, 0]
+        xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
+
+        time = epoch2time(ep)
+        year = ep[0]
+        doy = int(time2doy(time))
+        let = chr(ord('a')+ep[3])
+
+        bdir = '../data/doy{:04d}-{:03d}/'.format(year, doy)
+
+        navfile = bdir+'{:03d}{}_rnx.nav'.format(doy, let)
+        obsfile = bdir+'{:03d}{}_rnx.obs'.format(doy, let)  # SEPT MOSAIC-X5
+        l6file = bdir+'{:04d}{:03d}{}.L6'.format(year, doy, let)
+
+else:  # from receiver log
 
     if dataset == 0:
 
@@ -40,7 +57,7 @@
     elif dataset == 2:
 
         ep = [2025, 2, 15, 17, 0, 0]
-        xyz_ref = [-3962108.6726, 3381309.4719, 3668678.6264]
+        xyz_ref = [-3962108.6836, 3381309.5672, 3668678.6720]
 
         time = epoch2time(ep)
         year = ep[0]