mx-bluesky 1.5.11__py3-none-any.whl → 1.5.12__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- mx_bluesky/_version.py +2 -2
- mx_bluesky/beamlines/aithre_lasershaping/experiment_plans/__init__.py +0 -0
- mx_bluesky/beamlines/aithre_lasershaping/experiment_plans/robot_load_plan.py +198 -0
- mx_bluesky/beamlines/aithre_lasershaping/parameters/__init__.py +0 -0
- mx_bluesky/beamlines/aithre_lasershaping/parameters/constants.py +17 -0
- mx_bluesky/beamlines/aithre_lasershaping/parameters/robot_load_parameters.py +13 -0
- mx_bluesky/beamlines/aithre_lasershaping/pin_tip_centring.py +31 -0
- mx_bluesky/beamlines/aithre_lasershaping/robot_load.py +80 -0
- mx_bluesky/beamlines/i04/__init__.py +6 -2
- mx_bluesky/beamlines/i04/callbacks/murko_callback.py +27 -12
- mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py +87 -13
- mx_bluesky/beamlines/i04/external_interaction/__init__.py +0 -0
- mx_bluesky/beamlines/i04/external_interaction/config_server.py +15 -0
- mx_bluesky/beamlines/i04/oav_centering_plans/__init__.py +0 -0
- mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py +115 -0
- mx_bluesky/beamlines/i04/parameters/__init__.py +0 -0
- mx_bluesky/beamlines/i04/parameters/constants.py +21 -0
- mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py +24 -1
- mx_bluesky/beamlines/i04/thawing_plan.py +147 -152
- mx_bluesky/beamlines/i24/serial/dcid.py +4 -5
- mx_bluesky/beamlines/i24/serial/extruder/i24ssx_extruder_collect_py3v2.py +5 -2
- mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl +11 -11
- mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl +3 -3
- mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl +142 -142
- mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl +135 -135
- mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/PMAC_Command.edl +8 -8
- mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl +13 -13
- mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_collect_py3v1.py +7 -4
- mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_manager_py3v1.py +35 -32
- mx_bluesky/beamlines/i24/serial/parameters/utils.py +5 -5
- mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py +113 -306
- mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py +8 -2
- mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py +1 -1
- mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py +1 -1
- mx_bluesky/beamlines/i24/serial/web_gui_plans/oav_plans.py +64 -0
- mx_bluesky/{hyperion/device_setup_plans/smargon.py → common/device_setup_plans/gonio.py} +9 -6
- mx_bluesky/common/device_setup_plans/manipulate_sample.py +8 -1
- mx_bluesky/common/device_setup_plans/robot_load_unload.py +1 -1
- mx_bluesky/common/device_setup_plans/setup_oav.py +8 -0
- mx_bluesky/common/device_setup_plans/setup_zebra_and_shutter.py +0 -5
- mx_bluesky/common/device_setup_plans/xbpm_feedback.py +8 -1
- mx_bluesky/common/experiment_plans/beamstop_check.py +229 -0
- mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py +2 -0
- mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py +5 -2
- mx_bluesky/common/experiment_plans/oav_snapshot_plan.py +0 -1
- mx_bluesky/{hyperion → common}/experiment_plans/pin_tip_centring_plan.py +20 -21
- mx_bluesky/common/external_interaction/callbacks/common/grid_detection_callback.py +5 -0
- mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py +10 -12
- mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py +3 -5
- mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py +5 -5
- mx_bluesky/common/external_interaction/config_server.py +2 -2
- mx_bluesky/common/external_interaction/ispyb/data_model.py +11 -4
- mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py +159 -2
- mx_bluesky/common/external_interaction/ispyb/ispyb_store.py +76 -166
- mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py +0 -14
- mx_bluesky/common/parameters/components.py +1 -0
- mx_bluesky/common/parameters/constants.py +3 -2
- mx_bluesky/common/parameters/device_composites.py +4 -2
- mx_bluesky/common/utils/exceptions.py +15 -0
- mx_bluesky/common/utils/log.py +9 -0
- mx_bluesky/common/utils/utils.py +48 -0
- mx_bluesky/hyperion/__main__.py +3 -13
- mx_bluesky/hyperion/baton_handler.py +23 -6
- mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py +5 -6
- mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py +3 -10
- mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py +4 -2
- mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py +8 -2
- mx_bluesky/hyperion/experiment_plans/set_energy_plan.py +2 -2
- mx_bluesky/hyperion/experiment_plans/udc_default_state.py +160 -0
- mx_bluesky/hyperion/external_interaction/agamemnon.py +1 -1
- mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py +2 -2
- mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py +1 -0
- mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py +1 -4
- mx_bluesky/hyperion/external_interaction/config_server.py +5 -5
- mx_bluesky/hyperion/parameters/constants.py +10 -3
- mx_bluesky/hyperion/parameters/device_composites.py +2 -2
- mx_bluesky/hyperion/parameters/robot_load.py +1 -9
- {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/METADATA +6 -5
- {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/RECORD +83 -69
- mx_bluesky/common/experiment_plans/inner_plans/udc_default_state.py +0 -86
- mx_bluesky/common/external_interaction/callbacks/common/logging_callback.py +0 -29
- {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/WHEEL +0 -0
- {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/entry_points.txt +0 -0
- {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/licenses/LICENSE +0 -0
- {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/top_level.txt +0 -0
|
@@ -3,8 +3,8 @@ beginScreenProperties
|
|
|
3
3
|
major 4
|
|
4
4
|
minor 0
|
|
5
5
|
release 1
|
|
6
|
-
x
|
|
7
|
-
y
|
|
6
|
+
x 389
|
|
7
|
+
y 257
|
|
8
8
|
w 1030
|
|
9
9
|
h 950
|
|
10
10
|
font "arial-medium-r-18.0"
|
|
@@ -66,7 +66,7 @@ h 120
|
|
|
66
66
|
lineColor index 14
|
|
67
67
|
fill
|
|
68
68
|
fillColor index 38
|
|
69
|
-
visPv "BL24I-MO-IOC-
|
|
69
|
+
visPv "BL24I-MO-IOC-13:GP2"
|
|
70
70
|
visMin "1"
|
|
71
71
|
visMax "2"
|
|
72
72
|
endObjectProperties
|
|
@@ -84,7 +84,7 @@ h 20
|
|
|
84
84
|
lineColor index 9
|
|
85
85
|
fill
|
|
86
86
|
fillColor index 23
|
|
87
|
-
visPv "BL24I-MO-IOC-
|
|
87
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
88
88
|
visMin "1"
|
|
89
89
|
visMax "2"
|
|
90
90
|
endObjectProperties
|
|
@@ -146,7 +146,7 @@ h 20
|
|
|
146
146
|
lineColor index 9
|
|
147
147
|
fill
|
|
148
148
|
fillColor index 23
|
|
149
|
-
visPv "BL24I-MO-IOC-
|
|
149
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
150
150
|
visMin "0"
|
|
151
151
|
visMax "1"
|
|
152
152
|
endObjectProperties
|
|
@@ -234,12 +234,12 @@ y2Max 1
|
|
|
234
234
|
# Trace Properties
|
|
235
235
|
numTraces 2
|
|
236
236
|
xPv {
|
|
237
|
-
0 "BL24I-
|
|
238
|
-
1 "BL24I-
|
|
237
|
+
0 "BL24I-MO-CHIP-01:X.RBV"
|
|
238
|
+
1 "BL24I-MO-CHIP-01:X.VAL"
|
|
239
239
|
}
|
|
240
240
|
yPv {
|
|
241
|
-
0 "BL24I-
|
|
242
|
-
1 "BL24I-
|
|
241
|
+
0 "BL24I-MO-CHIP-01:Y.RBV"
|
|
242
|
+
1 "BL24I-MO-CHIP-01:Y.VAL"
|
|
243
243
|
}
|
|
244
244
|
plotStyle {
|
|
245
245
|
0 "single point"
|
|
@@ -417,8 +417,8 @@ release 0
|
|
|
417
417
|
x 120
|
|
418
418
|
y 830
|
|
419
419
|
w 87
|
|
420
|
-
h
|
|
421
|
-
controlPv "BL24I-
|
|
420
|
+
h 18
|
|
421
|
+
controlPv "BL24I-MO-CHIP-01:X.RBV"
|
|
422
422
|
font "arial-medium-r-16.0"
|
|
423
423
|
fgColor index 16
|
|
424
424
|
bgColor index 10
|
|
@@ -460,7 +460,7 @@ x 120
|
|
|
460
460
|
y 855
|
|
461
461
|
w 87
|
|
462
462
|
h 18
|
|
463
|
-
controlPv "BL24I-
|
|
463
|
+
controlPv "BL24I-MO-CHIP-01:Y.RBV"
|
|
464
464
|
font "arial-medium-r-16.0"
|
|
465
465
|
fgColor index 16
|
|
466
466
|
bgColor index 10
|
|
@@ -482,7 +482,7 @@ x 120
|
|
|
482
482
|
y 880
|
|
483
483
|
w 87
|
|
484
484
|
h 18
|
|
485
|
-
controlPv "BL24I-
|
|
485
|
+
controlPv "BL24I-MO-CHIP-01:Z.RBV"
|
|
486
486
|
font "arial-medium-r-16.0"
|
|
487
487
|
fgColor index 16
|
|
488
488
|
bgColor index 10
|
|
@@ -509,9 +509,9 @@ onColor index 21
|
|
|
509
509
|
offColor index 16
|
|
510
510
|
topShadowColor index 7
|
|
511
511
|
botShadowColor index 7
|
|
512
|
-
controlPv "BL24I-
|
|
513
|
-
pressValue "#
|
|
514
|
-
releaseValue "#
|
|
512
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
513
|
+
pressValue "#7J:200"
|
|
514
|
+
releaseValue "#6P"
|
|
515
515
|
3d
|
|
516
516
|
font "arial-medium-r-18.0"
|
|
517
517
|
endObjectProperties
|
|
@@ -531,9 +531,9 @@ onColor index 21
|
|
|
531
531
|
offColor index 16
|
|
532
532
|
topShadowColor index 7
|
|
533
533
|
botShadowColor index 7
|
|
534
|
-
controlPv "BL24I-
|
|
535
|
-
pressValue "#
|
|
536
|
-
releaseValue "#
|
|
534
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
535
|
+
pressValue "#7J:-200"
|
|
536
|
+
releaseValue "#6P"
|
|
537
537
|
3d
|
|
538
538
|
font "arial-medium-r-18.0"
|
|
539
539
|
endObjectProperties
|
|
@@ -728,9 +728,9 @@ onColor index 22
|
|
|
728
728
|
offColor index 17
|
|
729
729
|
topShadowColor index 7
|
|
730
730
|
botShadowColor index 7
|
|
731
|
-
controlPv "BL24I-
|
|
732
|
-
pressValue "#
|
|
733
|
-
releaseValue "#
|
|
731
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
732
|
+
pressValue "#7J:1200"
|
|
733
|
+
releaseValue "#6P"
|
|
734
734
|
3d
|
|
735
735
|
font "arial-medium-r-18.0"
|
|
736
736
|
endObjectProperties
|
|
@@ -750,9 +750,9 @@ onColor index 22
|
|
|
750
750
|
offColor index 17
|
|
751
751
|
topShadowColor index 7
|
|
752
752
|
botShadowColor index 7
|
|
753
|
-
controlPv "BL24I-
|
|
754
|
-
pressValue "#
|
|
755
|
-
releaseValue "#
|
|
753
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
754
|
+
pressValue "#7J:-1200"
|
|
755
|
+
releaseValue "#6P"
|
|
756
756
|
3d
|
|
757
757
|
font "arial-medium-r-18.0"
|
|
758
758
|
endObjectProperties
|
|
@@ -1021,8 +1021,8 @@ release 0
|
|
|
1021
1021
|
x 120
|
|
1022
1022
|
y 910
|
|
1023
1023
|
w 170
|
|
1024
|
-
h
|
|
1025
|
-
controlPv "BL24I-
|
|
1024
|
+
h 18
|
|
1025
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
1026
1026
|
font "arial-medium-r-16.0"
|
|
1027
1027
|
fgColor index 16
|
|
1028
1028
|
bgColor index 10
|
|
@@ -1196,7 +1196,7 @@ fgColor index 14
|
|
|
1196
1196
|
bgColor index 3
|
|
1197
1197
|
topShadowColor index 1
|
|
1198
1198
|
botShadowColor index 8
|
|
1199
|
-
controlPv "BL24I-MO-IOC-
|
|
1199
|
+
controlPv "BL24I-MO-IOC-13:GP4"
|
|
1200
1200
|
font "arial-medium-r-18.0"
|
|
1201
1201
|
numItems 9
|
|
1202
1202
|
symbolTag {
|
|
@@ -1268,7 +1268,7 @@ fgColor index 14
|
|
|
1268
1268
|
bgColor index 3
|
|
1269
1269
|
topShadowColor index 1
|
|
1270
1270
|
botShadowColor index 8
|
|
1271
|
-
controlPv "BL24I-MO-IOC-
|
|
1271
|
+
controlPv "BL24I-MO-IOC-13:GP2"
|
|
1272
1272
|
font "arial-medium-r-18.0"
|
|
1273
1273
|
numItems 2
|
|
1274
1274
|
symbolTag {
|
|
@@ -1382,7 +1382,10 @@ buttonLabel "GP PV"
|
|
|
1382
1382
|
numPvs 4
|
|
1383
1383
|
numDsps 1
|
|
1384
1384
|
displayFileName {
|
|
1385
|
-
0 "
|
|
1385
|
+
0 "/dls_sw/work/R3.14.12.7/ioc/BL24I/BL/data/BL24I-generalPurpose.edl"
|
|
1386
|
+
}
|
|
1387
|
+
symbols {
|
|
1388
|
+
0 "P=BL24I-MO-IOC-13"
|
|
1386
1389
|
}
|
|
1387
1390
|
endObjectProperties
|
|
1388
1391
|
|
|
@@ -1455,13 +1458,13 @@ major 4
|
|
|
1455
1458
|
minor 0
|
|
1456
1459
|
release 0
|
|
1457
1460
|
x 810
|
|
1458
|
-
y
|
|
1461
|
+
y 505
|
|
1459
1462
|
w 175
|
|
1460
1463
|
h 90
|
|
1461
1464
|
lineColor index 7
|
|
1462
1465
|
fill
|
|
1463
1466
|
fillColor index 7
|
|
1464
|
-
visPv "BL24I-MO-IOC-
|
|
1467
|
+
visPv "BL24I-MO-IOC-13:GP2"
|
|
1465
1468
|
visInvert
|
|
1466
1469
|
visMin "1"
|
|
1467
1470
|
visMax "2"
|
|
@@ -1494,7 +1497,7 @@ h 115
|
|
|
1494
1497
|
lineColor index 14
|
|
1495
1498
|
fill
|
|
1496
1499
|
fillColor index 38
|
|
1497
|
-
visPv "BL24I-MO-IOC-
|
|
1500
|
+
visPv "BL24I-MO-IOC-13:GP4"
|
|
1498
1501
|
visMin "1"
|
|
1499
1502
|
visMax "10"
|
|
1500
1503
|
endObjectProperties
|
|
@@ -1574,7 +1577,7 @@ x 580
|
|
|
1574
1577
|
y 860
|
|
1575
1578
|
w 75
|
|
1576
1579
|
h 18
|
|
1577
|
-
controlPv "BL24I-MO-STEP-
|
|
1580
|
+
controlPv "BL24I-MO-STEP-13:pmac:read:P2402"
|
|
1578
1581
|
font "arial-medium-r-16.0"
|
|
1579
1582
|
fgColor index 16
|
|
1580
1583
|
bgColor index 10
|
|
@@ -1639,7 +1642,7 @@ h 30
|
|
|
1639
1642
|
lineColor index 3
|
|
1640
1643
|
fill
|
|
1641
1644
|
fillColor index 3
|
|
1642
|
-
visPv "BL24I-MO-STEP-
|
|
1645
|
+
visPv "BL24I-MO-STEP-13:pmac:read:P2401"
|
|
1643
1646
|
visInvert
|
|
1644
1647
|
visMin "1"
|
|
1645
1648
|
visMax "2"
|
|
@@ -1698,7 +1701,7 @@ x 645
|
|
|
1698
1701
|
y 545
|
|
1699
1702
|
w 125
|
|
1700
1703
|
h 25
|
|
1701
|
-
controlPv "BL24I-
|
|
1704
|
+
controlPv "BL24I-MO-CHIP-01:detDistance"
|
|
1702
1705
|
font "helvetica-medium-r-18.0"
|
|
1703
1706
|
fgColor index 25
|
|
1704
1707
|
bgColor index 3
|
|
@@ -1765,7 +1768,7 @@ x 645
|
|
|
1765
1768
|
y 475
|
|
1766
1769
|
w 125
|
|
1767
1770
|
h 25
|
|
1768
|
-
controlPv "BL24I-
|
|
1771
|
+
controlPv "BL24I-MO-CHIP-01:expTime"
|
|
1769
1772
|
font "helvetica-medium-r-18.0"
|
|
1770
1773
|
fgColor index 25
|
|
1771
1774
|
bgColor index 3
|
|
@@ -1792,7 +1795,7 @@ x 710
|
|
|
1792
1795
|
y 445
|
|
1793
1796
|
w 60
|
|
1794
1797
|
h 25
|
|
1795
|
-
controlPv "BL24I-MO-IOC-
|
|
1798
|
+
controlPv "BL24I-MO-IOC-13:GP3"
|
|
1796
1799
|
font "helvetica-medium-r-18.0"
|
|
1797
1800
|
fgColor index 25
|
|
1798
1801
|
bgColor index 3
|
|
@@ -1859,7 +1862,7 @@ x 600
|
|
|
1859
1862
|
y 415
|
|
1860
1863
|
w 195
|
|
1861
1864
|
h 25
|
|
1862
|
-
controlPv "BL24I-
|
|
1865
|
+
controlPv "BL24I-MO-CHIP-01:chipName"
|
|
1863
1866
|
font "helvetica-medium-r-18.0"
|
|
1864
1867
|
fgColor index 25
|
|
1865
1868
|
bgColor index 3
|
|
@@ -1886,7 +1889,7 @@ x 600
|
|
|
1886
1889
|
y 385
|
|
1887
1890
|
w 235
|
|
1888
1891
|
h 25
|
|
1889
|
-
controlPv "BL24I-
|
|
1892
|
+
controlPv "BL24I-MO-CHIP-01:filePath"
|
|
1890
1893
|
font "helvetica-medium-r-18.0"
|
|
1891
1894
|
fgColor index 25
|
|
1892
1895
|
bgColor index 3
|
|
@@ -1953,7 +1956,7 @@ x 580
|
|
|
1953
1956
|
y 835
|
|
1954
1957
|
w 75
|
|
1955
1958
|
h 18
|
|
1956
|
-
controlPv "BL24I-MO-IOC-
|
|
1959
|
+
controlPv "BL24I-MO-IOC-13:GP10"
|
|
1957
1960
|
font "arial-medium-r-16.0"
|
|
1958
1961
|
fgColor index 16
|
|
1959
1962
|
bgColor index 10
|
|
@@ -2017,9 +2020,9 @@ onColor index 21
|
|
|
2017
2020
|
offColor index 16
|
|
2018
2021
|
topShadowColor index 7
|
|
2019
2022
|
botShadowColor index 7
|
|
2020
|
-
controlPv "BL24I-
|
|
2021
|
-
pressValue "#
|
|
2022
|
-
releaseValue "#
|
|
2023
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2024
|
+
pressValue "#6J:10"
|
|
2025
|
+
releaseValue "#6P"
|
|
2023
2026
|
3d
|
|
2024
2027
|
font "helvetica-medium-r-18.0"
|
|
2025
2028
|
endObjectProperties
|
|
@@ -2039,9 +2042,9 @@ onColor index 21
|
|
|
2039
2042
|
offColor index 16
|
|
2040
2043
|
topShadowColor index 7
|
|
2041
2044
|
botShadowColor index 7
|
|
2042
|
-
controlPv "BL24I-
|
|
2043
|
-
pressValue "#
|
|
2044
|
-
releaseValue "#
|
|
2045
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2046
|
+
pressValue "#5J:60"
|
|
2047
|
+
releaseValue "#5P"
|
|
2045
2048
|
offLabel "+3"
|
|
2046
2049
|
3d
|
|
2047
2050
|
font "helvetica-medium-r-18.0"
|
|
@@ -2062,9 +2065,9 @@ onColor index 21
|
|
|
2062
2065
|
offColor index 16
|
|
2063
2066
|
topShadowColor index 7
|
|
2064
2067
|
botShadowColor index 7
|
|
2065
|
-
controlPv "BL24I-
|
|
2066
|
-
pressValue "#
|
|
2067
|
-
releaseValue "#
|
|
2068
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2069
|
+
pressValue "#5J:10"
|
|
2070
|
+
releaseValue "#5P"
|
|
2068
2071
|
3d
|
|
2069
2072
|
font "helvetica-medium-r-18.0"
|
|
2070
2073
|
endObjectProperties
|
|
@@ -2084,9 +2087,9 @@ onColor index 21
|
|
|
2084
2087
|
offColor index 16
|
|
2085
2088
|
topShadowColor index 7
|
|
2086
2089
|
botShadowColor index 7
|
|
2087
|
-
controlPv "BL24I-
|
|
2088
|
-
pressValue "#
|
|
2089
|
-
releaseValue "#
|
|
2090
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2091
|
+
pressValue "#5J:-60"
|
|
2092
|
+
releaseValue "#5P"
|
|
2090
2093
|
offLabel "-3"
|
|
2091
2094
|
3d
|
|
2092
2095
|
font "helvetica-medium-r-18.0"
|
|
@@ -2107,9 +2110,9 @@ onColor index 21
|
|
|
2107
2110
|
offColor index 16
|
|
2108
2111
|
topShadowColor index 7
|
|
2109
2112
|
botShadowColor index 7
|
|
2110
|
-
controlPv "BL24I-
|
|
2111
|
-
pressValue "#
|
|
2112
|
-
releaseValue "#
|
|
2113
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2114
|
+
pressValue "#5J:-10"
|
|
2115
|
+
releaseValue "#5P"
|
|
2113
2116
|
3d
|
|
2114
2117
|
font "arial-medium-r-18.0"
|
|
2115
2118
|
endObjectProperties
|
|
@@ -2129,9 +2132,9 @@ onColor index 21
|
|
|
2129
2132
|
offColor index 16
|
|
2130
2133
|
topShadowColor index 7
|
|
2131
2134
|
botShadowColor index 7
|
|
2132
|
-
controlPv "BL24I-
|
|
2133
|
-
pressValue "#
|
|
2134
|
-
releaseValue "#
|
|
2135
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2136
|
+
pressValue "#6J:60"
|
|
2137
|
+
releaseValue "#6P"
|
|
2135
2138
|
offLabel "-3"
|
|
2136
2139
|
3d
|
|
2137
2140
|
font "helvetica-medium-r-18.0"
|
|
@@ -2152,9 +2155,9 @@ onColor index 21
|
|
|
2152
2155
|
offColor index 16
|
|
2153
2156
|
topShadowColor index 7
|
|
2154
2157
|
botShadowColor index 7
|
|
2155
|
-
controlPv "BL24I-
|
|
2156
|
-
pressValue "#
|
|
2157
|
-
releaseValue "#
|
|
2158
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2159
|
+
pressValue "#6J:-60"
|
|
2160
|
+
releaseValue "#6P"
|
|
2158
2161
|
offLabel "+3"
|
|
2159
2162
|
3d
|
|
2160
2163
|
font "helvetica-medium-r-18.0"
|
|
@@ -2175,9 +2178,9 @@ onColor index 21
|
|
|
2175
2178
|
offColor index 16
|
|
2176
2179
|
topShadowColor index 7
|
|
2177
2180
|
botShadowColor index 7
|
|
2178
|
-
controlPv "BL24I-
|
|
2179
|
-
pressValue "#
|
|
2180
|
-
releaseValue "#
|
|
2181
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2182
|
+
pressValue "#6J:-10"
|
|
2183
|
+
releaseValue "#6P"
|
|
2181
2184
|
3d
|
|
2182
2185
|
font "helvetica-medium-r-18.0"
|
|
2183
2186
|
endObjectProperties
|
|
@@ -2197,9 +2200,9 @@ onColor index 24
|
|
|
2197
2200
|
offColor index 19
|
|
2198
2201
|
topShadowColor index 7
|
|
2199
2202
|
botShadowColor index 7
|
|
2200
|
-
controlPv "BL24I-
|
|
2201
|
-
pressValue "#
|
|
2202
|
-
releaseValue "#
|
|
2203
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2204
|
+
pressValue "#6J:-31750"
|
|
2205
|
+
releaseValue "#6P"
|
|
2203
2206
|
onLabel "Y+Y"
|
|
2204
2207
|
offLabel "+Y+"
|
|
2205
2208
|
3d
|
|
@@ -2221,9 +2224,9 @@ onColor index 24
|
|
|
2221
2224
|
offColor index 19
|
|
2222
2225
|
topShadowColor index 7
|
|
2223
2226
|
botShadowColor index 7
|
|
2224
|
-
controlPv "BL24I-
|
|
2225
|
-
pressValue "#
|
|
2226
|
-
releaseValue "#
|
|
2227
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2228
|
+
pressValue "#5J:31750"
|
|
2229
|
+
releaseValue "#5P"
|
|
2227
2230
|
onLabel "X+X"
|
|
2228
2231
|
offLabel "+X+"
|
|
2229
2232
|
3d
|
|
@@ -2245,9 +2248,9 @@ onColor index 24
|
|
|
2245
2248
|
offColor index 19
|
|
2246
2249
|
topShadowColor index 7
|
|
2247
2250
|
botShadowColor index 7
|
|
2248
|
-
controlPv "BL24I-
|
|
2249
|
-
pressValue "#
|
|
2250
|
-
releaseValue "#
|
|
2251
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2252
|
+
pressValue "#5J:-31750"
|
|
2253
|
+
releaseValue "#5P"
|
|
2251
2254
|
onLabel "X-X"
|
|
2252
2255
|
offLabel "-X-"
|
|
2253
2256
|
3d
|
|
@@ -2269,9 +2272,9 @@ onColor index 24
|
|
|
2269
2272
|
offColor index 19
|
|
2270
2273
|
topShadowColor index 7
|
|
2271
2274
|
botShadowColor index 7
|
|
2272
|
-
controlPv "BL24I-
|
|
2273
|
-
pressValue "#
|
|
2274
|
-
releaseValue "#
|
|
2275
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2276
|
+
pressValue "#6J:31750"
|
|
2277
|
+
releaseValue "#6P"
|
|
2275
2278
|
onLabel "Y-Y"
|
|
2276
2279
|
offLabel "-Y-"
|
|
2277
2280
|
3d
|
|
@@ -2293,9 +2296,9 @@ onColor index 22
|
|
|
2293
2296
|
offColor index 17
|
|
2294
2297
|
topShadowColor index 7
|
|
2295
2298
|
botShadowColor index 7
|
|
2296
|
-
controlPv "BL24I-
|
|
2297
|
-
pressValue "#
|
|
2298
|
-
releaseValue "#
|
|
2299
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2300
|
+
pressValue "#5J:3750"
|
|
2301
|
+
releaseValue "#5P"
|
|
2299
2302
|
offLabel "+3"
|
|
2300
2303
|
3d
|
|
2301
2304
|
font "helvetica-medium-r-18.0"
|
|
@@ -2316,9 +2319,9 @@ onColor index 22
|
|
|
2316
2319
|
offColor index 17
|
|
2317
2320
|
topShadowColor index 7
|
|
2318
2321
|
botShadowColor index 7
|
|
2319
|
-
controlPv "BL24I-
|
|
2320
|
-
pressValue "#
|
|
2321
|
-
releaseValue "#
|
|
2322
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2323
|
+
pressValue "#5J:1250"
|
|
2324
|
+
releaseValue "#5P"
|
|
2322
2325
|
offLabel "+1"
|
|
2323
2326
|
3d
|
|
2324
2327
|
font "helvetica-medium-r-8.0"
|
|
@@ -2339,9 +2342,9 @@ onColor index 22
|
|
|
2339
2342
|
offColor index 17
|
|
2340
2343
|
topShadowColor index 7
|
|
2341
2344
|
botShadowColor index 7
|
|
2342
|
-
controlPv "BL24I-
|
|
2343
|
-
pressValue "#
|
|
2344
|
-
releaseValue "#
|
|
2345
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2346
|
+
pressValue "#5J:-3750"
|
|
2347
|
+
releaseValue "#5P"
|
|
2345
2348
|
offLabel "-3"
|
|
2346
2349
|
3d
|
|
2347
2350
|
font "helvetica-medium-r-18.0"
|
|
@@ -2362,9 +2365,9 @@ onColor index 22
|
|
|
2362
2365
|
offColor index 17
|
|
2363
2366
|
topShadowColor index 7
|
|
2364
2367
|
botShadowColor index 7
|
|
2365
|
-
controlPv "BL24I-
|
|
2366
|
-
pressValue "#
|
|
2367
|
-
releaseValue "#
|
|
2368
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2369
|
+
pressValue "#5J:-1250"
|
|
2370
|
+
releaseValue "#5P"
|
|
2368
2371
|
offLabel "-1"
|
|
2369
2372
|
3d
|
|
2370
2373
|
font "arial-medium-r-16.0"
|
|
@@ -2385,9 +2388,9 @@ onColor index 22
|
|
|
2385
2388
|
offColor index 17
|
|
2386
2389
|
topShadowColor index 7
|
|
2387
2390
|
botShadowColor index 7
|
|
2388
|
-
controlPv "BL24I-
|
|
2389
|
-
pressValue "#
|
|
2390
|
-
releaseValue "#
|
|
2391
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2392
|
+
pressValue "#6J:3750"
|
|
2393
|
+
releaseValue "#6P"
|
|
2391
2394
|
offLabel "-3"
|
|
2392
2395
|
3d
|
|
2393
2396
|
font "helvetica-medium-r-18.0"
|
|
@@ -2408,9 +2411,9 @@ onColor index 22
|
|
|
2408
2411
|
offColor index 17
|
|
2409
2412
|
topShadowColor index 7
|
|
2410
2413
|
botShadowColor index 7
|
|
2411
|
-
controlPv "BL24I-
|
|
2412
|
-
pressValue "#
|
|
2413
|
-
releaseValue "#
|
|
2414
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2415
|
+
pressValue "#6J:1250"
|
|
2416
|
+
releaseValue "#6P"
|
|
2414
2417
|
offLabel "-1"
|
|
2415
2418
|
3d
|
|
2416
2419
|
font "helvetica-medium-r-8.0"
|
|
@@ -2431,9 +2434,9 @@ onColor index 22
|
|
|
2431
2434
|
offColor index 17
|
|
2432
2435
|
topShadowColor index 7
|
|
2433
2436
|
botShadowColor index 7
|
|
2434
|
-
controlPv "BL24I-
|
|
2435
|
-
pressValue "#
|
|
2436
|
-
releaseValue "#
|
|
2437
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2438
|
+
pressValue "#6J:-3750"
|
|
2439
|
+
releaseValue "#6P"
|
|
2437
2440
|
offLabel "+3"
|
|
2438
2441
|
3d
|
|
2439
2442
|
font "helvetica-medium-r-18.0"
|
|
@@ -2454,9 +2457,9 @@ onColor index 22
|
|
|
2454
2457
|
offColor index 17
|
|
2455
2458
|
topShadowColor index 7
|
|
2456
2459
|
botShadowColor index 7
|
|
2457
|
-
controlPv "BL24I-
|
|
2458
|
-
pressValue "#
|
|
2459
|
-
releaseValue "#
|
|
2460
|
+
controlPv "BL24I-MO-IOC-13:PMAC:console"
|
|
2461
|
+
pressValue "#6J:-1250"
|
|
2462
|
+
releaseValue "#6P"
|
|
2460
2463
|
offLabel "+1"
|
|
2461
2464
|
3d
|
|
2462
2465
|
font "helvetica-medium-r-8.0"
|
|
@@ -2682,7 +2685,7 @@ h 10
|
|
|
2682
2685
|
lineColor index 25
|
|
2683
2686
|
fill
|
|
2684
2687
|
fillColor index 35
|
|
2685
|
-
visPv "BL24I-MO-IOC-
|
|
2688
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
2686
2689
|
visMin "1"
|
|
2687
2690
|
visMax "2"
|
|
2688
2691
|
endObjectProperties
|
|
@@ -2700,7 +2703,7 @@ h 10
|
|
|
2700
2703
|
lineColor index 25
|
|
2701
2704
|
fill
|
|
2702
2705
|
fillColor index 35
|
|
2703
|
-
visPv "BL24I-MO-IOC-
|
|
2706
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
2704
2707
|
visMin "1"
|
|
2705
2708
|
visMax "2"
|
|
2706
2709
|
endObjectProperties
|
|
@@ -2718,7 +2721,7 @@ h 10
|
|
|
2718
2721
|
lineColor index 25
|
|
2719
2722
|
fill
|
|
2720
2723
|
fillColor index 35
|
|
2721
|
-
visPv "BL24I-MO-IOC-
|
|
2724
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
2722
2725
|
visMin "1"
|
|
2723
2726
|
visMax "2"
|
|
2724
2727
|
endObjectProperties
|
|
@@ -2736,7 +2739,7 @@ h 10
|
|
|
2736
2739
|
lineColor index 25
|
|
2737
2740
|
fill
|
|
2738
2741
|
fillColor index 35
|
|
2739
|
-
visPv "BL24I-MO-IOC-
|
|
2742
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
2740
2743
|
visMin "1"
|
|
2741
2744
|
visMax "2"
|
|
2742
2745
|
endObjectProperties
|
|
@@ -2754,7 +2757,7 @@ h 10
|
|
|
2754
2757
|
lineColor index 25
|
|
2755
2758
|
fill
|
|
2756
2759
|
fillColor index 35
|
|
2757
|
-
visPv "BL24I-MO-IOC-
|
|
2760
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
2758
2761
|
visMin "1"
|
|
2759
2762
|
visMax "2"
|
|
2760
2763
|
endObjectProperties
|
|
@@ -2772,7 +2775,7 @@ h 10
|
|
|
2772
2775
|
lineColor index 25
|
|
2773
2776
|
fill
|
|
2774
2777
|
fillColor index 35
|
|
2775
|
-
visPv "BL24I-MO-IOC-
|
|
2778
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
2776
2779
|
visMin "1"
|
|
2777
2780
|
visMax "2"
|
|
2778
2781
|
endObjectProperties
|
|
@@ -2790,7 +2793,7 @@ h 10
|
|
|
2790
2793
|
lineColor index 25
|
|
2791
2794
|
fill
|
|
2792
2795
|
fillColor index 35
|
|
2793
|
-
visPv "BL24I-MO-IOC-
|
|
2796
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
2794
2797
|
visMin "1"
|
|
2795
2798
|
visMax "2"
|
|
2796
2799
|
endObjectProperties
|
|
@@ -2843,7 +2846,7 @@ h 21
|
|
|
2843
2846
|
font "arial-medium-r-18.0"
|
|
2844
2847
|
fgColor index 35
|
|
2845
2848
|
bgColor index 13
|
|
2846
|
-
visPv "BL24I-MO-IOC-
|
|
2849
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
2847
2850
|
visMin "1"
|
|
2848
2851
|
visMax "2"
|
|
2849
2852
|
value {
|
|
@@ -2865,7 +2868,7 @@ h 21
|
|
|
2865
2868
|
font "arial-medium-r-18.0"
|
|
2866
2869
|
fgColor index 35
|
|
2867
2870
|
bgColor index 13
|
|
2868
|
-
visPv "BL24I-MO-IOC-
|
|
2871
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
2869
2872
|
visMin "1"
|
|
2870
2873
|
visMax "2"
|
|
2871
2874
|
value {
|
|
@@ -2956,7 +2959,7 @@ font "helvetica-medium-r-18.0"
|
|
|
2956
2959
|
buttonLabel "Set Fiducial 0"
|
|
2957
2960
|
numCmds 1
|
|
2958
2961
|
command {
|
|
2959
|
-
0 "caput BL24I-
|
|
2962
|
+
0 "caput BL24I-MO-IOC-13:PMAC:console \\#5hmz\\#6hmz\\#7hmz"
|
|
2960
2963
|
}
|
|
2961
2964
|
endObjectProperties
|
|
2962
2965
|
|
|
@@ -3017,7 +3020,7 @@ h 21
|
|
|
3017
3020
|
font "arial-medium-r-18.0"
|
|
3018
3021
|
fgColor index 35
|
|
3019
3022
|
bgColor index 13
|
|
3020
|
-
visPv "BL24I-MO-IOC-
|
|
3023
|
+
visPv "BL24I-MO-IOC-13:GP1"
|
|
3021
3024
|
visMin "1"
|
|
3022
3025
|
visMax "2"
|
|
3023
3026
|
value {
|
|
@@ -3026,29 +3029,6 @@ value {
|
|
|
3026
3029
|
autoSize
|
|
3027
3030
|
endObjectProperties
|
|
3028
3031
|
|
|
3029
|
-
# (Text Monitor)
|
|
3030
|
-
object activeXTextDspClass:noedit
|
|
3031
|
-
beginObjectProperties
|
|
3032
|
-
major 4
|
|
3033
|
-
minor 6
|
|
3034
|
-
release 0
|
|
3035
|
-
x 350
|
|
3036
|
-
y 830
|
|
3037
|
-
w 60
|
|
3038
|
-
h 18
|
|
3039
|
-
controlPv "BL24I-EA-PILAT-01:cam1:DetectorState_RBV"
|
|
3040
|
-
font "arial-medium-r-16.0"
|
|
3041
|
-
fgColor index 16
|
|
3042
|
-
fgAlarm
|
|
3043
|
-
bgColor index 10
|
|
3044
|
-
autoHeight
|
|
3045
|
-
limitsFromDb
|
|
3046
|
-
nullColor index 0
|
|
3047
|
-
useHexPrefix
|
|
3048
|
-
newPos
|
|
3049
|
-
objType "monitors"
|
|
3050
|
-
endObjectProperties
|
|
3051
|
-
|
|
3052
3032
|
# (Static Text)
|
|
3053
3033
|
object activeXTextClass
|
|
3054
3034
|
beginObjectProperties
|
|
@@ -3057,14 +3037,14 @@ minor 1
|
|
|
3057
3037
|
release 1
|
|
3058
3038
|
x 305
|
|
3059
3039
|
y 830
|
|
3060
|
-
w
|
|
3040
|
+
w 42
|
|
3061
3041
|
h 18
|
|
3062
3042
|
font "arial-medium-r-16.0"
|
|
3063
3043
|
fgColor index 14
|
|
3064
3044
|
bgColor index 0
|
|
3065
3045
|
useDisplayBg
|
|
3066
3046
|
value {
|
|
3067
|
-
"
|
|
3047
|
+
"JF9M"
|
|
3068
3048
|
}
|
|
3069
3049
|
autoSize
|
|
3070
3050
|
endObjectProperties
|
|
@@ -3184,7 +3164,7 @@ fgColor index 14
|
|
|
3184
3164
|
bgColor index 3
|
|
3185
3165
|
topShadowColor index 1
|
|
3186
3166
|
botShadowColor index 8
|
|
3187
|
-
controlPv "BL24I-MO-IOC-
|
|
3167
|
+
controlPv "BL24I-MO-IOC-13:GP1"
|
|
3188
3168
|
font "arial-medium-r-18.0"
|
|
3189
3169
|
numItems 5
|
|
3190
3170
|
symbolTag {
|
|
@@ -3371,7 +3351,7 @@ h 90
|
|
|
3371
3351
|
lineColor index 7
|
|
3372
3352
|
fill
|
|
3373
3353
|
fillColor index 7
|
|
3374
|
-
visPv "BL24I-MO-IOC-
|
|
3354
|
+
visPv "BL24I-MO-IOC-13:GP4"
|
|
3375
3355
|
visInvert
|
|
3376
3356
|
visMin "1"
|
|
3377
3357
|
visMax "10"
|
|
@@ -3581,7 +3561,7 @@ fgColor index 14
|
|
|
3581
3561
|
bgColor index 3
|
|
3582
3562
|
topShadowColor index 1
|
|
3583
3563
|
botShadowColor index 8
|
|
3584
|
-
controlPv "BL24I-MO-IOC-
|
|
3564
|
+
controlPv "BL24I-MO-IOC-13:GP1"
|
|
3585
3565
|
font "arial-medium-r-18.0"
|
|
3586
3566
|
numItems 5
|
|
3587
3567
|
symbolTag {
|
|
@@ -3660,7 +3640,7 @@ x 350
|
|
|
3660
3640
|
y 880
|
|
3661
3641
|
w 60
|
|
3662
3642
|
h 18
|
|
3663
|
-
controlPv "BL24I-MO-IOC-
|
|
3643
|
+
controlPv "BL24I-MO-IOC-13:GP101"
|
|
3664
3644
|
font "arial-medium-r-16.0"
|
|
3665
3645
|
fgColor index 16
|
|
3666
3646
|
bgColor index 10
|
|
@@ -3859,7 +3839,7 @@ buttonLabel "Stages"
|
|
|
3859
3839
|
numPvs 4
|
|
3860
3840
|
numDsps 1
|
|
3861
3841
|
displayFileName {
|
|
3862
|
-
0 "/dls_sw/work/R3.14.12.7/ioc/BL24I/BL/data/BL24I-
|
|
3842
|
+
0 "/dls_sw/work/R3.14.12.7/ioc/BL24I/BL/data/BL24I-VGONIO-SERIAL-1.edl"
|
|
3863
3843
|
}
|
|
3864
3844
|
endObjectProperties
|
|
3865
3845
|
|
|
@@ -4134,3 +4114,23 @@ value {
|
|
|
4134
4114
|
}
|
|
4135
4115
|
autoSize
|
|
4136
4116
|
endObjectProperties
|
|
4117
|
+
|
|
4118
|
+
# (Static Text)
|
|
4119
|
+
object activeXTextClass
|
|
4120
|
+
beginObjectProperties
|
|
4121
|
+
major 4
|
|
4122
|
+
minor 1
|
|
4123
|
+
release 1
|
|
4124
|
+
x 365
|
|
4125
|
+
y 830
|
|
4126
|
+
w 35
|
|
4127
|
+
h 18
|
|
4128
|
+
font "arial-medium-i-16.0"
|
|
4129
|
+
fgColor index 11
|
|
4130
|
+
bgColor index 0
|
|
4131
|
+
useDisplayBg
|
|
4132
|
+
value {
|
|
4133
|
+
"soon"
|
|
4134
|
+
}
|
|
4135
|
+
autoSize
|
|
4136
|
+
endObjectProperties
|