From 9b04a7b591a5f6ae9d5f4e46d4a3ce1973ce21dc Mon Sep 17 00:00:00 2001 From: Perry Date: Fri, 15 Sep 2017 23:14:32 -0700 Subject: [PATCH 01/11] Fixes #21, update docs --- CONTRIBUTING.rst | 16 ++++--- HISTORY.rst | 2 +- README.rst | 89 ++++++++++++++++++++++++++---------- docs/conf.py | 5 +- docs/index.rst | 3 +- docs/installation.rst | 7 +-- docs/planetary_test_data.rst | 19 ++++++++ docs/usage.rst | 9 ++-- requirements.txt | 2 + 9 files changed, 110 insertions(+), 42 deletions(-) create mode 100644 docs/planetary_test_data.rst diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 75fcbfb..fb0c7e8 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -36,9 +36,11 @@ is open to whoever wants to implement it. Write Documentation ~~~~~~~~~~~~~~~~~~~ +.. _numpydocs: https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt + Planetary Test Data could always use more documentation, whether as part of the official Planetary Test Data docs, in docstrings, or even on the web in blog posts, -articles, and such. +articles, and such. Please use `numpy docstrings `_. Submit Feedback ~~~~~~~~~~~~~~~ @@ -68,11 +70,12 @@ Ready to contribute? Here's how to set up `planetary_test_data` for local develo $ cd planetary_test_data/ $ pip install -r requirements.txt -4. Create a branch for local development:: +4. Create a branch for local development. Please branch from ``development`` branch:: + $ git checkout development $ git checkout -b name-of-your-bugfix-or-feature - Now you can make your changes locally. + Now you can make your changes locally. 5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox:: @@ -84,11 +87,12 @@ Ready to contribute? Here's how to set up `planetary_test_data` for local develo 6. Commit your changes and push your branch to GitHub:: - $ git add . + $ git add file_was_that_changed.ext $ git commit -m "Your detailed description of your changes." $ git push origin name-of-your-bugfix-or-feature -7. Submit a pull request through the GitHub website. +7. Submit a pull request through the GitHub website. Please make sure the base + branch is ``development`` Pull Request Guidelines ----------------------- @@ -99,7 +103,7 @@ Before you submit a pull request, check that it meets these guidelines: 2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in README.rst. -3. The pull request should work for Python 2.6, 2.7, 3.3, and 3.4, and for PyPy. Check +3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4, 3.5, and 3.6, and for PyPy. Check https://travis-ci.org/planetarypy/planetary_test_data/pull_requests and make sure that the tests pass for all supported Python versions. diff --git a/HISTORY.rst b/HISTORY.rst index d440c81..47d96c8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,7 +1,7 @@ .. :changelog: History -------- +======= 0.3.3 (2015-07-27) ------------------- diff --git a/README.rst b/README.rst index 7a61b44..d1a5668 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ -=============================== +=================== Planetary Test Data -=============================== +=================== .. image:: https://img.shields.io/travis/planetarypy/planetary_test_data.svg :target: https://travis-ci.org/planetarypy/planetary_test_data @@ -22,7 +22,7 @@ Features -------- * Downloads a core set of sample Planetary test data into - ``./mission_data/`` or if ``./tests/mission_data/`` if ``./tests/`` exists. + ``./mission_data/`` or ``./tests/mission_data/`` if ``./tests/`` exists. TODO ------ @@ -32,8 +32,6 @@ TODO * Find smaller example images to reduce download times. * Command line usage improvements - * Include a mode that just copies the ``data.json`` file into the local - directory. * Include a mode that allows users to somehow specify subsets of data to retrieve. Perhaps selecting by mission or instrument name. @@ -52,44 +50,89 @@ and then run the command ``get_mission_data``:: pip install planetary_test_data get_mission_data +To get a copy of a subset of ``data.json``:: + + get_mission_json + Additional usage options are shown below:: - usage: get_mission_data [-h] [--all] [--file FILE] [--dir DIR] - [--tags [TAGS [TAGS ...]]] + usage: get_mission_data [-h] [--all] [--file FILE] [--dir DIR] [--tags [TAGS]] optional arguments: - -h, --help show this help message and exit - --all, -a Download all products. - --file FILE, -f FILE Override default data.json by providing path to custom - data.json file. - --dir DIR, -d DIR Directory to place test data products in. - --tags [TAGS [TAGS ...]], -t [TAGS [TAGS ...]] - Retrieve products whose tags match those provided - here. + -h, --help show this help message and exit + --all, -a Download all products. + --file FILE, -f FILE Override default data.json by providing path to custom + data.json file. + --dir DIR, -d DIR Directory to place test data products in. + --tags [TAGS], -t [TAGS] + Retrieve products whose tags match those provided + here. + Description ------------ -Running ``get_mission_data`` will do the following +Running ``get_mission_data`` will do the following: * If ``tests`` directory exists it will create ``tests/mission_data`` if necessary. If ``tests`` does not exist, it will just create ``mission_data`` in the current directory. * The data prodcuts tagged to be ``core`` products will be downloaded into the download directory. - -Only products which do not exist in the download directory will be -downloaded. +* Use the ``-a`` or ``--all`` flag to get all the images. This, however, is NOT + recommended for you will download over 200 images and labels. +* The ``-t`` or ``--tags`` will retrieve products matched with the supplied tag. + To give multiple tags, use the flag multiple times. +* The ``-d`` or ``--dir`` flag can be used to save the images in a new custom + location. +* If there exists a custom ``data.json`` locally and you would rather use that + file to download images rather than the default, use the ``-f`` or + ``--file`` flag and then the path to the ``data.json``. This is especially + useful if there are test images needed that do not exist in or are not + part of the ``core`` in the default ``data.json`` (see ``get_mission_json`` + below). +* Only products which do not exist in the download directory will be downloaded. + +Running ``get_mission_json`` will do the following: + +* Create a copy of ``data.json`` in the ``tests`` or ``test`` directory. This + will just be the ``core`` data by default. The purpose of getting a copy of + the ``data.json`` is so it is easier to include images in respective + projects that are not included in the default ``data.json``. Then developers + can use the ``-f`` flag on ``get_mission_data`` (see above) to use this + custom ``data.json``. +* If ``data.json`` already exists, an exception is raised. +* The same flags apply to ``get_mission_json`` as ``get_mission_data``. Mission Data ------------- -The PDS mission data included in the package can be found here:: +.. _here: https://github.com/planetarypy/planetary_test_data/blob/master/planetary_test_data/data.json + +The PDS mission data included in the package can be found here_. + +The following are core products: -https://github.com/planetarypy/planetary_test_data/blob/master/planetary_test_data/data.json +* 0047MH0000110010100214C00_DRCL.IMG +* 0047MH0000110010100214C00_DRCL.LBL +* 1p134482118erp0902p2600r8m1.img +* 1p190678905erp64kcp2600l8c1.img +* 2p129641989eth0361p2600r8m1.img +* 2m132591087cfd1800p2977m2f1.img +* h58n3118.img +* r01090al.img If there are products you think should be included or removed from this dataset -please file a Github issue. +please file a Github issue. New images should be images from instruments that +are not already included or different file types (i.e. EDR vs RDR). New core +images should be distinctly different than the ones that exist and would expose +test and/or edge cases for multiple PlanetaryPy projects/affiliates. For +example, if there was not an RGB image included in the core products (which +there is), then that would test image would expose an edge case for many +projects. However, it is best to use ``get_mission_json`` to get a copy of +``data.json``, add the desired test images to that json file, and then download +images using ``get_mission_data -f path/to/data.json``. We recommend using a +``make test`` command to get the proper mission data before testing. data.json Format ----------------- @@ -106,4 +149,4 @@ Below is a sample snippet of a ``data.json`` entry:: "label": "PDS3", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mo_0xxx/data/sol1918/edr/1m298459885effa312p2956m2m1.img" - }, + }, diff --git a/docs/conf.py b/docs/conf.py index 9f23004..cf9eeca 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -32,6 +32,7 @@ sys.path.insert(0, project_root) import planetary_test_data +import sphinx_rtd_theme # -- General configuration --------------------------------------------- @@ -111,7 +112,9 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +# html_theme = 'default' +html_theme = "sphinx_rtd_theme" +html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # Theme options are theme-specific and customize the look and feel of a # theme further. For a list of options available for each theme, see the diff --git a/docs/index.rst b/docs/index.rst index a47d447..b3b2576 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -4,7 +4,7 @@ contain the root `toctree` directive. Welcome to Planetary Test Data's documentation! -====================================== +=============================================== Contents: @@ -14,6 +14,7 @@ Contents: readme installation usage + planetary_test_data contributing authors history diff --git a/docs/installation.rst b/docs/installation.rst index 7bab769..2c5851a 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -2,11 +2,8 @@ Installation ============ -At the command line:: +.. _pip: https://pypi.python.org/pypi/planetary_test_data/ - $ easy_install planetary_test_data +Download using pip_:: -Or, if you have virtualenvwrapper installed:: - - $ mkvirtualenv planetary_test_data $ pip install planetary_test_data diff --git a/docs/planetary_test_data.rst b/docs/planetary_test_data.rst new file mode 100644 index 0000000..36df63e --- /dev/null +++ b/docs/planetary_test_data.rst @@ -0,0 +1,19 @@ +Planetary Test Data +=================== + +Download test data for PlanetaryPy packages + +.. automodule:: planetary_test_data.planetary_test_data + +PlanetaryTestDataProducts +------------------------- +.. autoclass:: PlanetaryTestDataProducts + :members: + +get_mission_data +---------------- +.. autofunction:: get_mission_data + +get_mission_json +---------------- +.. autofunction:: get_mission_json diff --git a/docs/usage.rst b/docs/usage.rst index 0a94913..3d44c85 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -1,7 +1,6 @@ -======== +===== Usage -======== +===== -To use Planetary Test Data in a project:: - - import planetary_test_data +See README. It is best to use the commands ``get_mission_data`` and +``get_mission_json``. diff --git a/requirements.txt b/requirements.txt index ddc3e3b..93345e9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,3 +8,5 @@ tox>=2.8.2 wheel>=0.30.0 pytest-cov>=2.5.1 coveralls>=1.2.0 +sphinx +sphinx_rtd_theme From 164c8e77201b02a4511d41452817206469604616 Mon Sep 17 00:00:00 2001 From: Perry Date: Fri, 15 Sep 2017 23:14:46 -0700 Subject: [PATCH 02/11] Test docs --- .travis.yml | 2 ++ tox.ini | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 11a198e..131238f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,8 @@ install: script: - py.test --cov=planetary_test_data tests/ - 'if [ "$TRAVIS_PYTHON_VERSION" != "2.6" ]; then flake8 planetary_test_data tests; fi' + - sphinx-build -b linkcheck docs/ docs/_build/ + - sphinx-build -b html docs/ docs/_build/ after_success: - 'if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then coveralls; fi' diff --git a/tox.ini b/tox.ini index a314a52..f03526d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26, py27, py33, py34, py35, py36 +envlist = py26, py27, py33, py34, py35, py36, style, docs [testenv] setenv = @@ -13,3 +13,14 @@ deps = flake8 commands = flake8 planetary_test_data + +[testenv:docs] +changedir=docs/ +basepython = python3.5 +setenv = + PYTHONPATH = {toxinidir} +deps = + -r{toxinidir}/requirements.txt +commands = + sphinx-build -b linkcheck ./ _build/ + sphinx-build -b html ./ _build/ From 12e2700dbafa179c656a7ccb48baae98cce2a66a Mon Sep 17 00:00:00 2001 From: Perry Date: Fri, 15 Sep 2017 23:28:59 -0700 Subject: [PATCH 03/11] Fix travis --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 131238f..c7bc63c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,10 @@ install: script: - py.test --cov=planetary_test_data tests/ - 'if [ "$TRAVIS_PYTHON_VERSION" != "2.6" ]; then flake8 planetary_test_data tests; fi' - - sphinx-build -b linkcheck docs/ docs/_build/ - - sphinx-build -b html docs/ docs/_build/ + - 'if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; sphinx-build -b linkcheck docs/ docs/_build/; fi' + - 'if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; sphinx-build -b html docs/ docs/_build/; fi' + - 'if [ "$TRAVIS_PYTHON_VERSION" == "3.6" ]; sphinx-build -b linkcheck docs/ docs/_build/; fi' + - 'if [ "$TRAVIS_PYTHON_VERSION" == "3.6" ]; sphinx-build -b html docs/ docs/_build/; fi' after_success: - 'if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then coveralls; fi' From c35aedeab4b54831056168d4848e9c8aa57712c3 Mon Sep 17 00:00:00 2001 From: Perry Date: Fri, 15 Sep 2017 23:33:56 -0700 Subject: [PATCH 04/11] Add 'then' to travis so it works --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7bc63c..e96dbd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,10 @@ install: script: - py.test --cov=planetary_test_data tests/ - 'if [ "$TRAVIS_PYTHON_VERSION" != "2.6" ]; then flake8 planetary_test_data tests; fi' - - 'if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; sphinx-build -b linkcheck docs/ docs/_build/; fi' - - 'if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; sphinx-build -b html docs/ docs/_build/; fi' - - 'if [ "$TRAVIS_PYTHON_VERSION" == "3.6" ]; sphinx-build -b linkcheck docs/ docs/_build/; fi' - - 'if [ "$TRAVIS_PYTHON_VERSION" == "3.6" ]; sphinx-build -b html docs/ docs/_build/; fi' + - 'if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then sphinx-build -b linkcheck docs/ docs/_build/; fi' + - 'if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then sphinx-build -b html docs/ docs/_build/; fi' + - 'if [ "$TRAVIS_PYTHON_VERSION" == "3.6" ]; then sphinx-build -b linkcheck docs/ docs/_build/; fi' + - 'if [ "$TRAVIS_PYTHON_VERSION" == "3.6" ]; then sphinx-build -b html docs/ docs/_build/; fi' after_success: - 'if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then coveralls; fi' From 37f6f49d32ca37910e977909d49717b8eef3b47c Mon Sep 17 00:00:00 2001 From: Perry Date: Sat, 23 Sep 2017 12:23:44 -0700 Subject: [PATCH 05/11] Add mission tags and fix instrument case --- planetary_test_data/data.json | 397 +++++++++++++++++++++++----------- 1 file changed, 274 insertions(+), 123 deletions(-) diff --git a/planetary_test_data/data.json b/planetary_test_data/data.json index d94d5be..23378ba 100644 --- a/planetary_test_data/data.json +++ b/planetary_test_data/data.json @@ -1,30 +1,35 @@ { "0000MD0000000000100027C00_DRCL.IMG": { - "instrument": "MARS DESCENT IMAGER CAMERA", + "instrument": "Mars Descent Imager Camera", + "mission": "Mars Science Laboratory", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMRD_0002/DATA/RDR/SURFACE/0000/0000MD0000000000100027C00_DRCL.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMRD_0002/DATA/RDR/SURFACE/0000/0000MD0000000000100027C00_DRCL.LBL" }, "0000MD0000000000100027C00_XXXX.DAT": { - "instrument": "MARS DESCENT IMAGER CAMERA", + "instrument": "Mars Descent Imager Camera", + "mission": "Mars Science Laboratory", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMRD_0002/DATA/EDR/SURFACE/0000/0000MD0000000000100027C00_XXXX.DAT", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMRD_0002/DATA/EDR/SURFACE/0000/0000MD0000000000100027C00_XXXX.LBL" }, "0025ML0001270000100807E01_DRCL.IMG": { - "instrument": "MAST CAMERA LEFT", + "instrument": "Mast Camera Left", + "mission": "Mars Science Laboratory", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMST_0002/DATA/RDR/SURFACE/0025/0025ML0001270000100807E01_DRCL.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMST_0002/DATA/RDR/SURFACE/0025/0025ML0001270000100807E01_DRCL.LBL" }, "0025ML0001270000100807E01_XXXX.DAT": { - "instrument": "MAST CAMERA LEFT", + "instrument": "Mast Camera Left", + "mission": "Mars Science Laboratory", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMST_0002/DATA/EDR/SURFACE/0025/0025ML0001270000100807E01_XXXX.DAT", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMST_0002/DATA/EDR/SURFACE/0025/0025ML0001270000100807E01_XXXX.LBL" }, "0047MH0000110010100214C00_DRCL.IMG": { - "instrument": "MARS HAND LENS IMAGER CAMERA", + "instrument": "Mars Hand Lens Imager Camera", + "mission": "Mars Science Laboratory", "opens": "False", "tags": [ "core" @@ -33,128 +38,149 @@ "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMHL_0002/DATA/RDR/SURFACE/0047/0047MH0000110010100214C00_DRCL.LBL" }, "0047MH0000110010100214C00_XXXX.DAT": { - "instrument": "MARS HAND LENS IMAGER CAMERA", + "instrument": "Mars Hand Lens Imager Camera", + "mission": "Mars Science Laboratory", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMHL_0002/DATA/EDR/SURFACE/0047/0047MH0000110010100214C00_XXXX.DAT", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMHL_0002/DATA/EDR/SURFACE/0047/0047MH0000110010100214C00_XXXX.LBL" }, "0600g.img": { "instrument": "Near Infrared Mapping Spectrometer", + "mission": "Mars Global Surveyor", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/go-a_c-ssi-2-redr-v1.0/go_0016/sl9/c024895/0600g.img" }, "10060584.img": { - "instrument": "IMAGING SCIENCE SUBSYSTEM", + "instrument": "Imaging Science Subsystem", + "mission": "Mariner 9", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/project/m71/mr9iss_0007/c100xxxx/10060584.img" }, "128078.img": { - "instrument": "IMAGING SCIENCE SUBSYSTEM", + "instrument": "Imaging Science Subsystem", + "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_0001/data/wacfm/prf/12807/128078.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_0001/data/wacfm/prf/12807/128078.lbl" }, "12j017.n06": { - "instrument": "CAMERA_2", + "instrument": "Camera_2", "label": "PDS3", + "mission": "Viking Lander", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/vl1_vl2-m-lcs-2-edr-v1.0/vl_0001/j0xx/12j017.n06" }, "134600.img": { - "instrument": "IMAGING SCIENCE SUBSYSTEM", + "instrument": "Imaging Science Subsystem", + "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_0001/data/nacfm/blemgain/1346/134600.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_0001/data/nacfm/blemgain/1346/134600.lbl" }, "1a468769014edrciq8n1419n0m1.dat": { "instrument": "Alpha Particle X-Ray Spectrometer", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-geosciences.wustl.edu/mer/mer1-m-apxs-2-edr-ops-v1/mer1ap_0xxx/data/sol3836/1a468769014edrciq8n1419n0m1.dat" }, "1b188656262ed564kcn1940n0m1.dat": { "instrument": "Moessbauer Spectrometer", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-geosciences.wustl.edu/mer/mer1-m-mb-2-edr-ops-v1/mer1mb_0xxx/data/sol0681/1b188656262ed564kcn1940n0m1.dat" }, "1e128278505edn0000f0006n0m1.img": { - "instrument": "DESCENT CAMERA", + "instrument": "Descent Camera", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1do_0xxx/data/sol0001/edr/1e128278505edn0000f0006n0m1.img" }, "1f139471884xyl3000p1214l0m1.rgb": { - "instrument": "FRONT HAZARD AVOIDANCE CAMERA LEFT", + "instrument": "Front Hazard Avoidance Camera Left", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mw_0xxx/data/hazcam/site0030/1f139471884xyl3000p1214l0m1.rgb", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mw_0xxx/data/hazcam/site0030/1f139471884xyl3000p1214l0m1.lbl" }, "1f161026369edn42d9p1111l0m1.img": { - "instrument": "FRONT HAZARD AVOIDANCE CAMERA LEFT", + "instrument": "Front Hazard Avoidance Camera Left", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1ho_0xxx/data/sol0370/edr/1f161026369edn42d9p1111l0m1.img" }, "1f161026369uvl42d9p1111l0m1.img": { - "instrument": "FRONT HAZARD AVOIDANCE CAMERA LEFT", + "instrument": "Front Hazard Avoidance Camera Left", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1ho_0xxx/data/sol0370/rdr/1f161026369uvl42d9p1111l0m1.img" }, "1m140877373cfd3190p2936m2f1.img": { - "instrument": "MICROSCOPIC IMAGER", + "instrument": "Microscopic Imager", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-geosciences.wustl.edu/mer/mer1-m-mi-3-rdr-sci-v1/mer1mi_1xxx/data/sol0143/1m140877373cfd3190p2936m2f1.img" }, "1m228942450eff81d2p2976m2f1.img": { - "instrument": "MICROSCOPIC IMAGER", + "instrument": "Microscopic Imager", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-geosciences.wustl.edu/mer/mer1-m-mi-2-edr-sci-v1/mer1mi_0xxx/data/sol1135/1m228942450eff81d2p2976m2f1.img" }, "1m298459667mrda312p2956m2m1.img": { - "instrument": "MICROSCOPIC IMAGER", + "instrument": "Microscopic Imager", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mo_0xxx/data/sol1918/rdr/1m298459667mrda312p2956m2m1.img" }, "1m298459885effa312p2956m2m1.img": { - "instrument": "MICROSCOPIC IMAGER", + "instrument": "Microscopic Imager", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mo_0xxx/data/sol1918/edr/1m298459885effa312p2956m2m1.img" }, "1n129510489eff0312p1930l0m1.img": { - "instrument": "NAVIGATION CAMERA LEFT", + "instrument": "Navigation Camera Left", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1no_0xxx/data/sol0015/edr/1n129510489eff0312p1930l0m1.img" }, "1n129510489mrl0312p1930l0m1.img": { - "instrument": "NAVIGATION CAMERA LEFT", + "instrument": "Navigation Camera Left", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1no_0xxx/data/sol0015/rdr/1n129510489mrl0312p1930l0m1.img" }, "1n137786085xyl2300p1981l0m1.rgb": { - "instrument": "NAVIGATION CAMERA LEFT", + "instrument": "Navigation Camera Left", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mw_0xxx/data/navcam/site0023/1n137786085xyl2300p1981l0m1.rgb", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mw_0xxx/data/navcam/site0023/1n137786085xyl2300p1981l0m1.lbl" }, "1nn013ilf03cyl00p1652l000m2.img": { - "instrument": "NAVIGATION CAMERA", + "instrument": "Navigation Camera", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1om_0xxx/data/navcam/site0003/1nn013ilf03cyl00p1652l000m2.img" }, "1p134482118erp0902p2600r8m1.img": { - "instrument": "PANORAMIC CAMERA RIGHT", + "instrument": "Panoramic Camera Right", "label": { "GEOMETRIC_CAMERA_MODEL": { "CALIBRATION_SOURCE_ID": "213" }, "^IMAGE": 537 }, + "mission": "Mars Exploration Rover", "opens": "True", "tags": [ "core" @@ -163,29 +189,33 @@ }, "1p134482118sfl0902p2600l8m1.img": { "instrument": "Panoromic Camera", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1po_0xxx/data/sol0071/rdr/1p134482118sfl0902p2600l8m1.img" }, "1p137953271xyl2513p2366l7m1.rgb": { - "instrument": "PANORAMIC CAMERA LEFT", + "instrument": "Panoramic Camera Left", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mw_0xxx/data/pancam/site0025/1p137953271xyl2513p2366l7m1.rgb", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mw_0xxx/data/pancam/site0025/1p137953271xyl2513p2366l7m1.lbl" }, "1p144429114rat3370p2542l2c1.img": { - "instrument": "PANORAMIC CAMERA LEFT", + "instrument": "Panoramic Camera Left", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-geosciences.wustl.edu/mer/mer1-m-pancam-3-radcal-rdr-v1/mer1pc_1xxx/data/sol0183/1p144429114rat3370p2542l2c1.img" }, "1p190678905erp64kcp2600l8c1.img": { - "instrument": "PANORAMIC CAMERA LEFT", + "instrument": "Panoramic Camera Left", "label": { "GEOMETRIC_CAMERA_MODEL": { "CALIBRATION_SOURCE_ID": "205" }, "^IMAGE": 538 }, + "mission": "Mars Exploration Rover", "opens": "True", "tags": [ "core" @@ -193,78 +223,92 @@ "url": "http://pds-geosciences.wustl.edu/mer/mer1-m-pancam-2-edr-sci-v1/mer1pc_0xxx/data/sol0704/1p190678905erp64kcp2600l8c1.img" }, "1pp081ilf11cyp00p2425l777m1.img": { - "instrument": "PANORAMIC CAMERA", + "instrument": "Panoramic Camera", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1om_0xxx/data/pancam/site0011/1pp081ilf11cyp00p2425l777m1.img" }, "1rr012eff02vrt42p1211l000m2.img": { "instrument": "Hazard Avoidance Camera", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1om_0xxx/data/hazcam/site0002/1rr012eff02vrt42p1211l000m2.img" }, "21e147.grn": { - "instrument": "CAMERA_1", + "instrument": "Camera_1", "label": "PDS3", + "mission": "Viking Lander", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/vl1_vl2-m-lcs-2-edr-v1.0/vl_0002/e1xx/21e147.grn" }, "2a132656587edr1800n1438n0m1.dat": { - "instrument": "Alpha Particle X-ray Spectrometer", + "instrument": "Alpha Particle X-Ray Spectrometer", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-geosciences.wustl.edu/mer/mer2-m-apxs-2-edr-ops-v1/mer2ap_0xxx/data/sol0071/2a132656587edr1800n1438n0m1.dat" }, "2b129423244ed50327n1940n0m1.dat": { "instrument": "Moessbauer Spectrometer", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-geosciences.wustl.edu/mer/mer2-m-mb-2-edr-ops-v1/mer2mb_0xxx/data/sol0034/2b129423244ed50327n1940n0m1.dat" }, "2d147320057edr8600d2515n0m1.dat": { "instrument": "Rock Abrasion Tool", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-geosciences.wustl.edu/mer/mer2-m-rat-2-edr-ops-v1/mer2ra_0xxx/data/sol0236/2d147320057edr8600d2515n0m1.dat" }, "2e126462398edn0000f0006n0m1.img": { - "instrument": "DESCENT CAMERA", + "instrument": "Descent Camera", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2do_0xxx/data/sol0001/edr/2e126462398edn0000f0006n0m1.img" }, "2f130352973ilf0800p1120r0m1.img": { "instrument": "Hazard Avoidance Camera", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2ho_0xxx/data/sol0045/rdr/2f130352973ilf0800p1120r0m1.img" }, "2f130356488eff0800p1110r0m1.img": { - "instrument": "FRONT HAZARD AVOIDANCE CAMERA RIGHT", + "instrument": "Front Hazard Avoidance Camera Right", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2ho_0xxx/data/sol0045/edr/2f130356488eff0800p1110r0m1.img" }, "2f132759178xyl2000p1212l0m1.rgb": { - "instrument": "FRONT HAZARD AVOIDANCE CAMERA LEFT", + "instrument": "Front Hazard Avoidance Camera Left", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2mw_0xxx/data/hazcam/site0020/2f132759178xyl2000p1212l0m1.rgb" }, "2ff010eff02per11p1003l000m2.img": { - "instrument": "FRONT HAZARD AVOIDANCE CAMERA LEFT", + "instrument": "Front Hazard Avoidance Camera Left", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2om_0xxx/data/hazcam/site0002/2ff010eff02per11p1003l000m2.img" }, "2m130974067rst1100p2942m1m1.img": { "instrument": "Microscopic Imager", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2mo_0xxx/data/sol0052/rdr/2m130974067rst1100p2942m1m1.img" }, "2m130974443eff1100p2953m2m1.img": { - "instrument": "MICROSCOPIC IMAGER", + "instrument": "Microscopic Imager", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2mo_0xxx/data/sol0052/edr/2m130974443eff1100p2953m2m1.img" }, "2m132591087cfd1800p2977m2f1.img": { - "instrument": "MICROSCOPIC IMAGER", + "instrument": "Microscopic Imager", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "tags": [ "core" @@ -272,41 +316,47 @@ "url": "http://pds-geosciences.wustl.edu/mer/mer2-m-mi-3-rdr-sci-v1/mer2mi_1xxx/data/sol0070/2m132591087cfd1800p2977m2f1.img" }, "2m133285881eff2232p2971m2f1.img": { - "instrument": "MICROSCOPIC IMAGER", + "instrument": "Microscopic Imager", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-geosciences.wustl.edu/mer/mer2-m-mi-2-edr-sci-v1/mer2mi_0xxx/data/sol0078/2m133285881eff2232p2971m2f1.img" }, "2n129472048eth0327p1874l0m1.img": { - "instrument": "NAVIGATION CAMERA LEFT", + "instrument": "Navigation Camera Left", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2no_0xxx/data/sol0035/edr/2n129472048eth0327p1874l0m1.img" }, "2n129472048inn0327p1874r0m1.img": { "instrument": "Navigation Camera", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2no_0xxx/data/sol0035/rdr/2n129472048inn0327p1874r0m1.img" }, "2n131962517xyl1400p1917l0m1.rgb": { - "instrument": "NAVIGATION CAMERA LEFT", + "instrument": "Navigation Camera Left", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2mw_0xxx/data/navcam/site0014/2n131962517xyl1400p1917l0m1.rgb", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2mw_0xxx/data/navcam/site0014/2n131962517xyl1400p1917l0m1.lbl" }, "2nn043ilf06cyp00p1817l000m1.img": { "instrument": "Navigation Camera", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2om_0xxx/data/navcam/site0006/2nn043ilf06cyp00p1817l000m1.img" }, "2p129641989eth0361p2600r8m1.img": { - "instrument": "PANORAMIC CAMERA RIGHT", + "instrument": "Panoramic Camera Right", "label": { "GEOMETRIC_CAMERA_MODEL": { "CALIBRATION_SOURCE_ID": "191" }, "^IMAGE": 269 }, + "mission": "Mars Exploration Rover", "opens": "True", "tags": [ "core" @@ -315,393 +365,460 @@ }, "2p129641989mrd0361p2600r8m1.img": { "instrument": "Panoromic Camera", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2po_0xxx/data/sol0037/rdr/2p129641989mrd0361p2600r8m1.img" }, "2p130614950erp09bvp2556r1c1.img": { - "instrument": "PANORAMIC CAMERA RIGHT", + "instrument": "Panoramic Camera Right", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-geosciences.wustl.edu/mer/mer2-m-pancam-2-edr-sci-v1/mer2pc_0xxx/data/sol0048/2p130614950erp09bvp2556r1c1.img" }, "2p130975038rad1100p2820l4c1.img": { - "instrument": "PANORAMIC CAMERA LEFT", + "instrument": "Panoramic Camera Left", "label": "PDS3", + "mission": "Mars Exploration Rover", "opens": "True", "url": "http://pds-geosciences.wustl.edu/mer/mer2-m-pancam-3-radcal-rdr-v1/mer2pc_1xxx/data/sol0052/2p130975038rad1100p2820l4c1.img" }, "2p132046745xyl1500p2445l7m1.rgb": { - "instrument": "PANORAMIC CAMERA LEFT", + "instrument": "Panoramic Camera Left", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2mw_0xxx/data/pancam/site0015/2p132046745xyl1500p2445l7m1.rgb", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2mw_0xxx/data/pancam/site0015/2p132046745xyl1500p2445l7m1.lbl" }, "2pp062ilf13cyp00p2119l666m1.img": { "instrument": "Panoromic Camera", + "mission": "Mars Exploration Rover", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/spirit/mer2om_0xxx/data/pancam/site0013/2pp062ilf13cyp00p2119l666m1.img" }, "9500r.img": { - "instrument": "SOLID_STATE_IMAGING", + "instrument": "Solid_State_Imaging", + "mission": "Galileo", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/go-v_e-ssi-2-redr-v1.0/go_0003/earth/c006101/9500r.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/go-v_e-ssi-2-redr-v1.0/go_0003/earth/c006101/9500r.lbl" }, "ABDR_04_D035_V02.ZIP": { - "instrument": "CASSINI RADAR", + "instrument": "Cassini Radar", + "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/ABDR/ABDR_04_D035_V02.ZIP", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/ABDR/ABDR_04_D035_V02.LBL" }, "BEAM1_V01.PAT": { - "instrument": "CASSINI RADAR", + "instrument": "Cassini Radar", + "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/CALIB/BEAMPAT/BEAM1_V01.PAT", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/CALIB/BEAMPAT/BEAM1_V01.LBL" }, "BIBQD49N071_D035_T00AS01_V02.ZIP": { - "instrument": "CASSINI RADAR", + "instrument": "Cassini Radar", + "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/BIDR/BIBQD49N071_D035_T00AS01_V02.ZIP", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/BIDR/BIBQD49N071_D035_T00AS01_V02.LBL" }, "C3289235_RAW.IMG": { - "instrument": "IMAGING SCIENCE SUBSYSTEM - NARROW ANGLE CAMERA", + "instrument": "Imaging Science Subsystem - Narrow Angle Camera", + "mission": "Voyager", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/voyager/VGISS_0026/TITAN/C3289235_RAW.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/voyager/VGISS_0026/TITAN/C3289235_RAW.LBL" }, "CN1052412325M_IF_4.IMG": { - "instrument": "MERCURY DUAL IMAGING SYSTEM NARROW ANGLE CAMERA", + "instrument": "Mercury Dual Imaging System Narrow Angle Camera", "label": "PDS3", + "mission": "MESSENGER", "opens": "True", "url": "http://pdsimage.wr.usgs.gov/archive/mess-e_v_h-mdis-4-cdr-caldata-v1.0/MSGRMDS_2001/CDR/2014_250/CN1052412325M_IF_4.IMG" }, "CN1052412325M_RA_4.IMG": { - "instrument": "MERCURY DUAL IMAGING SYSTEM NARROW ANGLE CAMERA", + "instrument": "Mercury Dual Imaging System Narrow Angle Camera", "label": "PDS3", + "mission": "MESSENGER", "opens": "True", "url": "http://pdsimage.wr.usgs.gov/archive/mess-e_v_h-mdis-4-cdr-caldata-v1.0/MSGRMDS_2001/CDR/2014_250/CN1052412325M_RA_4.IMG" }, "DW1026713343K_DE_0.IMG": { - "instrument": "MERCURY DUAL IMAGING SYSTEM WIDE ANGLE CAMERA", + "instrument": "Mercury Dual Imaging System Wide Angle Camera", "label": "PDS3", + "mission": "MESSENGER", "opens": "True", "url": "http://pdsimage.wr.usgs.gov/archive/mess-e_v_h-mdis-6-ddr-geomdata-v1.0/MSGRMDS_3001/DDR/2013_318/DW1026713343K_DE_0.IMG" }, "EDR2856A.07": { "instrument": "Synthetic-Aperture Radar", + "mission": "Magellan", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/magellan/edr/MGN_1046/TAPES/EDR2856A/DATA/EDR2856A.07" }, "FLB_431397159EDR_F0141262FHAZ00323M1.IMG": { - "instrument": "FRONT HAZARD AVOIDANCE CAMERA LEFT STRING B", + "instrument": "Front Hazard Avoidance Camera Left String B", "label": "ODL3", + "mission": "Mars Science Laboratory", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLHAZ_0XXX/DATA/SOL00382/FLB_431397159EDR_F0141262FHAZ00323M1.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLHAZ_0XXX/DATA/SOL00382/FLB_431397159EDR_F0141262FHAZ00323M1.LBL" }, "G12_022891_3112_MA_00N278W.IMG": { - "instrument": "MARS COLOR IMAGER", + "instrument": "Mars Color Imager", "label": "PDS3", + "mission": "Chandrayaan-1", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mro/mars_reconnaissance_orbiter/marci/mrom_0424/data/G12_022891_3112_MA_00N278W.IMG" }, "G13_023307_1051_XN_74S099W.IMG": { - "instrument": "CONTEXT CAMERA", + "instrument": "Context Camera", "label": "PDS3", + "mission": "Chandrayaan-1", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mro/mars_reconnaissance_orbiter/ctx/mrox_1369/data/G13_023307_1051_XN_74S099W.IMG" }, "I53094006BTR.IMG": { - "instrument": "THERMAL EMISSION IMAGING SYSTEM", + "instrument": "Thermal Emission Imaging System", "label": "PDS3", + "mission": "2001 Mars Odyssey", "opens": "True", "url": "http://static.mars.asu.edu/pds/ODTSDP_v1/data/odtib1_0048/i530xxbtr/I53094006BTR.IMG" }, "LAMP_80n_240mpp_long_dqual_01.img": { - "instrument": "LYMAN ALPHA MAPPING PROJECT", + "instrument": "Lyman Alpha Mapping Project", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lro/lamp/gdr/LROLAM_2001/DATA/DATA_QUALITY/LAMP_80n_240mpp_long_dqual_01.img" }, "LAMP_ENG_0322531705_02.fit": { - "instrument": "LYMAN ALPHA MAPPING PROJECT", + "instrument": "Lyman Alpha Mapping Project", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lro/lamp/edr/LROLAM_0007/DATA/2011082/LAMP_ENG_0322531705_02.fit", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lro/lamp/edr/LROLAM_0007/DATA/2011082/LAMP_ENG_0322531705_02.lbl" }, "LAMP_SCI_0345885974_03.fit": { - "instrument": "LYMAN ALPHA MAPPING PROJECT", + "instrument": "Lyman Alpha Mapping Project", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lro/lamp/rdr/LROLAM_1010/DATA/2011352/LAMP_SCI_0345885974_03.fit", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lro/lamp/rdr/LROLAM_1010/DATA/2011352/LAMP_SCI_0345885974_03.lbl" }, "LBDR_14_D035_V02.ZIP": { - "instrument": "CASSINI RADAR", + "instrument": "Cassini Radar", + "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/LBDR/LBDR_14_D035_V02.ZIP", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/LBDR/LBDR_14_D035_V02.LBL" }, "LCROSS_MIR1_CAL_20091009113134589.IMG": { - "instrument": "MID INFRARED CAMERA 1", + "instrument": "Mid Infrared Camera 1", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/MIR1/CAL/LCROSS_MIR1_CAL_20091009113134589.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/MIR1/CAL/LCROSS_MIR1_CAL_20091009113134589.LBL" }, "LCROSS_MIR2_CAL_20091009113110458.IMG": { - "instrument": "MID INFRARED CAMERA 2", + "instrument": "Mid Infrared Camera 2", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/MIR2/CAL/LCROSS_MIR2_CAL_20091009113110458.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/MIR2/CAL/LCROSS_MIR2_CAL_20091009113110458.LBL" }, "LCROSS_NIR1_CAL_20091009113055156.IMG": { - "instrument": "NEAR INFRARED CAMERA 1", + "instrument": "Near Infrared Camera 1", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NIR1/CAL/LCROSS_NIR1_CAL_20091009113055156.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NIR1/CAL/LCROSS_NIR1_CAL_20091009113055156.LBL" }, "LCROSS_NIR2_CAL_20091009113413068.IMG": { - "instrument": "NEAR INFRARED CAMERA 2", + "instrument": "Near Infrared Camera 2", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NIR2/CAL/LCROSS_NIR2_CAL_20091009113413068.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NIR2/CAL/LCROSS_NIR2_CAL_20091009113413068.LBL" }, "LCROSS_NSP1_CAL_20091009113218380.TAB": { "instrument": "Near Infrared Spectrometer 1", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NSP1/CAL/LCROSS_NSP1_CAL_20091009113218380.TAB", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NSP1/CAL/LCROSS_NSP1_CAL_20091009113218970.LBL" }, "LCROSS_NSP2_CAL_20091009113129443.TAB": { "instrument": "Near Infrared Spectrometer 2 ", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NSP2/CAL/LCROSS_NSP2_CAL_20091009113129443.TAB", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NSP2/CAL/LCROSS_NSP2_CAL_20091009113130032.LBL" }, "LCROSS_TLP_CAL_20091009104100.TAB": { - "instrument": "TOTAL LUMINANCE PHOTOMETER", + "instrument": "Total Luminance Photometer", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/TLP/CAL/LCROSS_TLP_CAL_20091009104100.TAB", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/TLP/CAL/LCROSS_TLP_CAL_20091009104100.LBL" }, "LCROSS_VIS_RAW_20091009113358274.IMG": { - "instrument": "VISIBLE CAMERA", + "instrument": "Visible Camera", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/VIS/RAW/LCROSS_VIS_RAW_20091009113358274.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/VIS/RAW/LCROSS_VIS_RAW_20091009113358274.LBL" }, "LCROSS_VSP_CAL_20091009113528839.TAB": { "instrument": " Visible Spectrometer ", + "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/VSP/CAL/LCROSS_VSP_CAL_20091009113528839.TAB", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/VSP/CAL/LCROSS_VSP_CAL_20091009113529919.LBL" }, "M1119524889RC.IMG": { - "instrument": "LUNAR RECONNAISSANCE ORBITER CAMERA", + "instrument": "Lunar Reconnaissance Orbiter Camera", "label": "PDS3", + "mission": "Lunar Reconnaissance Orbiter", "opens": "True", "url": "http://lroc.sese.asu.edu/data/LRO-L-LROC-3-CDR-V1.0/LROLRC_1015/DATA/ESM/2013092/NAC/M1119524889RC.IMG" }, "M1119570719MC.IMG": { - "instrument": "LUNAR RECONNAISSANCE ORBITER CAMERA", + "instrument": "Lunar Reconnaissance Orbiter Camera", "label": "PDS3", + "mission": "Lunar Reconnaissance Orbiter", "opens": "True", "url": "http://lroc.sese.asu.edu/data/LRO-L-LROC-3-CDR-V1.0/LROLRC_1015/DATA/ESM/2013092/WAC/M1119570719MC.IMG" }, "M181639328RE.IMG": { - "instrument": "LUNAR RECONNAISSANCE ORBITER CAMERA", + "instrument": "Lunar Reconnaissance Orbiter Camera", "label": "PDS3", + "mission": "Lunar Reconnaissance Orbiter", "opens": "True", "url": "http://lroc.sese.asu.edu/data/LRO-L-LROC-2-EDR-V1.0/LROLRC_0010/DATA/SCI/2012019/NAC/M181639328RE.IMG" }, "M181648212CE.IMG": { - "instrument": "LUNAR RECONNAISSANCE ORBITER CAMERA", + "instrument": "Lunar Reconnaissance Orbiter Camera", "label": "PDS3", + "mission": "Lunar Reconnaissance Orbiter", "opens": "True", "url": "http://lroc.sese.asu.edu/data/LRO-L-LROC-2-EDR-V1.0/LROLRC_0010/DATA/SCI/2012019/WAC/M181648212CE.IMG" }, "M3G20090714T080142_V03_LOC.IMG": { - "instrument": "MOON MINERALOGY MAPPER", + "instrument": "Moon Mineralogy Mapper", + "mission": "Chandrayaan-1", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/m3/CH1M3_0003/DATA/20090415_20090816/200907/L1B/M3G20090714T080142_V03_LOC.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/m3/CH1M3_0003/DATA/20090415_20090816/200907/L1B/M3G20090714T080142_V03_L1B.LBL" }, "MDIS_BDR_256PPD_H08NW0.IMG": { - "instrument": "MERCURY DUAL IMAGING SYSTEM NARROW ANGLE CAMERA, MERCURY DUAL IMAGING SYSTEM WIDE ANGLE CAMERA", + "instrument": "Mercury Dual Imaging System Narrow Angle Camera, Mercury Dual Imaging System Wide Angle Camera", + "mission": "MESSENGER", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/data/mess-h-mdis-5-rdr-bdr-v1.0/MSGRMDS_4001/BDR/H08/MDIS_BDR_256PPD_H08NW0.IMG" }, "MDIS_HIW_256PPD_H12NE0.IMG": { - "instrument": "MERCURY DUAL IMAGING SYSTEM NARROW ANGLE CAMERA, MERCURY DUAL IMAGING SYSTEM WIDE ANGLE CAMERA", + "instrument": "Mercury Dual Imaging System Narrow Angle Camera, Mercury Dual Imaging System Wide Angle Camera", + "mission": "MESSENGER", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/mess-h-mdis-5-rdr-hiw-v1.0/MSGRMDS_7101/HIW/H12/MDIS_HIW_256PPD_H12NE0.IMG" }, "MDIS_MD3_128PPD_H11SW0.IMG": { - "instrument": "MERCURY DUAL IMAGING SYSTEM WIDE ANGLE CAMERA", + "instrument": "Mercury Dual Imaging System Wide Angle Camera", + "mission": "MESSENGER", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/mess-h-mdis-5-rdr-md3-v1.0/MSGRMDS_6001/MD3/H11/MDIS_MD3_128PPD_H11SW0.IMG" }, "MDIS_MDR_064PPD_H10SW2.IMG": { - "instrument": "MERCURY DUAL IMAGING SYSTEM WIDE ANGLE CAMERA", + "instrument": "Mercury Dual Imaging System Wide Angle Camera", + "mission": "MESSENGER", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/data/mess-h-mdis-5-rdr-mdr-v1.0/MSGRMDS_5001/MDR/H10/MDIS_MDR_064PPD_H10SW2.IMG" }, "MDIS_RTM_N01_006966_5568032_0.IMG": { - "instrument": "MERCURY DUAL IMAGING SYSTEM NARROW ANGLE CAMERA", + "instrument": "Mercury Dual Imaging System Narrow Angle Camera", + "mission": "MESSENGER", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/mess-h-mdis-5-rdr-rtm-v1.0/MSGRMDS_8001/RTM/MDIS_RTM_N01/2014_014/MDIS_RTM_N01_006966_5568032_0.IMG" }, "MDIS_RTM_W11_006648_5217862_0.IMG": { - "instrument": "MERCURY DUAL IMAGING SYSTEM WIDE ANGLE CAMERA", + "instrument": "Mercury Dual Imaging System Wide Angle Camera", + "mission": "MESSENGER", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/mess-h-mdis-5-rdr-rtm-v1.0/MSGRMDS_8001/RTM/MDIS_RTM_W11/2013_322/MDIS_RTM_W11_006648_5217862_0.IMG" }, "N1454725799_1.IMG": { - "instrument": "IMAGING SCIENCE SUBSYSTEM NARROW ANGLE", + "instrument": "Imaging Science Subsystem Narrow Angle", + "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_2001/data/1454725799_1455008789/N1454725799_1.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_2001/data/1454725799_1455008789/N1454725799_1.LBL" }, "NAC_ROI_FLMSTEEDHIA_E023S3168_20M.IMG": { - "instrument": "LUNAR RECONNAISSANCE ORBITER CAMERA", + "instrument": "Lunar Reconnaissance Orbiter Camera", "label": "PDS3", + "mission": "Lunar Reconnaissance Orbiter", "opens": "True", "url": "http://lroc.sese.asu.edu/data/LRO-L-LROC-5-RDR-V1.0/LROLRC_2001/DATA/BDR/NAC_ROI/FLMSTEEDHIA/NAC_ROI_FLMSTEEDHIA_E023S3168_20M.IMG" }, "NLA_397671934ECS_N0010008AUT_04096M1.IMG": { - "instrument": "NAVIGATION CAMERA LEFT STRING A", + "instrument": "Navigation Camera Left String A", "label": "ODL3", + "mission": "Mars Science Laboratory", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLNAV_0XXX/DATA/SOL00002/NLA_397671934ECS_N0010008AUT_04096M1.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLNAV_0XXX/DATA/SOL00002/NLA_397671934ECS_N0010008AUT_04096M1.LBL" }, "N_A000_0012XEDR003CYPTUM0004XTOPMTM1.IMG": { - "instrument": "NAVIGATION CAMERA LEFT STRING A", + "instrument": "Navigation Camera Left String A", "label": "ODL3", + "mission": "Mars Science Laboratory", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMOS_1XXX/DATA/SOL00012/N_A000_0012XEDR003CYPTUM0004XTOPMTM1.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMOS_1XXX/DATA/SOL00012/N_A000_0012XEDR003CYPTUM0004XTOPMTM1.LBL" }, "PSP_005109_1770_COLOR.JP2": { - "instrument": "HIGH RESOLUTION IMAGING SCIENCE EXPERIMENT", + "instrument": "High Resolution Imaging Science Experiment", + "mission": "Chandrayaan-1", "opens": "False", "url": "http://hirise-pds.lpl.arizona.edu/PDS/RDR/PSP/ORB_005100_005199/PSP_005109_1770/PSP_005109_1770_COLOR.JP2" }, "PSP_007978_2005_RED4_1.IMG": { - "instrument": "HIGH RESOLUTION IMAGING SCIENCE EXPERIMENT", + "instrument": "High Resolution Imaging Science Experiment", "label": "PDS3", + "mission": "Chandrayaan-1", "opens": "True", "url": "http://hirise-pds.lpl.arizona.edu/PDS/EDR/PSP/ORB_007900_007999/PSP_007978_2005/PSP_007978_2005_RED4_1.IMG" }, "ST_1M_0_324_MERCATOR.IMG": { - "instrument": "IMAGING SCIENCE SUBSYSTEM NARROW ANGLE", + "instrument": "Imaging Science Subsystem Narrow Angle", "label": "PDS3", + "mission": "Cassini", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_3004/data/images/ST_1M_0_324_MERCATOR.IMG" }, "V48732003RDR.QUB": { "instrument": "Thermal Emission Imaging System", + "mission": "2001 Mars Odyssey", "opens": "False", "url": "http://static.mars.asu.edu/pds/ODTSDP_v1/data/odtvr1_0044/v487xxrdr/V48732003RDR.QUB" }, "V52514013ALB.IMG": { - "instrument": "THERMAL EMISSION IMAGING SYSTEM", + "instrument": "Thermal Emission Imaging System", "label": "PDS3", + "mission": "2001 Mars Odyssey", "opens": "True", "url": "http://static.mars.asu.edu/pds/ODTGEO_v2/data/odtva2_0048/v525xxalb/V52514013ALB.IMG" }, "WAC_ROI_FARSIDE_DUSK_P900S0000_100M.IMG": { - "instrument": "LUNAR RECONNAISSANCE ORBITER CAMERA", + "instrument": "Lunar Reconnaissance Orbiter Camera", "label": "PDS3", + "mission": "Lunar Reconnaissance Orbiter", "opens": "True", "url": "http://lroc.sese.asu.edu/data/LRO-L-LROC-5-RDR-V1.0/LROLRC_2001/DATA/BDR/WAC_ROI/FARSIDE_DUSK/WAC_ROI_FARSIDE_DUSK_P900S0000_100M.IMG" }, "a1526159.tab": { - "instrument": "Alpha X-ray Spectrometer (APXS)", + "instrument": "Alpha X-Ray Spectrometer (Apxs)", + "mission": "Mars Pathfinder", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/mpfr-m-apxs-2-edr-v1.0/mprv_0001/apxs_edr/a_10/a1526159.tab" }, "bi24s333.img": { - "instrument": "ULTRAVIOLET/VISIBLE CAMERA", + "instrument": "Ultraviolet/Visible Camera", "label": "PDS3", + "mission": "Clementine", "opens": "True", "url": "http://pdsimage.wr.usgs.gov/archive/clem1-l-u-5-dim-basemap-v1.0/cl_3013/bi35_00s/bi24s333.img" }, "c1138206.imq": { "instrument": "Imaging Science Subsystem", + "mission": "Voyager", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/vg2-n-iss-2-edr-v1.0/vg_0011/n_rings/c1138xxx/c1138206.imq" }, "e4i015.edr": { "instrument": "Near-Infrared Mapping Spectrometer", + "mission": "Galileo", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/go-j-nims-2-edr-v2.0/go_1005/io/edr/e4i015.edr" }, "e6e004ti.qub": { "instrument": "Near-Infrared Mapping Spectrometer", + "mission": "Galileo", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/go-j-nims-3-tube-v1.0/go_1108/europa/e6e004ti.qub" }, "f18.img": { - "instrument": "RADAR SYSTEM", + "instrument": "Radar System", + "mission": "Magellan", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-gdr-emissivity-v1.0/mg_3002/gedr/merc/f18.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-gdr-emissivity-v1.0/mg_3002/gedr/merc/f18.lbl" }, "f26.img": { - "instrument": "RADAR SYSTEM", + "instrument": "Radar System", + "mission": "Magellan", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-gdr-emissivity-v1.0/mg_3002/gsdr/merc/f26.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-gdr-emissivity-v1.0/mg_3002/gsdr/merc/f26.lbl" }, "f30.img": { "instrument": "Global Topography Data Record", + "mission": "Magellan", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-gdr-emissivity-v1.0/mg_3002/gtdr/merc/f30.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-gdr-emissivity-v1.0/mg_3002/gtdr/merc/f30.lbl" }, "f31.img": { - "instrument": "RADAR SYSTEM", + "instrument": "Radar System", + "mission": "Magellan", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-gdr-emissivity-v1.0/mg_3002/gredr/merc/f31.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-gdr-emissivity-v1.0/mg_3002/gredr/merc/f31.lbl" }, "f673b55.imq": { "instrument": "Viking Visual Imaging Subsystem", + "mission": "Viking Orbiter", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/vo1_vo2-m-vis-2-edr-v2.0/vo_1063/f673bxx/f673b55.imq" }, "ff05.img": { - "instrument": "RADAR SYSTEM", + "instrument": "Radar System", + "mission": "Magellan", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-midr-full-res-v1.0/mg_0124/f10s065/ff05.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/mgn-v-rdrs-5-midr-full-res-v1.0/mg_0124/f10s065/ff05.lbl" }, "fl05s205.img": { "instrument": "Radar", + "mission": "Magellan", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/mgn-v-rdrs-5-dim-v1.0/mg_1194/fl06s210/fl05s205.img" }, "h2225_0000_dt4.img": { - "instrument": "HIGH RESOLUTION STEREO CAMERA", + "instrument": "High Resolution Stereo Camera", "label": "PDS3", + "mission": "ESA Mars Express", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mex/hrsc/mexhrsc_2001/data/2225/h2225_0000_dt4.img" }, "h5395_0000_p23.img": { - "instrument": "HIGH RESOLUTION STEREO CAMERA", + "instrument": "High Resolution Stereo Camera", "label": "PDS3", + "mission": "ESA Mars Express", "opens": "True", "url": "http://pds-geosciences.wustl.edu/mex/mex-m-hrsc-5-refdr-mapprojected-v2/mexhrsc_1001/data/5395/h5395_0000_p23.img" }, "h58n3118.img": { - "instrument": "HIGH RESOLUTION CAMERA", + "instrument": "High Resolution Camera", "label": { "IMAGE_MAP_PROJECTION": { "COORDINATE_SYSTEM_NAME": "PLANETOGRAPHIC" }, "^IMAGE": 26 }, + "mission": "Clementine", "opens": "True", "tags": [ "core" @@ -709,91 +826,106 @@ "url": "http://pdsimage.wr.usgs.gov/archive/clem1-l-h-5-dim-mosaic-v1.0/cl_6016/hxxx3118/h58n3118.img" }, "h9335_0000_p12.img": { - "instrument": "HIGH RESOLUTION STEREO CAMERA", + "instrument": "High Resolution Stereo Camera", "label": "PDS3", + "mission": "ESA Mars Express", "opens": "True", "url": "http://pds-geosciences.wustl.edu/mex/mex-m-hrsc-3-rdr-v2/mexhrsc_0001/data/9335/h9335_0000_p12.img" }, "i277783l.img": { - "instrument": "IMAGER FOR MARS PATHFINDER", + "instrument": "Imager For Mars Pathfinder", "label": "PDS3", + "mission": "Mars Pathfinder", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mpfl-m-imp-2-edr-v1.0/mpim_0003/mars/seq0288/c1251xxx/i277783l.img" }, "lhd1540h.279": { "instrument": "High Resolution Camera", + "mission": "Clementine", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/clem1-l_e_y-a_b_u_h_l_n-2-edr-v1.0/cl_0065/lun279/lhxxxxxx/lhxxxxxh/lhd1540h.279" }, "lla2531k.252": { - "instrument": "Long Wave InfraRed Camera", + "instrument": "Long Wave Infrared Camera", + "mission": "Clementine", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/clem1-l_e_y-a_b_u_h_l_n-2-edr-v1.0/cl_0058/lun252/llxxxxxx/llxxxxxk/lla2531k.252" }, "lna3869l.335": { - "instrument": "NearInfraRed Camera", + "instrument": "Nearinfrared Camera", + "mission": "Clementine", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/clem1-l_e_y-a_b_u_h_l_n-2-edr-v1.0/cl_0078/lun335/lnxxxxxx/lnxxxxxl/lna3869l.335" }, "lub0204c.313": { - "instrument": "Ultraviolet/Visible (UV/VIS) Camera", + "instrument": "Ultraviolet/Visible (Uv/Vis) Camera", + "mission": "Clementine", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/clem1-l_e_y-a_b_u_h_l_n-2-edr-v1.0/cl_0072/lun313/luxxxxxx/luxxxxxc/lub0204c.313" }, "m0002320.imq": { "instrument": "Mars Orbiter Camera Wide Angle", "label": "PDS3", + "mission": "Mars Global Surveyor", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mgs-m-moc-na_wa-2-sdp-l0-v1.0/mgsc_1006/m00023/m0002320.imq" }, "mg00n217.sgr": { - "instrument": "VISUAL_IMAGING_SUBSYSTEM_CAMERA_A, VISUAL_IMAGING_SUBSYSTEM_CAMERA_B", + "instrument": "Visual_Imaging_Subsystem_Camera_A, Visual_Imaging_Subsystem_Camera_B", "label": "SFDU_LABEL", + "mission": "Viking Orbiter", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/vo1_vo2-m-vis-5-dim-v1.0/vo_2011/mg00nxxx/605a/mg00n217.sgr" }, "mi35n227.img": { - "instrument": "VISUAL_IMAGING_SUBSYSTEM_CAMERA_A, VISUAL_IMAGING_SUBSYSTEM_CAMERA_B", + "instrument": "Visual_Imaging_Subsystem_Camera_A, Visual_Imaging_Subsystem_Camera_B", "label": "SFDU_LABEL", + "mission": "Viking Orbiter", "opens": "True", "url": "http://pdsimage.wr.usgs.gov/archive/vo1_vo2-m-vis-5-dim-v2.0/vo_2004_v2/mi35nxxx/mi35n227.img" }, "mk19s259.img": { - "instrument": "VISUAL_IMAGING_SUBSYSTEM_CAMERA_A, VISUAL_IMAGING_SUBSYSTEM_CAMERA_B", + "instrument": "Visual_Imaging_Subsystem_Camera_A, Visual_Imaging_Subsystem_Camera_B", "label": "SFDU_LABEL", + "mission": "Viking Orbiter", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/vo1_vo2-m-vis-5-dim-v1.0/vo_2020/mk20s257/mk19s259.img" }, "mve_050.080": { "instrument": "Mariner 10", + "mission": "Mariner 10", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/mr10-m-iss-2-edr-pv0.x/mvm_0013/mve_050/images/mve_050.080" }, "os009rad897013001_119b0mbr1.img": { - "instrument": "OPTICAL MICROSCOPE", + "instrument": "Optical Microscope", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxsci_0xxx/data/om/sol009/os009rad897013001_119b0mbr1.img" }, "os017eff897721638_123d0mbm1.img": { - "instrument": "OPTICAL MICROSCOPE", + "instrument": "Optical Microscope", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxom_0xxx/data/sol017/os017eff897721638_123d0mbm1.img" }, "ox_perc.tab": { - "instrument": "Alpha X-ray Spectrometer", + "instrument": "Alpha X-Ray Spectrometer", + "mission": "Mars Pathfinder", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/mpfr-m-apxs-2-edr-v1.0/mprv_0001/apxs_ddr/ox_perc.tab" }, "r01090al.img": { - "instrument": "ROVER CAMERA LEFT", + "instrument": "Rover Camera Left", "label": { "IMAGE": { "INTERCHANGE_FORMAT": "BINARY" }, "^IMAGE": 7 }, + "mission": "Mars Pathfinder", "opens": "True", "tags": [ "core" @@ -801,112 +933,131 @@ "url": "http://pdsimage.wr.usgs.gov/archive/mpfr-m-apxs-2-edr-v1.0/mprv_0001/rvr_midr/rvr_mos/r01090al.img" }, "r9599891.img": { - "instrument": "ROVER CAMERA LEFT", + "instrument": "Rover Camera Left", "label": "PDS3", + "mission": "Mars Pathfinder", "opens": "True", "url": "http://pdsimage.wr.usgs.gov/archive/mpfr-m-apxs-2-edr-v1.0/mprv_0001/rvr_edr/rvr_left/r9599891.img" }, "r_013eff_cyl_sr11e4e_mdddm1.img": { - "instrument": "ROBOTIC ARM CAMERA", + "instrument": "Robotic Arm Camera", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxmos_0xxx/data/rac/sol013/r_013eff_cyl_sr11e4e_mdddm1.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxmos_0xxx/data/rac/sol013/r_013eff_cyl_sr11e4e_mdddm1.lbl" }, "r_sacc_s.tab": { - "instrument": "ATMOSPHERIC STRUCTURE INSTRUMENT / METEOROLOGY PACKAGE", + "instrument": "Atmospheric Structure Instrument / Meteorology Package", + "mission": "Mars Pathfinder", "opens": "False", "url": "http://atmos.nmsu.edu/PDS/data/mpam_0001/edl_erdr/r_sacc_s.tab" }, "rs003rad896482473_10e31mbr1.img": { - "instrument": "ROBOTIC ARM CAMERA", + "instrument": "Robotic Arm Camera", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxsci_0xxx/data/rac/sol003/rs003rad896482473_10e31mbr1.img" }, "rs004eff896573565_10f86mdm1.img": { - "instrument": "ROBOTIC ARM CAMERA", + "instrument": "Robotic Arm Camera", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxrac_0xxx/data/sol004/rs004eff896573565_10f86mdm1.img" }, "rs004ffl896573565_10f86mdm1.img": { - "instrument": "ROBOTIC ARM CAMERA", + "instrument": "Robotic Arm Camera", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxrac_1xxx/data/sol004/rs004ffl896573565_10f86mdm1.img" }, "s_000eff_cyl_sr10ca8_r222m1.img": { - "instrument": "SURFACE STEREO IMAGER", + "instrument": "Surface Stereo Imager", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxmos_0xxx/data/ssi/sol000/s_000eff_cyl_sr10ca8_r222m1.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxmos_0xxx/data/ssi/sol000/s_000eff_cyl_sr10ca8_r222m1.lbl" }, "se0732s.tab": { - "instrument": "ATMOSPHERIC STRUCTURE INSTRUMENT / METEOROLOGY PACKAGE", + "instrument": "Atmospheric Structure Instrument / Meteorology Package", + "mission": "Mars Pathfinder", "opens": "False", "url": "http://atmos.nmsu.edu/PDS/data/mpam_0001/surf_edr/scidata/se07xxs/se0732s.tab" }, "sp246804.img": { "instrument": "Mars Orbiter Camera - Wide Angle", "label": "PDS3", + "mission": "Mars Global Surveyor", "opens": "True", "url": "http://pdsimage.wr.usgs.gov/archive/mgs-m-moc-na_wa-2-dsdp-l0-v1.0/mgsc_0008/sp2468/sp246804.img" }, "sr0893s.tab": { - "instrument": "ATMOSPHERIC STRUCTURE INSTRUMENT / METEOROLOGY PACKAGE", + "instrument": "Atmospheric Structure Instrument / Meteorology Package", + "mission": "Mars Pathfinder", "opens": "False", "url": "http://atmos.nmsu.edu/PDS/data/mpam_0001/surf_rdr/scidata/sr08xxs/sr0893s.tab" }, "ss000edn896227848_10c70r1m1.img": { - "instrument": "SURFACE STEREO IMAGER", + "instrument": "Surface Stereo Imager", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxssi_0xxx/data/sol000/ss000edn896227848_10c70r1m1.img" }, "ss000iof896227848_10c70r1t1.img": { - "instrument": "SURFACE STEREO IMAGER", + "instrument": "Surface Stereo Imager", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxsci_0xxx/data/ssi/sol000/ss000iof896227848_10c70r1t1.img" }, "ss004dil896560177_11684l1m1.img": { - "instrument": "SURFACE STEREO IMAGER", + "instrument": "Surface Stereo Imager", "label": "PDS3", + "mission": "Phoenix", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/phoenix/phxssi_1xxx/data/sol004/ss004dil896560177_11684l1m1.img" }, "tg00n217.img": { - "instrument": "VISUAL_IMAGING_SUBSYSTEM_CAMERA_A, VISUAL_IMAGING_SUBSYSTEM_CAMERA_B", + "instrument": "Visual_Imaging_Subsystem_Camera_A, Visual_Imaging_Subsystem_Camera_B", "label": "SFDU_LABEL", + "mission": "Viking Orbiter", "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/vo1_vo2-m-vis-5-dtm-v1.0/vo_2007/tg00nxxx/tg00n217.img" }, "ui45s015.img": { - "instrument": "ULTRAVIOLET/VISIBLE CAMERA", + "instrument": "Ultraviolet/Visible Camera", "label": "PDS3", + "mission": "Clementine", "opens": "True", "url": "https://starbase.jpl.nasa.gov/archive/clem1-l-u-5-dim-uvvis-v1.0/cl_4009/data/ui45s015.img" }, "v1477775070_4.qub": { - "instrument": "VISUAL AND INFRARED MAPPING SPECTROMETER", + "instrument": "Visual And Infrared Mapping Spectrometer", + "mission": "Cassini", "opens": "False", "url": "http://pdsimage.wr.usgs.gov/archive/co-e_v_j_s-vims-2-qube-v1.0/covims_0005/data/2004303T191837_2004305T001017/v1477775070_4.qub" }, "v1585148848_2.qub": { - "instrument": "VISUAL AND INFRARED MAPPING SPECTROMETER", + "instrument": "Visual And Infrared Mapping Spectrometer", + "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/covims_unks/data/2008085T143116_2008085T143846/v1585148848_2.qub", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/covims_unks/data/2008085T143116_2008085T143846/v1585148848_2.lbl" }, "vl_0901.002": { - "instrument": "CAMERA_2", + "instrument": "Camera_2", + "mission": "Viking Lander", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/vl1_vl2-m-lcs-5-special-pv0.x/vl_2111/vl/vl_0901/data/vl_0901.002" }, "vl_0958.003": { - "instrument": "CAMERA_1", + "instrument": "Camera_1", + "mission": "Viking Lander", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/vl1_vl2-m-lcs-5-special-pv0.x/vl_2112/vl/vl_0958/data/vl_0958.003" } From 6dc4f42e01245aa4bf46683600a50e5ef967ae25 Mon Sep 17 00:00:00 2001 From: Perry Date: Sat, 23 Sep 2017 14:14:52 -0700 Subject: [PATCH 06/11] Get products by mission and/or instrument --- planetary_test_data/planetary_test_data.py | 46 ++++++-- tests/test_data.json | 2 + tests/test_planetary_test_data.py | 121 +++++++++++++++++++-- 3 files changed, 152 insertions(+), 17 deletions(-) diff --git a/planetary_test_data/planetary_test_data.py b/planetary_test_data/planetary_test_data.py index ffcec4c..35ef6c6 100755 --- a/planetary_test_data/planetary_test_data.py +++ b/planetary_test_data/planetary_test_data.py @@ -14,7 +14,7 @@ class PlanetaryTestDataProducts(object): def __init__(self, tags=None, all_products=None, directory=None, - data_file=None): + data_file=None, missions=[], instruments=[]): """Object contains core data projects or that match specified tags. Attributes @@ -38,6 +38,8 @@ def __init__(self, tags=None, all_products=None, directory=None, """ self.all_products = all_products + self.missions = missions or [] + self.instruments = instruments or [] if data_file: self.data_path = data_file @@ -50,7 +52,10 @@ def __init__(self, tags=None, all_products=None, directory=None, if tags: self.tags = tags else: - self.tags = ['core'] + if not self.missions and not self.instruments: + self.tags = ['core'] + else: + self.tags = [] with open(self.data_path, 'r') as stream: self.mission_data = json.load(stream) @@ -71,15 +76,27 @@ def __init__(self, tags=None, all_products=None, directory=None, def products(self): """List of products that match defined tags""" if self.all_products: - return_list = self.mission_data.keys() + return_list = list(self.mission_data.keys()) else: + tags = set(self.tags) return_list = [] - for product in self.mission_data.keys(): + for product, data in self.mission_data.items(): # If the intersection of the set of tags on the data product # with the set of tags on self is non null, then there is a # match and we should append the product to the returned list - product_tags = set(self.mission_data[product].get('tags', '')) - if product_tags & set(self.tags): + product_tags = set(data.get('tags', '')) + tags_match = bool(product_tags & tags) + if self.missions == []: + mission_match = False + else: + product_mission = str(data.get('mission')) + mission_match = product_mission in self.missions + if self.instruments == []: + instrument_match = False + else: + product_instrument = str(data.get('instrument')) + instrument_match = product_instrument in self.instruments + if tags_match or mission_match or instrument_match: return_list.append(product) return return_list @@ -98,8 +115,13 @@ def get_mission_data(args): None """ - data = PlanetaryTestDataProducts(all_products=args.all, directory=args.dir, - data_file=args.file) + data = PlanetaryTestDataProducts( + all_products=args.all, + directory=args.dir, + data_file=args.file, + instruments=args.instruments, + missions=args.missions, + ) for product in data.products: image = data.mission_data[product] @@ -143,7 +165,9 @@ def get_mission_json(args): data = PlanetaryTestDataProducts( all_products=args.all, directory=json_dir, - data_file=args.file + data_file=args.file, + instruments=args.instruments, + missions=args.missions, ) with open(data.data_path, 'r') as data_json: original_json = json.load(data_json) @@ -174,6 +198,10 @@ def cli(args): parser.add_argument('--tags', '-t', nargs='?', action='append', help="Retrieve products whose tags match those " + "provided here.") + parser.add_argument('--instruments', '-i', nargs='?', action='append', + help='Get products by instrument') + parser.add_argument('--missions', '-m', nargs='?', action='append', + help='Get products by mission') parsed_args = parser.parse_args(args) return parsed_args diff --git a/tests/test_data.json b/tests/test_data.json index b1b633b..6f06087 100644 --- a/tests/test_data.json +++ b/tests/test_data.json @@ -2,12 +2,14 @@ "1p190678905erp64kcp2600l8c1.img": { "url": "http://pds-geosciences.wustl.edu/mer/mer1-m-pancam-2-edr-sci-v1/mer1pc_0xxx/data/sol0704/1p190678905erp64kcp2600l8c1.img", "instrument": "Pancam", + "mission": "Mars Exploration Rover", "tags": ["core"], "opens": "True", "label": "PDS3" }, "0025ML0001270000100807E01_DRCL.IMG": { "url": "http://pds-imaging.jpl.nasa.gov/data/msl/MSLMST_0002/DATA/RDR/SURFACE/0025/0025ML0001270000100807E01_DRCL.IMG", + "mission": "Mars Science Laboratory", "instrument": "MastCam", "opens": "False" } diff --git a/tests/test_planetary_test_data.py b/tests/test_planetary_test_data.py index 945f04a..64b1fd2 100755 --- a/tests/test_planetary_test_data.py +++ b/tests/test_planetary_test_data.py @@ -115,13 +115,50 @@ def test_products(self, tempdir): u'1p190678905erp64kcp2600l8c1.img', ] + test_ptd = PlanetaryTestDataProducts( + data_file=test_data, + missions=['Mars Science Laboratory'], + ) + assert test_ptd.products == [u'0025ML0001270000100807E01_DRCL.IMG'] + + test_ptd = PlanetaryTestDataProducts( + data_file=test_data, + missions=['Mars Exploration Rover'], + ) + assert test_ptd.products == [u'1p190678905erp64kcp2600l8c1.img'] + + test_ptd = PlanetaryTestDataProducts( + data_file=test_data, + instruments=['MastCam'], + ) + assert test_ptd.products == [u'0025ML0001270000100807E01_DRCL.IMG'] + + test_ptd = PlanetaryTestDataProducts( + data_file=test_data, + instruments=['Pancam'], + ) + assert test_ptd.products == [u'1p190678905erp64kcp2600l8c1.img'] + + test_ptd = PlanetaryTestDataProducts( + data_file=test_data, + missions=['Mars Science Laboratory'], + tags=['core'], + ) + assert sorted(test_ptd.products) == [ + u'0025ML0001270000100807E01_DRCL.IMG', + u'1p190678905erp64kcp2600l8c1.img', + ] + class MockArgs(object): - def __init__(self, _all=False, _dir=None, _file=None): + def __init__(self, _all=False, _dir=None, _file=None, _instruments=None, + _missions=None): self.all = _all self.dir = _dir self.file = _file + self.instruments = _instruments + self.missions = _missions def test_get_mission_data1(tempdir): @@ -196,6 +233,34 @@ def test_get_mission_data4(tempdir): assert glob(os.path.join('store_dir', '*')) == [product] +def test_get_mission_data5(tempdir): + os.mkdir('tests') + test_data = os.path.join( + os.path.abspath(CWD), + 'tests', + 'test_data.json') + args = MockArgs(_file=test_data, _missions=['Mars Science Laboratory']) + planetary_test_data.get_mission_data(args) + product = os.path.join( + 'tests', 'mission_data', '0025ML0001270000100807E01_DRCL.IMG' + ) + assert glob(os.path.join('tests', 'mission_data', '*')) == [product] + + +def test_get_mission_data6(tempdir): + os.mkdir('tests') + test_data = os.path.join( + os.path.abspath(CWD), + 'tests', + 'test_data.json') + args = MockArgs(_file=test_data, _instruments=['MastCam']) + planetary_test_data.get_mission_data(args) + product = os.path.join( + 'tests', 'mission_data', '0025ML0001270000100807E01_DRCL.IMG' + ) + assert glob(os.path.join('tests', 'mission_data', '*')) == [product] + + def test_get_mission_json1(tempdir): os.mkdir('tests') args = MockArgs() @@ -299,16 +364,56 @@ def test_get_mission_json6(tempdir): assert sorted(list(copied_json.keys())) == expected_json_keys +def test_get_mission_json7(tempdir): + os.mkdir('test') + test_data = os.path.join( + os.path.abspath(CWD), + 'tests', + 'test_data.json') + args = MockArgs(_file=test_data, _missions=['Mars Science Laboratory']) + planetary_test_data.get_mission_json(args) + assert os.path.exists(os.path.join('test', 'data.json')) + expected_json_keys = sorted([ + '0025ML0001270000100807E01_DRCL.IMG', + ]) + with open(os.path.join('test', 'data.json'), 'r') as stream: + copied_json = json.load(stream) + + assert sorted(list(copied_json.keys())) == expected_json_keys + + +def test_get_mission_json8(tempdir): + os.mkdir('test') + test_data = os.path.join( + os.path.abspath(CWD), + 'tests', + 'test_data.json') + args = MockArgs(_file=test_data, _instruments=['MastCam']) + planetary_test_data.get_mission_json(args) + assert os.path.exists(os.path.join('test', 'data.json')) + expected_json_keys = sorted([ + '0025ML0001270000100807E01_DRCL.IMG', + ]) + with open(os.path.join('test', 'data.json'), 'r') as stream: + copied_json = json.load(stream) + + assert sorted(list(copied_json.keys())) == expected_json_keys + + @pytest.mark.parametrize( - 'test_args, test_all, test_file, test_dir, test_tags', + ('test_args, test_all, test_file, test_dir, test_tags, test_instruments,' + + 'test_missions'), [ - ([], False, None, None, None), - (['-a'], True, None, None, None), - (['-f', 'foo.json'], False, 'foo.json', None, None), - (['-d', 'foo'], False, None, 'foo', None), - ('-t foo -t bar'.split(), False, None, None, ['foo', 'bar']), + ([], False, None, None, None, None, None), + (['-a'], True, None, None, None, None, None), + (['-f', 'foo.json'], False, 'foo.json', None, None, None, None), + (['-d', 'foo'], False, None, 'foo', None, None, None), + ('-t f -t b'.split(), False, None, None, ['f', 'b'], None, None), + ('-i a -i b'.split(), False, None, None, None, ['a', 'b'], None), + ('-i c -i d'.split(), False, None, None, None, None, ['c', 'd']), ]) -def test_cli(test_args, test_all, test_file, test_dir, test_tags): +def test_cli(test_args, test_all, test_file, test_dir, test_tags, + test_instruments, test_missions): args = planetary_test_data.cli(test_args) assert args.all == test_all assert args.file == test_file From 03157d034a78a7947d7efc386288f35f51add570 Mon Sep 17 00:00:00 2001 From: Perry Date: Sat, 23 Sep 2017 14:46:07 -0700 Subject: [PATCH 07/11] Update README to reflect new capabilities --- README.rst | 152 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index d1a5668..db22f8d 100644 --- a/README.rst +++ b/README.rst @@ -50,23 +50,47 @@ and then run the command ``get_mission_data``:: pip install planetary_test_data get_mission_data +Additional usage options are shown below:: + + usage: get_mission_data [-h] [--all] [--file FILE] [--dir DIR] [--tags [TAGS]] + [--instruments [INSTRUMENTS]] [--missions [MISSIONS]] + + optional arguments: + -h, --help show this help message and exit + --all, -a Download all products. + --file FILE, -f FILE Override default data.json by providing path to custom + data.json file. + --dir DIR, -d DIR Directory to place test data products in. + --tags [TAGS], -t [TAGS] + Retrieve products whose tags match those provided + here. + --instruments [INSTRUMENTS], -i [INSTRUMENTS] + Get products by instrument + --missions [MISSIONS], -m [MISSIONS] + Get products by mission + To get a copy of a subset of ``data.json``:: get_mission_json Additional usage options are shown below:: - usage: get_mission_data [-h] [--all] [--file FILE] [--dir DIR] [--tags [TAGS]] + usage: get_mission_json [-h] [--all] [--file FILE] [--dir DIR] [--tags [TAGS]] + [--instruments [INSTRUMENTS]] [--missions [MISSIONS]] optional arguments: - -h, --help show this help message and exit - --all, -a Download all products. - --file FILE, -f FILE Override default data.json by providing path to custom - data.json file. - --dir DIR, -d DIR Directory to place test data products in. - --tags [TAGS], -t [TAGS] - Retrieve products whose tags match those provided - here. + -h, --help show this help message and exit + --all, -a Download all products. + --file FILE, -f FILE Override default data.json by providing path to custom + data.json file. + --dir DIR, -d DIR Directory to place test data products in. + --tags [TAGS], -t [TAGS] + Retrieve products whose tags match those provided + here. + --instruments [INSTRUMENTS], -i [INSTRUMENTS] + Get products by instrument + --missions [MISSIONS], -m [MISSIONS] + Get products by mission Description @@ -91,6 +115,16 @@ Running ``get_mission_data`` will do the following: useful if there are test images needed that do not exist in or are not part of the ``core`` in the default ``data.json`` (see ``get_mission_json`` below). +* To get products by mission use the ``--mission`` or ``-m`` flag. This will + download all the products from the given mission, even non ``core`` products, + unless explicity given ``core`` as a tag. To specify multiple missions, use + the flag multiple times. You must spell the mission the same as spelled in + `Missions and Instruments`_ (case matters!). +* To get products by instruments use the ``--instruments`` or ``-i`` flag. This + will download all the products from the given instrument, even non ``core`` + products, unless explicity given ``core`` as a tag. To specify multiple + instruments, use the flag multiple times. You must spell the instrument the + same as spelled in `Missions and Instruments`_ (case matters!). * Only products which do not exist in the download directory will be downloaded. Running ``get_mission_json`` will do the following: @@ -150,3 +184,103 @@ Below is a sample snippet of a ``data.json`` entry:: "opens": "True", "url": "http://pds-imaging.jpl.nasa.gov/data/mer/opportunity/mer1mo_0xxx/data/sol1918/edr/1m298459885effa312p2956m2m1.img" }, + + +Missions and Instruments +------------------------ + +The following missions and their instruments have products available for +testing: + +* 2001 Mars Odyssey + * Thermal Emission Imaging System +* Cassini + * Cassini Radar + * Imaging Science Subsystem + * Imaging Science Subsystem Narrow Angle + * Visual And Infrared Mapping Spectrometer +* Chandrayaan-1 + * Context Camera + * High Resolution Imaging Science Experiment + * Mars Color Imager + * Moon Mineralogy Mapper +* Clementine + * High Resolution Camera + * Long Wave Infrared Camera + * Nearinfrared Camera + * Ultraviolet/Visible (Uv/Vis) Camera + * Ultraviolet/Visible Camera +* ESA Mars Express + * High Resolution Stereo Camera +* Galileo + * Near-Infrared Mapping Spectrometer + * Solid_State_Imaging +* Lunar Reconnaissance Orbiter + * Lunar Reconnaissance Orbiter Camera + * Lyman Alpha Mapping Project + * Mid Infrared Camera 1 + * Mid Infrared Camera 2 + * Near Infrared Camera 1 + * Near Infrared Camera 2 + * Near Infrared Spectrometer 1 + * Near Infrared Spectrometer 2 + * Total Luminance Photometer + * Visible Camera + * Visible Spectrometer +* MESSENGER + * Mercury Dual Imaging System Narrow Angle Camera + * Mercury Dual Imaging System Narrow Angle Camera, Mercury Dual Imaging System Wide Angle Camera + * Mercury Dual Imaging System Wide Angle Camera +* Magellan + * Global Topography Data Record + * Radar + * Radar System + * Synthetic-Aperture Radar +* Mariner 10 + * Mariner 10 +* Mariner 9 + * Imaging Science Subsystem +* Mars Exploration Rover + * Alpha Particle X-Ray Spectrometer + * Descent Camera + * Front Hazard Avoidance Camera Left + * Front Hazard Avoidance Camera Right + * Hazard Avoidance Camera + * Microscopic Imager + * Moessbauer Spectrometer + * Navigation Camera + * Navigation Camera Left + * Panoramic Camera + * Panoramic Camera Left + * Panoramic Camera Right + * Panoromic Camera + * Rock Abrasion Tool +* Mars Global Surveyor + * Mars Orbiter Camera - Wide Angle + * Mars Orbiter Camera Wide Angle + * Near Infrared Mapping Spectrometer +* Mars Pathfinder + * Alpha X-Ray Spectrometer + * Alpha X-Ray Spectrometer (Apxs) + * Atmospheric Structure Instrument / Meteorology Package + * Imager For Mars Pathfinder + * Rover Camera Left +* Mars Science Laboratory + * Front Hazard Avoidance Camera Left String B + * Mars Descent Imager Camera + * Mars Hand Lens Imager Camera + * Mast Camera Left + * Navigation Camera Left String A +* Phoenix + * Optical Microscope + * Robotic Arm Camera + * Surface Stereo Imager +* Viking Lander + * Camera_1 + * Camera_2 +* Viking Orbiter + * Viking Visual Imaging Subsystem + * Visual_Imaging_Subsystem_Camera_A, Visual_Imaging_Subsystem_Camera_B +* Voyager + * Imaging Science Subsystem + * Imaging Science Subsystem - Narrow Angle Camera From eeb889218e3f246ed30ff8f3195e618c6c8cd943 Mon Sep 17 00:00:00 2001 From: Perry Date: Sat, 23 Sep 2017 14:47:20 -0700 Subject: [PATCH 08/11] Fix small formatting with data.json --- planetary_test_data/data.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/planetary_test_data/data.json b/planetary_test_data/data.json index 23378ba..4164cbd 100644 --- a/planetary_test_data/data.json +++ b/planetary_test_data/data.json @@ -550,7 +550,7 @@ "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NSP1/CAL/LCROSS_NSP1_CAL_20091009113218970.LBL" }, "LCROSS_NSP2_CAL_20091009113129443.TAB": { - "instrument": "Near Infrared Spectrometer 2 ", + "instrument": "Near Infrared Spectrometer 2", "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/NSP2/CAL/LCROSS_NSP2_CAL_20091009113129443.TAB", @@ -571,7 +571,7 @@ "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/VIS/RAW/LCROSS_VIS_RAW_20091009113358274.LBL" }, "LCROSS_VSP_CAL_20091009113528839.TAB": { - "instrument": " Visible Spectrometer ", + "instrument": "Visible Spectrometer", "mission": "Lunar Reconnaissance Orbiter", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/lcross/LCRO_0001/DATA/20091009113022_IMPACT/VSP/CAL/LCROSS_VSP_CAL_20091009113528839.TAB", From b7526ad9272dbf085d827180c1cc0540e1ce9d7d Mon Sep 17 00:00:00 2001 From: TJ Slezak Date: Mon, 25 Sep 2017 12:28:44 -0600 Subject: [PATCH 09/11] Added Galileo and Voyager data + Fixed PDS links and filenames for Messenger and Cassini data --- planetary_test_data/data.json | 91 ++++++++++++++++++++++++----------- 1 file changed, 63 insertions(+), 28 deletions(-) diff --git a/planetary_test_data/data.json b/planetary_test_data/data.json index 4164cbd..f64fd46 100644 --- a/planetary_test_data/data.json +++ b/planetary_test_data/data.json @@ -58,6 +58,7 @@ }, "128078.img": { "instrument": "Imaging Science Subsystem", + "label": "PDS3", "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_0001/data/wacfm/prf/12807/128078.img", @@ -72,6 +73,7 @@ }, "134600.img": { "instrument": "Imaging Science Subsystem", + "label": "PDS3", "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_0001/data/nacfm/blemgain/1346/134600.img", @@ -398,17 +400,26 @@ }, "9500r.img": { "instrument": "Solid_State_Imaging", + "label": "SFDU_LABEL", "mission": "Galileo", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/go-v_e-ssi-2-redr-v1.0/go_0003/earth/c006101/9500r.img", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/go-v_e-ssi-2-redr-v1.0/go_0003/earth/c006101/9500r.lbl" }, - "ABDR_04_D035_V02.ZIP": { + "6413r.img": { + "instrument": "Solid State Imaging System", + "label": "SFDU_LABEL", + "mission": "Galileo", + "opens": "False", + "url": "https://pds-imaging.jpl.nasa.gov/data/galileo/galileo_orbiter/go_0022/i25/io/c052734/6413r.img", + "url_lbl": "https://pds-imaging.jpl.nasa.gov/data/galileo/galileo_orbiter/go_0022/i25/io/c052734/6413r.lbl" + }, + "ABDR_04_D035_V03.ZIP": { "instrument": "Cassini Radar", "mission": "Cassini", "opens": "False", - "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/ABDR/ABDR_04_D035_V02.ZIP", - "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/ABDR/ABDR_04_D035_V02.LBL" + "url": "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/ABDR/ABDR_04_D035_V03.ZIP", + "url_lbl": "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/ABDR/ABDR_04_D035_V03.LBL" }, "BEAM1_V01.PAT": { "instrument": "Cassini Radar", @@ -417,12 +428,12 @@ "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/CALIB/BEAMPAT/BEAM1_V01.PAT", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/CALIB/BEAMPAT/BEAM1_V01.LBL" }, - "BIBQD49N071_D035_T00AS01_V02.ZIP": { + "BIBQD49N071_D035_T00AS01_V03.ZIP": { "instrument": "Cassini Radar", "mission": "Cassini", "opens": "False", - "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/BIDR/BIBQD49N071_D035_T00AS01_V02.ZIP", - "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/BIDR/BIBQD49N071_D035_T00AS01_V02.LBL" + "url": "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/BIDR/BIBQD49N071_D035_T00AS01_V03.ZIP", + "url_lbl": "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/BIDR/BIBQD49N071_D035_T00AS01_V03.LBL" }, "C3289235_RAW.IMG": { "instrument": "Imaging Science Subsystem - Narrow Angle Camera", @@ -431,26 +442,33 @@ "url": "http://pds-imaging.jpl.nasa.gov/data/voyager/VGISS_0026/TITAN/C3289235_RAW.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/voyager/VGISS_0026/TITAN/C3289235_RAW.LBL" }, - "CN1052412325M_IF_4.IMG": { + "c1639242.imq": { + "instrument": "Imaging Science Subsystem - Narrow Angle Camera", + "label": "SFDU_LABEL", + "mission" : "Voyager", + "opens": "False", + "url": "https://pdsimg.jpl.nasa.gov/data/vg1_vg2-j-iss-2-edr-v3.0/vg_0018/io/c1639xxx/c1639242.imq" + }, + "CN1052412325M_IF_5.IMG": { "instrument": "Mercury Dual Imaging System Narrow Angle Camera", "label": "PDS3", "mission": "MESSENGER", "opens": "True", - "url": "http://pdsimage.wr.usgs.gov/archive/mess-e_v_h-mdis-4-cdr-caldata-v1.0/MSGRMDS_2001/CDR/2014_250/CN1052412325M_IF_4.IMG" + "url": "https://pdsimage2.wr.usgs.gov/archive/mess-e_v_h-mdis-4-cdr-caldata-v1.0/MSGRMDS_2001/CDR/2014_250/CN1052412325M_IF_5.IMG" }, - "CN1052412325M_RA_4.IMG": { + "CN1052412325M_RA_5.IMG": { "instrument": "Mercury Dual Imaging System Narrow Angle Camera", "label": "PDS3", "mission": "MESSENGER", "opens": "True", - "url": "http://pdsimage.wr.usgs.gov/archive/mess-e_v_h-mdis-4-cdr-caldata-v1.0/MSGRMDS_2001/CDR/2014_250/CN1052412325M_RA_4.IMG" + "url": "https://pdsimage2.wr.usgs.gov/archive/mess-e_v_h-mdis-4-cdr-caldata-v1.0/MSGRMDS_2001/CDR/2014_250/CN1052412325M_RA_5.IMG" }, - "DW1026713343K_DE_0.IMG": { + "DW1026713343K_DE_1.IMG": { "instrument": "Mercury Dual Imaging System Wide Angle Camera", "label": "PDS3", "mission": "MESSENGER", "opens": "True", - "url": "http://pdsimage.wr.usgs.gov/archive/mess-e_v_h-mdis-6-ddr-geomdata-v1.0/MSGRMDS_3001/DDR/2013_318/DW1026713343K_DE_0.IMG" + "url": "https://pdsimage2.wr.usgs.gov/archive/mess-e_v_h-mdis-6-ddr-geomdata-v1.0/MSGRMDS_3001/DDR/2013_318/DW1026713343K_DE_1.IMG" }, "EDR2856A.07": { "instrument": "Synthetic-Aperture Radar", @@ -507,12 +525,13 @@ "url": "http://pds-imaging.jpl.nasa.gov/data/lro/lamp/rdr/LROLAM_1010/DATA/2011352/LAMP_SCI_0345885974_03.fit", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/lro/lamp/rdr/LROLAM_1010/DATA/2011352/LAMP_SCI_0345885974_03.lbl" }, - "LBDR_14_D035_V02.ZIP": { + "LBDR_14_D035_V03.ZIP": { "instrument": "Cassini Radar", + "label": "PDS3", "mission": "Cassini", "opens": "False", - "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/LBDR/LBDR_14_D035_V02.ZIP", - "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/LBDR/LBDR_14_D035_V02.LBL" + "url": "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/LBDR/LBDR_14_D035_V03.ZIP", + "url_lbl": "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/CORADR_0035/DATA/LBDR/LBDR_14_D035_V03.LBL" }, "LCROSS_MIR1_CAL_20091009113134589.IMG": { "instrument": "Mid Infrared Camera 1", @@ -612,44 +631,57 @@ "url": "http://pds-imaging.jpl.nasa.gov/data/m3/CH1M3_0003/DATA/20090415_20090816/200907/L1B/M3G20090714T080142_V03_LOC.IMG", "url_lbl": "http://pds-imaging.jpl.nasa.gov/data/m3/CH1M3_0003/DATA/20090415_20090816/200907/L1B/M3G20090714T080142_V03_L1B.LBL" }, - "MDIS_BDR_256PPD_H08NW0.IMG": { + "MDIS_BDR_256PPD_H08NW2.IMG": { "instrument": "Mercury Dual Imaging System Narrow Angle Camera, Mercury Dual Imaging System Wide Angle Camera", + "label": "PDS3", "mission": "MESSENGER", "opens": "False", - "url": "http://pdsimage.wr.usgs.gov/data/mess-h-mdis-5-rdr-bdr-v1.0/MSGRMDS_4001/BDR/H08/MDIS_BDR_256PPD_H08NW0.IMG" + "url": "https://pdsimage2.wr.usgs.gov/data/mess-h-mdis-5-rdr-bdr-v1.0/MSGRMDS_4001/BDR/H08/MDIS_BDR_256PPD_H08NW2.IMG", + "url_lbl": "https://pdsimage2.wr.usgs.gov/data/mess-h-mdis-5-rdr-bdr-v1.0/MSGRMDS_4001/BDR/H08/MDIS_BDR_256PPD_H08NW2.LBL" }, - "MDIS_HIW_256PPD_H12NE0.IMG": { + "MDIS_HIW_256PPD_H12NE2.IMG": { "instrument": "Mercury Dual Imaging System Narrow Angle Camera, Mercury Dual Imaging System Wide Angle Camera", + "label": "PDS3", "mission": "MESSENGER", "opens": "False", - "url": "http://pdsimage.wr.usgs.gov/archive/mess-h-mdis-5-rdr-hiw-v1.0/MSGRMDS_7101/HIW/H12/MDIS_HIW_256PPD_H12NE0.IMG" + "url": "http://pdsimage2.wr.usgs.gov/archive/mess-h-mdis-5-rdr-hiw-v1.0/MSGRMDS_7101/HIW/H12/MDIS_HIW_256PPD_H12NE2.IMG", + "url_lbl": "https://pdsimage2.wr.usgs.gov/archive/mess-h-mdis-5-rdr-hiw-v1.0/MSGRMDS_7101/HIW/H12/MDIS_HIW_256PPD_H12NE2.LBL" }, - "MDIS_MD3_128PPD_H11SW0.IMG": { + "MDIS_MD3_128PPD_H11NW2.IMG": { "instrument": "Mercury Dual Imaging System Wide Angle Camera", + "label": "PDS3", "mission": "MESSENGER", "opens": "False", - "url": "http://pdsimage.wr.usgs.gov/archive/mess-h-mdis-5-rdr-md3-v1.0/MSGRMDS_6001/MD3/H11/MDIS_MD3_128PPD_H11SW0.IMG" + "url": "http://pdsimage2.wr.usgs.gov/archive/mess-h-mdis-5-rdr-md3-v1.0/MSGRMDS_6001/MD3/H11/MDIS_MD3_128PPD_H11NW2.IMG", + "url_lbl": "https://pdsimage2.wr.usgs.gov/archive/mess-h-mdis-5-rdr-md3-v1.0/MSGRMDS_6001/MD3/H11/MDIS_MD3_128PPD_H11NW2.LBL" }, - "MDIS_MDR_064PPD_H10SW2.IMG": { + "MDIS_MDR_064PPD_H10SW4.IMG": { "instrument": "Mercury Dual Imaging System Wide Angle Camera", + "label": "PDS3", "mission": "MESSENGER", "opens": "False", - "url": "http://pdsimage.wr.usgs.gov/data/mess-h-mdis-5-rdr-mdr-v1.0/MSGRMDS_5001/MDR/H10/MDIS_MDR_064PPD_H10SW2.IMG" + "url": "https://pdsimage2.wr.usgs.gov/data/mess-h-mdis-5-rdr-mdr-v1.0/MSGRMDS_5001/MDR/H10/MDIS_MDR_064PPD_H10SW4.IMG", + "url_lbl": "https://pdsimage2.wr.usgs.gov/data/mess-h-mdis-5-rdr-mdr-v1.0/MSGRMDS_5001/MDR/H10/MDIS_MDR_064PPD_H10SW4.LBL" }, - "MDIS_RTM_N01_006966_5568032_0.IMG": { + "MDIS_RTM_N01_006966_5568032_1.IMG": { "instrument": "Mercury Dual Imaging System Narrow Angle Camera", + "label": "PDS3", "mission": "MESSENGER", "opens": "False", - "url": "http://pdsimage.wr.usgs.gov/archive/mess-h-mdis-5-rdr-rtm-v1.0/MSGRMDS_8001/RTM/MDIS_RTM_N01/2014_014/MDIS_RTM_N01_006966_5568032_0.IMG" + "url": "https://pdsimage2.wr.usgs.gov/archive/mess-h-mdis-5-rdr-rtm-v1.0/MSGRMDS_8001/RTM/MDIS_RTM_N01/2014_014/MDIS_RTM_N01_006966_5568032_1.IMG", + "url_lbl": "https://pdsimage2.wr.usgs.gov/archive/mess-h-mdis-5-rdr-rtm-v1.0/MSGRMDS_8001/RTM/MDIS_RTM_N01/2014_014/MDIS_RTM_N01_006966_5568032_1.LBL" }, - "MDIS_RTM_W11_006648_5217862_0.IMG": { + "MDIS_RTM_W11_006648_5217862_1.IMG": { "instrument": "Mercury Dual Imaging System Wide Angle Camera", + "label": "PDS3", "mission": "MESSENGER", "opens": "False", - "url": "http://pdsimage.wr.usgs.gov/archive/mess-h-mdis-5-rdr-rtm-v1.0/MSGRMDS_8001/RTM/MDIS_RTM_W11/2013_322/MDIS_RTM_W11_006648_5217862_0.IMG" + "url": "https://pdsimage2.wr.usgs.gov/archive/mess-h-mdis-5-rdr-rtm-v1.0/MSGRMDS_8001/RTM/MDIS_RTM_W11/2013_322/MDIS_RTM_W11_006648_5217862_1.IMG", + "url_lbl": "https://pdsimage2.wr.usgs.gov/archive/mess-h-mdis-5-rdr-rtm-v1.0/MSGRMDS_8001/RTM/MDIS_RTM_W11/2013_322/MDIS_RTM_W11_006648_5217862_1.LBL" }, "N1454725799_1.IMG": { "instrument": "Imaging Science Subsystem Narrow Angle", + "label": "PDS3", "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/coiss_2001/data/1454725799_1455008789/N1454725799_1.IMG", @@ -1038,12 +1070,15 @@ }, "v1477775070_4.qub": { "instrument": "Visual And Infrared Mapping Spectrometer", + "label": "PDS3", "mission": "Cassini", "opens": "False", - "url": "http://pdsimage.wr.usgs.gov/archive/co-e_v_j_s-vims-2-qube-v1.0/covims_0005/data/2004303T191837_2004305T001017/v1477775070_4.qub" + "url": "https://pdsimage2.wr.usgs.gov/archive/co-e_v_j_s-vims-2-qube-v1.0/covims_0005/data/2004303T191837_2004305T001017/v1477775070_4.qub", + "url_lbl": "https://pdsimage2.wr.usgs.gov/archive/co-e_v_j_s-vims-2-qube-v1.0/covims_0005/data/2004303T191837_2004305T001017/v1477775070_4.lbl" }, "v1585148848_2.qub": { "instrument": "Visual And Infrared Mapping Spectrometer", + "label": "PDS3", "mission": "Cassini", "opens": "False", "url": "http://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/covims_unks/data/2008085T143116_2008085T143846/v1585148848_2.qub", From f6052125fc3b7e95688b079cb35645c3e398268e Mon Sep 17 00:00:00 2001 From: TJ Slezak Date: Mon, 25 Sep 2017 13:20:48 -0600 Subject: [PATCH 10/11] Appended python extension to reference test file Should be an obvious fix, corrects documentation. --- CONTRIBUTING.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index fb0c7e8..e37aa8a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -112,4 +112,4 @@ Tips To run a subset of tests:: - py.test tests/test_planetary_test_data + py.test tests/test_planetary_test_data.py From 2284964a36634c8cfed67cb6b595423a17d15a00 Mon Sep 17 00:00:00 2001 From: Perry Vargas Date: Sun, 21 Jan 2018 22:26:07 -0800 Subject: [PATCH 11/11] Release 0.4.0 --- CONTRIBUTING.rst | 9 ++++++--- HISTORY.rst | 10 ++++++++++ planetary_test_data/__init__.py | 2 +- setup.py | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index e37aa8a..1c50054 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -70,10 +70,13 @@ Ready to contribute? Here's how to set up `planetary_test_data` for local develo $ cd planetary_test_data/ $ pip install -r requirements.txt -4. Create a branch for local development. Please branch from ``development`` branch:: +4. Create a feature branch for local development. If your feature addresses + an issue, include the issue number in the branch name. Remember to update + your master branch first!:: - $ git checkout development - $ git checkout -b name-of-your-bugfix-or-feature + $ git checkout master + $ git pull origin master + $ git checkout -b issue42_short_name_of_issue Now you can make your changes locally. diff --git a/HISTORY.rst b/HISTORY.rst index 47d96c8..949b859 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,16 @@ History ======= +0.4.0 (2018-01-21) +------------------ + +* Made new methods/commands to get products by mission and/or instrument +* Made new methods/command to get a copy of the subset of the data.json file +* Added several new products +* Created new documentation +* Made documentation available on RTD +* Create new tests to get %100 coverage + 0.3.3 (2015-07-27) ------------------- diff --git a/planetary_test_data/__init__.py b/planetary_test_data/__init__.py index f69fa07..376c892 100755 --- a/planetary_test_data/__init__.py +++ b/planetary_test_data/__init__.py @@ -2,7 +2,7 @@ __author__ = 'PlanetaryPy Developers' __email__ = 'contact@planetarypy.com' -__version__ = '0.3.3' +__version__ = '0.4.0' from .planetary_test_data import PlanetaryTestDataProducts diff --git a/setup.py b/setup.py index 90e6243..0b6a5a3 100755 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setup( name='planetary_test_data', - version='0.3.3', + version='0.4.0', description="""Planetary Test Data contains a list of planetary data for software testing purposes and utilities to retrieve them.""", long_description=readme + '\n\n' + history,