From 9353be1f14365cfb15ecd329b4ba0f14900b3b56 Mon Sep 17 00:00:00 2001 From: Jack Doughty Date: Wed, 18 Dec 2024 15:56:36 +0000 Subject: [PATCH 1/5] OPI updated --- .../resources/litronlasertimer.opi | 954 ++++++++++++++++++ .../resources/opi_info.xml | 16 + 2 files changed, 970 insertions(+) create mode 100644 base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi new file mode 100644 index 0000000000..b8a4e2859a --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi @@ -0,0 +1,954 @@ + + + + + false + -1 + -1 + + false + + + + 5.1.0 + + + + 6 + 600 + + true + $(P)$(IOC): + DG645_01 + $(P)AS:$(IOC): + $(P)CS:IOC:$(IOC): + + + + + true + true + true + true + true + Display + 800 + -1fce3382:15fb9cec36d:-75d6 + -1 + -1 + + + false + + + + + + + 0 + 1 + true + + ISIS_Header1_NEW + + + + + 37 + 0 + Label + + + true + true + false + + + false + Litron Laser Timing Control + + false + 1 + true + Label + 331 + true + 601b1d13:193cfd9f297:-7f44 + 12 + 12 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Header2_NEW + + + + + 37 + 0 + Label_1 + + + true + true + false + + + false + $(NAME) + + false + 1 + true + Label + 775 + true + 601b1d13:193cfd9f297:-7f43 + 12 + 48 + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 133 + false + + true + + + + + true + true + false + + + true + + false + true + Grouping Container + 385 + 601b1d13:193cfd9f297:-7f3d + 12 + 90 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label + + + true + true + false + + + false + Delay SP + + false + 1 + true + Label + 48 + true + 601b1d13:193cfd9f297:-7f3c + 18 + 6 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 31 + 2 + Label_3 + + + true + true + false + + + false + Offset SP + + false + 1 + true + Label + 67 + true + 601b1d13:193cfd9f297:-7f3a + -1 + 36 + + + + false + false + false + + + + false + + + + 3 + 1 + + true + + Default + + false + + + + 0 + 25 + 0 + false + 1.7976931348623157E308 + -1.7976931348623157E308 + false + Text Input + 0 + true + $(PV_ROOT)DELAY + + 0.0 + + + true + true + false + + + 0 + true + + + $(pv_name) +$(pv_value) + false + true + Text Input + 79 + 601b1d13:193cfd9f297:-7e32 + 77 + 3 + + + + false + false + false + + + + false + + + + 3 + 1 + + true + + Default + + false + + + + 0 + 25 + 0 + false + 1.7976931348623157E308 + -1.7976931348623157E308 + false + Text Input + 0 + true + $(PV_ROOT)OFFSET + + 0.0 + + + true + true + false + + + 0 + true + + + $(pv_name) +$(pv_value) + false + true + Text Input + 79 + 601b1d13:193cfd9f297:-7e2a + 77 + 39 + + + + + $(PV_ROOT)ERROR.PROC + 1 + 10 + + + + + false + false + + + + false + + + + 0 + 1 + true + + Default + + false + + + + 25 + + Set + 0 + + + + + true + true + false + + + + Set + false + $(pv_name) +$(pv_value) + true + Action Button + 67 + 601b1d13:193cfd9f297:-7d93 + 83 + 72 + + + + false + false + + + + -1 + true + + + + 0 + 1 + 3 + + + + 0 + true + true + + Default + + false + + + + 20 + LED + + + + OFF + + + + ON + $(PV_ROOT)ERROR + + + + true + true + true + + + false + false + $(pv_name) +$(pv_value) + true + LED + 20 + 601b1d13:193cfd9f297:-7766 + 275 + 42 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 31 + 2 + Label_5 + + + true + true + false + + + false + Error + + false + 1 + true + Label + 72 + true + 601b1d13:193cfd9f297:-775e + 185 + 36 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 31 + 2 + Label_3 + + + true + true + false + + + false + Mode SP + + false + 1 + true + Label + 72 + true + -16127485:193da73ca1c:-7fd8 + 185 + 0 + + + + false + false + + + + false + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 23 + true + Combo_1 + $(PV_ROOT)SAVE_STATE + + + + true + false + false + + + $(pv_name) +$(pv_value) + true + Combo + 67 + -16127485:193da73ca1c:-7fd7 + 275 + 4 + + + + + false + + + + 0 + 1 + true + + ISIS_Button_NEW + + false + + + + 1 + + Dummy + 0 + + + + + true + true + false + + + + + false + + true + Action Button + 1 + 601b1d13:193cfd9f297:-7f36 + 264 + 126 + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 133 + false + + true + + + + + true + true + false + + + true + + false + true + Grouping Container + 229 + 601b1d13:193cfd9f297:-7d7f + 12 + 234 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label + + + true + true + false + + + false + dA_0 RB + + false + 1 + true + Label + 53 + true + 601b1d13:193cfd9f297:-7d7e + 43 + 6 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 0 + true + $(PV_ROOT)ADELAY:RB + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 78 + false + 601b1d13:193cfd9f297:-7d7d + 114 + 6 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 31 + 2 + Label_3 + + + true + true + false + + + false + dC_0 RB + + false + 1 + true + Label + 72 + true + 601b1d13:193cfd9f297:-7d7c + 24 + 36 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update_2 + 0 + true + $(PV_ROOT)CDELAY:RB + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 78 + false + 601b1d13:193cfd9f297:-7d7b + 114 + 42 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 31 + 2 + Label_3 + + + true + true + false + + + false + Summed Delay + + false + 1 + true + Label + 103 + true + 601b1d13:193cfd9f297:-7d70 + -7 + 72 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update_2 + 0 + true + $(PV_ROOT)SUMMED_DLAY + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 78 + false + 601b1d13:193cfd9f297:-7d6f + 114 + 78 + + + \ 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..102333d9aa 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 @@ -3888,5 +3888,21 @@ + + LLTDG645 + + UNKNOWN + litronlasertimer.opi + The OPI for the LitronLaserTimer. + + + LLTDG645 + The LitronLaserTimer PV prefix (e.g. LLTDG645_01) + LLTDG645_01 + + + + + From 9d5fc7d750a334196736250dc8d5205c94ce21ed Mon Sep 17 00:00:00 2001 From: Jack Doughty Date: Fri, 20 Dec 2024 14:16:34 +0000 Subject: [PATCH 2/5] Updates litron laser timing opi --- .../resources/DG645/dg645.opi | 12 +-- .../resources/litronlasertimer.opi | 94 +++++++++---------- .../resources/opi_info.xml | 8 +- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/DG645/dg645.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/DG645/dg645.opi index b5558a210f..1acc867589 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/DG645/dg645.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/DG645/dg645.opi @@ -1591,7 +1591,7 @@ $(pv_value) true Linking Container - 237 + 261 29055ce3:17c4ab9edb9:-7ee8 24 51 @@ -1634,7 +1634,7 @@ $(pv_value) true Linking Container - 237 + 261 231c343d:183cb33d8b8:-52be 24 136 @@ -1677,7 +1677,7 @@ $(pv_value) true Linking Container - 237 + 261 231c343d:183cb33d8b8:-5282 24 221 @@ -1720,7 +1720,7 @@ $(pv_value) true Linking Container - 237 + 261 231c343d:183cb33d8b8:-5246 24 306 @@ -1763,7 +1763,7 @@ $(pv_value) true Linking Container - 237 + 261 231c343d:183cb33d8b8:-51d1 24 391 @@ -2595,7 +2595,7 @@ $(pv_value) 61 -4d9fb07c:18a031ecdc2:-7dcb 228 - 37 + 38 diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi index b8a4e2859a..2a8cfeda89 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi @@ -463,7 +463,7 @@ $(pv_value) LED 20 601b1d13:193cfd9f297:-7766 - 275 + 240 42 @@ -501,18 +501,20 @@ $(pv_value) 1 true Label - 72 + 43 true 601b1d13:193cfd9f297:-775e - 185 + 174 36 - + - false + false + false - + + false @@ -520,75 +522,73 @@ $(pv_value) 1 true - ISIS_Label_NEW + ISIS_Value_NEW + false - 31 - 2 - Label_3 + 23 + true + Combo + $(PV_ROOT)MODE + true - true + false false - false - Mode SP - - false - 1 + $(pv_name) +$(pv_value) true - Label - 72 - true - -16127485:193da73ca1c:-7fd8 - 185 - 0 + Combo + 96 + -16127485:193da73ca1c:-7da2 + 240 + 4 - + - false - false + false - + - false 0 1 - true + false - ISIS_Value_NEW + ISIS_Label_NEW - false - 23 - true - Combo_1 - $(PV_ROOT)SAVE_STATE - + 20 + 0 + Label true - false + true false - $(pv_name) -$(pv_value) + false + Mode + + false + 1 true - Combo - 67 - -16127485:193da73ca1c:-7fd7 - 275 - 4 + Label + 150 + true + -16127485:193da73ca1c:-7d9f + 186 + 6 @@ -670,7 +670,7 @@ $(pv_value) 229 601b1d13:193cfd9f297:-7d7f 12 - 234 + 228 false @@ -740,7 +740,7 @@ $(pv_value) Text Update 0 true - $(PV_ROOT)ADELAY:RB + $(PV_ROOT)ADLAY 0.0 @@ -833,7 +833,7 @@ $(pv_value) Text Update_2 0 true - $(PV_ROOT)CDELAY:RB + $(PV_ROOT)CDLAY 0.0 @@ -926,7 +926,7 @@ $(pv_value) Text Update_2 0 true - $(PV_ROOT)SUMMED_DLAY + $(PV_ROOT)SUMMED_DELAY 0.0 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 54af43aa62..8d0ac8ac5a 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 @@ -3956,16 +3956,16 @@ - LLTDG645 + Litron Laser Timing (DG645) UNKNOWN litronlasertimer.opi The OPI for the LitronLaserTimer. - LLTDG645 - The LitronLaserTimer PV prefix (e.g. LLTDG645_01) - LLTDG645_01 + DG645 + The DG645 PV prefix (e.g. DG645_01) + DG645_01 From fff2fde14a9239122fb44bcf7307cf21437b83db Mon Sep 17 00:00:00 2001 From: Jack Doughty Date: Fri, 20 Dec 2024 14:37:29 +0000 Subject: [PATCH 3/5] Updates litron laser timing opi --- .../resources/litronlasertimer.opi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi index 2a8cfeda89..be73304771 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi @@ -584,7 +584,7 @@ $(pv_value) 1 true Label - 150 + 49 true -16127485:193da73ca1c:-7d9f 186 @@ -740,7 +740,7 @@ $(pv_value) Text Update 0 true - $(PV_ROOT)ADLAY + $(PV_ROOT)ADLAYSCAL 0.0 @@ -833,7 +833,7 @@ $(pv_value) Text Update_2 0 true - $(PV_ROOT)CDLAY + $(PV_ROOT)CDLAYSCAL 0.0 From 6e2f2908e927787a8ddee000c74ce397b54a92dd Mon Sep 17 00:00:00 2001 From: Jack Doughty Date: Fri, 20 Dec 2024 15:04:30 +0000 Subject: [PATCH 4/5] Updates litron laser timing opi --- .../resources/litronlasertimer.opi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi index be73304771..baeee4ab8d 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi @@ -187,7 +187,7 @@ false - Delay SP + Delay false 1 @@ -228,7 +228,7 @@ false - Offset SP + Offset false 1 @@ -463,7 +463,7 @@ $(pv_value) LED 20 601b1d13:193cfd9f297:-7766 - 240 + 234 42 @@ -546,7 +546,7 @@ $(pv_value) Combo 96 -16127485:193da73ca1c:-7da2 - 240 + 234 4 @@ -584,7 +584,7 @@ $(pv_value) 1 true Label - 49 + 37 true -16127485:193da73ca1c:-7d9f 186 @@ -761,7 +761,7 @@ $(pv_value) 78 false 601b1d13:193cfd9f297:-7d7d - 114 + 108 6 @@ -854,7 +854,7 @@ $(pv_value) 78 false 601b1d13:193cfd9f297:-7d7b - 114 + 108 42 @@ -947,7 +947,7 @@ $(pv_value) 78 false 601b1d13:193cfd9f297:-7d6f - 114 + 108 78 From 0eec256539cf0a5235a89df788ebeb675f4f0c18 Mon Sep 17 00:00:00 2001 From: Jack Doughty Date: Fri, 20 Dec 2024 15:45:25 +0000 Subject: [PATCH 5/5] Updates litron laser timing opi --- .../resources/litronlasertimer.opi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi index baeee4ab8d..e612dfb2de 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi @@ -193,10 +193,10 @@ 1 true Label - 48 + 36 true 601b1d13:193cfd9f297:-7f3c - 18 + 27 6 @@ -234,10 +234,10 @@ 1 true Label - 67 + 42 true 601b1d13:193cfd9f297:-7f3a - -1 + 21 36