shipgrav 1.0.7__py2.py3-none-any.whl → 1.0.10__py2.py3-none-any.whl

shipgrav/database.toml

@@ -1,11 +1,11 @@
 [bias-values]
-Atlantis = {'dgs'=969758.4968, 'bgm'=855580.65}
-Thompson = {'dgs'=969527.3497, 'bgm'=855489.8}
+Atlantis = {'dgs'=969751.259, 'bgm'=855580.65}  # 2025
+Thompson = {'dgs'=969492.789, 'bgm'=855489.8}  # Jan 2026
 Revelle = {'dgs'=968888.6465, 'bgm'=855240.81987}
 NBP = {'dgs'=968634.2514, 'bgm'=-999}
 Ride = {'dgs'=968895.7718, 'bgm'=-999}
-Langseth = {'dgs'=-999, 'bgm'=854974.4}
-Sikuliaq = {'dgs'=969538.8152, 'bgm'=-999}
+Langseth = {'dgs'=969376.125, 'bgm'=854974.4}  # 2025
+Sikuliaq = {'dgs'=969538.8152, 'bgm'=-999}   #2025
 
 [nav-talkers]
 Atlantis = 'GPGGA'

shipgrav/io.py

@@ -572,6 +572,8 @@ def read_dgs_laptop(fp, ship, ship_function=None, progressbar=True):
                 dat = _dgs_laptop_Thompson(path)
             elif ship == 'Sikuliaq':
                 dat = _dgs_laptop_Sikuliaq(path)
+            elif ship == 'Langseth':
+                dat = _dgs_laptop_Langseth(path)
             else:
                 print('R/V %s not supported for dgs laptop file read' % ship)
                 return -999
@@ -613,6 +615,55 @@ def _dgs_laptop_Thompson(path):
     dat['date_time'] = pd.to_datetime(dat.pop('date')+' '+dat.pop('time'),utc=True)
     return dat
 
