From e12ba2e721c9054de6d2371354b136c75ef996aa Mon Sep 17 00:00:00 2001
From: "emanuele.laface@esss.se" <emanuele.laface@esss.se>
Date: Mon, 15 Mar 2021 14:45:41 +0100
Subject: [PATCH] Fix ts2 Helimum levels

---
 WebSites/ts2_helevpres/dashboard.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/WebSites/ts2_helevpres/dashboard.json b/WebSites/ts2_helevpres/dashboard.json
index 83f60c4..887f7e2 100644
--- a/WebSites/ts2_helevpres/dashboard.json
+++ b/WebSites/ts2_helevpres/dashboard.json
@@ -120,7 +120,7 @@
 					"type": "vertical-linear-gauge",
 					"settings": {
 						"title": "<a href=\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=TS2-010CRM:Cryo-PT-003:MeasValue\" target=\"_blank\">Pressure</a>",
-						"value": "function p2t(p) {\n      // This formula uses the Table 3 of ITS-90 from NIST paper: https://www.nist.gov/system/files/documents/pml/div685/grp01/ITS-90_metrologia.pdf\n  // Check if pressure is a number and is within the range of validity of this function that is from 1.25 to 5 K.\n  if (isNaN(p) || p == null || p < 1.14734339634282 || p > 1960.16532874851) {\n    return \"N/A\";\n  }\n  if (p <= 50.4181) {\n        let P = p * 100;  // From mbar to Pascal\n        let A = [\n            1.392408,\n            0.527153,\n            0.166756,\n            0.050988,\n            0.026514,\n            0.001975,\n            -0.017976,\n            0.005409,\n            0.013259,\n            0.000000,\n        ];\n        let B = 5.6;\n        let C = 2.9;\n        var t = A[0];\n        var i;\n        for (i = 1; i < 10; i++) {\n            t += A[i] * ((Math.log(P) - B) / C) ** i;\n        }\n  }\n  else {\n        let P = p * 100;  // From mbar to Pascal\n        let A = [\n            3.146631,\n            1.357655,\n            0.413923,\n            0.091159,\n            0.016349,\n            0.001826,\n            -0.004325,\n            -0.004973,\n            0.000000,\n            0.000000,\n        ];\n        let B = 10.3;\n        let C = 1.9;\n        var t = A[0];\n        var i;\n        for (i = 1; i < 10; i++) {\n            t += A[i] * ((Math.log(P) - B) / C) ** i;\n        }\n  }\n  return t\n}\n\n//return p2t(datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-003\"][\"value\"]).toFixed(3)\nreturn p2t(datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-003\"][\"value\"])",
+						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-003:MeasValue\"][\"value\"].toFixed(3)",
 						"units": "mbar",
 						"min_value": 0,
 						"max_value": 1100
@@ -130,7 +130,7 @@
 					"type": "vertical-linear-gauge",
 					"settings": {
 						"title": "Temperature",
-						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-003\"][\"value\"]",
+						"value": "function p2t(p) {\n      // This formula uses the Table 3 of ITS-90 from NIST paper: https://www.nist.gov/system/files/documents/pml/div685/grp01/ITS-90_metrologia.pdf\n  // Check if pressure is a number and is within the range of validity of this function that is from 1.25 to 5 K.\n  if (isNaN(p) || p == null || p < 1.14734339634282 || p > 1960.16532874851) {\n    return \"N/A\";\n  }\n  if (p <= 50.4181) {\n        let P = p * 100;  // From mbar to Pascal\n        let A = [\n            1.392408,\n            0.527153,\n            0.166756,\n            0.050988,\n            0.026514,\n            0.001975,\n            -0.017976,\n            0.005409,\n            0.013259,\n            0.000000,\n        ];\n        let B = 5.6;\n        let C = 2.9;\n        var t = A[0];\n        var i;\n        for (i = 1; i < 10; i++) {\n            t += A[i] * ((Math.log(P) - B) / C) ** i;\n        }\n  }\n  else {\n        let P = p * 100;  // From mbar to Pascal\n        let A = [\n            3.146631,\n            1.357655,\n            0.413923,\n            0.091159,\n            0.016349,\n            0.001826,\n            -0.004325,\n            -0.004973,\n            0.000000,\n            0.000000,\n        ];\n        let B = 10.3;\n        let C = 1.9;\n        var t = A[0];\n        var i;\n        for (i = 1; i < 10; i++) {\n            t += A[i] * ((Math.log(P) - B) / C) ** i;\n        }\n  }\n  return t.toFixed(3)\n}\n\n//return p2t(datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-003\"][\"value\"]).toFixed(3)\nreturn p2t(datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-003\"][\"value\"])",
 						"units": "K",
 						"min_value": 0,
 						"max_value": 5
@@ -165,7 +165,7 @@
 					"type": "vertical-linear-gauge",
 					"settings": {
 						"title": "<a href=\"https://pos.esss.lu.se/plot/retrieval/ui/viewer/archViewer.html?pv=TS2-010CRM:Cryo-PT-004:MeasValue\" target=\"_blank\">Pressure</a>",
-						"value": "function p2t(p) {\n      // This formula uses the Table 3 of ITS-90 from NIST paper: https://www.nist.gov/system/files/documents/pml/div685/grp01/ITS-90_metrologia.pdf\n  // Check if pressure is a number and is within the range of validity of this function that is from 1.25 to 5 K.\n  if (isNaN(p) || p == null || p < 1.14734339634282 || p > 1960.16532874851) {\n    return \"N/A\";\n  }\n  if (p <= 50.4181) {\n        let P = p * 100;  // From mbar to Pascal\n        let A = [\n            1.392408,\n            0.527153,\n            0.166756,\n            0.050988,\n            0.026514,\n            0.001975,\n            -0.017976,\n            0.005409,\n            0.013259,\n            0.000000,\n        ];\n        let B = 5.6;\n        let C = 2.9;\n        var t = A[0];\n        var i;\n        for (i = 1; i < 10; i++) {\n            t += A[i] * ((Math.log(P) - B) / C) ** i;\n        }\n  }\n  else {\n        let P = p * 100;  // From mbar to Pascal\n        let A = [\n            3.146631,\n            1.357655,\n            0.413923,\n            0.091159,\n            0.016349,\n            0.001826,\n            -0.004325,\n            -0.004973,\n            0.000000,\n            0.000000,\n        ];\n        let B = 10.3;\n        let C = 1.9;\n        var t = A[0];\n        var i;\n        for (i = 1; i < 10; i++) {\n            t += A[i] * ((Math.log(P) - B) / C) ** i;\n        }\n  }\n  return t\n}\n\n//return p2t(datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-003\"][\"value\"]).toFixed(3)\nreturn p2t(datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-004\"][\"value\"])",
+						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-004:MeasValue\"][\"value\"].toFixed(3)",
 						"units": "mbar",
 						"min_value": 0,
 						"max_value": 67
@@ -175,7 +175,7 @@
 					"type": "vertical-linear-gauge",
 					"settings": {
 						"title": "Temperature",
-						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-004\"][\"value\"]",
+						"value": "function p2t(p) {\n      // This formula uses the Table 3 of ITS-90 from NIST paper: https://www.nist.gov/system/files/documents/pml/div685/grp01/ITS-90_metrologia.pdf\n  // Check if pressure is a number and is within the range of validity of this function that is from 1.25 to 5 K.\n  if (isNaN(p) || p == null || p < 1.14734339634282 || p > 1960.16532874851) {\n    return \"N/A\";\n  }\n  if (p <= 50.4181) {\n        let P = p * 100;  // From mbar to Pascal\n        let A = [\n            1.392408,\n            0.527153,\n            0.166756,\n            0.050988,\n            0.026514,\n            0.001975,\n            -0.017976,\n            0.005409,\n            0.013259,\n            0.000000,\n        ];\n        let B = 5.6;\n        let C = 2.9;\n        var t = A[0];\n        var i;\n        for (i = 1; i < 10; i++) {\n            t += A[i] * ((Math.log(P) - B) / C) ** i;\n        }\n  }\n  else {\n        let P = p * 100;  // From mbar to Pascal\n        let A = [\n            3.146631,\n            1.357655,\n            0.413923,\n            0.091159,\n            0.016349,\n            0.001826,\n            -0.004325,\n            -0.004973,\n            0.000000,\n            0.000000,\n        ];\n        let B = 10.3;\n        let C = 1.9;\n        var t = A[0];\n        var i;\n        for (i = 1; i < 10; i++) {\n            t += A[i] * ((Math.log(P) - B) / C) ** i;\n        }\n  }\n  return t.toFixed(3)\n}\n\n//return p2t(datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-003\"][\"value\"]).toFixed(3)\nreturn p2t(datasources[\"TS2\"][\"TS2-010CRM:Cryo-PT-004\"][\"value\"])",
 						"units": "K",
 						"min_value": 0,
 						"max_value": 5
@@ -189,11 +189,10 @@
 			"name": "TS2",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/TS2-010CRM:Cryo-PT-003,TS2-010CRM:Cryo-PT-004",
+				"url": "/data/api/v1/caget/TS2-010CRM:Cryo-PT-003:MeasValue,TS2-010CRM:Cryo-PT-004:MeasValue",
 				"use_thingproxy": false,
 				"refresh": 5,
-				"method": "GET",
-				"name": "TS2"
+				"method": "GET"
 			}
 		},
 		{
@@ -210,7 +209,8 @@
 				"url": "/data/api/v1/archiver/TS2-010CRM:Cryo-LT-001:MeasValue,TS2-010CRM:Cryo-LT-002:MeasValue/1209600/100/freeboard",
 				"use_thingproxy": false,
 				"refresh": 3600,
-				"method": "GET"
+				"method": "GET",
+				"name": "2w"
 			}
 		},
 		{
-- 
GitLab