diff --git a/examples/example1.ipynb b/examples/example1.ipynb
deleted file mode 100644
index c30e54f3037c45ee7ad73ef29d3a5e0d16ce5084..0000000000000000000000000000000000000000
--- a/examples/example1.ipynb
+++ /dev/null
@@ -1,273 +0,0 @@
-{
- "cells": [
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "## MoonDB Jupyter notebook workbook\n",
- "#### Alessandro Frigeri, IAPS/INAF, Rome Italy\n",
- "\n",
- "\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 104,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "The autoreload extension is already loaded. To reload it, use:\n",
- " %reload_ext autoreload\n",
- "/home/alf/gitwrk/pymoondb/moondb/__init__.py\n"
- ]
- }
- ],
- "source": [
- "# First we import the moondb module\n",
- "%load_ext autoreload\n",
- "%autoreload 2\n",
- "\n",
- "%aimport moondb\n",
- "\n",
- "print(moondb.__file__)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 105,
- "metadata": {},
- "outputs": [
- {
- "data": {
- "text/plain": [
- "['Apollo 11',\n",
- " 'Apollo 12',\n",
- " 'Apollo 14',\n",
- " 'Apollo 15',\n",
- " 'Apollo 16',\n",
- " 'Apollo 17',\n",
- " 'Luna 16',\n",
- " 'Luna 20',\n",
- " 'Luna 24']"
- ]
- },
- "execution_count": 105,
- "metadata": {},
- "output_type": "execute_result"
- }
- ],
- "source": [
- "# Let's get a list of the missions in MoonDB\n",
- "\n",
- "mlist = moondb.get_missions()\n",
- "\n",
- "[m.name for m in mlist]"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 106,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "MoonDB holds 2991 specimens from Apollo 17.\n"
- ]
- }
- ],
- "source": [
- "# Now, we want to know how many specimens are available from the Apollo 17 missions\n",
- "\n",
- "f = moondb.SpecimenFilter()\n",
- "mission = 'Apollo 17'\n",
- "f.missionName = [ mission ]\n",
- "results = f.get_results()\n",
- "specimen_list = [r for r in results]\n",
- "\n",
- "print(\"MoonDB holds {} specimens from Apollo 17.\".format(len(specimen_list)))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 79,
- "metadata": {},
- "outputs": [
- {
- "data": {
- "text/plain": [
- "['COMPOSITE',\n",
- " 'ROCK',\n",
- " 'ROCK/Basalt/Ilmenite Basalt',\n",
- " 'ROCK/Basalt/Unclassified Basalt',\n",
- " 'ROCK/Breccia/Fragmental Breccia',\n",
- " 'ROCK/Breccia/Impact Melt Breccia',\n",
- " 'ROCK/Breccia/Regolith Breccia',\n",
- " 'ROCK/Breccia/Unclassified Breccia',\n",
- " 'ROCK/Crustal/Crustal:Cataclasite',\n",
- " 'ROCK/Crustal/Crustal:Norite',\n",
- " 'ROCK/Crustal/Crustal:Troctolite',\n",
- " 'SOIL/Soil:1-2mm',\n",
- " 'SOIL/Soil:2-4mm',\n",
- " 'SOIL/Soil:4-10mm',\n",
- " 'SOIL/Soil:<1mm',\n",
- " 'SOIL/Soil:Unsieved',\n",
- " 'Unknown']"
- ]
- },
- "execution_count": 79,
- "metadata": {},
- "output_type": "execute_result"
- }
- ],
- "source": [
- "# Get a list of type of specimen of Apollo 17 available in MoonDB\n",
- "s_list = [s.specimenType for s in specimen_list]\n",
- "list(sorted(set(s_list)))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "code",
- "execution_count": 108,
- "metadata": {
- "scrolled": true
- },
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "2991\n"
- ]
- }
- ],
- "source": [
- "#\n",
- "# Let's see the analyses done on the first specimen\n",
- "#\n",
- "\n",
- "s_list = [s for s in specimen_list]\n",
- "\n",
- "print(len(s_list))\n",
- "\n",
- "s0 = s_list[0]\n",
- "\n",
- "an_list = [a for a in s0.get_analyses()]"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 109,
- "metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "[result of MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY (code MC-ICP-MS), result of MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY (code MC-ICP-MS), result of MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY (code MC-ICP-MS), result of MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY (code MC-ICP-MS), result of MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY (code MC-ICP-MS), result of MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY (code MC-ICP-MS), result of MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY (code MC-ICP-MS), result of MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY (code MC-ICP-MS), result of CACULATED (code CALC)]\n"
- ]
- }
- ],
- "source": [
- "# now we check the results of the first analysis\n",
- "\n",
- "#result_of\n",
- "\n",
- "print(an_list[0].dataResultsObj)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 103,
- "metadata": {
- "scrolled": true
- },
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "Apollo 17 specimen: 76535,16\n",
- "Result: Os 8.5 ppb (MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY)\n",
- "Result: Ir 55.0 ppb (MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY)\n",
- "Result: Ru 81.0 ppb (MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY)\n",
- "Result: Pt 54.0 ppb (MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY)\n",
- "Result: Pd 89.0 ppb (MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY)\n",
- "Result: Re 9.0 ppb (MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY)\n",
- "Result: Re187_Os188 5.1 Not Applicable (MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY)\n",
- "Result: Os187_Os188 0.1511 Not Applicable (MULTICOLLECTOR INDUCTIVELY COUPLED PLASMA MASS SPECTROMETRY)\n",
- "Result: G_Os(T) -348.0 Not Applicable (CACULATED)\n"
- ]
- }
- ],
- "source": [
- "\n",
- "\n",
- "\n",
- "print(mission+\" specimen: \",s0.specimenName)\n",
- "for r in an_list[0].dataResultsObj:\n",
- " print('Result: {} {} {} ({})'.format(r.variable,r.value,r.unit,r.methodName))"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- }
- ],
- "metadata": {
- "kernelspec": {
- "display_name": "Python 3",
- "language": "python",
- "name": "python3"
- },
- "language_info": {
- "codemirror_mode": {
- "name": "ipython",
- "version": 3
- },
- "file_extension": ".py",
- "mimetype": "text/x-python",
- "name": "python",
- "nbconvert_exporter": "python",
- "pygments_lexer": "ipython3",
- "version": "3.7.3"
- }
- },
- "nbformat": 4,
- "nbformat_minor": 2
-}
diff --git a/moondb/__pycache__/core.cpython-37.pyc b/moondb/__pycache__/core.cpython-37.pyc
index 96bb62901a8a7c6de0f215953d4f30ea33a80d2e..1b6108972e4ed44ebbdfcb84fa32facf83806aae 100644
Binary files a/moondb/__pycache__/core.cpython-37.pyc and b/moondb/__pycache__/core.cpython-37.pyc differ
diff --git a/moondb/core.py b/moondb/core.py
index 67bc12028831eec3ca39025f1abfd46188a1812e..09b2a0f58bafb23fce0f34eb29bb2ad6d6554dff 100644
--- a/moondb/core.py
+++ b/moondb/core.py
@@ -235,17 +235,17 @@ def get_specimens(sc=None,mn=None,ln=None,sty=None,ste=None):
if ln:
for n in ln:
- count,spec = _get_resp('/specimenlist/mission/'+n)
+ count,spec = _get_resp('/specimenlist/landmark/'+n)
sp_list.extend(spec)
if sty:
for st in sty:
- count,spec = _get_resp('/specimenlist/mission/'+st)
+ count,spec = _get_resp('/specimenlist/specimentype/'+st)
sp_list.extend(spec)
if ste:
for st in ste:
- count,spec = _get_resp('/specimenlist/mission/'+st)
+ count,spec = _get_resp('/specimenlist/samplingtechnique/'+st)
sp_list.extend(spec)
sp_obj_list = []