From 572a59fe9760f179f37fc1915ee680aacc09532a Mon Sep 17 00:00:00 2001
From: Bruce Flynn <brucef@ssec.wisc.edu>
Date: Thu, 12 Apr 2018 20:40:36 +0000
Subject: [PATCH] fix: VIIRS apid order for rdr2l0
---
edosl0util/jpssrdr.py | 5 +++--
setup.py | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/edosl0util/jpssrdr.py b/edosl0util/jpssrdr.py
index a22a413..a2601b4 100644
--- a/edosl0util/jpssrdr.py
+++ b/edosl0util/jpssrdr.py
@@ -22,7 +22,7 @@ import numpy as np
from h5py import File as H5File
from .headers import BaseStruct
-from .merge import merge
+from .merge import merge, VIIRS_APID_ORDER
LOG = logging.getLogger(__name__)
@@ -323,8 +323,9 @@ def _do_rdr_to_l0(filepat, satellite, product, rdrs, start, end):
pdsname = pdsfilename(product, start)
LOG.info('merging to %s', pdsname)
+ order = VIIRS_APID_ORDER if 'VIIRSSCIENCE' in product else None
with open(pdsname, 'wb') as dest:
- merge(streams, output=dest, trunc_to=[start, end])
+ merge(streams, output=dest, trunc_to=[start, end], apid_order=order)
return pdsname
diff --git a/setup.py b/setup.py
index 9c4d4d0..441e77e 100644
--- a/setup.py
+++ b/setup.py
@@ -32,5 +32,6 @@ setup(
edosl0merge = edosl0util.cli.merge:main
edosl0crgen = edosl0util.cli.crgen:main
rdr2l0 = edosl0util.cli.rdr2l0:main
+ rdrgen = edosl0util.cli.rdrgen:main
"""
)
--
GitLab