Browse Source

modified: bora
modified: style.yaml
modified: trigger.sh
modified: varname.yaml

Woosik Gil 5 years ago
parent
commit
f829abb799
4 changed files with 172 additions and 54 deletions
  1. 1 1
      bora
  2. 141 49
      style.yaml
  3. 1 1
      trigger.sh
  4. 29 3
      varname.yaml

+ 1 - 1
bora

@@ -1 +1 @@
-Subproject commit 6f42327669e1ea1401a06cdd4961c0d3456a3782
+Subproject commit eaca9fa777ada934d19032afd02939aa34f4631c

+ 141 - 49
style.yaml

@@ -5,9 +5,9 @@
   formula: ''
   header:
     size: 15
-    title: '             '
+    title: '                    '
     weight: '400'
-  height: 22.4
+  height: 22
   larger: ''
   left: 1624px
   lesser: ''
@@ -18,19 +18,42 @@
   type: data
   unit:
     size: 15
-    title: '             W'
+    title: '                    W'
     weight: '400'
-  width: 76.4
+  width: 76
+110-PCO-1-1071:
+  background_color: rgba(0, 0, 0, 0)
+  decimal: '0'
+  exponential: 'false'
+  formula: ''
+  header:
+    size: 15
+    title: 'ON?  '
+    weight: '400'
+  height: 22
+  larger: ''
+  left: 1396px
+  lesser: '1'
+  linkhtml: 'true'
+  ref: 110-PCO-1-1071
+  top: 182px
+  trend: 'true'
+  type: data
+  unit:
+    size: 15
+    title: '  '
+    weight: '400'
+  width: 86
 110-RBY-1-1051:
   background_color: rgba(0, 0, 0, 0)
   decimal: '3'
   exponential: 'false'
   formula: ''
   header:
-    size: '15'
-    title: ''
+    size: 15
+    title: '       '
     weight: '700'
-  height: 22.4
+  height: 22
   larger: ''
   left: 1257px
   lesser: ''
@@ -40,10 +63,10 @@
   trend: 'true'
   type: data
   unit:
-    size: '15'
-    title: T
+    size: 15
+    title: '       T'
     weight: '400'
-  width: 72.4
+  width: 72
 110-RBY-1-1052:
   background_color: rgba(0, 0, 0, 0)
   decimal: '3'
@@ -51,9 +74,9 @@
   formula: ''
   header:
     size: 15
-    title: ' '
+    title: '        '
     weight: '700'
-  height: 23.4
+  height: 23
   larger: ''
   left: 1657px
   lesser: ''
@@ -64,9 +87,9 @@
   type: data
   unit:
     size: 15
-    title: ' T'
+    title: '        T'
     weight: '400'
-  width: 70.4
+  width: 70
 110-RLY-1-1041:
   background_color: rgba(0, 0, 0, 0)
   decimal: '1'
@@ -74,9 +97,9 @@
   formula: ''
   header:
     size: 15
-    title: '     '
+    title: '            '
     weight: '700'
-  height: 22.4
+  height: 22
   larger: ''
   left: 1622px
   lesser: '65'
@@ -87,9 +110,9 @@
   type: data
   unit:
     size: 15
-    title: '     %'
+    title: '            %'
     weight: '400'
-  width: 76.4
+  width: 76
 110-RPY-1-1011:
   background_color: rgba(0, 0, 0, 0)
   decimal: '2'
@@ -97,9 +120,9 @@
   formula: ''
   header:
     size: 15
-    title: '               '
+    title: '                      '
     weight: '700'
-  height: 22.4
+  height: 22
   larger: '2'
   left: 1622px
   lesser: '0.5'
@@ -110,9 +133,55 @@
   type: data
   unit:
     size: 15
-    title: '               psi'
+    title: '                      psi'
     weight: '400'
