From 48e39589497a23e61e12e42c26c0a9c495869b51 Mon Sep 17 00:00:00 2001
From: Angelo Ziletti <ziletti@fhi-berlin.mpg.de>
Date: Mon, 15 May 2017 15:46:36 +0200
Subject: [PATCH] Fix dataset loading in sis tutorial.

---
 beaker-notebooks/sis_cscl.bkr | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/beaker-notebooks/sis_cscl.bkr b/beaker-notebooks/sis_cscl.bkr
index 52d3050..29ba5b1 100644
--- a/beaker-notebooks/sis_cscl.bkr
+++ b/beaker-notebooks/sis_cscl.bkr
@@ -109,7 +109,7 @@
                     " and Matthias Scheffler<sup>1</sup> <br><br>",
                     "   ",
                     "      <sup>1</sup> Fritz Haber Institute of the Max Planck Society, Faradayweg 4-6, D-14195 Berlin, Germany <br>",
-                    "      <span class=\"nomad--last-updated\" data-version=\"v1.0.0\">[Last updated: May 12, 2017]</span>",
+                    "      <span class=\"nomad--last-updated\" data-version=\"v1.0.0\">[Last updated: May 15, 2017]</span>",
                     "    </p>",
                     "</div>",
                     "",
@@ -128,7 +128,7 @@
                 "result": {
                     "type": "BeakerDisplay",
                     "innertype": "Html",
-                    "object": "<script>\nvar beaker = bkHelper.getBeakerObject().beakerObj;\n</script>\n<div id=\"teaser\" style=\"background-color: rgba(149,170,79, 1.0); background-position:  right center; background-size: 200px; background-repeat: no-repeat; \n    padding-top: 20px;\n    padding-right: 10px;\n    padding-bottom: 50px;\n    padding-left: 80px;\"> \n\n  <div class=\"nomad--header\">\n   <div style=\"text-align:center\">\n    <h2> <img id=\"nomad\" src=\"https://nomad-coe.eu/uploads/nomad/images/NOMAD_Logo2.png\" alt=\"NOMAD Logo\" height=\"100\">  NOMAD Analytics Toolkit   \n  <img id=\"nomad\" src=\"https://www.nomad-coe.eu/uploads/nomad/backgrounds/head_big-data_analytics_2.png\" alt=\"NOMAD Logo\" height=\"80\"> </h2>\n  </div>\n    <h3>Predicting energy differences between crystal structures: (Meta-)stability of octet-binary compounds</h3>\n    <p class=\"nomad--description\">\n      created by:\n Angelo Ziletti<sup> 1</sup>,\n Emre Ahmetcik<sup>1</sup>,\n Runhai Ouyang<sup>1</sup>,\n Ankit Kariryaa<sup>1</sup>, \n Fawzi R. Mohamed<sup>1</sup>,\n Luca Ghiringhelli<sup>1</sup>,\n and Matthias Scheffler<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      <span class=\"nomad--last-updated\" data-version=\"v1.0.0\">[Last updated: May 12, 2017]</span>\n    </p>\n</div>\n\n</div>  \n\n<div style=\"text-align: right;\">\n<a href=\"https://analytics-toolkit.nomad-coe.eu/home/\" class=\"btn btn-primary\" style=\"font-size:larger;\">Back to Analytics Home</a> \n<a href=\"https://www.nomad-coe.eu/\" class=\"btn btn-primary\" style=\"font-size:larger;\">Back to NOMAD CoE Home</a> \n</div>\n"
+                    "object": "<script>\nvar beaker = bkHelper.getBeakerObject().beakerObj;\n</script>\n<div id=\"teaser\" style=\"background-color: rgba(149,170,79, 1.0); background-position:  right center; background-size: 200px; background-repeat: no-repeat; \n    padding-top: 20px;\n    padding-right: 10px;\n    padding-bottom: 50px;\n    padding-left: 80px;\"> \n\n  <div class=\"nomad--header\">\n   <div style=\"text-align:center\">\n    <h2> <img id=\"nomad\" src=\"https://nomad-coe.eu/uploads/nomad/images/NOMAD_Logo2.png\" alt=\"NOMAD Logo\" height=\"100\">  NOMAD Analytics Toolkit   \n  <img id=\"nomad\" src=\"https://www.nomad-coe.eu/uploads/nomad/backgrounds/head_big-data_analytics_2.png\" alt=\"NOMAD Logo\" height=\"80\"> </h2>\n  </div>\n    <h3>Predicting energy differences between crystal structures: (Meta-)stability of octet-binary compounds</h3>\n    <p class=\"nomad--description\">\n      created by:\n Angelo Ziletti<sup> 1</sup>,\n Emre Ahmetcik<sup>1</sup>,\n Runhai Ouyang<sup>1</sup>,\n Ankit Kariryaa<sup>1</sup>, \n Fawzi R. Mohamed<sup>1</sup>,\n Luca Ghiringhelli<sup>1</sup>,\n and Matthias Scheffler<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      <span class=\"nomad--last-updated\" data-version=\"v1.0.0\">[Last updated: May 15, 2017]</span>\n    </p>\n</div>\n\n</div>  \n\n<div style=\"text-align: right;\">\n<a href=\"https://analytics-toolkit.nomad-coe.eu/home/\" class=\"btn btn-primary\" style=\"font-size:larger;\">Back to Analytics Home</a> \n<a href=\"https://www.nomad-coe.eu/\" class=\"btn btn-primary\" style=\"font-size:larger;\">Back to NOMAD CoE Home</a> \n</div>\n"
                 },
                 "selectedType": "BeakerDisplay",
                 "elapsedTime": 0,
