4 Commits d3a49a088c ... 11cb4320f1

Author SHA1 Message Date
  Genrich Zeller 11cb4320f1 Small fixes, for first test of new BORA for LARA 3 years ago
  Genrich Zeller ab1d6b2e9d Added Laser PSU Temp + some boundaries 3 years ago
  Genrich Zeller 3fdea69ade Removed o2, n2 + h2o 3 years ago
  Genrich Zeller 6f8a5f66b3 Removed broken - No other changes 3 years ago
2 changed files with 84 additions and 216 deletions
  1. 83 210
      style.yaml
  2. 1 6
      varname.yaml

+ 83 - 210
style.yaml

@@ -5,7 +5,7 @@
   formula: ''
   header:
     size: 20
-    title: 'Water :     '
+    title: 'Water :                         '
     weight: '400'
   height: 24.4
   larger: ''
@@ -18,30 +18,30 @@
   type: data
   unit:
     size: 20
-    title: '     °C'
+    title: '                         °C'
     weight: '400'
   width: 202.4
 611-HCL-5-3012-0003:
   background_color: rgba(255, 255, 255, 0)
-  decimal: '2'
+  decimal: '0'
   exponential: 'false'
   formula: ''
   header:
-    size: 20
-    title: 'Water chiller "no faults"                                     '
+    size: '20'
+    title: Water chiller "no faults"
     weight: '700'
   height: 62.4
   larger: ''
   left: 1551px
-  lesser: ''
+  lesser: '1'
   linkhtml: 'true'
   ref: 611-HCL-5-3012-0003
   top: 384px
   trend: 'true'
   type: data
   unit:
-    size: 20
-    title: '                                     '
+    size: '20'
+    title: ''
     weight: '400'
   width: 252.4
 611-HCL-5-3012-0005:
@@ -51,7 +51,7 @@
   formula: ''
   header:
     size: 20
-    title: 'Tank level low :              '
+    title: 'Tank level low :                                  '
     weight: '400'
   height: 24.4
   larger: '0'
@@ -64,7 +64,7 @@
   type: data
   unit:
     size: 20
-    title: '              '
+    title: '                                  '
     weight: '400'
   width: 232.4
 611-HCL-5-3012-0006:
@@ -74,7 +74,7 @@
   formula: ''
   header:
     size: 20
-    title: 'Pump failure :             '
+    title: 'Pump failure :                                 '
     weight: '400'
   height: 24.4
   larger: ''
@@ -87,7 +87,7 @@
   type: data
   unit:
     size: 20
-    title: '             '
+    title: '                                 '
     weight: '400'
   width: 208.4
 611-HCL-5-3012-0007:
@@ -97,7 +97,7 @@
   formula: ''
   header:
     size: 20
-    title: 'Pump slow :            '
+    title: 'Pump slow :                                '
     weight: '400'
   height: 26.4
   larger: '0'
@@ -110,7 +110,7 @@
   type: data
   unit:
     size: 20
-    title: '            '
+    title: '                                '
     weight: '400'
   width: 188.4
 611-HCL-5-3012-0008:
@@ -120,7 +120,7 @@
   formula: ''
   header:
     size: 20
-    title: 'Pump off :          '
+    title: 'Pump off :                              '
     weight: '400'
   height: 28.4
   larger: '0'
@@ -133,30 +133,30 @@
   type: data
   unit:
     size: 20
-    title: '          '
+    title: '                              '
     weight: '400'
   width: 166.4
 611-LVI-0-3010-0002:
   background_color: rgba(255, 255, 255, 0)
-  decimal: '2'
+  decimal: '0'
   exponential: 'false'
   formula: ''
   header:
     size: 20
-    title: 'Laser "on/off"                                      '
+    title: 'Laser "on/off"   '
     weight: '700'
   height: 64.4
   larger: ''
-  left: 1551px
-  lesser: ''
+  left: 1552px
+  lesser: '1'
   linkhtml: 'true'
   ref: 611-LVI-0-3010-0002
-  top: 310px
+  top: 309px
   trend: 'true'
   type: data
   unit:
     size: 20
-    title: '                                      '
+    title: '   '
     weight: '400'
   width: 153.4
 611-LVI-0-3010-0003:
@@ -169,9 +169,9 @@
     title: 'Laser Output power :                '
     weight: '400'
   height: 33.4
-  larger: ''
+  larger: '4'
   left: 130px
