Commit 1253ca5e authored by Angelo Ziletti's avatar Angelo Ziletti
Browse files

Continue if resolve fails.

parent a76e845b
......@@ -100,7 +100,7 @@
" ",
" <sup>1</sup> Fritz Haber Institute of the Max Planck Society, Faradayweg 4-6, D-14195 Berlin, Germany <br>",
" <sup>2</sup> Engineering Laboratory, University of Cambridge, Trumpington Street, Cambridge CB2 1PZ, UK",
" <span class=\"nomad--last-updated\" data-version=\"v1.0.3\">[Last updated: February 5, 2018]</span>",
" <span class=\"nomad--last-updated\" data-version=\"v1.0.4\">[Last updated: February 5, 2018]</span>",
" </p>",
"</div>"
],
......@@ -111,7 +111,7 @@
"result": {
"type": "BeakerDisplay",
"innertype": "Html",
"object": "<script>\nvar beaker = bkHelper.getBeakerObject().beakerObj;\n</script>\n<div class=\"nomad--header\">\n <h2>NOMAD Analytics Toolkit</h2>\n <h3>On-the-fly data analysis for the NOMAD Archive</h3>\n <p class=\"nomad--description\">\n created by:\n <a href=\"mailto:ziletti@fhi-berlin.mpg.de\">Angelo Ziletti</a><sup> 1</sup>,\n Carl Poelking<sup>2</sup>, \n Fawzi Mohamed<sup>1</sup>, \n Gábor Csányi<sup>2</sup>, \n and Luca Ghiringhelli<sup>1</sup> <br><br>\n \n <sup>1</sup> Fritz Haber Institute of the Max Planck Society, Faradayweg 4-6, D-14195 Berlin, Germany <br>\n <sup>2</sup> Engineering Laboratory, University of Cambridge, Trumpington Street, Cambridge CB2 1PZ, UK\n <span class=\"nomad--last-updated\" data-version=\"v1.0.3\">[Last updated: February 5, 2018]</span>\n </p>\n</div>"
"object": "<script>\nvar beaker = bkHelper.getBeakerObject().beakerObj;\n</script>\n<div class=\"nomad--header\">\n <h2>NOMAD Analytics Toolkit</h2>\n <h3>On-the-fly data analysis for the NOMAD Archive</h3>\n <p class=\"nomad--description\">\n created by:\n <a href=\"mailto:ziletti@fhi-berlin.mpg.de\">Angelo Ziletti</a><sup> 1</sup>,\n Carl Poelking<sup>2</sup>, \n Fawzi Mohamed<sup>1</sup>, \n Gábor Csányi<sup>2</sup>, \n and Luca Ghiringhelli<sup>1</sup> <br><br>\n \n <sup>1</sup> Fritz Haber Institute of the Max Planck Society, Faradayweg 4-6, D-14195 Berlin, Germany <br>\n <sup>2</sup> Engineering Laboratory, University of Cambridge, Trumpington Street, Cambridge CB2 1PZ, UK\n <span class=\"nomad--last-updated\" data-version=\"v1.0.4\">[Last updated: February 5, 2018]</span>\n </p>\n</div>"
},
"selectedType": "BeakerDisplay",
"elapsedTime": 0,
......@@ -342,21 +342,12 @@
},
"output": {
"state": {},
"selectedType": "Results",
"selectedType": "Hidden",
"pluginName": "IPython",
"shellId": "D7B13EC8435A46E8B6A371D4CCA911A2",
"elapsedTime": 2939,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 332,
"height": 50,
"hidden": true,
"result": {
"type": "Results",
"outputdata": [
{
"type": "err",
"value": "Using TensorFlow backend.\n"
}
]
}
"hidden": true
},
"evaluatorReader": true,
"lineCount": 39,
......@@ -2118,312 +2109,318 @@
"values": [
[
0,
"TiO2new",
"/data/private/angeloziletti/nomad-query/data/2018-02-05 084541 TiO2new.json",
"2018-02-05 08:45:41"
],
[
1,
"CaCO3",
"/data/private/angeloziletti/nomad-query/data/2018-01-29 105041 CaCO3.json",
"2018-01-29 10:50:41"
],
[
1,
2,
"c100",
"/data/private/angeloziletti/nomad-query/data/2018-01-26 144119 c100.json",
"2018-01-26 14:41:19"
],
[
2,
3,
"Gold",
"/data/private/angeloziletti/nomad-query/data/2018-01-26 134358 Gold.json",
"2018-01-26 13:43:58"
],
[
3,
4,
"NaCl",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 131946 NaCl.json",
"2018-01-19 13:19:46"
],
[
4,
5,
"H100",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 130210 H100.json",
"2018-01-19 13:02:10"
],
[
5,
6,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 125348 VASP.json",
"2018-01-19 12:53:48"
],
[
6,
7,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 125302 VASP.json",
"2018-01-19 12:53:02"
],
[
7,
8,
"Ge100",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 125245 Ge100.json",
"2018-01-19 12:52:45"
],
[
8,
9,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 125154 VASP.json",
"2018-01-19 12:51:54"
],
[
9,
10,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 115503 VASP.json",
"2018-01-19 11:55:03"
],
[
10,
11,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 115417 VASP.json",
"2018-01-19 11:54:17"
],
[
11,
12,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 115302 VASP.json",
"2018-01-19 11:53:02"
],
[
12,
13,
"bla",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 115243 bla.json",
"2018-01-19 11:52:43"
],
[
13,
14,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 113914 VASP.json",
"2018-01-19 11:39:14"
],
[
14,
15,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 113901 VASP.json",
"2018-01-19 11:39:01"
],
[
15,
16,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-19 113323 VASP.json",
"2018-01-19 11:33:23"
],
[
16,
17,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-18 074355 VASP.json",
"2018-01-18 07:43:55"
],
[
17,
18,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-18 074123 VASP.json",
"2018-01-18 07:41:23"
],
[
18,
19,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-18 074027 VASP.json",
"2018-01-18 07:40:27"
],
[
19,
20,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-18 073508 VASP.json",
"2018-01-18 07:35:08"
],
[
20,
21,
"TiO2",
"/data/private/angeloziletti/nomad-query/data/2018-01-18 073456 TiO2.json",
"2018-01-18 07:34:56"
],
[
21,
22,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-18 073337 VASP.json",
"2018-01-18 07:33:37"
],
[
22,
23,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 132652 VASP.json",
"2018-01-17 13:26:52"
],
[
23,
24,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 132444 VASP.json",
"2018-01-17 13:24:44"
],
[
24,
25,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 132303 VASP.json",
"2018-01-17 13:23:03"
],
[
25,
26,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 132217 VASP.json",
"2018-01-17 13:22:17"
],
[
26,
27,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 131846 VASP.json",
"2018-01-17 13:18:46"
],
[
27,
28,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 131816 VASP.json",
"2018-01-17 13:18:16"
],
[
28,
29,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 131747 VASP.json",
"2018-01-17 13:17:47"
],
[
29,
30,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 131454 VASP.json",
"2018-01-17 13:14:54"
],
[
30,
31,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 130713 VASP.json",
"2018-01-17 13:07:13"
],
[
31,
32,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 130702 VASP.json",
"2018-01-17 13:07:02"
],
[
32,
33,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 130230 VASP.json",
"2018-01-17 13:02:30"
],
[
33,
34,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 125954 VASP.json",
"2018-01-17 12:59:54"
],
[
34,
35,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 125936 VASP.json",
"2018-01-17 12:59:36"
],
[
35,
36,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 125716 VASP.json",
"2018-01-17 12:57:16"
],
[
36,
37,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 125702 VASP.json",
"2018-01-17 12:57:02"
],
[
37,
38,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 124915 VASP.json",
"2018-01-17 12:49:15"
],
[
38,
39,
"Au",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 124908 Au.json",
"2018-01-17 12:49:08"
],
[
39,
40,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 124534 VASP.json",
"2018-01-17 12:45:34"
],
[
40,
41,
"CO2",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 124513 CO2.json",
"2018-01-17 12:45:13"
],
[
41,
42,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 124425 VASP.json",
"2018-01-17 12:44:25"
],
[
42,
43,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 124039 VASP.json",
"2018-01-17 12:40:39"
],
[
43,
44,
"HF100_Curtarolo",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 124019 HF100_Curtarolo.json",
"2018-01-17 12:40:19"
],
[
44,
45,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 123513 VASP.json",
"2018-01-17 12:35:13"
],
[
45,
46,
"TiO2_gaussian",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 123503 TiO2_gaussian.json",
"2018-01-17 12:35:03"
],
[
46,
47,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 122937 VASP.json",
"2018-01-17 12:29:37"
],
[
47,
48,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 122910 VASP.json",
"2018-01-17 12:29:10"
],
[
48,
49,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 122721 VASP.json",
"2018-01-17 12:27:21"
],
[
49,
50,
"VASP",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 122647 VASP.json",
"2018-01-17 12:26:47"
],
[
50,
51,
"TiO2",
"/data/private/angeloziletti/nomad-query/data/2018-01-17 122439 TiO2.json",
"2018-01-17 12:24:39"
],
[
51,
52,
"gaussian_all",
"/data/private/angeloziletti/nomad-query/data/2018-01-08 125655 gaussian_all.json",
"2018-01-08 12:56:55"
......@@ -2440,8 +2437,8 @@
},
"selectedType": "Table",
"pluginName": "IPython",
"shellId": "D7B13EC8435A46E8B6A371D4CCA911A2",
"elapsedTime": 350,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 266,
"dataresult": 1,
"height": 785
},
......@@ -4220,8 +4217,8 @@
"state": {},
"selectedType": "BeakerDisplay",
"pluginName": "IPython",
"shellId": "D7B13EC8435A46E8B6A371D4CCA911A2",
"elapsedTime": 5477,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 5232,
"height": 88
},
"evaluatorReader": true,
......@@ -4297,8 +4294,8 @@
"state": {},
"selectedType": "Results",
"pluginName": "IPython",
"shellId": "D5752A60AFB9499DB4D1BB94FAE902A8",
"elapsedTime": 236,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 240,
"dataresult": {
"name": "Fe_query",
"timestamp": 1516012342,
......@@ -14474,8 +14471,8 @@
"state": {},
"selectedType": "Hidden",
"pluginName": "IPython",
"shellId": "D7B13EC8435A46E8B6A371D4CCA911A2",
"elapsedTime": 458,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 375,
"height": 88
},
"evaluatorReader": true,
......@@ -14515,8 +14512,8 @@
"state": {},
"selectedType": "Hidden",
"pluginName": "IPython",
"shellId": "D5752A60AFB9499DB4D1BB94FAE902A8",
"elapsedTime": 297,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 309,
"height": 88
},
"evaluatorReader": true,
......@@ -14588,8 +14585,8 @@
"state": {},
"selectedType": "Hidden",
"pluginName": "IPython",
"shellId": "D5752A60AFB9499DB4D1BB94FAE902A8",
"elapsedTime": 314,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 324,
"height": 88
},
"evaluatorReader": true,
......@@ -14629,7 +14626,11 @@
" logger.debug('{0}/{1}'.format(idx_nmd+1, len(nmd_uri_sampled)))",
" ",
" for path in section['paths']:",
" nmd_dict = nomad_query.resolve(nmd=nmd, path=path, recursive=True)",
" try:",
" nmd_dict = nomad_query.resolve(nmd=nmd, path=path, recursive=True)",
" except:",
" nmd_dict = []",
" ",
" # first try with atom species (this is the correct procedure)",
" if all([required_key in nmd_dict for required_key in section['required_keys_atom_species']]):",
" logging.debug(\"Using path {} for query-data retrieval\".format(path))",
......@@ -14644,7 +14645,11 @@
" # necessary to be atomic species (e.g. C1, C2)",
" # we need to do this because there was a bug in the Gaussian parser",
" for path in section['paths']:",
" nmd_dict = nomad_query.resolve(nmd=nmd, path=path, recursive=True)",
" try:",
" nmd_dict = nomad_query.resolve(nmd=nmd, path=path, recursive=True)",
" except:",
" nmd_dict = []",
"",
" # first try with atom species (this is the correct procedure)",
" if all([required_key in nmd_dict for required_key in section['required_keys_atom_labels']]):",
" logging.debug(\"Using path {} for query-data retrieval\".format(path))",
......@@ -14743,12 +14748,12 @@
"state": {},
"selectedType": "Results",
"pluginName": "IPython",
"shellId": "D5752A60AFB9499DB4D1BB94FAE902A8",
"elapsedTime": 24552,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 23138,
"height": 1672
},
"evaluatorReader": true,
"lineCount": 134,
"lineCount": 142,
"initialization": false,
"tags": "cell_soap_run"
},
......@@ -14833,8 +14838,8 @@
"state": {},
"selectedType": "Hidden",
"pluginName": "IPython",
"shellId": "D5752A60AFB9499DB4D1BB94FAE902A8",
"elapsedTime": 1000,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 1001,
"height": 88
},
"evaluatorReader": true,
......@@ -14876,8 +14881,8 @@
"state": {},
"selectedType": "Results",
"pluginName": "IPython",
"shellId": "D5752A60AFB9499DB4D1BB94FAE902A8",
"elapsedTime": 1010,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 681,
"height": 62
},
"evaluatorReader": true,
......@@ -14930,8 +14935,8 @@
"state": {},
"selectedType": "Hidden",
"pluginName": "IPython",
"shellId": "D5752A60AFB9499DB4D1BB94FAE902A8",
"elapsedTime": 990,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 315,
"height": 88
},
"evaluatorReader": true,
......@@ -15002,2011 +15007,2011 @@
"state": {},
"selectedType": "Results",
"pluginName": "IPython",
"shellId": "D5752A60AFB9499DB4D1BB94FAE902A8",
"elapsedTime": 8016,
"shellId": "75FF6936EFF74C9D8B9C8082ECAC5944",
"elapsedTime": 61329,
"height": 50,
"result": {
"type": "Results",
"outputdata": [
{
"type": "out",
"value": "[Kernel] 81 120 \n"
"value": "[Kernel] 42 36 \n"
},
{
"type": "out",
"value": "[Kernel] 81 121 \n"
"value": "[Kernel] 42 51 \n"
},
{
"type": "out",
"value": "[Kernel] 81 122 \n"
"value": "[Kernel] 42 52 \n"
},
{
"type": "out",
"value": "[Kernel] 81 123 \n"
"value": "[Kernel] 42 55 \n"
},
{
"type": "out",
"value": "[Kernel] 82 82 \n"
"value": "[Kernel] 56 56 \n"
},
{
"type": "out",
"value": "[Kernel] 82 0 \n"
"value": "[Kernel] 56 57 \n"
},
{
"type": "out",
"value": "[Kernel] 82 1 \n"
"value": "[Kernel] 56 58 \n"
},
{
"type": "out",
"value": "[Kernel] 82 2 \n"
"value": "[Kernel] 56 59 \n"
},
{
"type": "out",
"value": "[Kernel] 82 3 \n"
"value": "[Kernel] 56 76 \n"
},
{
"type": "out",
"value": "[Kernel] 82 4 \n"
"value": "[Kernel] 56 77 \n"
},
{
"type": "out",
"value": "[Kernel] 82 5 \n"
"value": "[Kernel] 56 4 \n"
},
{
"type": "out",
"value": "[Kernel] 82 6 \n"
"value": "[Kernel] 56 12 \n"
},
{
"type": "out",
"value": "[Kernel] 82 7 \n"
"value": "[Kernel] 56 18 \n"
},
{
"type": "out",
"value": "[Kernel] 82 8 \n"
"value": "[Kernel] 56 19 \n"