@@ -338,9 +338,11 @@
                     "  $(\"#lasso_result_button\").removeClass(\"active\").addClass(\"disabled\");",
                     "  getFeatures();",
                     "  getOperators();",
-                    "  getMaxDim();",
-                    "  getUnits();",
-                    "  beaker.evaluate(\"calc_cell\"); // evaluate cells with tag \"calc_cell\"",
+                    "  beaker.max_dim = $(\"#lasso_max_dim_selector\").val();",
+                    "  beaker.structures_diff = $(\"#lasso_structures_diff\").val();",
+                    "  beaker.n_comb = $(\"#n_comb\").val();",
+                    "  beaker.n_sis = $(\"#n_sis\").val();",
+                    "  beaker.evaluate(\"calc_cell\"); // evaluate cells with tag \"lasso_cell\"",
                     " // view_result()",
                     "};",
                     "var reset_lasso = function(){",
@@ -364,13 +366,7 @@
                     "          beaker.allowed_operations.push(this.value);",
                     "    });",
                     "};  ",
-                    "var getMaxDim = function() {",
-                    "   beaker.max_dim = $(\"#lasso_max_dim_selector\").val();",
-                    "};",
-                    "  ",
-                    "var getUnits = function() {",
-                    "   beaker.units = $(\"#units_select\").val();",
-                    "};",
+                    "",
                     "var toggle_settings = function(){",
                     "  var e = document.getElementById('lasso-hidden-settings-div');",
                     "  var b = document.getElementById('lasso-hidden-settings-button');",
@@ -389,9 +385,11 @@
                     "//   }); ",
                     "  $(\"#lasso_result_button\").removeClass(\"disabled\").addClass(\"active\");",
                     "}",
+                    "",
+                    "",
+                    "",
                     "</script>"
-                ],
-                "hidden": true
+                ]
             },
             "output": {
                 "state": {},
@@ -405,7 +403,7 @@
                 "height": 50
             },
             "evaluatorReader": true,
-            "lineCount": 57
+            "lineCount": 56
         },
         {
             "id": "lasso-settings-cell",
-- 
GitLab