-  width: 86.4
+  width: 86
+110-RTP-1-1001:
+  background_color: rgba(0, 0, 0, 0)
+  decimal: '1'
+  exponential: 'false'
+  formula: ''
+  header:
+    size: 15
+    title: 'CL+ '
+    weight: '400'
+  height: 21
+  larger: '45'
+  left: 1703px
+  lesser: ''
+  linkhtml: 'true'
+  ref: 110-RTP-1-1001
+  top: 280px
+  trend: 'true'
+  type: data
+  unit:
+    size: 15
+    title: ' °C'
+    weight: '400'
+  width: 111
+110-RTP-1-1002:
+  background_color: rgba(0,0,0,0)
+  decimal: '1'
+  exponential: 'false'
+  formula: ''
+  header:
+    size: '15'
+    title: CL-
+    weight: '400'
+  height: 21
+  larger: '45'
+  left: 1705px
+  lesser: ''
+  linkhtml: 'true'
+  ref: 110-RTP-1-1002
+  top: 305px
+  trend: 'true'
+  type: data
+  unit:
+    size: '15'
+    title: °C
+    weight: '400'
+  width: 107
 110-RTP-1-1021:
   background_color: rgba(0, 0, 0, 0)
   decimal: '1'
@@ -120,9 +189,9 @@
   formula: ''
   header:
     size: 15
-    title: '            '
+    title: '                   '
     weight: '400'
-  height: 22.4
+  height: 22
   larger: ''
   left: 1476px
   lesser: ''
@@ -133,9 +202,9 @@
   type: data
   unit:
     size: 15
-    title: '            K'
+    title: '                   K'
     weight: '400'
-  width: 73.4
+  width: 73
 110-RTP-1-1025:
   background_color: rgba(0, 0, 0, 0)
   decimal: '1'
@@ -143,9 +212,9 @@
   formula: ''
   header:
     size: 15
-    title: '           '
+    title: '                  '
     weight: '400'
-  height: 22.4
+  height: 22
   larger: ''
   left: 1485px
   lesser: ''
@@ -156,9 +225,9 @@
   type: data
   unit:
     size: 15
-    title: '           K'
+    title: '                  K'
     weight: '400'
-  width: 72.4
+  width: 72
 110-RTP-1-1031:
   background_color: rgba(0, 0, 0, 0)
   decimal: '1'
@@ -166,9 +235,9 @@
   formula: ''
   header:
     size: 15
-    title: '       '
+    title: '              '
     weight: '700'
-  height: 27.4
+  height: 27
   larger: ''
   left: 1521px
   lesser: ''
@@ -179,9 +248,9 @@
   type: data
   unit:
     size: 15
-    title: '       K'
+    title: '              K'
     weight: '400'
-  width: 70.4
+  width: 70
 110-RTY-1-1023:
   background_color: rgba(0, 0, 0, 0)
   decimal: '2'
@@ -189,9 +258,9 @@
   formula: ''
   header:
     size: 15
-    title: '         '
+    title: '                '
     weight: '700'
-  height: 22.4
+  height: 22
   larger: ''
   left: 1481px
   lesser: ''
@@ -202,9 +271,9 @@
   type: data
   unit:
     size: 15
-    title: '         K'
+    title: '                K'
     weight: '400'
-  width: 75.4
+  width: 75
 110-RTY-1-1027:
   background_color: rgba(0, 0, 0, 0)
   decimal: '2'
@@ -212,9 +281,9 @@
   formula: ''
   header:
     size: 15
-    title: '          '
+    title: '                 '
     weight: '700'
-  height: 22.4
+  height: 22
   larger: ''
   left: 1484px
   lesser: ''
@@ -225,9 +294,9 @@
   type: data
   unit:
     size: 15
-    title: '          K'
+    title: '                 K'
     weight: '400'
-  width: 72.4
+  width: 72
 110-RTY-1-1029:
   background_color: rgba(0, 0, 0, 0)
   decimal: '2'
@@ -235,9 +304,9 @@
   formula: ''
   header:
     size: 15
-    title: '        '
+    title: '               '
     weight: '700'
-  height: 22.4
+  height: 22
   larger: ''
   left: 1475px
   lesser: ''
@@ -248,18 +317,41 @@
   type: data
   unit:
     size: 15
-    title: '        K'
+    title: '               K'
+    weight: '400'
+  width: 72
+113-E23-1-1100-MAG-I:
+  background_color: rgba(0, 0, 0, 0)
+  decimal: '2'
+  exponential: 'false'
+  formula: ''
+  header:
+    size: 15
+    title: 'I_mag     '
     weight: '400'
