From 58b522b44ec2820b0f7313e4695f289f712aacfd Mon Sep 17 00:00:00 2001
From: Bruce Flynn <brucef@ssec.wisc.edu>
Date: Fri, 23 Feb 2018 12:15:08 -0600
Subject: [PATCH] fix: bad imports and names in rdr2l0
---
edosl0util/cli/rdr2l0.py | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/edosl0util/cli/rdr2l0.py b/edosl0util/cli/rdr2l0.py
index 9097684..4b6a5b1 100644
--- a/edosl0util/cli/rdr2l0.py
+++ b/edosl0util/cli/rdr2l0.py
@@ -3,8 +3,16 @@ Create a NASA Level0 PDS file from a set of NOAA IDPS RDR files. The output
PDS file will have packets sorted by time and apid. Any packets marked in
the RDR PacketTracker as containing fill are removed.
"""
-from edosl0util.jpssrdr import cris_hsk, cris_dwell, atms_dwell, atms_sci, viirs_sci, spacecraft, \
- cris_sci, atms_hsk
+from edosl0util.jpssrdr import (
+ cris_dwell_to_l0,
+ cris_hsk_to_l0,
+ cris_sci_to_l0,
+ atms_dwell_to_l0,
+ atms_hsk_to_l0,
+ atms_sci_to_l0,
+ viirs_sci_to_l0,
+ spacecraft_to_l0,
+)
__copyright__ = "Copyright (C) 2015 University of Wisconsin SSEC. All rights reserved."
@@ -52,14 +60,14 @@ def main():
subs = parser.add_subparsers(title='Destination level 0 data type sub-commands')
def cmd_cris_hsk(args):
- cris_hsk(args.satellite, args.rcrit, args.start, args.end)
+ cris_hsk_to_l0(args.satellite, args.rcrit, args.start, args.end)
subp = subs.add_parser('CRISHSK')
subp.add_argument('rcrit', nargs='+')
subp.set_defaults(func=cmd_cris_hsk)
def cmd_cris_dwell(args):
- return cris_dwell(args.satellite, args.rdrs, args.start, args.end)
+ return cris_dwell_to_l0(args.satellite, args.rdrs, args.start, args.end)
subp = subs.add_parser('CRISDWELL')
subp.add_argument(
@@ -69,21 +77,21 @@ def main():
subp.set_defaults(func=cmd_cris_dwell)
def cmd_cris_sci(args):
- return cris_sci(args.satellite, args.rcris, args.start, args.end)
+ return cris_sci_to_l0(args.satellite, args.rcris, args.start, args.end)
subp = subs.add_parser('CRISSCIENCE')
subp.add_argument('rcris', nargs='+')
subp.set_defaults(func=cmd_cris_sci)
def cmd_atms_hsk(args):
- return atms_hsk(args.satellite, args.ratmt, args.start, args.end)
+ return atms_hsk_to_l0(args.satellite, args.ratmt, args.start, args.end)
subp = subs.add_parser('ATMSHSK')
subp.add_argument('ratmt', nargs='+')
subp.set_defaults(func=cmd_atms_hsk)
def cmd_atms_dwell(args):
- return atms_dwell(args.satellite, args.rdrs, args.start, args.end)
+ return atms_dwell_to_l0(args.satellite, args.rdrs, args.start, args.end)
subp = subs.add_parser('ATMSDWELL')
subp.add_argument(
@@ -93,21 +101,21 @@ def main():
subp.set_defaults(func=cmd_atms_dwell)
def cmd_atms_sci(args):
- return atms_sci(args.satellite, args.ratms, args.start, args.end)
+ return atms_sci_to_l0(args.satellite, args.ratms, args.start, args.end)
subp = subs.add_parser('ATMSSCIENCE')
subp.add_argument('ratms', nargs='+')
subp.set_defaults(func=cmd_atms_sci)
def cmd_viirs_sci(args):
- return viirs_sci(args.satellite, args.rvirs, args.start, args.end)
+ return viirs_sci_to_l0(args.satellite, args.rvirs, args.start, args.end)
subp = subs.add_parser('VIIRSSCIENCE')
subp.add_argument('rvirs', nargs='+')
subp.set_defaults(func=cmd_viirs_sci)
def cmd_spacecraft(args):
- return spacecraft(args.satellite, args.rnsca, args.start, args.end)
+ return spacecraft_to_l0(args.satellite, args.rnsca, args.start, args.end)
subp = subs.add_parser('SPACECRAFT')
subp.add_argument('rnsca', nargs='+')
--
GitLab