From 6072fb025ff08b67d7666ffebe4126ffc48590a8 Mon Sep 17 00:00:00 2001 From: Lowri Jenkins Date: Fri, 6 Dec 2024 16:14:49 +0000 Subject: [PATCH 1/2] Added Litron power opi to control litron laser power controller motor --- .../resources/LITRON_POWER.opi | 482 ++++++++++++++++++ .../resources/opi_info.xml | 18 + 2 files changed, 500 insertions(+) create mode 100644 base/uk.ac.stfc.isis.ibex.opis/resources/LITRON_POWER.opi diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/LITRON_POWER.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/LITRON_POWER.opi new file mode 100644 index 0000000000..0a3916b998 --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/LITRON_POWER.opi @@ -0,0 +1,482 @@ + + + + + false + -1 + -1 + + false + + + + 5.1.0 + + + + 6 + 600 + + true + + + + + true + true + true + true + true + Display + 800 + 705c2ac5:1939bd0ad59:-7fcb + -1 + -1 + + + false + + + + + + + 0 + 1 + true + + ISIS_Header1_NEW + + + + + 37 + 0 + Label + + + true + true + false + + + false + Litron Power Supply + + false + 1 + true + Label + 793 + true + 705c2ac5:1939bd0ad59:-7f5c + 0 + 0 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Header2_NEW + + + + + 37 + 0 + Label_1 + + + true + true + false + + + false + $(NAME) + + false + 1 + true + Label + 793 + true + 705c2ac5:1939bd0ad59:-7f5b + 0 + 36 + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 439 + false + + true + + + + + + 40*pv0+30 + + loc://sample_stack:naxes + + + + true + true + false + + + true + + false + true + Grouping Container + 481 + 705c2ac5:1939bd0ad59:-7f5a + 0 + 72 + + + + + + + + + 0 + 1 + true + + Default + + + + + + 246 + + true + $(MOTOR) + $(P)$(MOTOR) + + Linking Container + Motor/mymotor.opi + 2 + + + true + true + false + + + + true + Linking Container + 447 + 705c2ac5:1939bd0ad59:-7e8d + 0 + 1 + + + + + + + + + + 13 + 1 + true + false + + Default + + + + + 60 + false + + true + + + + + true + true + false + + + false + + false + true + Grouping Container + 289 + 705c2ac5:1939bd0ad59:-7e56 + 0 + 246 + + + false + false + false + + + + true + + + + 0 + 1 + true + + Default + + false + + + + 0 + 20 + 0 + Text Update + 0 + true + $(P)$(MOTOR).RRBV + + 0.0 + + + true + true + false + + + false + ###### + $(pv_name) +$(pv_value) + false + 1 + true + Text Update + 100 + false + 705c2ac5:1939bd0ad59:-7f0e + 90 + 3 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 1 + Label + + + true + true + false + + + Raw Steps: + + true + 1 + true + Label + 80 + false + 705c2ac5:1939bd0ad59:-7ed2 + 0 + 3 + + + + false + false + false + + + + false + + + + 3 + 1 + + true + + Default + + false + + + + 0 + 25 + 0 + false + Infinity + -Infinity + false + Text Input + 0 + true + $(P)$(MOTOR).RVAL + + 0.0 + + + true + true + false + + + 0 + false + + + $(pv_name) +$(pv_value) + false + true + Text Input + 100 + 705c2ac5:1939bd0ad59:-7eac + 156 + 0 + + + + + + false + false + + + + false + + + + 0 + 1 + true + + ISIS_Button_NEW + + false + + + + 1 + Picture1.jpg + Dummy + 0 + + + + + true + true + false + + + + + false + + true + Action Button + 1 + 705c2ac5:1939bd0ad59:-7f41 + 0 + 36 + + + + false + + + + 0 + 1 + true + + ISIS_Button_NEW + + false + + + + 1 + + Dummy_1 + 0 + + + + + true + true + false + + + + + false + + true + Action Button + 1 + 705c2ac5:1939bd0ad59:-7f3f + 432 + 36 + + \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 05c1ee0eef..1926c82d50 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -384,6 +384,24 @@ + + Litron Power Control + + LITRONPOWER + LITRON_POWER.opi + The OPI for the Litron laser power controller. + + + MOTOR + The motor used to control the laser power. (e.g. MOT:MTR0101) + MOT:MTR0101 + + + + Miscellaneous motion control + + + Pinhole Selector From 9319e75a1ec4013f709ab342adb9667a1c94d55e Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Mon, 9 Dec 2024 17:14:41 +0000 Subject: [PATCH 2/2] Remove rule referencing sample stack --- .../resources/LITRON_POWER.opi | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/LITRON_POWER.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/LITRON_POWER.opi index 0a3916b998..f00998f58e 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/LITRON_POWER.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/LITRON_POWER.opi @@ -138,14 +138,7 @@ true - - - - 40*pv0+30 - - loc://sample_stack:naxes - - + true true @@ -362,8 +355,8 @@ $(pv_value) 25 0 false - Infinity - -Infinity + 1.7976931348623157E308 + -1.7976931348623157E308 false Text Input 0