From 6af17f17aaad1fb189b034b122165fcf28611bbf Mon Sep 17 00:00:00 2001
From: Bruce Flynn <brucef@ssec.wisc.edu>
Date: Wed, 18 Dec 2019 14:39:01 -0600
Subject: [PATCH] fix j1 handling in rdrmerge, add test
---
.gitattributes | 1 +
edosl0util/cli/rdrmerge.py | 8 +++++++-
...e0800120_b00001_c20191212080005825000_all-_dev.h5 | 3 +++
tests/test_rdrmerge.py | 12 ++++++++++++
4 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 .gitattributes
create mode 100644 tests/fixtures/merge/RNSCA-RVIRS_j01_d20191212_t0745585_e0800120_b00001_c20191212080005825000_all-_dev.h5
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4f159de
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+tests/fixtures/merge/RNSCA-RVIRS_j01_d20191212_t0745585_e0800120_b00001_c20191212080005825000_all-_dev.h5 filter=lfs diff=lfs merge=lfs -text
diff --git a/edosl0util/cli/rdrmerge.py b/edosl0util/cli/rdrmerge.py
index 0a12727..506a8e0 100644
--- a/edosl0util/cli/rdrmerge.py
+++ b/edosl0util/cli/rdrmerge.py
@@ -80,7 +80,13 @@ def extract_packets(sat, product, fpath, workdir="."):
return outputs
-start_of_mission = {"snpp": datetime(2011, 10, 28), "noaa20": datetime(2017, 11, 18)}
+start_of_mission = {
+ "snpp": datetime(2011, 10, 28),
+ "npp": datetime(2011, 10, 28),
+ "j01": datetime(2017, 11, 18),
+ "jpss1": datetime(2017, 11, 18),
+ "noaa20": datetime(2017, 11, 18),
+}
def merge_rdrs(inputs):
diff --git a/tests/fixtures/merge/RNSCA-RVIRS_j01_d20191212_t0745585_e0800120_b00001_c20191212080005825000_all-_dev.h5 b/tests/fixtures/merge/RNSCA-RVIRS_j01_d20191212_t0745585_e0800120_b00001_c20191212080005825000_all-_dev.h5
new file mode 100644
index 0000000..c4d98a7
--- /dev/null
+++ b/tests/fixtures/merge/RNSCA-RVIRS_j01_d20191212_t0745585_e0800120_b00001_c20191212080005825000_all-_dev.h5
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b43663102af691fc30d09cf2ea8a686a2d5a2af0dc17b7274eb806822ec255e
+size 282464388
diff --git a/tests/test_rdrmerge.py b/tests/test_rdrmerge.py
index 7d7105f..b4e49fb 100644
--- a/tests/test_rdrmerge.py
+++ b/tests/test_rdrmerge.py
@@ -35,3 +35,15 @@ def test_rdrmerge_viirs(testdir):
outputs = rdrmerge.merge_rdrs(rdrs)
assert len(outputs) == 1
assert os.path.exists(outputs[0])
+
+
+@pytest.mark.slow
+def test_rdrmerge_viirs_j1(testdir):
+ rdrs = glob(
+ os.path.join(os.getcwd(), "tests/fixtures/merge/RNSCA-RVIRS_j01_d2019*.h5")
+ )
+ testdir.chdir()
+
+ outputs = rdrmerge.merge_rdrs(rdrs)
+ assert len(outputs) == 1
+ assert os.path.exists(outputs[0])
--
GitLab