diff --git a/WebSites/instruments/dashboard.json b/WebSites/instruments/dashboard.json
index 995f706268b0fbc116cdd363666ffcecd0c66b21..eaedca151febfa5717fbb95d7914ce30f06e183b 100644
--- a/WebSites/instruments/dashboard.json
+++ b/WebSites/instruments/dashboard.json
@@ -30,65 +30,46 @@
]
},
{
+ "title": "Beam Current Monitors and Faraday Cups",
"width": 1,
"row": {
"4": 7,
+ "5": 7,
"7": 7
},
"col": {
- "4": 3,
+ "4": 1,
+ "5": 3,
"7": 3
},
- "col_width": 2,
+ "col_width": 4,
"widgets": [
{
"type": "flot_extended_plugin",
"settings": {
"plot_type": "line",
"legend": true,
- "height": 5,
- "value": "lebtydata = datasources[\"Current\"][\"LEBT-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1]\"][\"value\"];\n\nlebtdata = [];\n\nfor (i=0; i < lebtydata.length; i++) {\n\tlebtdata.push([i*80/lebtydata.length, lebtydata[i]]);\n}\n\n\ndata = [{label: 'BCM LEBT', data: lebtdata, color: \"red\"}];\n\nreturn data;\n\n/*\n\"LEBT-010:PBI-BCM-001:PRC-TR1-ArrayData\" BCM LEBT red\n\"RFQ-010:PBI-BCM-001:PRC-TR1-ArrayData\", BCM RFQ green\n\"MEBT-010:PBI-BCM-001:PRC-TR1-ArrayData\", BCM MEBT 1 pink\n\"MEBT-010:PBI-BCM-002:PRC-TR1-ArrayData\", BCM MEBT2 black\n\"LEBT-010:PBI-FC-001:TRC2-ArrayData-Comp\", FC LEBT lime\n\"MEBT-010:PBI-FC-001:TRC2-ArrayData-Comp\" FC MEBT yellow\n*/",
+ "height": 6,
+ "value": "isxdata = datasources[\"Current\"][\"ISrc-010:PBI-BCM-001:PRC-TR1-ArrayTimeUs.[0:800:-1]\"][\"value\"];\nisydata = datasources[\"Current\"][\"ISrc-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1]\"][\"value\"];\nisdata = [];\n\nrfqxdata = datasources[\"Current\"][\"RFQ-010:PBI-BCM-001:PRC-TR1-ArrayTimeUs.[0:800:-1]\"][\"value\"];\nrfqydata = datasources[\"Current\"][\"RFQ-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1]\"][\"value\"];\nrfqdata = [];\n\nlebtxdata = datasources[\"Current\"][\"LEBT-010:PBI-BCM-001:PRC-TR1-ArrayTimeUs.[0:800:-1]\"][\"value\"];\nlebtydata = datasources[\"Current\"][\"LEBT-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1]\"][\"value\"];\nlebtdata = [];\n\nmebt1xdata = datasources[\"Current\"][\"MEBT-010:PBI-BCM-001:PRC-TR1-ArrayTimeUs.[0:800:-1]\"][\"value\"];\nmebt1ydata = datasources[\"Current\"][\"MEBT-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1]\"][\"value\"];\nmebt1data = [];\n\nmebt2xdata = datasources[\"Current\"][\"MEBT-010:PBI-BCM-002:PRC-TR1-ArrayTimeUs.[0:800:-1]\"][\"value\"];\nmebt2ydata = datasources[\"Current\"][\"MEBT-010:PBI-BCM-002:PRC-TR1-ArrayData.[0:800:-1]\"][\"value\"];\nmebt2data = [];\n\nlebtfcydata = datasources[\"Current\"][\"LEBT-010:PBI-FC-001:TRC2-ArrayData-Comp.[0:120:-1]\"][\"value\"];\nlebtfcdata = [];\n\nmebtfcydata = datasources[\"Current\"][\"MEBT-010:PBI-FC-001:TRC2-ArrayData-Comp.[0:120:-1]\"][\"value\"];\nmebtfcdata = [];\n\nfor (i=0; i < isxdata.length; i++) {\n\tisdata.push([isxdata[i]/1000, isydata[i]]);\n}\nfor (i=0; i < rfqxdata.length; i++) {\n rfqdata.push([rfqxdata[i]/1000, rfqydata[i]]);\n}\nfor (i=0; i < lebtxdata.length; i++) {\n lebtdata.push([lebtxdata[i]/1000, lebtydata[i]]);\n}\nfor (i=0; i < mebt1xdata.length; i++) {\n mebt1data.push([mebt1xdata[i]/1000, mebt1ydata[i]]);\n}\nfor (i=0; i < mebt2xdata.length; i++) {\n mebt2data.push([mebt2xdata[i]/1000, mebt2ydata[i]]);\n}\nfor (i=0; i < lebtfcydata.length; i++) {\n lebtfcdata.push([i*120/1000, lebtfcydata[i]]);\n}\nfor (i=0; i < mebtfcydata.length; i++) {\n mebtfcdata.push([i*120/1000, mebtfcydata[i]]);\n}\n\nbcmdata = [{label: 'ISrc BCM', data: isdata, color: \"lightblue\"},\n {label: 'RFQ BCM', data: rfqdata, color: \"green\"},\n {label: 'LEBT BCM', data: lebtdata, color: \"red\"},\n {label: 'MEBT 1 BCM', data: mebt1data, color: \"pink\"},\n {label: 'MEBT 2 BCM', data: mebt2data, color: \"black\"},\n {label: 'LEBT FC', data: lebtfcdata, color: \"lime\"},\n {label: 'MEBT FC', data: mebtfcdata, color: \"yellow\"}];\n\nreturn bcmdata;",
"xticks": "",
"yticks": "",
+ "points": false,
"zoom": "xy"
}
}
]
},
- {
- "title": "Ion Source Beam Current",
- "width": 1,
- "row": {
- "4": 7,
- "8": 7
- },
- "col": {
- "4": 1,
- "8": 1
- },
- "col_width": 2,
- "widgets": [
- {
- "type": "flot_extended_plugin",
- "settings": {
- "plot_type": "line",
- "legend": true,
- "height": 5,
- "value": "isydata = datasources[\"Current\"][\"ISrc-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1]\"][\"value\"];\n\nisdata = [];\n\nfor (i=0; i < isydata.length; i++) {\n\tisdata.push([i*80/isydata.length, isydata[i]]);\n}\n\n\ndata = [{label: 'BCM IS', data: isdata, color: \"red\"}];\n\nreturn data;\n",
- "zoom": ""
- }
- }
- ]
- },
{
"title": "MEBT BPMS",
"width": 1,
"row": {
- "4": 19,
+ "4": 21,
+ "8": 19,
"9": 19
},
"col": {
"4": 1,
+ "8": 1,
"9": 1
},
"col_width": 4,
@@ -98,7 +79,7 @@
"settings": {
"plot_type": "line",
"legend": true,
- "height": 4,
+ "height": 6,
"value": "datasources[\"Clock\"][\"numeric_value\"];\n\nxbpm = [];\nybpm = [];\n\nbpmpositions = [0.400, 0.762, 2.224, 2.424, 2.624, 3.436, 3.636, 3.836];\n\nfor (i=1; i < 9; i++) {\n xpv = \"MEBT-010:PBI-BPM-00\"+String(i)+\":XP-AvgValue\";\n xvalue = datasources[\"BPM\"][xpv][\"value\"]/1000;\n if (xvalue == null) {\n xvalue = 0.0;\n }\n xbpm.push([bpmpositions[i-1], xvalue]);\n ypv = \"MEBT-010:PBI-BPM-00\"+String(i)+\":YP-AvgValue\";\n yvalue = datasources[\"BPM\"][ypv][\"value\"]/1000;\n if (yvalue == null) {\n yvalue = 0.0;\n }\n ybpm.push([bpmpositions[i-1], yvalue]);\n}\n\ndata = [{label: 'Horizontal', data: xbpm, color: \"lime\"},\n {label: 'Vertical', data: ybpm, color: \"yellow\"}];\n\nreturn data;",
"xticks": "datasources[\"Clock\"][\"numeric_value\"];\n\nvar cols = document.getElementsByClassName('gs_w')[0].getAttribute('data-sizex');\n\ndigits = 3;\nbpmxlabel = \"<br>BPM Position from MEBT start [m]\";\n\nif (cols == 2) {\n bpmxlabel = \"<br>BPM pos. [m]\";\n digits = 1;\n}\nif (cols == 1) {\n bpmxlabel = \"<br>BPM pos. [m]\";\n digits = 0;\n}\n\n\nbpmxtick = [];\n\nbpmpositions = [0.400, 0.762, 2.224, 2.424, 2.624, 3.436, 3.636, 3.836];\n\nfor (i = 0; i < 8; i += 1) {\n\tbpmxtick.push([bpmpositions[i], String(bpmpositions[i].toFixed(digits))]);\n}\nbpmxtick[2][1] += bpmxlabel;\n\nreturn bpmxtick;",
"yticks": "datasources[\"Clock\"][\"numeric_value\"];\n\nytick = [];\n\nfor (i = -4; i < 4; i += 1) {\n\tytick.push([i, String(i)]);\n}\n\nytick.push([4, \"∆X,∆Y [mm]\"]);\n\nreturn ytick;",
@@ -114,10 +95,11 @@
"name": "Current",
"type": "JSON",
"settings": {
- "url": "/data/api/v2/pvget/LEBT-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1],ISrc-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1]",
+ "url": "/data/api/v2/pvget/ISrc-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1],ISrc-010:PBI-BCM-001:PRC-TR1-ArrayTimeUs.[0:800:-1],RFQ-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1],RFQ-010:PBI-BCM-001:PRC-TR1-ArrayTimeUs.[0:800:-1],LEBT-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1],LEBT-010:PBI-BCM-001:PRC-TR1-ArrayTimeUs.[0:800:-1],MEBT-010:PBI-BCM-001:PRC-TR1-ArrayData.[0:800:-1],MEBT-010:PBI-BCM-001:PRC-TR1-ArrayTimeUs.[0:800:-1],MEBT-010:PBI-BCM-002:PRC-TR1-ArrayData.[0:800:-1],MEBT-010:PBI-BCM-002:PRC-TR1-ArrayTimeUs.[0:800:-1],LEBT-010:PBI-FC-001:TRC2-ArrayData-Comp.[0:120:-1],MEBT-010:PBI-FC-001:TRC2-ArrayData-Comp.[0:120:-1],LEBT-010:PBI-FC-001:TRC2-ArrayData-Comp.[0:120:-1],MEBT-010:PBI-FC-001:TRC2-ArrayData-Comp.[0:120:-1]",
"use_thingproxy": false,
"refresh": 10,
- "method": "GET"
+ "method": "GET",
+ "name": "Current"
}
},
{