Merge branch 'maven_mgs' into maven_mgs_2

pysat · Oct 2, 2023 · 2ea0dac · 2ea0dac
2 parents c8a27a6 + 106aeb4
commit 2ea0dac
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/pysatNASA/instruments/__init__.py b/pysatNASA/instruments/__init__.py
@@ -11,7 +11,7 @@
            'de2_lang', 'de2_nacs', 'de2_rpa', 'de2_vefi', 'de2_wats',
            'dmsp_ssusi', 'formosat1_ivm',
            'icon_euv', 'icon_fuv', 'icon_ivm', 'icon_mighti',
-           'igs_gps', 'iss_fpmu', 'jpl_gps', 'maven_insitu',
+           'igs_gps', 'iss_fpmu', 'jpl_gps', 'maven_insitu_kp',
            'maven_mag', 'maven_sep', 'omni_hro',
            'ses14_gold', 'timed_guvi', 'timed_saber', 'timed_see']
 

diff --git a/pysatNASA/instruments/maven_insitu.py → pysatNASA/instruments/maven_insitu_kp.py b/pysatNASA/instruments/maven_insitu.py → pysatNASA/instruments/maven_insitu_kp.py
@@ -24,7 +24,7 @@
 ::
     import pysat
 
-    insitu = pysat.Instrument(platform='maven', name='insitu')
+    insitu = pysat.Instrument(platform='maven', name='insitu_kp')
     insitu.download(dt.datetime(2020, 1, 1), dt.datetime(2020, 1, 31))
     insitu.load(2020, 1, use_header=True)
 
@@ -42,7 +42,7 @@
 # Instrument attributes
 
 platform = 'maven'
-name = 'insitu'
+name = 'insitu_kp'
 tags = {'': ''}
 inst_ids = {'': ['']}
 

diff --git a/pysatNASA/instruments/maven_sep.py b/pysatNASA/instruments/maven_sep.py
@@ -23,7 +23,7 @@
 ::
     import pysat
 
-    insitu = pysat.Instrument(platform='MAVEN', name='insitu')
+    insitu = pysat.Instrument(platform='maven', name='sep', inst_id = 's1')
     insitu.download(dt.datetime(2020, 1, 1), dt.datetime(2020, 1, 31))
     insitu.load(2020, 1, use_header = True)
 """
@@ -42,7 +42,7 @@
 platform = 'maven'
 name = 'sep'
 tags = {'': ''}
-inst_ids = {'': ['', 's1', 's2']}
+inst_ids = {'s1': [''], 's2': ['']}
 
 pandas_format = False
 
@@ -74,9 +74,8 @@
 fname2 = ''.join(('mvn_sep_l2_s2-cal-svy-full_{year:04d}{month:02d}{day:02d}_',
                  'v{version:02d}_r{revision:02d}.cdf'))
 
-supported_tags = {'': {'': fname,
-                       's1': fname,
-                       's2': fname2}}
+supported_tags = {'s1': {'': fname},
+                  's2': {'': fname2}}
 
 list_files = functools.partial(mm_gen.list_files,
                                supported_tags=supported_tags)
@@ -90,9 +89,8 @@
                                     '/{year:04d}/{month:02d}')),
               'fname': fname2}
 
-download_tags = {'': {'': basic_tag,
-                      's1': basic_tag,
-                      's2': basic_tag2}}
+download_tags = {'s1': {'': basic_tag},
+                 's2': {'': basic_tag2}}
 
 # Set the download routine
 download = functools.partial(cdw.download, supported_tags=download_tags)

diff --git a/pysatNASA/instruments/methods/maven.py b/pysatNASA/instruments/methods/maven.py
@@ -10,10 +10,11 @@
                     ' The Mars Atmosphere and Volatile Evolution',
                     '(MAVEN) Mission. Space Sci Rev 195, 3–48 (2015).',
                     ' https://doi.org/10.1007/s11214-015-0139-x'))
-refs = {'insitu': ''.join(('Jakosky, B.M., Lin, R.P., Grebowsky, J.M. et al.',
-                           ' The Mars Atmosphere and Volatile Evolution',
-                           '(MAVEN) Mission. Space Sci Rev 195, 3–48 (2015).',
-                           ' https://doi.org/10.1007/s11214-015-0139-x')),
+refs = {'insitu_kp': ''.join(('Jakosky, B.M., Lin, R.P., Grebowsky, J.M. et',
+                              ' al. The Mars Atmosphere and Volatile Evolution',
+                              '(MAVEN) Mission. Space Sci Rev',
+                              ' 195, 3–48 (2015).',
+                              ' https://doi.org/10.1007/s11214-015-0139-x')),
         'mag': ''.join(('Connerney, J., and P. Lawton, MAVEN MAG',
                         ' PDS Archive SIS - This document ',
                         'describes the format and content of the MAVEN',