From 8d4d8314d6be8a0c7df7a97e77c573f4663a5dbb Mon Sep 17 00:00:00 2001
From: Alessandro Frigeri <alessandro.frigeri@inaf.it>
Date: Fri, 13 Sep 2019 15:31:21 +0200
Subject: [PATCH] updated example
---
examples/example1.ipynb | 273 -------------------------
moondb/__pycache__/core.cpython-37.pyc | Bin 13484 -> 13067 bytes
moondb/core.py | 6 +-
3 files changed, 3 insertions(+), 276 deletions(-)
delete mode 100644 examples/example1.ipynb
diff --git a/examples/example1.ipynb b/examples/example1.ipynb
deleted file mode 100644
index c30e54f..0000000
--- 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
GIT binary patch
delta 2557
zcmZ3J*`220#LLUYz`(#ztymd*U4?<+F^B`htPBhc4h#$o#g7;_YIrg-I!`WQY!zoL
zx|gcZ%n+rUs+X$U%*e=)!Whh;>9YAAlRXpXEjIT6KQ~X8Ta(pTGX#Yh7#NC#7#J8d
znTpsM7#MC%p3hp&C^q>bzr<#JHXTMb1&{*e$%*Vi+!7$BB#2N2$ur7KzRoVoC^LB>
zujFJtj#<LD*pu^fb5rw5Zn38%mLwLZmfV`Wo1>Ra9i&BLaw5AVQ<3WAOwMp5k;(Tt
zO;r&FGlQJKl9O3nQltygr3WHZK?FC*N<}pW1_o1*e?d;>V&Y(gK_NyVCJyEzHLzp4
zxt7S^;wdgjP0q|s&GSplO})iekXV$OR}u^ryEWO5+u7w7PflrGVo`8OVo7Fx-Yx#3
z)RNMoJm>tplElos)S_E#<*AwJ86~&43W_p|OEU8^ODb>iA=oa7C8@V2U*%qz40o$0
z>n+as^wg60qSWGoB14eFWk6nHODrfz%}Xf)xnGkL64Km>dGYy4S@9s>-eSzV#h#c4
zWhdU^D2mUAa*A#-7scn_n*5L_TL2MI`XHk{L1DsZFu9aho6%tMLf%j|hyswXpcexJ
zLnbJwm>3usxR{E(CjaAi*__Fz!pNvPxsTt85gdu4-V6*3xgce13=9k$j2uiHOhw+C
z|M8cDl$8m(LzVe3Fff#&Df0oFs4rvyQko#_236|Iz`#(8rqma#R6;})q*PDT7OK>b
zfq|hFO{pJ9>Eyejfs6r@86{*UdyAcCRGlm>?gG{0&%nUYi=>B{gQ>`W@;`pb$;-r#
z2?jDSFiZ!@f_%-vSQI$9R>DqR78F`?AVMBQfYY=hh@}J~lqcVkFcl19U|^Vsq%&x;
zf@C1aE!Kj>qT<wBlPe|l86zgIlr&|$HTk}z9b?R7IjO6Rw<dp)@)3*xMKM=uMRIBZ
zC?OT!nj9!CV|$CeJh3P*GcWxXb8%(yEtb@Z%#vGt&iQ$HsmUcFnYpR?r6ol%AgwG}
z#rb)f%thfK*F=K|x5<gT!i@Hl_epCr+D}%Hl$^{glfhU3X0^(Q%iiM7Ps&P7E{V^`
z&(GFmF3JWO!<v(ym{MF+FnOnp0b|MJS2Ask%##acwHa9^&z03?WSu-$R($dUSv^L!
z&HQqVO!Zab`mj6#N`v}2iFqlxiACA^Rnn*uFjXa$1*!T~3TTpvxdl0ydFdso$r*W>
zg{7(bnk+^3AWwh_rdw>O6(yjQZvZM|cyBQkC*NYq&AY{vlV@>@xwxbfM5NwgFD`&4
z_u^YDAnS^pKqe%Byv0;pa*MmT0FhTF=PM*IHcq~vP;V0tQUyx6n(Rf1Aa)Xn0L2G5
zWWnK51ae0asHD_nzQvK7SzMf%pI2NIJ-J)aj<IF(DaB${uya8<0jyS&^%i?^3D`YF
zAQu$XfefvgoTTK$*gpA`V&vq1O7d!8J)mp>)l&pY$jItJn%X8Sst8XGQ`Tkd0BgLf
zEC<mD$|Qs|+B0@ePE;w@0^0=k1Sr20HG@Ku<rYU`USdvVNoq0J&Ra~0c||T@+XPh=
z8G9z5QnZ|$qiUlI)(pxsMKvG?fs6t9FEJP4zgtX+xkWCZpq_kH)t+&}WKp$3h^73<
zT5^!Ju;t`}(#$Q!oLiGOs97>jo%~A8Q*kOtJvcg;Z}GyCQ+yt%0A|j~EiRf2c3`@?
zBIAt7o$3jUGr{>*hFN*Cn#Kpl&y&S9BN($M7icChE(Mig!m}6{7(5vn7>Ze-g;UWi
zZ~-r>mBnZ{xj{>w4OAHvnN41*<!o98vb-EbRDg&|5K#pRE4HFW5F1<?F9)$!fC#8g
zS?yvKunf3F1=nuqYCx)2f!xEmZ1P!cNycT+5{h%OiB5=;IY`<9L_kagu{1z|$qtR6
zTa#DmZ048^atUM698kvQpUc3&kjcovPy{M)sx&4u>WNL(*A!JLnh(;w0Hl<;Xd#Hb
z2t+If2{1tt^Abosx^(kL-GfZ^;PelwRBmyBs@$N|;?kTFO-69#smX($C6<B=0~Zx6
zDVfP7MW9eE0u}y6c_0~ZEe1*;w>aX9QVVhtlT$T0z;#s-xKLUNQsf5m8dFgUIQ{A8
zR2F9z-{J+?4XX0MY3ddSj9bJ3(g7woL9A7i6AUBRz^(v?XZ&gg28MW0{DRU92O|du
z2Xhff>=s9Sd~RZ9UVOYJs~-qx>KA2zOaMEcr?e<1Co@S8TrwAhfE>gQ5i-8TR-B)l
zomx_q1`?fo+DNk=Tr7Zce-St}gQ{b2HCzNLk%~aIWDz*$gR?R?TY_^LILm-)lOj;X
zP=qK_z!|Cl<d_l=0Zv*iAXYnw=l~I&Afg9EOkmJrU?>7-iy0vPOb`J|)kVudERbJ|
actB2N%q>cte34&#vaAU|W6)$>lTZM>Lz<!h
delta 2978
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
ROl*uSj9iRDj9iR7i~tF7si*(|
diff --git a/moondb/core.py b/moondb/core.py
index 67bc120..09b2a0f 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 = []
--
GitLab