mx-bluesky 1.5.10__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.
Files changed (121) hide show
  1. mx_bluesky/_version.py +2 -2
  2. mx_bluesky/beamlines/aithre_lasershaping/experiment_plans/__init__.py +0 -0
  3. mx_bluesky/beamlines/aithre_lasershaping/experiment_plans/robot_load_plan.py +198 -0
  4. mx_bluesky/beamlines/aithre_lasershaping/goniometer_controls.py +2 -2
  5. mx_bluesky/beamlines/aithre_lasershaping/parameters/__init__.py +0 -0
  6. mx_bluesky/beamlines/aithre_lasershaping/parameters/constants.py +17 -0
  7. mx_bluesky/beamlines/aithre_lasershaping/parameters/robot_load_parameters.py +13 -0
  8. mx_bluesky/beamlines/aithre_lasershaping/pin_tip_centring.py +31 -0
  9. mx_bluesky/beamlines/aithre_lasershaping/robot_load.py +80 -0
  10. mx_bluesky/beamlines/i02_1/parameters/gridscan.py +1 -1
  11. mx_bluesky/beamlines/i04/__init__.py +6 -2
  12. mx_bluesky/beamlines/i04/callbacks/murko_callback.py +27 -12
  13. mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py +94 -20
  14. mx_bluesky/beamlines/i04/external_interaction/__init__.py +0 -0
  15. mx_bluesky/beamlines/i04/external_interaction/config_server.py +15 -0
  16. mx_bluesky/beamlines/i04/oav_centering_plans/__init__.py +0 -0
  17. mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py +115 -0
  18. mx_bluesky/beamlines/i04/parameters/__init__.py +0 -0
  19. mx_bluesky/beamlines/i04/parameters/constants.py +21 -0
  20. mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py +24 -1
  21. mx_bluesky/beamlines/i04/thawing_plan.py +149 -154
  22. mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/do_darks.py +55 -10
  23. mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_external_acquisition.py +1 -1
  24. mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/plan_utils.py +1 -1
  25. mx_bluesky/beamlines/i24/serial/__init__.py +7 -5
  26. mx_bluesky/beamlines/i24/serial/dcid.py +6 -7
  27. mx_bluesky/beamlines/i24/serial/extruder/{i24ssx_Extruder_Collect_py3v2.py → i24ssx_extruder_collect_py3v2.py} +70 -37
  28. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl +11 -11
  29. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl +3 -3
  30. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl +142 -142
  31. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl +135 -135
  32. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/PMAC_Command.edl +8 -8
  33. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl +13 -13
  34. mx_bluesky/beamlines/i24/serial/fixed_target/{i24ssx_Chip_Collect_py3v1.py → i24ssx_chip_collect_py3v1.py} +12 -9
  35. mx_bluesky/beamlines/i24/serial/fixed_target/{i24ssx_Chip_Manager_py3v1.py → i24ssx_chip_manager_py3v1.py} +81 -78
  36. mx_bluesky/beamlines/i24/serial/fixed_target/{i24ssx_Chip_StartUp_py3v1.py → i24ssx_chip_startup_py3v1.py} +3 -3
  37. mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py +33 -33
  38. mx_bluesky/beamlines/i24/serial/log.py +11 -11
  39. mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json +3 -3
  40. mx_bluesky/beamlines/i24/serial/parameters/utils.py +5 -5
  41. mx_bluesky/beamlines/i24/serial/setup_beamline/ca.py +0 -12
  42. mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py +122 -334
  43. mx_bluesky/beamlines/i24/serial/setup_beamline/pv_abstract.py +5 -5
  44. mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py +30 -251
  45. mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py +3 -3
  46. mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py +4 -4
  47. mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py +103 -16
  48. mx_bluesky/beamlines/i24/serial/web_gui_plans/oav_plans.py +64 -0
  49. mx_bluesky/beamlines/i24/serial/write_nexus.py +4 -4
  50. mx_bluesky/common/device_setup_plans/gonio.py +28 -0
  51. mx_bluesky/common/device_setup_plans/manipulate_sample.py +8 -1
  52. mx_bluesky/common/device_setup_plans/robot_load_unload.py +1 -1
  53. mx_bluesky/common/device_setup_plans/setup_oav.py +8 -0
  54. mx_bluesky/common/device_setup_plans/setup_zebra_and_shutter.py +0 -5
  55. mx_bluesky/common/device_setup_plans/xbpm_feedback.py +8 -1
  56. mx_bluesky/common/experiment_plans/beamstop_check.py +229 -0
  57. mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py +8 -6
  58. mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py +2 -2
  59. mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py +1 -1
  60. mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py +7 -4
  61. mx_bluesky/common/experiment_plans/inner_plans/write_sample_status.py +2 -2
  62. mx_bluesky/common/experiment_plans/oav_snapshot_plan.py +1 -2
  63. mx_bluesky/{hyperion → common}/experiment_plans/pin_tip_centring_plan.py +23 -24
  64. mx_bluesky/common/external_interaction/callbacks/common/grid_detection_callback.py +5 -0
  65. mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py +13 -15
  66. mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py +3 -5
  67. mx_bluesky/common/external_interaction/callbacks/common/plan_reactive_callback.py +1 -1
  68. mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py +2 -2
  69. mx_bluesky/common/external_interaction/callbacks/sample_handling/sample_handling_callback.py +3 -3
  70. mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py +12 -10
  71. mx_bluesky/common/external_interaction/callbacks/xray_centre/nexus_callback.py +2 -2
  72. mx_bluesky/common/external_interaction/config_server.py +4 -4
  73. mx_bluesky/common/external_interaction/ispyb/data_model.py +11 -4
  74. mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py +163 -4
  75. mx_bluesky/common/external_interaction/ispyb/ispyb_store.py +76 -167
  76. mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py +0 -14
  77. mx_bluesky/common/external_interaction/nexus/nexus_utils.py +2 -2
  78. mx_bluesky/common/external_interaction/nexus/write_nexus.py +3 -3
  79. mx_bluesky/common/parameters/components.py +1 -0
  80. mx_bluesky/common/parameters/constants.py +4 -3
  81. mx_bluesky/common/parameters/device_composites.py +4 -2
  82. mx_bluesky/common/parameters/gridscan.py +2 -2
  83. mx_bluesky/common/utils/exceptions.py +24 -7
  84. mx_bluesky/common/utils/log.py +13 -4
  85. mx_bluesky/common/utils/tracing.py +5 -5
  86. mx_bluesky/common/utils/utils.py +56 -8
  87. mx_bluesky/hyperion/__main__.py +6 -16
  88. mx_bluesky/hyperion/baton_handler.py +38 -14
  89. mx_bluesky/hyperion/device_setup_plans/utils.py +1 -1
  90. mx_bluesky/hyperion/experiment_plans/experiment_registry.py +1 -1
  91. mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py +15 -13
  92. mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py +2 -2
  93. mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py +9 -9
  94. mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py +7 -8
  95. mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py +3 -10
  96. mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py +4 -2
  97. mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py +10 -4
  98. mx_bluesky/hyperion/experiment_plans/set_energy_plan.py +2 -2
  99. mx_bluesky/hyperion/experiment_plans/udc_default_state.py +160 -0
  100. mx_bluesky/hyperion/external_interaction/agamemnon.py +3 -3
  101. mx_bluesky/hyperion/external_interaction/callbacks/__main__.py +2 -2
  102. mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py +3 -3
  103. mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py +1 -0
  104. mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py +3 -6
  105. mx_bluesky/hyperion/external_interaction/config_server.py +5 -5
  106. mx_bluesky/hyperion/parameters/constants.py +11 -4
  107. mx_bluesky/hyperion/parameters/device_composites.py +2 -2
  108. mx_bluesky/hyperion/parameters/gridscan.py +4 -4
  109. mx_bluesky/hyperion/parameters/robot_load.py +1 -9
  110. mx_bluesky/hyperion/plan_runner.py +6 -6
  111. mx_bluesky/hyperion/runner.py +10 -8
  112. mx_bluesky/jupyter_example.ipynb +3 -3
  113. {mx_bluesky-1.5.10.dist-info → mx_bluesky-1.5.12.dist-info}/METADATA +9 -7
  114. {mx_bluesky-1.5.10.dist-info → mx_bluesky-1.5.12.dist-info}/RECORD +118 -104
  115. mx_bluesky/common/experiment_plans/inner_plans/udc_default_state.py +0 -65
  116. mx_bluesky/common/external_interaction/callbacks/common/logging_callback.py +0 -29
  117. mx_bluesky/hyperion/device_setup_plans/smargon.py +0 -25
  118. {mx_bluesky-1.5.10.dist-info → mx_bluesky-1.5.12.dist-info}/WHEEL +0 -0
  119. {mx_bluesky-1.5.10.dist-info → mx_bluesky-1.5.12.dist-info}/entry_points.txt +0 -0
  120. {mx_bluesky-1.5.10.dist-info → mx_bluesky-1.5.12.dist-info}/licenses/LICENSE +0 -0
  121. {mx_bluesky-1.5.10.dist-info → mx_bluesky-1.5.12.dist-info}/top_level.txt +0 -0
mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py CHANGED
@@ -4,36 +4,17 @@ PVs
4
4
  # Now with Eiger goodness
5
5
  """
6
6
 
7
- import os
8
- import sys
9
-
10
-
11
- def __show__(name):
12
- """Checks available variables given a string, uses first two letters"""
13
- for things in globals():
14
- if name[:2].lower() in things.lower():
15
- print("Available:", things)
16
- print()
17
-
18
-
19
- def __which__():
20
- """Return script directory, used for finding which pv.py you are running"""
21
- pathname, scriptname = os.path.split(sys.argv[0])
22
- print("Current dir: " + os.path.abspath(pathname))
23
- print("path to pv.py: ")
24
-
25
-
26
7
  requested_transmission = "BL24I-OP-ATTN-01:T2A:SETVAL1"
27
8
 
28
9
 
29
10
  # Eiger
30
11
  eiger_filepath = "BL24I-EA-EIGER-01:CAM:FilePath"
31
12
  eiger_filename = "BL24I-EA-EIGER-01:CAM:FileName"
32
- eiger_ODfilepath = "BL24I-EA-EIGER-01:OD:FilePath"
33
- eiger_ODfilename = "BL24I-EA-EIGER-01:OD:FileName"
34
- eiger_seqID = "BL24I-EA-EIGER-01:CAM:SequenceId"
13
+ eiger_od_filepath = "BL24I-EA-EIGER-01:OD:FilePath"
14
+ eiger_od_filename = "BL24I-EA-EIGER-01:OD:FileName"
15
+ eiger_seq_id = "BL24I-EA-EIGER-01:CAM:SequenceId"
35
16
  eiger_numimages = "BL24I-EA-EIGER-01:CAM:NumImages"
36
- eiger_ODnumcapture = "BL24I-EA-EIGER-01:OD:NumCapture"
17
+ eiger_od_num_capture = "BL24I-EA-EIGER-01:OD:NumCapture"
37
18
  eiger_numexpimage = "BL24I-EA-EIGER-01:CAM:NumExposures"
38
19
  eiger_acquiretime = "BL24I-EA-EIGER-01:CAM:AcquireTime"
39
20
  eiger_acquireperiod = "BL24I-EA-EIGER-01:CAM:AcquirePeriod"
@@ -47,194 +28,34 @@ eiger_stream = "BL24I-EA-EIGER-01:CAM:StreamEnable"
47
28
  eiger_monitor = "BL24I-EA-EIGER-01:CAM:MonitorEnable"
48
29
  eiger_datasource = "BL24I-EA-EIGER-01:CAM:DataSource"
49
30
  eiger_statuspoll = "BL24I-EA-EIGER-01:CAM:ReadStatus.SCAN"
50
- eiger_ROImode = "BL24I-EA-EIGER-01:CAM:ROIMode"
31
+ eiger_roi_mode = "BL24I-EA-EIGER-01:CAM:ROIMode"
51
32
  eiger_ff = "BL24I-EA-EIGER-01:CAM:FlatfieldApplied"
52
33
  eiger_compress = "BL24I-EA-EIGER-01:CAM:FWCompression"
53
34
  eiger_compresstype = "BL24I-EA-EIGER-01:CAM:CompressionAlgo"
54
- eiger_ODcompress = "BL24I-EA-EIGER-01:OD:Compression"
55
- eiger_ODdatatype = "BL24I-EA-EIGER-01:OD:DataType"
35
+ eiger_od_compress = "BL24I-EA-EIGER-01:OD:Compression"
36
+ eiger_od_datatype = "BL24I-EA-EIGER-01:OD:DataType"
56
37
  eiger_bitdepthrbv = "BL24I-EA-EIGER-01:CAM:BitDepthImage_RBV"
57
38
  eiger_countmode = "BL24I-EA-EIGER-01:CAM:CountingMode"
58
39
  eiger_autosum = "BL24I-EA-EIGER-01:CAM:AutoSummation"
59
40
  eiger_hdrdetail = "BL24I-EA-EIGER-01:CAM:StreamHdrDetail"
60
41
  eiger_hdrappen = "BL24I-EA-EIGER-01:CAM:StreamHdrAppendix"
61
- eiger_ODcapture = "BL24I-EA-EIGER-01:OD:Capture"
42
+ eiger_od_capture = "BL24I-EA-EIGER-01:OD:Capture"
62
43
  eiger_acquire = "BL24I-EA-EIGER-01:CAM:Acquire"
63
44
  eiger_wavelength = "BL24I-EA-EIGER-01:CAM:Wavelength"
64
45
  eiger_detdist = "BL24I-EA-EIGER-01:CAM:DetDist"
65
46
  eiger_beamx = "BL24I-EA-EIGER-01:CAM:BeamX"
66
47
  eiger_beamy = "BL24I-EA-EIGER-01:CAM:BeamY"
67
48
  eiger_omegaincr = "BL24I-EA-EIGER-01:CAM:OmegaIncr"
68
- eiger_ODfilenameRBV = "BL24I-EA-EIGER-01:OD:FP:FileName_RBV"
69
-
70
- # BPMs
71
- qbpm1_inten = "BL24I-DI-QBPM-01:INTEN"
72
- qbpm1_intenN = "BL24I-DI-QBPM-01:INTEN_N"
73
- qbpm2_inten = "BL24I-DI-QBPM-02:INTEN"
74
- qbpm2_intenN = "BL24I-DI-QBPM-02:INTEN_N"
75
- qbpm3_inten = "BL24I-DI-QBPM-03:INTEN"
76
- qbpm3_intenN = "BL24I-DI-QBPM-03:INTEN_N"
77
- # Cividec
78
- cividec_x = "BL24I-AL-XBPM-01:XS"
79
- cividec_y = "BL24I-AL-XBPM-01:YS"
80
- cividec_sumI = "BL24I-EA-XBPM-01:SumAll:Sigma_RBV"
81
- cividec_beamx = "BL24I-EA-XBPM-01:PosX:MeanValue_RBV"
82
- cividec_beamy = "BL24I-EA-XBPM-01:PosY:MeanValue_RBV"
83
- # Lancelot
84
- lance_x = "BL24I-EA-DET-03:X"
85
- lance_y = "BL24I-EA-DET-03:Y"
86
- lance_beamx = "BL24I-EA-DET-03:STAT:CentroidX_RBV"
87
- lance_beamy = "BL24I-EA-DET-03:STAT:CentroidY_RBV"
88
- # FAST SHUTTER
89
- shtr_ctrl1 = "BL24I-EA-SHTR-01:CTRL1"
90
- shtr_ctrl2 = "BL24I-EA-SHTR-01:CTRL2"
91
- shtr_toggle = shtr_ctrl1
92
- shtr_pos = shtr_ctrl2
93
- # XPRESS3
94
- xsp3_acquire = "BL24I-EA-XSP3-01:Acquire"
95
- xsp3_erase = "BL24I-EA-XSP3-01:ERASE"
96
- xsp3_acquiretime = "BL24I-EA-XSP3-01:AcquireTime"
97
- xsp3_hdf5_filename = "BL24I-EA-XSP3-01:HDF5:FileName"
98
- xsp3_hdf5_filepath = "BL24I-EA-XSP3-01:HDF5:FilePath"
99
- xsp3_numimages = "BL24I-EA-XSP3-01:NumImages"
100
- xsp3_triggermode = "BL24I-EA-XSP3-01:TriggerMode"
101
- xsp3_c1_mca_roi1_llm = "BL24I-EA-XSP3-01:C1_MCA_ROI1_LLM"
102
- xsp3_c1_mca_roi2_llm = "BL24I-EA-XSP3-01:C1_MCA_ROI2_LLM"
103
- xsp3_c1_mca_roi3_llm = "BL24I-EA-XSP3-01:C1_MCA_ROI3_LLM"
104
- xsp3_c1_mca_roi4_llm = "BL24I-EA-XSP3-01:C1_MCA_ROI4_LLM"
105
- xsp3_c1_mca_roi1_hlm = "BL24I-EA-XSP3-01:C1_MCA_ROI1_HLM"
106
- xsp3_c1_mca_roi2_hlm = "BL24I-EA-XSP3-01:C1_MCA_ROI2_HLM"
107
- xsp3_c1_mca_roi3_hlm = "BL24I-EA-XSP3-01:C1_MCA_ROI3_HLM"
108
- xsp3_c1_mca_roi4_hlm = "BL24I-EA-XSP3-01:C1_MCA_ROI4_HLM"
109
- xsp3_c1_roi1_value_rbv = "BL24I-EA-XSP3-01:C1_ROI1:Value_RBV"
110
- xsp3_c1_roi2_value_rbv = "BL24I-EA-XSP3-01:C1_ROI2:Value_RBV"
111
- xsp3_c1_roi3_value_rbv = "BL24I-EA-XSP3-01:C1_ROI3:Value_RBV"
112
- xsp3_c1_roi4_value_rbv = "BL24I-EA-XSP3-01:C1_ROI4:Value_RBV"
113
- # Ring parameter
114
- ring_current = "SR-DI-DCCT-01:SIGNAL"
115
- ring_energy = "CS-CS-MSTAT-01:BEAMENERGY"
116
- beam_energy = "BL24I-OP-DCM-01:ENERGY.RBV"
117
- # Shutter status
118
- port_shutter_status = "FE24I-PS-SHTR-01:STA"
119
- optics_hutch_shutter_status = "FE24I-VA-GROUP-01:BLENABLE"
120
- experimental_hutch_shutter_status = "BL24I-PS-SHTR-01:STA"
121
- # S1
122
- s1_x_gap = "BL24I-AL-SLITS-01:X:GAP"
123
- s1_x_inboard = "BL24I-AL-SLITS-01:X:INBOARD"
124
- s1_y_gap = "BL24I-AL-SLITS-01:Y:GAP"
125
- s1_y_bottom = "BL24I-AL-SLITS-01:Y:BOTTOM"
126
- # Mono
127
- dcm_bragg = "BL24I-MO-DCM-01:BRAGG"
128
- dcm_gap = "BL24I-MO-DCM-01:GAP"
129
- dcm_roll1 = "BL24I-MO-DCM-01:XTAL1:ROLL"
130
- dcm_roll2 = "BL24I-MO-DCM-01:XTAL2:ROLL"
131
- dcm_pitch2 = "BL24I-MO-DCM-01:XTAL2:PITCH"
132
- dcm_energy = "BL24I-MO-DCM-01:ENERGY"
49
+ eiger_od_filename_rbv = "BL24I-EA-EIGER-01:OD:FP:FileName_RBV"
133
50
 
134
- # S2
135
- s2_x_plus = "BL24I-AL-SLITS-02:X:PLUS"
136
- s2_x_minus = "BL24I-AL-SLITS-02:X:MINUS"
137
- s2_y_plus = "BL24I-AL-SLITS-02:Y:PLUS"
138
- s2_y_minus = "BL24I-AL-SLITS-02:Y:MINUS"
139
- # PreFocussing Mirrors
140
- hpfm_y1 = "BL24I-OP-HPFM-01:Y1"
141
- hpfm_y2 = "BL24I-OP-HPFM-01:Y2"
142
- hpfm_y3 = "BL24I-OP-HPFM-01:Y3"
143
- hpfm_x1 = "BL24I-OP-HPFM-01:X1"
144
- hpfm_x2 = "BL24I-OP-HPFM-01:X2"
145
- vpfm_y1 = "BL24I-OP-VPFM-01:Y1"
146
- vpfm_y2 = "BL24I-OP-VPFM-01:Y2"
147
- vpfm_y3 = "BL24I-OP-VPFM-01:Y3"
148
- vpfm_x1 = "BL24I-OP-VPFM-01:X1"
149
- vpfm_x2 = "BL24I-OP-VPFM-01:X2"
150
- # S3
151
- s3_x_gap = "BL24I-AL-SLITS-03:X:GAP"
152
- s3_x_inboard = "BL24I-AL-SLITS-03:X:INBOARD"
153
- s3_y_gap = "BL24I-AL-SLITS-03:Y:GAP"
154
- s3_y_top = "BL24I-AL-SLITS-03:Y:TOP"
155
- # MicroFocussing Mirrors
156
- hmfm_x = "BL24I-OP-HMFM-01:X"
157
- hmfm_y = "BL24I-OP-HMFM-01:Y"
158
- hmfm_pitch = "BL24I-OP-HMFM-01:PITCH"
159
- vmfm_x = "BL24I-OP-VMFM-01:X"
160
- vmfm_y = "BL24I-OP-VMFM-01:Y"
161
- vmfm_pitch = "BL24I-OP-VMFM-01:PITCH"
162
- mtab_z = "BL24I-OP-MTAB-01:Z"
163
- # Collimation Table
164
- ctab_x1 = "BL24I-MO-CTAB-01:X1"
165
- ctab_x2 = "BL24I-MO-CTAB-01:X2"
166
- # Attenuators
167
- attn_disc1 = "BL24I-OP-ATTN-01:DISC1"
168
- attn_disc2 = "BL24I-OP-ATTN-01:DISC2"
169
- attn_match = "BL24I-OP-ATTN-01:MATCH"
170
- # AP1
171
- aptr1_x = "BL24I-AL-APTR-01:X"
172
- aptr1_y = "BL24I-AL-APTR-01:Y"
173
- aptr1_mp_select = "BL24I-AL-APTR-01:MP:SELECT"
174
- # AP2
175
- aptr2_x = "BL24I-AL-APTR-02:X"
176
- aptr2_y = "BL24I-AL-APTR-02:Y"
177
- aptr2_mp_select = "BL24I-AL-APTR-02:MP:SELECT"
178
- # Vertical Pin Goniometer
179
- vgon_omega = "BL24I-MO-VGON-01:OMEGA"
180
- vgon_kappa = "BL24I-MO-VGON-01:KAPPA"
181
- vgon_phi = "BL24I-MO-VGON-01:PHI"
182
- vgon_pinxs = "BL24I-MO-VGON-01:PINXS"
183
- vgon_pinys = "BL24I-MO-VGON-01:PINYS"
184
- vgon_pinzs = "BL24I-MO-VGON-01:PINZS"
185
- vgon_pinyh = "BL24I-MO-VGON-01:PINYH"
186
- ptab_x = "BL24I-MO-PTAB-01:X"
187
- ptab_z = "BL24I-MO-PTAB-01:Z"
188
- ptab_y = "BL24I-MO-PTAB-01:Y"
189
- # Horizontal Tray Goniometer
190
- hgon_omega = "BL24I-MO-HGON-01:OMEGA"
191
- hgon_trayys = "BL24I-MO-HGON-01:TRAYYS"
192
- hgon_trayzs = "BL24I-MO-HGON-01:TRAYZS"
193
- ttab_x = "BL24I-MO-TTAB-01:X"
194
- ttab_y = "BL24I-MO-TTAB-01:Y"
195
- ttab_z = "BL24I-MO-TTAB-01:Z"
196
- # Cryo
197
- cstrm_trans = "BL24I-MO-CSTRM-01:TRANS"
198
- cstrm_mp_select = "BL24I-MO-CSTRM-01:MP:SELECT"
199
- cstrm_p1701 = "BL24I-MO-CSTRM-01:P1701"
200
- # Fluorescence Detector
201
- fluo_trans = "BL24I-EA-DET-02:TRANS"
202
- fluo_out_limit = "BL24I-EA-DET-02:OUT:LIMIT"
203
- fluo_in_limit = "BL24I-EA-DET-02:IN:LIMIT"
204
- # Beamstop
205
- bs_x = "BL24I-MO-BS-01:X"
206
- bs_y = "BL24I-MO-BS-01:Y"
207
- bs_z = "BL24I-MO-BS-01:Z"
208
- bs_roty = "BL24I-MO-BS-01:ROTY"
209
- bs_mp_select = "BL24I-MO-BS-01:MP:SELECT"
210
- # Backlight
211
- bl_y = "BL24I-MO-BL-01:Y"
212
- bl_mp_select = "BL24I-MO-BL-01:MP:SELECT"
213
- # LED
214
- led1_doxcurrent_ouputcurrent = "BL24I-DI-LED-01:DOXCURRENT:OUTPUTCURRENT"
215
- led2_doxcurrent_ouputcurrent = "BL24I-DI-LED-02:DOXCURRENT:OUTPUTCURRENT"
216
- led3_doxcurrent_ouputcurrent = "BL24I-DI-LED-03:DOXCURRENT:OUTPUTCURRENT"
217
- led4_doxcurrent_ouputcurrent = "BL24I-DI-LED-04:DOXCURRENT:OUTPUTCURRENT"
218
- # Detector
219
- det_y = "BL24I-EA-DET-01:Y"
220
- det_z = "BL24I-EA-DET-01:Z"
221
- # Fast grid diagnostics
222
- pmc_gridstatus = "BL24I-MO-STEP-10:signal:P2401"
223
- pmc_gridcounter = "BL24I-MO-STEP-10:signal:P2402"
224
-
225
- # PMAC Strings
226
- step08_pmac_str = "BL24I-MO-IOC-08:ASYN8.AOUT"
227
- step09_pmac_str = "BL24I-MO-IOC-09:ASYN9.AOUT"
228
- step10_pmac_str = "BL24I-MO-IOC-10:ASYN10.AOUT"
229
- step11_pmac_str = "BL24I-MO-IOC-11:ASYN11.AOUT"
230
- step12_pmac_str = "BL24I-MO-IOC-12:ASYN12.AOUT"
231
- step13_pmac_str = "BL24I-MO-IOC-13:PMAC:console"
232
- step08_pmac_response = "BL24I-MO-IOC-08:ASYN8.AINP"
233
- step09_pmac_response = "BL24I-MO-IOC-09:ASYN9.AINP"
234
- step10_pmac_response = "BL24I-MO-IOC-10:ASYN10.AINP"
235
- step11_pmac_response = "BL24I-MO-IOC-11:ASYN11.AINP"
236
- step12_pmac_response = "BL24I-MO-IOC-12:ASYN12.AINP"
237
- step13_pmac_response = "BL24I-MO-IOC-13:PMAC:console_RBV"
51
+ # BL24I beamline-specific labelled PVs
52
+ me14e_filter = "BL24I-EA-CHIP-01:FILTER" # to check
53
+ me14e_filepath = "BL24I-MO-CHIP-01:filePath"
54
+ me14e_chip_name = "BL24I-MO-CHIP-01:chipName"
55
+ me14e_chipcapacity = "BL24I-MO-CHIP-01:chipCapacity"
56
+ me14e_blockcapacity = "BL24I-MO-CHIP-01:blockCapacity"
57
+ me14e_exptime = "BL24I-MO-CHIP-01:expTime"
58
+ me14e_dcdetdist = "BL24I-MO-CHIP-01:detDistance"
238
59
 
239
60
  # General Purpose PV. Now use STEP13
240
61
  ioc13_gp1 = "BL24I-MO-IOC-13:GP1"
@@ -252,141 +73,108 @@ ioc13_gp12 = "BL24I-MO-IOC-13:GP12"
252
73
  ioc13_gp13 = "BL24I-MO-IOC-13:GP13"
253
74
  ioc13_gp14 = "BL24I-MO-IOC-13:GP14"
254
75
  ioc13_gp15 = "BL24I-MO-IOC-13:GP15"
255
-
256
- # BL24I beamline-specific labelled PVs
257
- me14e_filter = "BL24I-EA-CHIP-01:FILTER" # to check
258
- me14e_filepath = "BL24I-MO-CHIP-01:filePath"
259
- me14e_chip_name = "BL24I-MO-CHIP-01:chipName"
260
- me14e_chipcapacity = "BL24I-MO-CHIP-01:chipCapacity"
261
- me14e_blockcapacity = "BL24I-MO-CHIP-01:blockCapacity"
262
- me14e_exptime = "BL24I-MO-CHIP-01:expTime"
263
- me14e_dcdetdist = "BL24I-MO-CHIP-01:detDistance"
264
-
265
- # STEP-13 chip motion
266
- ioc13_filepath = "BL24I-MO-CHIP-01:filePath"
267
- ioc13_chip_name = "BL24I-MO-CHIP-01:chipName"
268
- ioc13_chipcapacity = "BL24I-MO-CHIP-01:chipCapacity"
269
- ioc13_blockcapacity = "BL24I-MO-CHIP-01:blockCapacity"
270
- ioc13_exptime = "BL24I-MO-CHIP-01:expTime"
271
- ioc13_dcdetdist = "BL24I-MO-CHIP-01:detDistance"
272
-
273
- me14e_gp1 = "BL24I-MO-IOC-13:GP1"
274
- me14e_gp2 = "BL24I-MO-IOC-13:GP2"
275
- me14e_gp3 = "BL24I-MO-IOC-13:GP3"
276
- me14e_gp4 = "BL24I-MO-IOC-13:GP4"
277
- me14e_gp5 = "BL24I-MO-IOC-13:GP5"
278
- me14e_gp6 = "BL24I-MO-IOC-13:GP6"
279
- me14e_gp7 = "BL24I-MO-IOC-13:GP7"
280
- me14e_gp8 = "BL24I-MO-IOC-13:GP8"
281
- me14e_gp9 = "BL24I-MO-IOC-13:GP9"
282
- me14e_gp10 = "BL24I-MO-IOC-13:GP10"
283
- me14e_gp11 = "BL24I-MO-IOC-13:GP11"
284
- me14e_gp12 = "BL24I-MO-IOC-13:GP12"
285
- me14e_gp13 = "BL24I-MO-IOC-13:GP13"
286
- me14e_gp14 = "BL24I-MO-IOC-13:GP14"
287
- me14e_gp15 = "BL24I-MO-IOC-13:GP15"
288
- me14e_gp16 = "BL24I-MO-IOC-13:GP16"
289
- me14e_gp17 = "BL24I-MO-IOC-13:GP17"
290
- me14e_gp18 = "BL24I-MO-IOC-13:GP18"
291
- me14e_gp19 = "BL24I-MO-IOC-13:GP19"
292
- me14e_gp20 = "BL24I-MO-IOC-13:GP20"
293
- me14e_gp21 = "BL24I-MO-IOC-13:GP21"
294
- me14e_gp22 = "BL24I-MO-IOC-13:GP22"
295
- me14e_gp23 = "BL24I-MO-IOC-13:GP23"
296
- me14e_gp24 = "BL24I-MO-IOC-13:GP24"
297
- me14e_gp25 = "BL24I-MO-IOC-13:GP25"
298
- me14e_gp26 = "BL24I-MO-IOC-13:GP26"
299
- me14e_gp27 = "BL24I-MO-IOC-13:GP27"
300
- me14e_gp28 = "BL24I-MO-IOC-13:GP28"
301
- me14e_gp29 = "BL24I-MO-IOC-13:GP29"
302
- me14e_gp30 = "BL24I-MO-IOC-13:GP30"
303
- me14e_gp31 = "BL24I-MO-IOC-13:GP31"
304
- me14e_gp32 = "BL24I-MO-IOC-13:GP32"
305
- me14e_gp33 = "BL24I-MO-IOC-13:GP33"
306
- me14e_gp34 = "BL24I-MO-IOC-13:GP34"
307
- me14e_gp35 = "BL24I-MO-IOC-13:GP35"
308
- me14e_gp36 = "BL24I-MO-IOC-13:GP36"
309
- me14e_gp37 = "BL24I-MO-IOC-13:GP37"
310
- me14e_gp38 = "BL24I-MO-IOC-13:GP38"
311
- me14e_gp39 = "BL24I-MO-IOC-13:GP39"
312
- me14e_gp40 = "BL24I-MO-IOC-13:GP40"
313
- me14e_gp41 = "BL24I-MO-IOC-13:GP41"
314
- me14e_gp42 = "BL24I-MO-IOC-13:GP42"
315
- me14e_gp43 = "BL24I-MO-IOC-13:GP43"
316
- me14e_gp44 = "BL24I-MO-IOC-13:GP44"
317
- me14e_gp45 = "BL24I-MO-IOC-13:GP45"
318
- me14e_gp46 = "BL24I-MO-IOC-13:GP46"
319
- me14e_gp47 = "BL24I-MO-IOC-13:GP47"
320
- me14e_gp48 = "BL24I-MO-IOC-13:GP48"
321
- me14e_gp49 = "BL24I-MO-IOC-13:GP49"
322
- me14e_gp50 = "BL24I-MO-IOC-13:GP50"
323
- me14e_gp51 = "BL24I-MO-IOC-13:GP51"
324
- me14e_gp52 = "BL24I-MO-IOC-13:GP52"
325
- me14e_gp53 = "BL24I-MO-IOC-13:GP53"
326
- me14e_gp54 = "BL24I-MO-IOC-13:GP54"
327
- me14e_gp55 = "BL24I-MO-IOC-13:GP55"
328
- me14e_gp56 = "BL24I-MO-IOC-13:GP56"
329
- me14e_gp57 = "BL24I-MO-IOC-13:GP57"
330
- me14e_gp58 = "BL24I-MO-IOC-13:GP58"
331
- me14e_gp59 = "BL24I-MO-IOC-13:GP59"
332
- me14e_gp60 = "BL24I-MO-IOC-13:GP60"
333
- me14e_gp61 = "BL24I-MO-IOC-13:GP61"
334
- me14e_gp62 = "BL24I-MO-IOC-13:GP62"
335
- me14e_gp63 = "BL24I-MO-IOC-13:GP63"
336
- me14e_gp64 = "BL24I-MO-IOC-13:GP64"
337
- me14e_gp65 = "BL24I-MO-IOC-13:GP65"
338
- me14e_gp66 = "BL24I-MO-IOC-13:GP66"
339
- me14e_gp67 = "BL24I-MO-IOC-13:GP67"
340
- me14e_gp68 = "BL24I-MO-IOC-13:GP68"
341
- me14e_gp69 = "BL24I-MO-IOC-13:GP69"
342
- me14e_gp70 = "BL24I-MO-IOC-13:GP70"
343
- me14e_gp71 = "BL24I-MO-IOC-13:GP71"
344
- me14e_gp72 = "BL24I-MO-IOC-13:GP72"
345
- me14e_gp73 = "BL24I-MO-IOC-13:GP73"
346
- me14e_gp74 = "BL24I-MO-IOC-13:GP74"
347
- me14e_gp75 = "BL24I-MO-IOC-13:GP75"
348
- me14e_gp76 = "BL24I-MO-IOC-13:GP76"
349
- me14e_gp77 = "BL24I-MO-IOC-13:GP77"
350
- me14e_gp78 = "BL24I-MO-IOC-13:GP78"
351
- me14e_gp79 = "BL24I-MO-IOC-13:GP79"
352
- me14e_gp80 = "BL24I-MO-IOC-13:GP80"
353
- me14e_gp81 = "BL24I-MO-IOC-13:GP81"
354
- me14e_gp82 = "BL24I-MO-IOC-13:GP82"
355
- me14e_gp83 = "BL24I-MO-IOC-13:GP83"
356
- me14e_gp84 = "BL24I-MO-IOC-13:GP84"
357
- me14e_gp85 = "BL24I-MO-IOC-13:GP85"
358
- me14e_gp86 = "BL24I-MO-IOC-13:GP86"
359
- me14e_gp87 = "BL24I-MO-IOC-13:GP87"
360
- me14e_gp88 = "BL24I-MO-IOC-13:GP88"
361
- me14e_gp89 = "BL24I-MO-IOC-13:GP89"
362
- me14e_gp90 = "BL24I-MO-IOC-13:GP90"
363
- me14e_gp91 = "BL24I-MO-IOC-13:GP91"
364
- me14e_gp92 = "BL24I-MO-IOC-13:GP92"
365
- me14e_gp93 = "BL24I-MO-IOC-13:GP93"
366
- me14e_gp94 = "BL24I-MO-IOC-13:GP94"
367
- me14e_gp95 = "BL24I-MO-IOC-13:GP95"
368
- me14e_gp96 = "BL24I-MO-IOC-13:GP96"
369
- me14e_gp97 = "BL24I-MO-IOC-13:GP97"
370
- me14e_gp98 = "BL24I-MO-IOC-13:GP98"
371
- me14e_gp99 = "BL24I-MO-IOC-13:GP99"
372
- me14e_gp100 = "BL24I-MO-IOC-13:GP100"
373
- me14e_gp101 = "BL24I-MO-IOC-13:GP101" # Detector in use
374
- me14e_gp102 = "BL24I-MO-IOC-13:GP102"
375
- me14e_gp103 = "BL24I-MO-IOC-13:GP103"
376
- me14e_gp104 = "BL24I-MO-IOC-13:GP104"
377
- me14e_gp105 = "BL24I-MO-IOC-13:GP105"
378
- me14e_gp106 = "BL24I-MO-IOC-13:GP106"
379
- me14e_gp107 = "BL24I-MO-IOC-13:GP107"
380
- me14e_gp108 = "BL24I-MO-IOC-13:GP108"
381
- me14e_gp109 = "BL24I-MO-IOC-13:GP109"
382
- me14e_gp110 = "BL24I-MO-IOC-13:GP110"
383
- me14e_gp111 = "BL24I-MO-IOC-13:GP111"
384
- me14e_gp112 = "BL24I-MO-IOC-13:GP112"
385
- me14e_gp113 = "BL24I-MO-IOC-13:GP113"
386
- me14e_gp114 = "BL24I-MO-IOC-13:GP114"
387
- me14e_gp115 = "BL24I-MO-IOC-13:GP115"
388
- me14e_gp116 = "BL24I-MO-IOC-13:GP116"
389
- me14e_gp117 = "BL24I-MO-IOC-13:GP117"
390
- me14e_gp118 = "BL24I-MO-IOC-13:GP118"
391
- me14e_gp119 = "BL24I-MO-IOC-13:GP119"
392
- me14e_gp120 = "BL24I-MO-IOC-13:GP120"
76
+ ioc13_gp16 = "BL24I-MO-IOC-13:GP16"
77
+ ioc13_gp17 = "BL24I-MO-IOC-13:GP17"
78
+ ioc13_gp18 = "BL24I-MO-IOC-13:GP18"
79
+ ioc13_gp19 = "BL24I-MO-IOC-13:GP19"
80
+ ioc13_gp20 = "BL24I-MO-IOC-13:GP20"
81
+ ioc13_gp21 = "BL24I-MO-IOC-13:GP21"
82
+ ioc13_gp22 = "BL24I-MO-IOC-13:GP22"
83
+ ioc13_gp23 = "BL24I-MO-IOC-13:GP23"
84
+ ioc13_gp24 = "BL24I-MO-IOC-13:GP24"
85
+ ioc13_gp25 = "BL24I-MO-IOC-13:GP25"
86
+ ioc13_gp26 = "BL24I-MO-IOC-13:GP26"
87
+ ioc13_gp27 = "BL24I-MO-IOC-13:GP27"
88
+ ioc13_gp28 = "BL24I-MO-IOC-13:GP28"
89
+ ioc13_gp29 = "BL24I-MO-IOC-13:GP29"
90
+ ioc13_gp30 = "BL24I-MO-IOC-13:GP30"
91
+ ioc13_gp31 = "BL24I-MO-IOC-13:GP31"
92
+ ioc13_gp32 = "BL24I-MO-IOC-13:GP32"
93
+ ioc13_gp33 = "BL24I-MO-IOC-13:GP33"
94
+ ioc13_gp34 = "BL24I-MO-IOC-13:GP34"
95
+ ioc13_gp35 = "BL24I-MO-IOC-13:GP35"
96
+ ioc13_gp36 = "BL24I-MO-IOC-13:GP36"
97
+ ioc13_gp37 = "BL24I-MO-IOC-13:GP37"
98
+ ioc13_gp38 = "BL24I-MO-IOC-13:GP38"
99
+ ioc13_gp39 = "BL24I-MO-IOC-13:GP39"
100
+ ioc13_gp40 = "BL24I-MO-IOC-13:GP40"
101
+ ioc13_gp41 = "BL24I-MO-IOC-13:GP41"
102
+ ioc13_gp42 = "BL24I-MO-IOC-13:GP42"
103
+ ioc13_gp43 = "BL24I-MO-IOC-13:GP43"
104
+ ioc13_gp44 = "BL24I-MO-IOC-13:GP44"
105
+ ioc13_gp45 = "BL24I-MO-IOC-13:GP45"
106
+ ioc13_gp46 = "BL24I-MO-IOC-13:GP46"
107
+ ioc13_gp47 = "BL24I-MO-IOC-13:GP47"
108
+ ioc13_gp48 = "BL24I-MO-IOC-13:GP48"
109
+ ioc13_gp49 = "BL24I-MO-IOC-13:GP49"
110
+ ioc13_gp50 = "BL24I-MO-IOC-13:GP50"
111
+ ioc13_gp51 = "BL24I-MO-IOC-13:GP51"
112
+ ioc13_gp52 = "BL24I-MO-IOC-13:GP52"
113
+ ioc13_gp53 = "BL24I-MO-IOC-13:GP53"
114
+ ioc13_gp54 = "BL24I-MO-IOC-13:GP54"
115
+ ioc13_gp55 = "BL24I-MO-IOC-13:GP55"
116
+ ioc13_gp56 = "BL24I-MO-IOC-13:GP56"
117
+ ioc13_gp57 = "BL24I-MO-IOC-13:GP57"
118
+ ioc13_gp58 = "BL24I-MO-IOC-13:GP58"
119
+ ioc13_gp59 = "BL24I-MO-IOC-13:GP59"
120
+ ioc13_gp60 = "BL24I-MO-IOC-13:GP60"
121
+ ioc13_gp61 = "BL24I-MO-IOC-13:GP61"
122
+ ioc13_gp62 = "BL24I-MO-IOC-13:GP62"
123
+ ioc13_gp63 = "BL24I-MO-IOC-13:GP63"
124
+ ioc13_gp64 = "BL24I-MO-IOC-13:GP64"
125
+ ioc13_gp65 = "BL24I-MO-IOC-13:GP65"
126
+ ioc13_gp66 = "BL24I-MO-IOC-13:GP66"
127
+ ioc13_gp67 = "BL24I-MO-IOC-13:GP67"
128
+ ioc13_gp68 = "BL24I-MO-IOC-13:GP68"
129
+ ioc13_gp69 = "BL24I-MO-IOC-13:GP69"
130
+ ioc13_gp70 = "BL24I-MO-IOC-13:GP70"
131
+ ioc13_gp71 = "BL24I-MO-IOC-13:GP71"
132
+ ioc13_gp72 = "BL24I-MO-IOC-13:GP72"
133
+ ioc13_gp73 = "BL24I-MO-IOC-13:GP73"
134
+ ioc13_gp74 = "BL24I-MO-IOC-13:GP74"
135
+ ioc13_gp75 = "BL24I-MO-IOC-13:GP75"
136
+ ioc13_gp76 = "BL24I-MO-IOC-13:GP76"
137
+ ioc13_gp77 = "BL24I-MO-IOC-13:GP77"
138
+ ioc13_gp78 = "BL24I-MO-IOC-13:GP78"
139
+ ioc13_gp79 = "BL24I-MO-IOC-13:GP79"
140
+ ioc13_gp80 = "BL24I-MO-IOC-13:GP80"
141
+ ioc13_gp81 = "BL24I-MO-IOC-13:GP81"
142
+ ioc13_gp82 = "BL24I-MO-IOC-13:GP82"
143
+ ioc13_gp83 = "BL24I-MO-IOC-13:GP83"
144
+ ioc13_gp84 = "BL24I-MO-IOC-13:GP84"
145
+ ioc13_gp85 = "BL24I-MO-IOC-13:GP85"
146
+ ioc13_gp86 = "BL24I-MO-IOC-13:GP86"
147
+ ioc13_gp87 = "BL24I-MO-IOC-13:GP87"
148
+ ioc13_gp88 = "BL24I-MO-IOC-13:GP88"
149
+ ioc13_gp89 = "BL24I-MO-IOC-13:GP89"
150
+ ioc13_gp90 = "BL24I-MO-IOC-13:GP90"
151
+ ioc13_gp91 = "BL24I-MO-IOC-13:GP91"
152
+ ioc13_gp92 = "BL24I-MO-IOC-13:GP92"
153
+ ioc13_gp93 = "BL24I-MO-IOC-13:GP93"
154
+ ioc13_gp94 = "BL24I-MO-IOC-13:GP94"
155
+ ioc13_gp95 = "BL24I-MO-IOC-13:GP95"
156
+ ioc13_gp96 = "BL24I-MO-IOC-13:GP96"
157
+ ioc13_gp97 = "BL24I-MO-IOC-13:GP97"
158
+ ioc13_gp98 = "BL24I-MO-IOC-13:GP98"
159
+ ioc13_gp99 = "BL24I-MO-IOC-13:GP99"
160
+ ioc13_gp100 = "BL24I-MO-IOC-13:GP100"
161
+ ioc13_gp101 = "BL24I-MO-IOC-13:GP101"
162
+ ioc13_gp102 = "BL24I-MO-IOC-13:GP102"
163
+ ioc13_gp103 = "BL24I-MO-IOC-13:GP103"
164
+ ioc13_gp104 = "BL24I-MO-IOC-13:GP104"
165
+ ioc13_gp105 = "BL24I-MO-IOC-13:GP105"
166
+ ioc13_gp106 = "BL24I-MO-IOC-13:GP106"
167
+ ioc13_gp107 = "BL24I-MO-IOC-13:GP107"
168
+ ioc13_gp108 = "BL24I-MO-IOC-13:GP108"
169
+ ioc13_gp109 = "BL24I-MO-IOC-13:GP109"
170
+ ioc13_gp110 = "BL24I-MO-IOC-13:GP110"
171
+ ioc13_gp111 = "BL24I-MO-IOC-13:GP111"
172
+ ioc13_gp112 = "BL24I-MO-IOC-13:GP112"
173
+ ioc13_gp113 = "BL24I-MO-IOC-13:GP113"
174
+ ioc13_gp114 = "BL24I-MO-IOC-13:GP114"
175
+ ioc13_gp115 = "BL24I-MO-IOC-13:GP115"
176
+ ioc13_gp116 = "BL24I-MO-IOC-13:GP116"
177
+ ioc13_gp117 = "BL24I-MO-IOC-13:GP117"
178
+ ioc13_gp118 = "BL24I-MO-IOC-13:GP118"
179
+ ioc13_gp119 = "BL24I-MO-IOC-13:GP119"
180
+ ioc13_gp120 = "BL24I-MO-IOC-13:GP120"
mx_bluesky/beamlines/i24/serial/setup_beamline/pv_abstract.py CHANGED
@@ -22,15 +22,15 @@ class Eiger:
22
22
  det_y_threshold = 70.0
23
23
  det_y_target = 59.0
24
24
 
25
- class pv:
25
+ class PV:
26
26
  detector_distance = pv.eiger_detdist
27
27
  wavelength = pv.eiger_wavelength
28
28
  transmission = "BL24I-EA-PILAT-01:cam1:FilterTransm"
29
- filenameRBV = pv.eiger_ODfilenameRBV
30
- file_name = pv.eiger_ODfilename
31
- file_path = pv.eiger_ODfilepath
29
+ filename_rbv = pv.eiger_od_filename_rbv
30
+ file_name = pv.eiger_od_filename
31
+ file_path = pv.eiger_od_filepath
32
32
  file_template = None
33
- sequence_id = pv.eiger_seqID
33
+ sequence_id = pv.eiger_seq_id
34
34
  beamx = pv.eiger_beamx
35
35
  beamy = pv.eiger_beamy
36
36
  bit_depth = pv.eiger_bitdepthrbv