-  width: 72.4
+  height: 21
+  larger: ''
+  left: 1436px
+  lesser: ''
+  linkhtml: 'true'
+  ref: 113-E23-1-1100-MAG-I
+  top: 819px
+  trend: 'true'
+  type: data
+  unit:
+    size: 15
+    title: '     A'
+    weight: '700'
+  width: 123
 header_rear-section:
   background_color: rgba(0, 0, 0, 0)
   header:
     size: 28
-    title: 'Rear Section    '
+    title: 'Rear Section           '
     weight: '700'
-  height: 39.4
+  height: 39
   left: 777px
   titlelink: https://katrin.kit.edu/adei-katrin/#module=graph&db_server=virtual&db_name=srctree&db_group=-3&control_group=-3&db_mask=all&experiment=-&window=3600&module=graph&virtual=srctree&srctree=csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__0,csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__3,csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__6,csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__9,csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__12,csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__24,csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__27,csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__33,csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__36,csrear__ControlSystem_REAR__110_MAG_Magnetbetrieb__39&percent_axis_range=54.09962:61.57088&pressure/psi_axis_range=16.77299:16.99713&infomod=legend&history_id=1525271764662
   top: 61px
   type: header
-  width: 189.4
+  width: 189

+ 1 - 1
trigger.sh

@@ -1,3 +1,3 @@
 # This is a manual trigger to the CPS pod at the OpenShift platform.
 # Only run this when the webhook is not working.
-curl -X POST -k https://kaas.kit.edu:8443/oapi/v1/namespaces/bora/buildconfigs/cps/webhooks/<SECRET>/generic
+curl -X POST -k https://kaas.kit.edu:8443/oapi/v1/namespaces/bora/buildconfigs/rs/webhooks/LoVaEmSp/generic

+ 29 - 3
varname.yaml

@@ -4,12 +4,38 @@
 110-RBY-1-1052: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=6
 110-RLY-1-1041: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=9
 110-RPY-1-1011: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=12
+110-RTP-1-1001: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=18
+110-RTP-1-1002: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=21
 110-RTP-1-1021: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=24
 110-RTP-1-1025: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=27
 110-RTP-1-1031: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=30
 110-RTY-1-1023: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=33
 110-RTY-1-1027: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=36
 110-RTY-1-1029: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=39
-###### not yet in ADEI #####
-#110-RFC-1-1510-F-SUM: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=0
-#110-RFC-1-1510-F-X: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=3
+#### Compressor ###
+110-PCO-1-1071: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetkuehlung&db_mask=0
+###### Helium-gas-filling #####
+113-RFC-1-1510-F-SUM: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=0
+113-RFC-1-1510-F-X: db_server=csrear&db_name=ControlSystem_REAR&db_group=110_MAG_Magnetbetrieb&db_mask=3
+#######800-MCS#####
+113-E23-1-1100-MAG-I: db_server=cstmagnet&db_name=ControlSystem_Magnet&db_group=800_MAG_MAG_Control&db_mask=0
+113-E23-1-1100-MAG-U: db_server=cstmagnet&db_name=ControlSystem_Magnet&db_group=800_MAG_MAG_Control&db_mask=3
+113-E23-1-1100-NETZ-I: db_server=cstmagnet&db_name=ControlSystem_Magnet&db_group=800_MAG_MAG_Control&db_mask=6
+113-E23-1-1100-NETZ-U: db_server=cstmagnet&db_name=ControlSystem_Magnet&db_group=800_MAG_MAG_Control&db_mask=9
+#### LOOPs-RS #####
+110-VAO-8-0101: db_server=cstloops&db_name=ControlSystem_Loop_WGTS&db_group=110CMS_Primaersystem&db_mask=0
+#### RS-E-Gun-coils #####
+113-ELV-1-0101: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=3
+113-ELV-1-0201: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=6
+113-ELV-1-0301: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=9
+113-ELV-1-0401: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=12
+113-ELV-1-0501: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=15
+113-ELV-1-0601: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=18
+113-ELV-1-0602: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=21
+113-ELV-1-0603: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=24
+113-ELV-1-0604: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=27
+111-EHV-0-1101: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=33
+111-EHV-0-1102: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=37
+111-LUV-0-2501: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=53
+111-LUV-0-2101: db_server=egunrs&db_name=EgunRS&db_group=0&db_mask=50
+