Skip to content

Commit 152545d

Browse files
Tom-WillemsenTom-Willemsen
committed
Merge remote-tracking branch 'origin/master' into Release_5.2.1
2 parents c138ce7 + 886273d commit 152545d

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎base/uk.ac.stfc.isis.ibex.opis/resources/moxa1262.opi‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<exp bool_exp="pv0 == 0">
182182
<value>true</value>
183183
</exp>
184-
<pv trig="true">$(PV_ROOT):CH0:TEMP:RBV:STAT</pv>
184+
<pv trig="true">$(PV_ROOT):CH0:TEMP:STAT</pv>
185185
</rule>
186186
</rules>
187187
<scale_options>
@@ -229,7 +229,7 @@
229229
<exp bool_exp="pv0 == 0">
230230
<value>true</value>
231231
</exp>
232-
<pv trig="true">$(PV_ROOT):CH1:TEMP:RBV:STAT</pv>
232+
<pv trig="true">$(PV_ROOT):CH1:TEMP:STAT</pv>
233233
</rule>
234234
</rules>
235235
<scale_options>
@@ -277,7 +277,7 @@
277277
<exp bool_exp="pv0 == 0">
278278
<value>true</value>
279279
</exp>
280-
<pv trig="true">$(PV_ROOT):CH2:TEMP:RBV:STAT</pv>
280+
<pv trig="true">$(PV_ROOT):CH2:TEMP:STAT</pv>
281281
</rule>
282282
</rules>
283283
<scale_options>
@@ -325,7 +325,7 @@
325325
<exp bool_exp="pv0 == 0">
326326
<value>true</value>
327327
</exp>
328-
<pv trig="true">$(PV_ROOT):CH3:TEMP:RBV:STAT</pv>
328+
<pv trig="true">$(PV_ROOT):CH3:TEMP:STAT</pv>
329329
</rule>
330330
</rules>
331331
<scale_options>
@@ -373,7 +373,7 @@
373373
<exp bool_exp="pv0 == 0">
374374
<value>true</value>
375375
</exp>
376-
<pv trig="true">$(PV_ROOT):CH4:TEMP:RBV:STAT</pv>
376+
<pv trig="true">$(PV_ROOT):CH4:TEMP:STAT</pv>
377377
</rule>
378378
</rules>
379379
<scale_options>
@@ -421,7 +421,7 @@
421421
<exp bool_exp="pv0 == 0">
422422
<value>true</value>
423423
</exp>
424-
<pv trig="true">$(PV_ROOT):CH5:TEMP:RBV:STAT</pv>
424+
<pv trig="true">$(PV_ROOT):CH5:TEMP:STAT</pv>
425425
</rule>
426426
</rules>
427427
<scale_options>
@@ -469,7 +469,7 @@
469469
<exp bool_exp="pv0 == 0">
470470
<value>true</value>
471471
</exp>
472-
<pv trig="true">$(PV_ROOT):CH6:TEMP:RBV:STAT</pv>
472+
<pv trig="true">$(PV_ROOT):CH6:TEMP:STAT</pv>
473473
</rule>
474474
</rules>
475475
<scale_options>
@@ -517,7 +517,7 @@
517517
<exp bool_exp="pv0 == 0">
518518
<value>true</value>
519519
</exp>
520-
<pv trig="true">$(PV_ROOT):CH7:TEMP:RBV:STAT</pv>
520+
<pv trig="true">$(PV_ROOT):CH7:TEMP:STAT</pv>
521521
</rule>
522522
</rules>
523523
<scale_options>
@@ -936,15 +936,15 @@
936936
<name>Text Update</name>
937937
<precision>0</precision>
938938
<precision_from_pv>true</precision_from_pv>
939-
<pv_name>$(PV_ROOT):CH0:TEMP:RBV:NAME</pv_name>
939+
<pv_name>$(PV_ROOT):CH0:TEMP:NAME</pv_name>
940940
<pv_value />
941941
<rotation_angle>0.0</rotation_angle>
942942
<rules>
943943
<rule name="Rule" prop_id="visible" out_exp="false">
944944
<exp bool_exp="pv0==0">
945945
<value>false</value>
946946
</exp>
947-
<pv trig="true">$(PV_ROOT):CH0:TEMP:RBV:STAT</pv>
947+
<pv trig="true">$(PV_ROOT):CH0:TEMP:STAT</pv>
948948
</rule>
949949
</rules>
950950
<scale_options>
@@ -995,15 +995,15 @@ $(pv_value)</tooltip>
995995
<name>Text Update</name>
996996
<precision>0</precision>
997997
<precision_from_pv>true</precision_from_pv>
998-
<pv_name>$(PV_ROOT):CH1:TEMP:RBV:NAME</pv_name>
998+
<pv_name>$(PV_ROOT):CH1:TEMP:NAME</pv_name>
999999
<pv_value />
10001000
<rotation_angle>0.0</rotation_angle>
10011001
<rules>
10021002
<rule name="Rule" prop_id="visible" out_exp="false">
10031003
<exp bool_exp="pv0==0">
10041004
<value>false</value>
10051005
</exp>
1006-
<pv trig="true">$(PV_ROOT):CH1:TEMP:RBV:STAT</pv>
1006+
<pv trig="true">$(PV_ROOT):CH1:TEMP:STAT</pv>
10071007
</rule>
10081008
</rules>
10091009
<scale_options>
@@ -1054,15 +1054,15 @@ $(pv_value)</tooltip>
10541054
<name>Text Update</name>
10551055
<precision>0</precision>
10561056
<precision_from_pv>true</precision_from_pv>
1057-
<pv_name>$(PV_ROOT):CH2:TEMP:RBV:NAME</pv_name>
1057+
<pv_name>$(PV_ROOT):CH2:TEMP:NAME</pv_name>
10581058
<pv_value />
10591059
<rotation_angle>0.0</rotation_angle>
10601060
<rules>
10611061
<rule name="Rule" prop_id="visible" out_exp="false">
10621062
<exp bool_exp="pv0==0">
10631063
<value>false</value>
10641064
</exp>
1065-
<pv trig="true">$(PV_ROOT):CH2:TEMP:RBV:STAT</pv>
1065+
<pv trig="true">$(PV_ROOT):CH2:TEMP:STAT</pv>
10661066
</rule>
10671067
</rules>
10681068
<scale_options>
@@ -1113,15 +1113,15 @@ $(pv_value)</tooltip>
11131113
<name>Text Update_1</name>
11141114
<precision>0</precision>
11151115
<precision_from_pv>true</precision_from_pv>
1116-
<pv_name>$(PV_ROOT):CH3:TEMP:RBV:NAME</pv_name>
1116+
<pv_name>$(PV_ROOT):CH3:TEMP:NAME</pv_name>
11171117
<pv_value />
11181118
<rotation_angle>0.0</rotation_angle>
11191119
<rules>
11201120
<rule name="Rule" prop_id="visible" out_exp="false">
11211121
<exp bool_exp="pv0==0">
11221122
<value>false</value>
11231123
</exp>
1124-
<pv trig="true">$(PV_ROOT):CH3:TEMP:RBV:STAT</pv>
1124+
<pv trig="true">$(PV_ROOT):CH3:TEMP:STAT</pv>
11251125
</rule>
11261126
</rules>
11271127
<scale_options>
@@ -1172,15 +1172,15 @@ $(pv_value)</tooltip>
11721172
<name>Text Update</name>
11731173
<precision>0</precision>
11741174
<precision_from_pv>true</precision_from_pv>
1175-
<pv_name>$(PV_ROOT):CH4:TEMP:RBV:NAME</pv_name>
1175+
<pv_name>$(PV_ROOT):CH4:TEMP:NAME</pv_name>
11761176
<pv_value />
11771177
<rotation_angle>0.0</rotation_angle>
11781178
<rules>
11791179
<rule name="Rule" prop_id="visible" out_exp="false">
11801180
<exp bool_exp="pv0==0">
11811181
<value>false</value>
11821182
</exp>
1183-
<pv trig="true">$(PV_ROOT):CH4:TEMP:RBV:STAT</pv>
1183+
<pv trig="true">$(PV_ROOT):CH4:TEMP:STAT</pv>
11841184
</rule>
11851185
</rules>
11861186
<scale_options>
@@ -1231,15 +1231,15 @@ $(pv_value)</tooltip>
12311231
<name>Text Update_1</name>
12321232
<precision>0</precision>
12331233
<precision_from_pv>true</precision_from_pv>
1234-
<pv_name>$(PV_ROOT):CH5:TEMP:RBV:NAME</pv_name>
1234+
<pv_name>$(PV_ROOT):CH5:TEMP:NAME</pv_name>
12351235
<pv_value />
12361236
<rotation_angle>0.0</rotation_angle>
12371237
<rules>
12381238
<rule name="Rule" prop_id="visible" out_exp="false">
12391239
<exp bool_exp="pv0==0">
12401240
<value>false</value>
12411241
</exp>
1242-
<pv trig="true">$(PV_ROOT):CH5:TEMP:RBV:STAT</pv>
1242+
<pv trig="true">$(PV_ROOT):CH5:TEMP:STAT</pv>
12431243
</rule>
12441244
</rules>
12451245
<scale_options>
@@ -1290,15 +1290,15 @@ $(pv_value)</tooltip>
12901290
<name>Text Update_2</name>
12911291
<precision>0</precision>
12921292
<precision_from_pv>true</precision_from_pv>
1293-
<pv_name>$(PV_ROOT):CH6:TEMP:RBV:NAME</pv_name>
1293+
<pv_name>$(PV_ROOT):CH6:TEMP:NAME</pv_name>
12941294
<pv_value />
12951295
<rotation_angle>0.0</rotation_angle>
12961296
<rules>
12971297
<rule name="Rule" prop_id="visible" out_exp="false">
12981298
<exp bool_exp="pv0==0">
12991299
<value>false</value>
13001300
</exp>
1301-
<pv trig="true">$(PV_ROOT):CH6:TEMP:RBV:STAT</pv>
1301+
<pv trig="true">$(PV_ROOT):CH6:TEMP:STAT</pv>
13021302
</rule>
13031303
</rules>
13041304
<scale_options>
@@ -1349,15 +1349,15 @@ $(pv_value)</tooltip>
13491349
<name>Text Update_3</name>
13501350
<precision>0</precision>
13511351
<precision_from_pv>true</precision_from_pv>
1352-
<pv_name>$(PV_ROOT):CH7:TEMP:RBV:NAME</pv_name>
1352+
<pv_name>$(PV_ROOT):CH7:TEMP:NAME</pv_name>
13531353
<pv_value />
13541354
<rotation_angle>0.0</rotation_angle>
13551355
<rules>
13561356
<rule name="Rule" prop_id="visible" out_exp="false">
13571357
<exp bool_exp="pv0==0">
13581358
<value>false</value>
13591359
</exp>
1360-
<pv trig="true">$(PV_ROOT):CH7:TEMP:RBV:STAT</pv>
1360+
<pv trig="true">$(PV_ROOT):CH7:TEMP:STAT</pv>
13611361
</rule>
13621362
</rules>
13631363
<scale_options>
@@ -1408,15 +1408,15 @@ $(pv_value)</tooltip>
14081408
<name>Text Update</name>
14091409
<precision>0</precision>
14101410
<precision_from_pv>true</precision_from_pv>
1411-
<pv_name>$(PV_ROOT):CH0:TEMP:RBV</pv_name>
1411+
<pv_name>$(PV_ROOT):CH0:TEMP</pv_name>
14121412
<pv_value />
14131413
<rotation_angle>0.0</rotation_angle>
14141414
<rules>
14151415
<rule name="Rule" prop_id="visible" out_exp="false">
14161416
<exp bool_exp="pv0==0">
14171417
<value>false</value>
14181418
</exp>
1419-
<pv trig="true">$(PV_ROOT):CH0:TEMP:RBV:STAT</pv>
1419+
<pv trig="true">$(PV_ROOT):CH0:TEMP:STAT</pv>
14201420
</rule>
14211421
</rules>
14221422
<scale_options>
@@ -1467,15 +1467,15 @@ $(pv_value)</tooltip>
14671467
<name>Text Update_9</name>
14681468
<precision>0</precision>
14691469
<precision_from_pv>true</precision_from_pv>
1470-
<pv_name>$(PV_ROOT):CH1:TEMP:RBV</pv_name>
1470+
<pv_name>$(PV_ROOT):CH1:TEMP</pv_name>
14711471
<pv_value />
14721472
<rotation_angle>0.0</rotation_angle>
14731473
<rules>
14741474
<rule name="Rule" prop_id="visible" out_exp="false">
14751475
<exp bool_exp="pv0==0">
14761476
<value>false</value>
14771477
</exp>
1478-
<pv trig="true">$(PV_ROOT):CH1:TEMP:RBV:STAT</pv>
1478+
<pv trig="true">$(PV_ROOT):CH1:TEMP:STAT</pv>
14791479
</rule>
14801480
</rules>
14811481
<scale_options>
@@ -1526,15 +1526,15 @@ $(pv_value)</tooltip>
15261526
<name>Text Update</name>
15271527
<precision>0</precision>
15281528
<precision_from_pv>true</precision_from_pv>
1529-
<pv_name>$(PV_ROOT):CH2:TEMP:RBV</pv_name>
1529+
<pv_name>$(PV_ROOT):CH2:TEMP</pv_name>
15301530
<pv_value />
15311531
<rotation_angle>0.0</rotation_angle>
15321532
<rules>
15331533
<rule name="Rule" prop_id="visible" out_exp="false">
15341534
<exp bool_exp="pv0==0">
15351535
<value>false</value>
15361536
</exp>
1537-
<pv trig="true">$(PV_ROOT):CH2:TEMP:RBV:STAT</pv>
1537+
<pv trig="true">$(PV_ROOT):CH2:TEMP:STAT</pv>
15381538
</rule>
15391539
</rules>
15401540
<scale_options>
@@ -1585,15 +1585,15 @@ $(pv_value)</tooltip>
15851585
<name>Text Update_9</name>
15861586
<precision>0</precision>
15871587
<precision_from_pv>true</precision_from_pv>
1588-
<pv_name>$(PV_ROOT):CH3:TEMP:RBV</pv_name>
1588+
<pv_name>$(PV_ROOT):CH3:TEMP</pv_name>
15891589
<pv_value />
15901590
<rotation_angle>0.0</rotation_angle>
15911591
<rules>
15921592
<rule name="Rule" prop_id="visible" out_exp="false">
15931593
<exp bool_exp="pv0==0">
15941594
<value>false</value>
15951595
</exp>
1596-
<pv trig="true">$(PV_ROOT):CH3:TEMP:RBV:STAT</pv>
1596+
<pv trig="true">$(PV_ROOT):CH3:TEMP:STAT</pv>
15971597
</rule>
15981598
</rules>
15991599
<scale_options>
@@ -1644,15 +1644,15 @@ $(pv_value)</tooltip>
16441644
<name>Text Update</name>
16451645
<precision>0</precision>
16461646
<precision_from_pv>true</precision_from_pv>
1647-
<pv_name>$(PV_ROOT):CH4:TEMP:RBV</pv_name>
1647+
<pv_name>$(PV_ROOT):CH4:TEMP</pv_name>
16481648
<pv_value />
16491649
<rotation_angle>0.0</rotation_angle>
16501650
<rules>
16511651
<rule name="Rule" prop_id="visible" out_exp="false">
16521652
<exp bool_exp="pv0==0">
16531653
<value>false</value>
16541654
</exp>
1655-
<pv trig="true">$(PV_ROOT):CH4:TEMP:RBV:STAT</pv>
1655+
<pv trig="true">$(PV_ROOT):CH4:TEMP:STAT</pv>
16561656
</rule>
16571657
</rules>
16581658
<scale_options>
@@ -1703,15 +1703,15 @@ $(pv_value)</tooltip>
17031703
<name>Text Update_9</name>
17041704
<precision>0</precision>
17051705
<precision_from_pv>true</precision_from_pv>
1706-
<pv_name>$(PV_ROOT):CH5:TEMP:RBV</pv_name>
1706+
<pv_name>$(PV_ROOT):CH5:TEMP</pv_name>
17071707
<pv_value />
17081708
<rotation_angle>0.0</rotation_angle>
17091709
<rules>
17101710
<rule name="Rule" prop_id="visible" out_exp="false">
17111711
<exp bool_exp="pv0==0">
17121712
<value>false</value>
17131713
</exp>
1714-
<pv trig="true">$(PV_ROOT):CH5:TEMP:RBV:STAT</pv>
1714+
<pv trig="true">$(PV_ROOT):CH5:TEMP:STAT</pv>
17151715
</rule>
17161716
</rules>
17171717
<scale_options>
@@ -1762,15 +1762,15 @@ $(pv_value)</tooltip>
17621762
<name>Text Update_10</name>
17631763
<precision>0</precision>
17641764
<precision_from_pv>true</precision_from_pv>
1765-
<pv_name>$(PV_ROOT):CH6:TEMP:RBV</pv_name>
1765+
<pv_name>$(PV_ROOT):CH6:TEMP</pv_name>
17661766
<pv_value />
17671767
<rotation_angle>0.0</rotation_angle>
17681768
<rules>
17691769
<rule name="Rule" prop_id="visible" out_exp="false">
17701770
<exp bool_exp="pv0==0">
17711771
<value>false</value>
17721772
</exp>
1773-
<pv trig="true">$(PV_ROOT):CH6:TEMP:RBV:STAT</pv>
1773+
<pv trig="true">$(PV_ROOT):CH6:TEMP:STAT</pv>
17741774
</rule>
17751775
</rules>
17761776
<scale_options>
@@ -1821,15 +1821,15 @@ $(pv_value)</tooltip>
18211821
<name>Text Update_11</name>
18221822
<precision>0</precision>
18231823
<precision_from_pv>true</precision_from_pv>
1824-
<pv_name>$(PV_ROOT):CH7:TEMP:RBV</pv_name>
1824+
<pv_name>$(PV_ROOT):CH7:TEMP</pv_name>
18251825
<pv_value />
18261826
<rotation_angle>0.0</rotation_angle>
18271827
<rules>
18281828
<rule name="Rule" prop_id="visible" out_exp="false">
18291829
<exp bool_exp="pv0==0">
18301830
<value>false</value>
18311831
</exp>
1832-
<pv trig="true">$(PV_ROOT):CH7:TEMP:RBV:STAT</pv>
1832+
<pv trig="true">$(PV_ROOT):CH7:TEMP:STAT</pv>
18331833
</rule>
18341834
</rules>
18351835
<scale_options>

0 commit comments

Comments
 (0)