+def _dgs_laptop_Langseth(path):
+    """Read DGS laptop data from Langseth, which has a prefix of dgsdata yyyy:ddd:hh:mm:ss.ssss 
+    and some random errors of misaligned columns
+    """
+    cleaned, skipped = [], 0
+
+    with open(path, 'r', encoding='utf-8', errors='ignore') as f:
+        for ln_no, raw in enumerate(f, 1):
+            s = raw.lstrip()  # remove leading spaces before 'dgsdata'
+            # Remove optional prefix: "dgsdata yyyy:ddd:hh:mm:ss.ssss "
+            if s.startswith('dgsdata'):
+                parts = s.split(None, 2)
+                if len(parts) < 3:
+                    print(f"SKIP malformed prefix in {path}: line {ln_no}")
+                    skipped += 1
+                    continue
+                tail = parts[2].rstrip('\n')
+            else:
+                tail = s.rstrip('\n')
+            # Skip lines that are not 26 fields and report where they are
+            fields = tail.split(',')
+            if len(fields) != 26:
+                print(f"SKIP non-26-field line in {path}: line {ln_no} (NF={len(fields)})")
+                skipped += 1
+                continue
+
+            cleaned.append(fields)
+
+    if skipped:
+        print(f"INFO: Skipped {skipped} line(s) in {path} (not 26 fields)")
+
+    if not cleaned:
+        # Return empty frame with expected columns if nothing valid
+        cols = ['rgrav','long_a','crss_a','status','ve','vcc','al','ax','lat','lon',
+                'year','month','day','hour','minute','second','date_time']
+        return pd.DataFrame(columns=cols)
+
+    dat = pd.DataFrame(np.array(cleaned).T[[1, 2, 3, 6, 10, 11, 12, 13, 14, 15, 19, 20, 21, 22, 23, 24]].T,
+            columns=['rgrav', 'long_a', 'crss_a', 'status', 've', 'vcc','al', 'ax', 
+            'lat', 'lon', 'year', 'month', 'day','hour', 'minute', 'second'])
+
+    # Convert to numeric
+    for col in dat.columns:
+        dat[col] = pd.to_numeric(dat[col], errors='coerce')
+
+    dat['date_time'] = pd.to_datetime(
+        dat[['year', 'month', 'day', 'hour', 'minute', 'second']], utc=True)
+    return dat
+
 
 def read_dgs_raw(fp, ship, scale_ccp=True, progressbar=True):
     """Read raw (serial) output files from DGS AT1M.
@@ -638,6 +689,8 @@ def read_dgs_raw(fp, ship, scale_ccp=True, progressbar=True):
     for path in tqdm(fp,desc='reading DGS files',disable=not progressbar):
         if ship == 'Thompson':  # always with the special file formats
             dat = _dgs_raw_Thompson(path)
+        elif ship == 'Sikuliaq':
+            dat = _dgs_raw_Sikuliaq(path)
         else:  # there might be exceptions besides Thompson but I don't know about them yet
             dat = _dgs_raw_general(path)
 
@@ -704,6 +757,25 @@ def _dgs_raw_Thompson(path):
 
     return dat
 
+def _dgs_raw_Sikuliaq(path):
+    """Read raw gravity file for R/V Sikuliaq. Not extensively tested.
+    """
+    dat = pd.read_csv(path, comment='#', delimiter='\t', names=['logname', 'timestamp', 'raw'])
+
+    # Extract relevant fields
+    parts = dat['raw'].str.extract(
+        r'^\$AT1M_[^,]*,([-\d.]+),([-\d.]+),([-\d.]+),[^,]*,[^,]*,[^,]*,[^,]*,([-\d.]+),([-\d.]+),([-\d.]+),([-\d.]+),[^,]*,[^,]*,([-\d.]+),([-\d.]+)'
+    )
+    parts.columns = ['rgrav', 'long_a', 'crss_a', 'vcc', 've', 'al', 'ax', 'lat', 'lon']
+
+    # Convert to numeric
+    for col in parts.columns:
+        parts[col] = pd.to_numeric(parts[col], errors='coerce')
+
+    dat = pd.concat([dat[['timestamp']], parts], axis=1)
+    dat['date_time'] = pd.to_datetime(dat.pop('timestamp'), utc=True)
+    return dat
+
 ########################################################################
 # reading other things (MRU etc)
 ########################################################################

shipgrav/tests/ex_files/MGL_dgsdata.y2025d254

@@ -0,0 +1,5 @@
+dgsdata	2025:254:00:00:00.9100	9382.775980900780,1483.187129171984, -4.223089483153, -5.347272318276,  0.003149038929, 51.500000000000,           20830,         5546652, 28.281200000000, 52.868836000000,  0.323080000000, 16.646090000000,  0.254130000000, -0.379190000000, 23.067226666667,-112.378688333333,  5.111352558064,144.700000000000, 19.918886685114,2025,09,11,00,00,00.91,297172
+dgsdata	2025:254:00:00:01.9201	9382.768550844663,380.608909648050, -2.882289037977, -3.642013197185,  0.002531534735, 51.500000000000,           20830,         6059436, 28.281640000000, 52.878764000000,  0.415790000000, 21.178990000000,  0.316760000000, -0.183670000000, 23.067188333333,-112.378660000000,  5.069654546462,144.700000000000, 19.835721693473,2025,09,11,00,00,01.91,297173
+dgsdata	2025:254:00:00:02.9270	9382.768166650942,2396.951266607078, -0.499869286998, -0.758080692062,  0.001363283558, 51.500000000000,           20830,         6773987, 28.281750000000, 52.901102000000,  0.493870000000, 26.768760000000,  0.514720000000,  0.152990000000, 23.067148333333,-112.378628333333,  5.132458958999,144.700000000000, 19.755630454797,2025,09,11,00,00,02.91,297174
+dgsdata	2025:254:00:00:03.9120	9382.773314616561,7551.568206079627,  2.084704051579,  2.431311479963,  0.000397688198, 51.500000000000,           20830,         7395594, 28.281640000000, 52.903584000000,  0.554250000000, 30.714220000000,  0.805880000000,  0.642830000000, 23.067111666667,-112.378598333333,  5.210707079537,144.500000000000, 19.678636578924,2025,09,11,00,00,03.91,297175
+dgsdata	2025:254:00:00:04.9238	9382.780964749858,13428.584672971925,  3.915424217632,  4.815386928962,  0.000407224942, 51.500000000000,           20830,         7720796, 28.281750000000, 52.901102000000,  0.570960000000, 31.924110000000,  1.041950000000,  1.100670000000, 23.067073333333,-112.378570000000,  5.212766240604,144.300000000000, 19.604757648864,2025,09,11,00,00,04.91,297176

shipgrav/tests/ex_files/SKQ_dgs_proc.20241213T0000Z

@@ -0,0 +1,21 @@
+# Platform:
+#   Name: R/V Sikuliaq
+#   Operator: UAF
+#   IMO Number: 9578945
+#   ICES Code: 33BI
+#   Call Sign: WDN7246
+#   MMSI Number: 338417000
+# Cruise ID: SKQ202418S
+#
+# Instrument:
+#   Name: Dynamic Gravity Systems Advanced Technology Marine Gravimeter
+#   Model: AT1-M
+#   Serial Number: 33
+#   Location: Aft inboard wall of tech workshop, 1-12-1
+#   Installation Date: 28 November 2023
+#
+# Parameters:
+# Log Name	Log Time	QC_Gravity, Gravity, Long accelerometer, Cross accelerometer, beam, Sensor Temp, STATUS, Checksum, Pressure, Etemp, Ve, Vcc, Al, Ax, Latitude, Longitude, Speed, Course, VMOND, Year, Month, Day Hours, Min, Seconds, NumLine
+#
+grav_dgs_33_proc	2024-12-13T00:00:00.4059Z	9389.827772838045,9288.404692385160, -0.023006441952, -0.112389577912, -0.981155312199, 52.255832250000,           20766,         4039201, 28.944054383333, 51.226372500000,  0.002350000000,  0.436120000000,  0.005350000000,  0.001870000000, 21.315802416667,-157.877074616667,  0.000000000000,  8.140000000000,  0.160753801557,2024,12,12,23,59,55.00,5196653
+grav_dgs_33_proc	2024-12-13T00:00:01.3929Z	9389.825061856613,9323.774367216154, -0.035286907588, -0.139204518700, -0.981177961967, 52.256280125000,           20766,         4036172, 28.944054383333, 51.225338333333,  0.002200000000,  0.404080000000,  0.005640000000,  0.002050000000, 21.315802483333,-157.877074600000,  0.000000000000,318.940000000000,  0.160422031783,2024,12,12,23,59,56.00,5196654

shipgrav/tests/ex_files/SKQ_dgs_raw.20241018T2212Z

@@ -0,0 +1,21 @@
+# Platform:
+#   Name: R/V Sikuliaq
+#   Operator: UAF
+#   IMO Number: 9578945
+#   ICES Code: 33BI
+#   Call Sign: WDN7246
+#   MMSI Number: 338417000
+# Cruise ID: SKQ202416T
+#
+# Instrument:
+#   Name: Dynamic Gravity Systems Advanced Technology Marine Gravimeter
+#   Model: AT1-M
+#   Serial Number: 33
+#   Location: Aft inboard wall of tech workshop, 1-12-1
+#   Installation Date: 28 November 2023
+#
+# Parameters:
+# Log Name	Log Time	$head2, dgravity, dlong, dcross, dbeam, dtemp, dpressure, detemp, rvcc, rve, ral, rax, status, check, latitude, longitude, speed, course, datestamp
+#
+grav_dgs_33_raw	2024-10-18T22:12:35.6591Z	$AT1M_3.64_438219,19964,1208,-578,4008935,273,498,202,30569,425,277,-224,266,4061549,0.0000000000,0.0000000000,0.0000,0.0000,438219
+grav_dgs_33_raw	2024-10-18T22:12:36.6591Z	$AT1M_3.64_438220,19569,1174,-762,4008937,273,497,203,30566,410,264,-233,266,4060898,0.0000000000,0.0000000000,0.0000,0.0000,438220

shipgrav/tests/test_grav_data.py

@@ -74,7 +74,7 @@ class gravDataTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(gravDataTestCase, 'test')
+    return unittest.defaultTestLoader.loadTestsFromTestCase(gravDataTestCase)
 
 
 if __name__ == '__main__':

shipgrav/tests/test_grav_nodata.py

@@ -58,7 +58,7 @@ class gravNoDataTestCase(unittest.TestCase):
         self.assertTrue(sdat[0,0] - 130.877533 < 0.001)
 
 def suite():
-    return unittest.makeSuite(gravNoDataTestCase, 'test')
+    return unittest.defaultTestLoader.loadTestsFromTestCase(gravNoDataTestCase)
 
 
 if __name__ == '__main__':

shipgrav/tests/test_io.py

@@ -94,6 +94,18 @@ class ioTestCase(unittest.TestCase):
         self.assertEqual(dgs.iloc[0]['ve'], 2e-5)
         self.assertTrue(dgs.iloc[0]['rgrav'] - 9995.95186 < 0.0001)
 
+    def test_read_dgs_dat_Langseth(self):
+        dgs = sgi.read_dgs_laptop(f'{self.ex_files}'+os.sep+'MGL_dgsdata.y2025d254', 'Langseth', progressbar=False)
+        self.assertEqual(dgs.iloc[0]['date_time'].timestamp(), 1757548800.91)
+        self.assertEqual(dgs.iloc[0]['ve'], 0.32308)
+        self.assertTrue(dgs.iloc[0]['rgrav'] - 1483.1871291 < 0.0001)
+
+    def test_read_dgs_dat_Sikuliaq(self):
+        dgs = sgi.read_dgs_laptop(f'{self.ex_files}'+os.sep+'SKQ_dgs_proc.20241213T0000Z', 'Sikuliaq', progressbar=False)
+        self.assertEqual(dgs.iloc[0]['date_time'].timestamp(), 1734047995.0)
+        self.assertEqual(dgs.iloc[0]['ve'], 0.00235)
+        self.assertTrue(dgs.iloc[0]['rgrav'] - 9288.4046923 < 0.0001)
+
     def test_read_dgs_dat_nope(self):
         dgs = sgi.read_dgs_laptop(f'{self.ex_files}'+os.sep+'DGStest_laptop.dat', 'Katama', progressbar=False)
         self.assertEqual(dgs, -999)
@@ -112,6 +124,13 @@ class ioTestCase(unittest.TestCase):
         self.assertEqual(dgs.iloc[0]['Gravity'], -82)
         self.assertTrue(dgs.iloc[0]['vcc'] - 0.0357100 < 0.0001)
 
+    def test_read_dgs_raw_Sikuliaq(self):
+        dgs = sgi.read_dgs_raw(f'{self.ex_files}'+os.sep+'SKQ_dgs_raw.20241018T2212Z', 'Sikuliaq', progressbar=False)
+        self.assertEqual(
+            dgs.iloc[0]['date_time'].timestamp(), 1729289555.6591)
+        self.assertEqual(dgs.iloc[0]['rgrav'], 19964)
+        self.assertTrue(dgs.iloc[0]['vcc'] - 0.30569 < 0.001)
+
     def test_read_mru(self):
         mru, cols = sgi.read_other_stuff(
             f'{self.ex_files}'+os.sep+'IXBlue.yaml', f'{self.ex_files}'+os.sep+'SR2312_mru.txt', 'PASHR')
@@ -121,7 +140,7 @@ class ioTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(ioTestCase, 'test')
+    return unittest.defaultTestLoader.loadTestsFromTestCase(ioTestCase)
 
 
 if __name__ == '__main__':

shipgrav/tests/test_nav.py

@@ -35,7 +35,7 @@ class navTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(navTestCase, 'test')
+    return unittest.defaultTestLoader.loadTestsFromTestCase(navTestCase)
 
 
 if __name__ == '__main__':

shipgrav/tests/test_utils.py

@@ -27,7 +27,7 @@ class utilsTestCase(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(utilsTestCase, 'test')
+    return unittest.defaultTestLoader.loadTestsFromTestCase(utilsTestCase)
 
 
 if __name__ == '__main__':

{shipgrav-1.0.7.dist-info → shipgrav-1.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipgrav
-Version: 1.0.7
+Version: 1.0.10
 Summary: Functions for marine gravity data processing and reduction
 Author-email: "Hannah F. Mark" <hmark@whoi.edu>
 Maintainer-email: "Hannah F. Mark" <hmark@whoi.edu>

{shipgrav-1.0.7.dist-info → shipgrav-1.0.10.dist-info}/RECORD

@@ -1,16 +1,16 @@
 shipgrav/__init__.py,sha256=aCI3zS2iUUH_hFhwPgs-VZDSdfsCnJExBjSgCJSVpY8,12151
-shipgrav/database.toml,sha256=_uQdFL6XeiYX_YKRB-3lzr7mVY6gcRF5r7CRL_F8Dx0,594
+shipgrav/database.toml,sha256=m8d-YCaReNGNiH1L8wjdJV9ewFb1a26jEpWzcDqgUWg,634
 shipgrav/grav.py,sha256=09d5LIczUGys9VerTngumOMLeYOqdVJVtAdBGJZw2R8,43196
-shipgrav/io.py,sha256=-w-NhsccIkTKqHwyD_rgJ3K1kiFT_fL1Nwcvw41_MsI,31586
+shipgrav/io.py,sha256=E4rXr8BWT2gUaZUf7_mEZrJdpSSyTtYrCgOF8FKBwaY,34581
 shipgrav/nav.py,sha256=3E2Il-PhTEPVv8_8PrLVe7h6slHq-2HYX_Q8PdpB6X4,2895
 shipgrav/utils.py,sha256=BJSBrKgCOADzdb6gBO3u9n16l22zzFXTAw42e5_QkBY,9582
 shipgrav/tests/__init__.py,sha256=i8hMukDivY8kFp7OBdo1byRJWMBvb8nDDWJcAy2cOOI,427
 shipgrav/tests/__main__.py,sha256=iJ8xSU8ucCmIDcOuv8uasZ9iV5dNR0DDuFRZrG0o2hE,38
-shipgrav/tests/test_grav_data.py,sha256=dmD49rb5p4GQumaldU0d6Ara-2L2-TjS4S7fXMXFFwo,3537
-shipgrav/tests/test_grav_nodata.py,sha256=skVHlimoyohxlDW7UG-sT_ASKOxs7sWakYm3HfkAoIE,2202
-shipgrav/tests/test_io.py,sha256=aiZTB2znmMFYUKgnMBHqjIty2MXlpyo8hqt7gI4_pSA,6141
-shipgrav/tests/test_nav.py,sha256=R2Fd_TIp_lOUjNtUcxvhZ5l-Vm1CmZ0-XzTcFiMFBRY,1195
-shipgrav/tests/test_utils.py,sha256=dz9T_hDBpPhhLj9Xv9U-QpeMC3MsGS3aGnAWIaUVJAc,970
+shipgrav/tests/test_grav_data.py,sha256=VTKUd9Y2rmH9rKpSSBrdga2LoBKDOGdDVBY-YXeUDkM,3559
+shipgrav/tests/test_grav_nodata.py,sha256=5YcY4uN564Dpl_K9YUogr6v2rKwNZdBJdbSnGsQ7pWo,2224
+shipgrav/tests/test_io.py,sha256=4HUStDkxNrAhMcLCZK6u6m13ZeINRo9XRDLp10Aejf0,7258
+shipgrav/tests/test_nav.py,sha256=pNgf4p-GEFsTZijbEQodn40bMr1POPi-aVj63RNAr9A,1217
+shipgrav/tests/test_utils.py,sha256=enhwMNkvoCYpPwIm0mZm3vOfK6F_CQ4VDEvYqZTJ9xA,992
 shipgrav/tests/ex_files/AT01_bgm.BGM,sha256=yaiVxd6vFeuoiKsUhMeTh22U2VOPPOR-UApr165Ua_I,184
 shipgrav/tests/ex_files/AT01_nav.gps,sha256=75q1E_z65N82UW33x1vcaXfIHIwY_7qq1alcD2LbahQ,722
 shipgrav/tests/ex_files/AT05_01_bgm.RGS,sha256=3MnlHJiIyzYe7KGr-bD8dfQ1nS_-Dt4A4g6TiVuNaBw,515
@@ -18,9 +18,12 @@ shipgrav/tests/ex_files/DGStest_laptop.dat,sha256=kUwAMltUXm32Dv9BnaDakA-KtNAuMx
 shipgrav/tests/ex_files/IXBlue.yaml,sha256=W-GGSMrSSvIXzX-b4rIU0u6Fv8bgNccZzNjTy-K1dNE,5394
 shipgrav/tests/ex_files/MGL2003_bgm.y2020d244,sha256=MdF9duKY138vuVcOzZ26XcpKPSrGp20MbWYkCUtXTIk,164
 shipgrav/tests/ex_files/MGL2003_nav.y2020d244,sha256=HheoWXYaevWkWE5uzNdv1vG5SHzh4AEog7UCu1O6Lw4,866
+shipgrav/tests/ex_files/MGL_dgsdata.y2025d254,sha256=J61CwundT_ihbKw8N_lyEHXGYtN0uYQSyDd6_1EGTGE,1935
 shipgrav/tests/ex_files/NBP_2301_nav.d013,sha256=Q-68kTPwGvYJ3u-nED3rem9JMSjaFxz75dYaxxrIb7c,1251
 shipgrav/tests/ex_files/RR2212_bgm.txt,sha256=sB3Si6hhdZevjQrtoEcdztiX7Zf1H6g5GxRpZyXK-po,246
 shipgrav/tests/ex_files/RR2212_nav.txt,sha256=BzazwIVkgILjHffoaWEKrqxN-4oOv_zGWqRvx3cF6I8,857
+shipgrav/tests/ex_files/SKQ_dgs_proc.20241213T0000Z,sha256=9h8yCmJaKbNS3-kQVPfdt9Wmp0_K4EAewb79begfD-4,1454
+shipgrav/tests/ex_files/SKQ_dgs_raw.20241018T2212Z,sha256=HfP6whrZA-r2py8-Y3YcDrQJdNVXox072VT0TtNQvs4,928
 shipgrav/tests/ex_files/SR2302_nav.raw,sha256=7LhR1GEG17QDnTIp5NAamqjDteTLD2bTHaNfZrVFFh4,2352
 shipgrav/tests/ex_files/SR2312_dgs_raw.txt,sha256=rTlIn75MBICBjnkjcn9SPCwpC5J3lMs4aq7-y6-dAmU,368
 shipgrav/tests/ex_files/SR2312_mru.txt,sha256=YBM4qy4BS_D0U4ngEyoIFZr4QQbMWQgEO681fVEmgYM,1060
@@ -28,7 +31,7 @@ shipgrav/tests/ex_files/TN400_bgm.Raw,sha256=DL7T2aJednjGLMKJo6K8KcUYLMjQCiv6bsU
 shipgrav/tests/ex_files/TN400_dgs_proc.Raw,sha256=oxTXwDdyoz5yuKe253L1GgOSR5oWGGMuXfSQWrT24Ag,760
 shipgrav/tests/ex_files/TN400_dgs_raw.Raw,sha256=tb-zerwCH6kkbGDbnnJ6I-sAUdCHOvkKgXXrBb6zTj8,311
 shipgrav/tests/ex_files/TN400_nav.Raw,sha256=66dgRQTXjf0JItMWE1ZGUO6NptrGqV6JyN2wdYe5bW8,194
-shipgrav-1.0.7.dist-info/METADATA,sha256=V2cPOwuPuUfHqExOfpOHfDerjQcAhmsbVHMeKkK_2yo,2877
-shipgrav-1.0.7.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
-shipgrav-1.0.7.dist-info/licenses/LICENSE,sha256=5X8cMguM-HmKfS_4Om-eBqM6A1hfbgZf6pfx2G24QFI,35150
-shipgrav-1.0.7.dist-info/RECORD,,
+shipgrav-1.0.10.dist-info/METADATA,sha256=IC-Ni5ku7QJVi32XxBlcheOhzMgbglXbsVWd8_GIqoA,2878
+shipgrav-1.0.10.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+shipgrav-1.0.10.dist-info/licenses/LICENSE,sha256=5X8cMguM-HmKfS_4Om-eBqM6A1hfbgZf6pfx2G24QFI,35150
+shipgrav-1.0.10.dist-info/RECORD,,