From 38c8620efa8cf36fe63182adcba89611cedc8a7b Mon Sep 17 00:00:00 2001
From: Alessandro Frigeri <alessandro.frigeri@inaf.it>
Date: Fri, 10 May 2019 10:16:24 +0200
Subject: [PATCH] fixed examples
---
examples/Apollo11_soils.py | 62 --------------------------------------
examples/Apollo12_soils.py | 18 +++++++++++
examples/specimen.py | 9 ------
3 files changed, 18 insertions(+), 71 deletions(-)
delete mode 100644 examples/Apollo11_soils.py
create mode 100644 examples/Apollo12_soils.py
diff --git a/examples/Apollo11_soils.py b/examples/Apollo11_soils.py
deleted file mode 100644
index 9939bce..0000000
--- a/examples/Apollo11_soils.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import moondb,sys
-
-#s0 = moondb.get_specimens(mn=['Apollo 11',])
-
-s = moondb.SpecimenFilter()
-s.missionName = ["Apollo 11"]
-res = s.get_results()
-
-apollo11_weight = 0
-for r in res:
- if r.weight is not None:
- apollo11_weight += float(r.weight.split(' ')[0])
-
-print(apollo11_weight)
-
-s1 = moondb.SpecimenFilter()
-s1.missionName = ["Apollo 17"]
-res = s1.get_results()
-
-apollo17_weight = 0
-for r in res:
- if r.weight is not None:
- apollo17_weight += float(r.weight.split(' ')[0])
-
-print(apollo17_weight)
-
-
-moon_missions = moondb.get_missions()
-
-weight_cum = 0
-for m in moon_missions:
- s = moondb.SpecimenFilter()
- s.missionName = [ m.name ]
- res = s.get_results()
- weight = 0
- for r in res:
- if r.weight is not None:
- weight += float(r.weight.split(' ')[0])
- weight_cum += weight
- print("MoonDB holds {:.3f} kg of specimens from {}".format(weight/1000.0,m.name))
-
-print("MoonDB contains a total of {:.3f} kg of specimen from the Moon!".format(weight_cum/1000.0))
-
-sys.exit(0)
-
-
-f = moondb.AnalysisFilter()
-f.mission = ["Apollo 11"]
-f.analyte = ["Na2O","CaO"]
-f.specimenType = ["SOIL"]
-
-
-
-results = f.get_results()
-
-for r in results:
- for dr in r.dataResults:
- print(dr)
- #print(dr.laboratory,dr.variable,dr.value,dr.unit)
-
-
-
diff --git a/examples/Apollo12_soils.py b/examples/Apollo12_soils.py
new file mode 100644
index 0000000..ddc0da4
--- /dev/null
+++ b/examples/Apollo12_soils.py
@@ -0,0 +1,18 @@
+import moondb,sys
+
+
+
+# Let's setup the data filter
+f = moondb.AnalysisFilter()
+f.mission = ["Apollo 12"]
+f.analyte = ["Na2O","CaO"]
+f.specimenType = ["SOIL"]
+# retreive the results
+results = f.get_results()
+
+for r in results:
+ for dr in r.dataResults:
+ print(dr.laboratory,dr.variable,dr.value,dr.unit)
+
+
+
diff --git a/examples/specimen.py b/examples/specimen.py
index 9f749ed..9aa96f1 100644
--- a/examples/specimen.py
+++ b/examples/specimen.py
@@ -2,12 +2,3 @@ import moondb
s_12023 = moondb.get_specimens(sc=['12023'])[0]
-#print(dir(s_12023))
-
-#print(s_12023.landmark)
-
-lms = moondb.get_landmarks()
-
-lm = moondb.get_landmark('BLOCK CRATER')
-
-print(lm.asWkt())
--
GitLab