diff --git a/pysatNASA/instruments/maven_mag.py b/pysatNASA/instruments/maven_mag.py index a18b034c..e108c460 100644 --- a/pysatNASA/instruments/maven_mag.py +++ b/pysatNASA/instruments/maven_mag.py @@ -24,8 +24,8 @@ -------- :: import pysat - - + + mag = pysat.Instrument(platform='maven', name='mag') mag.download(dt.datetime(2020, 1, 1), dt.datetime(2020, 1, 31)) mag.load(2020, 1, use_header = True) diff --git a/pysatNASA/instruments/maven_sep.py b/pysatNASA/instruments/maven_sep.py index 3bd60b27..796db117 100644 --- a/pysatNASA/instruments/maven_sep.py +++ b/pysatNASA/instruments/maven_sep.py @@ -27,7 +27,6 @@ insitu = pysat.Instrument(platform='MAVEN', name='insitu') insitu.download(dt.datetime(2020, 1, 1), dt.datetime(2020, 1, 31)) insitu.load(2020, 1, use_header = True) - """ import datetime as dt diff --git a/pysatNASA/instruments/methods/maven.py b/pysatNASA/instruments/methods/maven.py index 3d27d489..e5ecb5e9 100644 --- a/pysatNASA/instruments/methods/maven.py +++ b/pysatNASA/instruments/methods/maven.py @@ -10,22 +10,34 @@ ' The Mars Atmosphere and Volatile Evolution', '(MAVEN) Mission. Space Sci Rev 195, 3–48 (2015).', ' https://doi.org/10.1007/s11214-015-0139-x')) -references = ''.join(('Connerney, J., and P. Lawton, MAVEN MAG', - ' PDS Archive SIS - This document ', - 'describes the format and content of the MAVEN', - ' Magnetometer (MAG) Planetary Data System ', - '(PDS) data archive. ', - 'It includes descriptions of the Standard', - 'Data Products and associated metadata, ', - 'and the volume archive format,', - 'content, and generation pipeline. ', - 'Connerney, J.E.P.; Espley, J.; Lawton, P.;', - ' Murphy, S.; Odom, J.; Oliversen, R.;', - 'and Sheppard, D., The MAVEN Magnetic Field', - ' Investigation, Space Sci Rev,', - 'Vol 195, Iss 1-4, pp.257-291, 2015. ', - 'doi:10.1007/s11214-015-0169-4', - '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': ''.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', + ' Magnetometer (MAG) Planetary Data System ', + '(PDS) data archive. ', + 'It includes descriptions of the Standard', + 'Data Products and associated metadata, ', + 'and the volume archive format,', + 'content, and generation pipeline. ', + 'Connerney, J.E.P.; Espley, J.; Lawton, P.;', + ' Murphy, S.; Odom, J.; Oliversen, R.;', + 'and Sheppard, D., The MAVEN Magnetic Field', + ' Investigation, Space Sci Rev,', + 'Vol 195, Iss 1-4, pp.257-291, 2015. ', + 'doi:10.1007/s11214-015-0169-4', + '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')), + 'sep': ''.join(('Larson, D.E., Lillis, R.J., Lee, C.O. et al.', + 'The MAVEN Solar Energetic Particle Investigation.', + ' Space Sci Rev 195, 153–172 (2015).', + ' https://doi.org/10.1007/s11214-015-0218-z', + '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'))}