diff --git a/PythonServer/screens/ts2.py b/PythonServer/screens/ts2.py
index 526bae68928f59eaebfa40717104da0dfbd2951f..b2a5f65e57217be4b3f3d468f12642abd8cd4474 100755
--- a/PythonServer/screens/ts2.py
+++ b/PythonServer/screens/ts2.py
@@ -9,7 +9,7 @@ class ts2Screen(Thread):
self.stop_signal = stop_signal
def run(self):
- pvs = ['CrS-TICP:Cryo-TE-31491:Val', 'TS2-010CDL:Cryo-TE-82313:MeasValue', 'TS2-010CDL:Cryo-TE-82360:MeasValue', 'TS2-010CRM:Cryo-TE-068:MeasValue', 'TS2-010CRM:Cryo-TE-063:MeasValue', 'TS2-010CRM:Cryo-TE-069:MeasValue', 'TS2-010CRM:Cryo-TE-064:MeasValue', 'TS2-010CDL:Cryo-TE-82365:MeasValue', 'TS2-010CDL:Cryo-TE-82314:MeasValue', 'CrS-TICP:Cryo-TE-31492:Val', 'TS2-010CRM:Cryo-TE-010:MeasValue', 'TS2-010CRM:Cryo-TE-018:MeasValue', 'TS2-010CRM:Cryo-TE-019:MeasValue', 'TS2-010CRM:Cryo-TE-020:MeasValue', 'TS2-010CRM:Cryo-TE-021:MeasValue', 'TS2-010CRM:Cryo-TE-022:MeasValue', 'TS2-010CRM:Cryo-TE-028:MeasValue', 'TS2-010CRM:Cryo-TE-029:MeasValue', 'TS2-010CRM:Cryo-TE-030:MeasValue', 'TS2-010CRM:Cryo-TE-031:MeasValue', 'TS2-010CRM:Cryo-TE-032:MeasValue', 'TS2-010CRM:Cryo-TE-038:MeasValue', 'TS2-010CRM:Cryo-TE-039:MeasValue', 'TS2-010CRM:Cryo-TE-041:MeasValue', 'TS2-010CRM:Cryo-TE-042:MeasValue', 'TS2-010CRM:Cryo-TE-048:MeasValue', 'TS2-010CRM:Cryo-TE-049:MeasValue']
+ pvs = ['CrS-TICP:Cryo-TE-31491:Val', 'TS2-010CDL:Cryo-TE-82313:MeasValue', 'TS2-010CDL:Cryo-TE-82360:MeasValue', 'TS2-010CRM:Cryo-TE-068:MeasValue', 'TS2-010CRM:Cryo-TE-063:MeasValue', 'TS2-010CRM:Cryo-TE-069:MeasValue', 'TS2-010CRM:Cryo-TE-064:MeasValue', 'TS2-010CDL:Cryo-TE-82365:MeasValue', 'TS2-010CDL:Cryo-TE-82314:MeasValue', 'CrS-TICP:Cryo-TE-31492:Val', 'TS2-010CRM:Cryo-TE-010:MeasValue', 'TS2-010CRM:Cryo-TE-011:MeasValue', 'TS2-010CRM:Cryo-TE-012:MeasValue', 'TS2-010CRM:Cryo-TE-013:MeasValue', 'TS2-010CRM:Cryo-TE-014:MeasValue', 'TS2-010CRM:Cryo-TE-015:MeasValue', 'TS2-010CRM:Cryo-TE-018:MeasValue', 'TS2-010CRM:Cryo-TE-019:MeasValue', 'TS2-010CRM:Cryo-TE-020:MeasValue', 'TS2-010CRM:Cryo-TE-021:MeasValue', 'TS2-010CRM:Cryo-TE-022:MeasValue', 'TS2-010CRM:Cryo-TE-023:MeasValue', 'TS2-010CRM:Cryo-TE-024:MeasValue', 'TS2-010CRM:Cryo-TE-025:MeasValue', 'TS2-010CRM:Cryo-TE-028:MeasValue', 'TS2-010CRM:Cryo-TE-029:MeasValue', 'TS2-010CRM:Cryo-TE-030:MeasValue', 'TS2-010CRM:Cryo-TE-031:MeasValue', 'TS2-010CRM:Cryo-TE-032:MeasValue', 'TS2-010CRM:Cryo-TE-033:MeasValue', 'TS2-010CRM:Cryo-TE-034:MeasValue', 'TS2-010CRM:Cryo-TE-035:MeasValue', 'TS2-010CRM:Cryo-TE-038:MeasValue', 'TS2-010CRM:Cryo-TE-039:MeasValue', 'TS2-010CRM:Cryo-TE-041:MeasValue', 'TS2-010CRM:Cryo-TE-042:MeasValue', 'TS2-010CRM:Cryo-TE-043:MeasValue', 'TS2-010CRM:Cryo-TE-044:MeasValue', 'TS2-010CRM:Cryo-TE-045:MeasValue', 'TS2-010CRM:Cryo-TE-048:MeasValue', 'TS2-010CRM:Cryo-TE-049:MeasValue' ]
epics_dict={}
for pv in pvs:
diff --git a/WebSites/ts2/dashboard.json b/WebSites/ts2/dashboard.json
index 703a28701433743b68f2b59739a64943ada2977d..7c5bd44769ff1dcde40e509670c0e05f0f1a5d69 100644
--- a/WebSites/ts2/dashboard.json
+++ b/WebSites/ts2/dashboard.json
@@ -30,41 +30,53 @@
]
},
{
- "title": "Cavity 4",
+ "title": "Cavity 1",
"width": 1,
"row": {
- "1": 91,
- "2": 39,
- "3": 27,
+ "1": 7,
+ "2": 7,
+ "3": 7,
"4": 7,
"5": 7,
+ "6": 7,
"7": 7
},
"col": {
"1": 1,
- "2": 2,
+ "2": 1,
"3": 1,
- "4": 4,
- "5": 4,
- "7": 4
+ "4": 1,
+ "5": 1,
+ "6": 1,
+ "7": 1
},
"col_width": 1,
"widgets": [
{
"type": "gauge",
"settings": {
- "title": "Cernox in cold tuning system - ECCTD only",
- "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-048:MeasValue\"][\"value\"]",
+ "title": "TE18 CTS CAV1",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-018:MeasValue\"][\"value\"]",
"units": "K",
- "min_value": 0,
+ "min_value": "0",
"max_value": "300"
}
},
{
"type": "gauge",
"settings": {
- "title": "Cernox in helium tank boTEom",
- "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-049:MeasValue\"][\"value\"]",
+ "title": "TE19 Tank Bottom CAV1",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-019:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": 300
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE10 Tank Top CAV1",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-010:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
"max_value": "300"
@@ -73,8 +85,8 @@
{
"type": "gauge",
"settings": {
- "title": "PT100 in Power Coupler - ECCTD only",
- "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-041:MeasValue\"][\"value\"]",
+ "title": "TE11 PT FPC1",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-011:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
"max_value": "300"
@@ -83,61 +95,38 @@
{
"type": "gauge",
"settings": {
- "title": "Power Coupler double wall cooling - ECCTD only",
- "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-042:MeasValue\"][\"value\"]",
+ "title": "TE12 FPC1 DWT IN",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-012:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
"max_value": "300"
}
- }
- ]
- },
- {
- "title": "Cavity 1",
- "width": 1,
- "row": {
- "1": 7,
- "2": 7,
- "3": 7,
- "4": 7,
- "6": 7,
- "7": 7
- },
- "col": {
- "1": 1,
- "2": 1,
- "3": 1,
- "4": 1,
- "6": 1,
- "7": 1
- },
- "col_width": 1,
- "widgets": [
+ },
{
"type": "gauge",
"settings": {
- "title": "Cernox in cold tuning system",
- "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-018:MeasValue\"][\"value\"]",
+ "title": "TE13 PT FPC1 DWT OUT",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-013:MeasValue\"][\"value\"]",
"units": "K",
- "min_value": "0",
+ "min_value": 0,
"max_value": "300"
}
},
{
"type": "gauge",
"settings": {
- "title": "Cernox in helium tank boTEom",
- "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-019:MeasValue\"][\"value\"]",
+ "title": "TE14 PT FPC1 WIN",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-014:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
- "max_value": 300
+ "max_value": "300"
}
},
{
"type": "gauge",
"settings": {
- "title": "Cernox in helium manifold to he tank",
- "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-010:MeasValue\"][\"value\"]",
+ "title": "TE15 PT FPC1 EXT",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-015:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
"max_value": "300"
@@ -149,7 +138,7 @@
"title": "Cavity 2",
"width": 1,
"row": {
- "1": 27,
+ "1": 57,
"2": 7,
"3": 7,
"4": 7,
@@ -169,7 +158,7 @@
{
"type": "gauge",
"settings": {
- "title": "Cernox in cold tuning system - ECCTD only",
+ "title": "TE28 CTS CAV2",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-028:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
@@ -179,7 +168,7 @@
{
"type": "gauge",
"settings": {
- "title": "Cernox in helium tank boTEom",
+ "title": "TE29 Tank Bottom CAV2",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-029:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
@@ -189,7 +178,7 @@
{
"type": "gauge",
"settings": {
- "title": "Cernox in helium manifold to he tank",
+ "title": "TE20 Tank Top CAV2",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-020:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
@@ -199,7 +188,7 @@
{
"type": "gauge",
"settings": {
- "title": "PT100 in Power Coupler - ECCTD only",
+ "title": "TE21 PT FPC2",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-021:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
@@ -209,12 +198,42 @@
{
"type": "gauge",
"settings": {
- "title": "Power Coupler double wall cooling - ECCTD only",
+ "title": "TE22 FPC2 DWT IN",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-022:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
"max_value": "300"
}
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE23 FPC2 DWT OUT",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-023:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE24 PT FPC2 WIN",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-024:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE25 PT FPC2 EXT",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-025:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
}
]
},
@@ -222,8 +241,8 @@
"title": "Cavity 3",
"width": 1,
"row": {
- "1": 59,
- "2": 27,
+ "1": 107,
+ "2": 57,
"3": 7,
"4": 7,
"6": 7,
@@ -242,7 +261,7 @@
{
"type": "gauge",
"settings": {
- "title": "Cernox in cold tuning system - ECCTD only",
+ "title": "TE38 CTS CAV3",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-038:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
@@ -252,7 +271,7 @@
{
"type": "gauge",
"settings": {
- "title": "Cernox in helium tank boTEom",
+ "title": "TE39 Tank Bottom CAV3",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-039:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
@@ -262,7 +281,7 @@
{
"type": "gauge",
"settings": {
- "title": "Cernox in helium manifold to he tank",
+ "title": "TE30 Tank Top CAV3",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-030:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
@@ -272,7 +291,7 @@
{
"type": "gauge",
"settings": {
- "title": "PT100 in Power Coupler - ECCTD only",
+ "title": "TE31 PT FPC3",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-031:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
@@ -282,12 +301,143 @@
{
"type": "gauge",
"settings": {
- "title": "Power Coupler double wall cooling - ECCTD only",
+ "title": "TE32 FPC3 DWT IN",
"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-032:MeasValue\"][\"value\"]",
"units": "K",
"min_value": 0,
"max_value": "300"
}
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE33 FPC3 DWT OUT",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-033:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE34 PT FPC3 WIN",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-034:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE35 PT FPC3 EXT",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-035:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ }
+ ]
+ },
+ {
+ "title": "Cavity 4",
+ "width": 1,
+ "row": {
+ "1": 157,
+ "2": 57,
+ "3": 57,
+ "4": 7,
+ "5": 7,
+ "6": 7,
+ "7": 7
+ },
+ "col": {
+ "1": 1,
+ "2": 2,
+ "3": 1,
+ "4": 4,
+ "5": 4,
+ "6": 4,
+ "7": 4
+ },
+ "col_width": 1,
+ "widgets": [
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE48 CTS CAV4",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-048:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE49 Tank Bottom CAV4",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-049:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "html",
+ "settings": {
+ "height": 3
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE41 PT FPC4",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-041:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE42 FPC4 DWT IN",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-042:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE43 FPC4 DWT OUT",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-043:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE44 PT FPC4 WIN",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-044:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
+ },
+ {
+ "type": "gauge",
+ "settings": {
+ "title": "TE45 PT FPC4 EXT",
+ "value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-045:MeasValue\"][\"value\"]",
+ "units": "K",
+ "min_value": 0,
+ "max_value": "300"
+ }
}
]
},
@@ -295,18 +445,20 @@
"title": "Thermal Screens",
"width": 1,
"row": {
- "1": 117,
- "2": 65,
- "3": 53,
- "4": 39,
- "6": 39
+ "1": 207,
+ "2": 107,
+ "3": 107,
+ "4": 57,
+ "6": 39,
+ "7": 39
},
"col": {
"1": 1,
"2": 1,
"3": 1,
"4": 1,
- "6": 1
+ "6": 1,
+ "7": 1
},
"col_width": 4,
"widgets": [