-  lesser: ''
+  lesser: '1'
   linkhtml: 'true'
   ref: 611-LVI-0-3010-0003
   top: 783px
@@ -179,7 +179,7 @@
   type: data
   unit:
     size: 20
-    title: '                mW'
+    title: '                W'
     weight: '400'
   width: 332.4
 611-LVI-0-3010-0005:
@@ -189,10 +189,10 @@
   formula: ''
   header:
     size: 20
-    title: 'Laser head temp. :                 '
+    title: 'Laser head temp. :               '
     weight: '400'
   height: 26.4
-  larger: ''
+  larger: '40'
   left: 130px
   lesser: ''
   linkhtml: 'true'
@@ -202,7 +202,30 @@
   type: data
   unit:
     size: 20
-    title: '                 °C'
+    title: '               °C'
+    weight: '400'
+  width: 270.4
+611-LVI-0-3010-0006:
+  background_color: rgba(0, 0, 0, 0)
+  decimal: '2'
+  exponential: 'false'
+  formula: ''
+  header:
+    size: 20
+    title: 'Laser PSU temp. :  '
+    weight: '400'
+  height: 26.4
+  larger: '40'
+  left: 130px
+  lesser: ''
+  linkhtml: 'true'
+  ref: 611-LVI-0-3010-0006
+  top: 861px
+  trend: 'true'
+  type: data
+  unit:
+    size: 20
+    title: '  °C'
     weight: '400'
   width: 270.4
 611-RCR-8-0002-0002:
@@ -212,7 +235,7 @@
   formula: ''
   header:
     size: 18
-    title: '      '
+    title: '                          '
     weight: '400'
   height: 39.4
   larger: ''
@@ -225,7 +248,7 @@
   type: data
   unit:
     size: 30
-    title: '      %'
+    title: '                          %'
     weight: '400'
   width: 164.4
 611-RCR-8-0002-0003:
@@ -235,7 +258,7 @@
   formula: ''
   header:
     size: 18
-    title: '                                                     '
+    title: '                                                                         '
     weight: '400'
   height: 34.4
   larger: ''
@@ -248,7 +271,7 @@
   type: data
   unit:
     size: 30
-    title: '                                                     %'
+    title: '                                                                         %'
     weight: '400'
   width: 152.4
 611-RCR-8-0002-0004:
@@ -258,7 +281,7 @@
   formula: ''
   header:
     size: 18
-    title: '                                                    '
+    title: '                                                                        '
     weight: '400'
   height: 35.4
   larger: ''
@@ -271,7 +294,7 @@
   type: data
   unit:
     size: 30
-    title: '                                                    %'
+    title: '                                                                        %'
     weight: '400'
   width: 166.4
 611-RCR-8-0002-0005:
@@ -281,7 +304,7 @@
   formula: ''
   header:
     size: 18
-    title: '                                                   '
+    title: '                                                                       '
     weight: '400'
   height: 26.4
   larger: ''
@@ -294,7 +317,7 @@
   type: data
   unit:
     size: 30
-    title: '                                                   %'
+    title: '                                                                       %'
     weight: '400'
   width: 164.4
 611-RCR-8-0002-0006:
@@ -304,7 +327,7 @@
   formula: ''
   header:
     size: 18
-    title: '                                                  '
+    title: '                                                                      '
     weight: '400'
   height: 24.4
   larger: ''
@@ -317,7 +340,7 @@
   type: data
   unit:
     size: 30
-    title: '                                                  %'
+    title: '                                                                      %'
     weight: '400'
   width: 164.4
 611-RCR-8-0002-0007:
@@ -327,7 +350,7 @@
   formula: ''
   header:
     size: 18
-    title: '                                                '
+    title: '                                                  '
     weight: '400'
   height: 22.4
   larger: ''
@@ -340,7 +363,7 @@
   type: data
   unit:
     size: 30
-    title: '                                                %'
+    title: '                                                  %'
     weight: '400'
   width: 164.4
 611-RCR-8-0002-0008:
@@ -350,7 +373,7 @@
   formula: ''
   header:
     size: 18
-    title: '                                               '
+    title: '                                                 '
     weight: '400'
   height: 44.4
   larger: ''
@@ -363,7 +386,7 @@
   type: data
   unit:
     size: 30
-    title: '                                               %'
+    title: '                                                 %'
     weight: '400'
   width: 164.4
 611-RCR-8-0002-0009:
