Merge pull request #11 from emit-sds/develop

Merge develop into main for v1.5.1
emit-sds · Nov 17, 2022 · b69aa98 · b69aa98
2 parents 70c7e3c + bb2a922
commit b69aa98
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.5.1](https://github.com/emit-sds/emit-sds-l1a/compare/v1.5.0...v1.5.1)
+
+> 17 November 2022
+
+- Ignore duplicate coarse times [`b1db604`](https://github.com/emit-sds/emit-sds-l1a/commit/b1db6041f1ef8b95d4be331867874b34a6d3667d)
+- Update version to 1.5.1 [`eb77b22`](https://github.com/emit-sds/emit-sds-l1a/commit/eb77b22ac8ac88e8e125e81943fde758a7ed59ab)
+
 #### [v1.5.0](https://github.com/emit-sds/emit-sds-l1a/compare/v1.4.1...v1.5.0)
 
-> 14 October 2022
+> 17 October 2022
 
+- Merge develop into main for v1.5.0 [`#10`](https://github.com/emit-sds/emit-sds-l1a/pull/10)
 - Corrupt frame handling in reassembly [`#9`](https://github.com/emit-sds/emit-sds-l1a/pull/9)
 - Merge IOC hotfixes into develop [`#8`](https://github.com/emit-sds/emit-sds-l1a/pull/8)
 - Save corrupt frames with '9' as acquisition status. During reassembly only use these frames if data is not compressed. [`8ce2620`](https://github.com/emit-sds/emit-sds-l1a/commit/8ce26200972cb2d3ebca109977b7c37abe9da578)

diff --git a/reformat_bad.py b/reformat_bad.py
@@ -113,7 +113,7 @@ def main():
     # Read in the STO files and store data in out_arr
     # TODO: Do I need to fill in missing data somehow?
     out_arr = []
-    out_arr_lens = []
+    coarse_times = set()
     for p in sto_paths:
         logger.info(f"Processing file {p}")
 
@@ -149,10 +149,16 @@ def main():
                     # Check if data is in start/stop time range and if so, append to output array
                     if ind is None:
                         raise RuntimeError("Attempting to add data, but no header row has been found.")
-                    timestamp = get_utc_time_from_gps(int(data[ind["time_coarse"]]))
-                    if start_time <= timestamp <= stop_time:
+                    if data[ind["time_coarse"]] is None:
+                        # If there is no coarse time, then just move on to the next row
+                        logger.debug(f"Skipping row because no coarse time was found: {data}")
+                        continue
+                    coarse_time = int(data[ind["time_coarse"]])
+                    timestamp = get_utc_time_from_gps(coarse_time)
+                    if start_time <= timestamp <= stop_time and coarse_time not in coarse_times:
                         out_arr.append(data)
-                        out_arr_lens.append(len(data))
+                        coarse_times.add(coarse_time)
+                        logger.debug(f"Adding row: {data}")
                         # out_file.writelines(",".join(data).rstrip(",") + "\n")
                 # Set or reset data_start to True
                 if "Start_Data" in line:

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setuptools.setup(
     name="emit_sds_l1a",
-    version="1.5.0",
+    version="1.5.1",
     author="Winston Olson-Duvall",
     author_email="[email protected]",
     description="""