diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi
index 5addc3d44d..b58001ab29 100644
--- a/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi
+++ b/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi
@@ -157,30 +157,28 @@
336
108
-
+
-
-
-
+ false
-
+
- 13
+ 0
1
true
- false
- ISIS_GroupBox_NEW
+ ISIS_Button_NEW
+ false
-
+
- 523
- false
-
- true
-
- Collimator
+ 1
+
+ Dummy
+ 0
+
+
true
@@ -188,571 +186,39 @@
false
- true
+
+
+ false
- false
true
- Grouping Container
- 376
- -4805f29c:1579922e8d6:-7f64
+ Action Button
+ 1
+ -648922a4:1624e4fa0bd:-7f69
3
- 78
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
- ISIS_Label_NEW
-
-
-
-
- 20
- 2
- Label
-
-
- true
- true
- false
-
-
- false
- Target position:
-
- false
- 1
- true
- Label
- 103
- true
- -48159ee9:1567f536160:-5c7e
- 6
- 6
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
- ISIS_Value_NEW
-
- false
-
-
-
- 0
- 20
- 0
- Text Update
- 0
- true
- $(COL)TARGET_POS:SP:RBV
-
- 0.0
-
-
- true
- true
- false
-
-
- true
- ######
- $(pv_name)
-$(pv_value)
- true
- 1
- true
- Text Update
- 85
- false
- -48159ee9:1567f536160:-5a1b
- 120
- 6
-
-
-
- false
- false
- false
-
-
-
- false
-
-
-
- 3
- 1
-
- true
-
- ISIS_Value_NEW
-
- false
-
-
-
- 0
- 20
- 0
- true
- false
- Text Input
- 0
- false
- $(COL)TARGET_POS:SP
-
- 0.0
-
-
- true
- true
- false
-
-
- 0
- false
-
- 0
- $(pv_name)
-$(pv_value)
- false
- true
- Text Input
- 90
- -48159ee9:1567f536160:-5a01
- 174
- 6
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
- ISIS_Label_NEW
-
-
-
-
- 20
- 2
- Label_2
-
-
- true
- true
- false
-
-
- false
- Current position:
-
- false
- 1
- true
- Label
- 103
- true
- 3678fe54:18fceb05548:-7d6f
- 6
- 30
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
- ISIS_Value_NEW
-
- false
-
-
-
- 0
- 20
- 0
- Text Update
- 0
- true
- $(COL)CURR_POS
-
- 0.0
-
-
- true
- true
- false
-
-
- true
- ######
- $(pv_name)
-$(pv_value)
- true
- 1
- true
- Text Update
- 85
- false
- 3678fe54:18fceb05548:-7d6e
- 120
- 30
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
- ISIS_Label_NEW
-
-
-
-
- 20
- 2
- Label_2
-
-
- true
- true
- false
-
-
- false
- Previous position:
-
- false
- 1
- true
- Label
- 103
- true
- 3678fe54:18fceb05548:-7d63
- 6
- 54
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
- ISIS_Value_NEW
-
- false
-
-
-
- 0
- 20
- 0
- Text Update
- 0
- true
- $(COL)PREV_POS
-
- 0.0
-
-
- true
- true
- false
-
-
- true
- ######
- $(pv_name)
-$(pv_value)
- true
- 1
- true
- Text Update
- 85
- false
- 3678fe54:18fceb05548:-7d62
- 120
- 54
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
- ISIS_Label_NEW
-
-
-
-
- 20
- 2
- Label_2
-
-
- true
- true
- false
-
-
- false
- Mode:
-
- false
- 1
- true
- Label
- 103
- true
- 3678fe54:18fceb05548:-7d5a
- 6
- 78
-
-
-
- false
- false
- false
-
-
-
- true
-
-
-
- 0
- 1
- true
-
- ISIS_Value_NEW
-
- false
-
-
-
- 0
- 20
- 0
- Text Update
- 0
- true
- $(COL)MODE
-
- 0.0
-
-
- true
- true
- false
-
-
- true
- ######
- $(pv_name)
-$(pv_value)
- true
- 1
- true
- Text Update
- 85
- false
- 3678fe54:18fceb05548:-7d52
- 120
- 78
-
-
-
- false
- true
-
-
-
-
-
-
- 0
- 1
- 0
- 0
- 0
- 0
- 0
- true
- false
- false
-
- Default
-
-
-
-
- 292
- collimator.png
- Image
- false
-
-
- 1.0
- 0.0
-
-
- 0.0
- 1.0
-
-
-
-
- true
- true
- false
-
-
- false
-
- false
- true
- Image
- 299
- 3678fe54:18fceb05548:-7aa1
- 6
- 180
-
-
-
- false
-
-
-
-
-
-
- 0
- 1
- true
-
- ISIS_Label_NEW
-
-
-
-
- 139
- 0
- Label_5
-
-
- true
- true
- false
-
-
- false
- 0 - Shut
- 1 - 150mm
- 2 - 300mm
- 3 - 200mm
- 4 - 100mm
- 5 - 50mm
- 6 - 400mm
-
- false
- 1
- true
- Label
- 123
- true
- 3678fe54:18fceb05548:-7c19
- 222
- 30
-
+ 108
-
+
+ 0
-
+
- 13
+ 0
1
true
- false
-
- ISIS_GroupBox_NEW
-
-
+
- 523
- false
+ 601
+ true
true
- Jaws
+ 10
+ Tabbed Container
true
@@ -760,41 +226,62 @@ $(pv_value)
false
- true
+
+
+
+ true
+
+ ISIS_TabTitle_NEW
+
+
+
+
+
+ Collimator + Jaws
+
+
+
+ true
+
+ ISIS_TabTitle_NEW
+
+
+
+
+
+ Filters
+ 2
- false
true
- Grouping Container
- 469
- 3678fe54:18fceb05548:-78ba
- 378
- 78
-
+ Tabbed Container
+ 931
+ 1b9e8df3:195a8acee6d:-7d9c
+ 6
+ 84
+
-
+
-
+
0
1
true
+ false
- ISIS_GroupBox_NEW
+ ISIS_Label_Small
-
- 223
+ 572
+ false
true
- 2
- A Linking Container That Looks Like a Group Box_1
- ../stage/motion_setpoint_position_part.opi
- 2
+ Collimator + Jaws
true
@@ -802,39 +289,734 @@ $(pv_value)
false
+ true
- true
- Linking Container
- 421
- 3678fe54:18fceb05548:-7944
- -3
- 12
+ true
+ false
+ Grouping Container
+ 929
+ 1b9e8df3:195a8acee6d:-7d9b
+ 1
+ 1
+
+
+
+
+
+
+
+
+ 13
+ 1
+ true
+ false
+
+ ISIS_GroupBox_NEW
+
+
+
+
+ 493
+ false
+
+ true
+
+ Collimator
+
+
+ true
+ true
+ false
+
+
+ true
+
+ false
+ true
+ Grouping Container
+ 376
+ -4805f29c:1579922e8d6:-7f64
+ 9
+ 12
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_Label_NEW
+
+
+
+
+ 20
+ 2
+ Label
+
+
+ true
+ true
+ false
+
+
+ false
+ Target position:
+
+ false
+ 1
+ true
+ Label
+ 103
+ true
+ -48159ee9:1567f536160:-5c7e
+ 6
+ 6
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_Value_NEW
+
+ false
+
+
+
+ 0
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(COL)TARGET_POS:SP:RBV
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ true
+ ######
+ $(pv_name)
+$(pv_value)
+ true
+ 1
+ true
+ Text Update
+ 85
+ false
+ -48159ee9:1567f536160:-5a1b
+ 120
+ 6
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_Label_NEW
+
+
+
+
+ 20
+ 2
+ Label_2
+
+
+ true
+ true
+ false
+
+
+ false
+ Current position:
+
+ false
+ 1
+ true
+ Label
+ 103
+ true
+ 3678fe54:18fceb05548:-7d6f
+ 6
+ 30
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_Value_NEW
+
+ false
+
+
+
+ 0
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(COL)CURR_POS
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ true
+ ######
+ $(pv_name)
+$(pv_value)
+ true
+ 1
+ true
+ Text Update
+ 85
+ false
+ 3678fe54:18fceb05548:-7d6e
+ 120
+ 30
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_Label_NEW
+
+
+
+
+ 20
+ 2
+ Label_2
+
+
+ true
+ true
+ false
+
+
+ false
+ Previous position:
+
+ false
+ 1
+ true
+ Label
+ 103
+ true
+ 3678fe54:18fceb05548:-7d63
+ 6
+ 54
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_Value_NEW
+
+ false
+
+
+
+ 0
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(COL)PREV_POS
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ true
+ ######
+ $(pv_name)
+$(pv_value)
+ true
+ 1
+ true
+ Text Update
+ 85
+ false
+ 3678fe54:18fceb05548:-7d62
+ 120
+ 54
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_Label_NEW
+
+
+
+
+ 20
+ 2
+ Label_2
+
+
+ true
+ true
+ false
+
+
+ false
+ Mode:
+
+ false
+ 1
+ true
+ Label
+ 103
+ true
+ 3678fe54:18fceb05548:-7d5a
+ 6
+ 78
+
+
+
+ false
+ false
+ false
+
+
+
+ true
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_Value_NEW
+
+ false
+
+
+
+ 0
+ 20
+ 0
+ Text Update
+ 0
+ true
+ $(COL)MODE
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ true
+ ######
+ $(pv_name)
+$(pv_value)
+ true
+ 1
+ true
+ Text Update
+ 85
+ false
+ 3678fe54:18fceb05548:-7d52
+ 120
+ 78
+
+
+
+ false
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_Label_NEW
+
+
+
+
+ 139
+ 0
+ Label_5
+
+
+ true
+ true
+ false
+
+
+ false
+ 0 - Shut
+ 1 - 150mm
+ 2 - 300mm
+ 3 - 200mm
+ 4 - 100mm
+ 5 - 50mm
+ 6 - 400mm
+
+ false
+ 1
+ true
+ Label
+ 123
+ true
+ 3678fe54:18fceb05548:-7c19
+ 222
+ 18
+
+
+
+ false
+ false
+ false
+
+
+
+ false
+
+
+
+ 3
+ 1
+
+ true
+
+ ISIS_Value_NEW
+
+ false
+
+
+
+ 0
+ 20
+ 0
+ true
+ false
+ Text Input
+ 0
+ false
+ $(COL)TARGET_POS:SP
+
+ 0.0
+
+
+ true
+ true
+ false
+
+
+ 0
+ false
+
+ 0
+ $(pv_name)
+$(pv_value)
+ false
+ true
+ Text Input
+ 90
+ -48159ee9:1567f536160:-5a01
+ 174
+ 6
+
+
+
+ false
+ true
+
+
+
+
+
+
+ 0
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ true
+ false
+ false
+
+ Default
+
+
+
+
+ 292
+ collimator.png
+ Image
+ false
+
+
+ 1.0
+ 0.0
+
+
+ 0.0
+ 1.0
+
+
+
+
+ true
+ true
+ false
+
+
+ false
+
+ false
+ true
+ Image
+ 299
+ 3678fe54:18fceb05548:-7aa1
+ 6
+ 156
+
+
+
+
+
+
+
+
+
+
+ 13
+ 1
+ true
+ false
+
+ ISIS_GroupBox_NEW
+
+
+
+
+ 547
+ false
+
+ true
+
+ Jaws
+
+
+ true
+ true
+ false
+
+
+ true
+
+ false
+ true
+ Grouping Container
+ 493
+ 3678fe54:18fceb05548:-78ba
+ 384
+ 12
+
+
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_GroupBox_NEW
+
+
+
+
+
+ 223
+
+ true
+ 2
+
+ A Linking Container That Looks Like a Group Box_1
+ ../stage/motion_setpoint_position_part.opi
+ 2
+
+
+ true
+ true
+ false
+
+
+
+ true
+ Linking Container
+ 421
+ 3678fe54:18fceb05548:-7944
+ 0
+ 30
+
+
+
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_GroupBox_NEW
+
+
+
+
+
+ 236
+
+ true
+
+ A Linking Container That Looks Like a Group Box_1
+ ../jaws/single_jaw_manager.opi
+ 1
+
+
+ true
+ true
+ false
+
+
+
+ true
+ Linking Container
+ 452
+ 3678fe54:18fceb05548:-79af
+ -3
+ 258
+
+
-
+
-
+
-
+
0
1
true
+ false
- ISIS_GroupBox_NEW
+ ISIS_Label_Small
-
- 236
+ 572
+ false
true
- A Linking Container That Looks Like a Group Box_1
- ../jaws/single_jaw_manager.opi
- 1
+ Filters
true
@@ -842,13 +1024,98 @@ $(pv_value)
false
+ true
+ true
true
- Linking Container
- 452
- 3678fe54:18fceb05548:-79af
- -3
- 234
+ Grouping Container
+ 929
+ 1b9e8df3:195a8acee6d:-7d97
+ 1
+ 1
+
+
+
+
+
+
+
+
+ 0
+ 1
+ true
+
+ ISIS_GroupBox_NEW
+
+
+
+
+
+ 1
+
+ true
+ 2
+
+ A Linking Container That Looks Like a Group Box
+ template_inside_linking_container.opi
+ 1
+
+
+ true
+ true
+ false
+
+
+
+ true
+ Linking Container
+ 1
+ 1b9e8df3:195a8acee6d:-7d95
+ 21
+ 138
+
+
+
+
+
+
+
+
+
+ 3
+ 1
+ true
+
+ Default
+
+
+
+
+
+ 559
+
+ true
+ TC_01
+ $(P)$(SHUTTER_AND_FILTER_CONTROL):
+
+ Linking Container
+ ../chipir_filter_set.opi
+ 0
+
+
+ true
+ true
+ false
+
+
+
+ true
+ Linking Container
+ 919
+ 1b9e8df3:195a8acee6d:-7d6c
+ 6
+ 6
+