@@ -373,7 +396,7 @@
   formula: ''
   header:
     size: 18
-    title: '                                              '
+    title: '                                                '
     weight: '400'
   height: 55.4
   larger: ''
@@ -386,7 +409,7 @@
   type: data
   unit:
     size: 30
-    title: '                                              %'
+    title: '                                                %'
     weight: '400'
   width: 160.4
 611-RCR-8-0002-0010:
@@ -396,7 +419,7 @@
   formula: ''
   header:
     size: 25
-    title: '                                             '
+    title: '                                              '
     weight: '400'
   height: 103.4
   larger: ''
@@ -409,7 +432,7 @@
   type: data
   unit:
     size: 30
-    title: '                                             %'
+    title: '                                              %'
     weight: '400'
   width: 162.4
 611-RCR-8-0002-0011:
@@ -419,20 +442,20 @@
   formula: ''
   header:
     size: 30
-    title: '         '
+    title: '            '
     weight: '400'
   height: 40.4
   larger: ''
-  left: 211px
-  lesser: ''
+  left: 204px
+  lesser: '95'
   linkhtml: 'true'
   ref: 611-RCR-8-0002-0011
-  top: 297px
+  top: 296px
   trend: 'true'
   type: data
   unit:
     size: 30
-    title: '         '
+    title: '            '
     weight: '400'
   width: 60.4
 611-RCR-8-0002-0012:
@@ -442,20 +465,20 @@
   formula: ''
   header:
     size: 18
-    title: '                                                        '
+    title: '        '
     weight: '400'
   height: 28.4
   larger: ''
-  left: 213px
+  left: 207px
   lesser: ''
   linkhtml: 'true'
   ref: 611-RCR-8-0002-0012
-  top: 474px
+  top: 477px
   trend: 'true'
   type: data
   unit:
-    size: 30
-    title: '                                                        '
+    size: 25
+    title: '        '
     weight: '400'
   width: 144.4
 611-RRC-0-3060-0002:
@@ -465,10 +488,10 @@
   formula: ''
   header:
     size: 20
-    title: 'CCD Temperature                                    '
+    title: 'CCD Temperature      '
     weight: '700'
   height: 52.4
-  larger: ''
+  larger: '-70'
   left: 1083px
   lesser: ''
   linkhtml: 'true'
@@ -478,167 +501,17 @@
   type: data
   unit:
     size: 20
-    title: '                                    °C'
-    weight: '400'
-  width: 183.4
-611-RRP-0-3040-0002:
-  background_color: rgba(0, 0, 0, 0)
-  decimal: '2'
-  exponential: 'false'
-  formula: ''
-  header:
-    size: '20'
-    title: Signal PD1
-    weight: '700'
-  height: 56.4
-  larger: ''
-  left: 1085px
-  lesser: ''
-  linkhtml: 'false'
-  ref: 611-RRP-0-3040-0002
-  top: 873px
-  trend: 'false'
-  type: data
-  unit:
-    size: '20'
-    title: V
-    weight: '400'
-  width: 122.4
-611-RRP-0-3040-0003:
-  background_color: rgba(0, 0, 0, 0)
-  condition: ''
-  decimal: '2'
-  exponential: 'false'
-  formula: ''
-  header:
-    size: 20
-    title: 'Signal PD2   '
-    weight: '700'
-  height: 58.4
-  larger: ''
-  left: 1085px
-  lesser: ''
-  linkhtml: 'false'
-  ref: 611-RRP-0-3040-0003
-  top: 935px
-  trend: 'false'
-  type: data
-  unit:
-    size: 20
-    title: '  V'
-    weight: '400'
-  width: 122.4
-611-RRY-0-3030-0002:
-  background_color: rgba(255, 255, 255, 0)
-  decimal: '2'
-  exponential: 'false'
-  formula: ''
-  header:
-    size: 20
-    title: 'Laser Power :                  '
-    weight: '400'
-  height: 24.4
-  larger: ''
-  left: 130px
-  lesser: ''
-  linkhtml: 'true'
-  ref: 611-RRY-0-3030-0002
-  top: 910px
-  trend: 'true'
-  type: data
-  unit:
-    size: 20
-    title: '                  mW'
-    weight: '400'
-  width: 272.4
-611-RRY-0-3030-0003:
-  background_color: rgba(255, 255, 255, 0)
-  decimal: '2'
-  exponential: 'false'
-  formula: ''
-  header:
-    size: 20
-    title: 'Beam pos. x :                    '
-    weight: '400'
-  height: 26.4
-  larger: ''
-  left: 129px
-  lesser: ''
-  linkhtml: 'true'
-  ref: 611-RRY-0-3030-0003
-  top: 951px
-  trend: 'true'
-  type: data
-  unit:
-    size: 20
-    title: '                    mm'
-    weight: '400'
-  width: 304.4
-611-RRY-0-3030-0004:
-  background_color: rgba(255, 255, 255, 0)
-  decimal: '2'
-  exponential: 'false'
-  formula: ''
-  header:
-    size: 20
-    title: 'Beam pos. y :                   '
-    weight: '400'
-  height: 22.4
-  larger: ''
-  left: 129px
-  lesser: ''
-  linkhtml: 'true'
-  ref: 611-RRY-0-3030-0004
-  top: 992px
-  trend: 'true'
-  type: data
-  unit:
-    size: 20
-    title: '                   mm'
-    weight: '400'
-  width: 272.4
-611-RTP-0-4060-0002:
-  background_color: rgba(255, 255, 255, 0)
-  decimal: '2'
-  exponential: 'false'
-  formula: ''
-  header:
-    size: 20
-    title: 'Enclosure temp.                                   '
-    weight: '700'
-  height: 51.4
-  larger: ''
-  left: 1083px
-  lesser: ''
-  linkhtml: 'true'
-  ref: 611-RTP-0-4060-0002
-  top: 812px
-  trend: 'true'
-  type: data
-  unit:
-    size: 20
-    title: '                                   °C'
+    title: '      °C'
     weight: '400'
   width: 183.4
 header_laser:
   background_color: rgba(255, 255, 255, 0)
   header:
     size: 20
-    title: 'Laser                           '
+    title: 'Laser                                               '
     weight: '700'
   height: 24.4
   left: 130px
   top: 743px
   type: header
   width: 50.4
-header_laser-power-meter:
-  background_color: rgba(255, 255, 255, 0)
-  header:
-    size: 20
-    title: 'Laser power meter                        '
-    weight: '700'
-  height: 24.4
-  left: 129px
-  top: 870.333px
-  type: header
-  width: 204.4

+ 1 - 6
varname.yaml

@@ -7,6 +7,7 @@
 611-LVI-0-3010-0002: db_server=lara&db_name=611_LARA&db_group=Laser&db_mask=1
 611-LVI-0-3010-0003: db_server=lara&db_name=611_LARA&db_group=Laser&db_mask=2
 611-LVI-0-3010-0005: db_server=lara&db_name=611_LARA&db_group=Laser&db_mask=4
+611-LVI-0-3010-0006: db_server=lara&db_name=611_LARA&db_group=Laser&db_mask=5
 611-RCR-8-0002-0002: db_server=lara&db_name=611_LARA&db_group=WGTSGas&db_mask=1
 611-RCR-8-0002-0003: db_server=lara&db_name=611_LARA&db_group=WGTSGas&db_mask=2
 611-RCR-8-0002-0004: db_server=lara&db_name=611_LARA&db_group=WGTSGas&db_mask=3
@@ -19,9 +20,3 @@
 611-RCR-8-0002-0011: db_server=lara&db_name=611_LARA&db_group=WGTSGas&db_mask=10
 611-RCR-8-0002-0012: db_server=lara&db_name=611_LARA&db_group=WGTSGas&db_mask=11
 611-RRC-0-3060-0002: db_server=lara&db_name=611_LARA&db_group=CCDCamera&db_mask=1
-611-RRP-0-3040-0002: db_server=lara&db_name=611_LARA&db_group=PhotoDiodes&db_mask=1
-611-RRP-0-3040-0003: db_server=lara&db_name=611_LARA&db_group=PhotoDiodes&db_mask=2
-611-RRY-0-3030-0002: db_server=lara&db_name=611_LARA&db_group=LaserPower&db_mask=1
-611-RRY-0-3030-0003: db_server=lara&db_name=611_LARA&db_group=LaserPower&db_mask=2
-611-RRY-0-3030-0004: db_server=lara&db_name=611_LARA&db_group=LaserPower&db_mask=3
-611-RTP-0-4060-0002: db_server=lara&db_name=611_LARA&db_group=Pt100&db_mask=1