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.
Files changed (85) 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/parameters/__init__.py +0 -0
  5. mx_bluesky/beamlines/aithre_lasershaping/parameters/constants.py +17 -0
  6. mx_bluesky/beamlines/aithre_lasershaping/parameters/robot_load_parameters.py +13 -0
  7. mx_bluesky/beamlines/aithre_lasershaping/pin_tip_centring.py +31 -0
  8. mx_bluesky/beamlines/aithre_lasershaping/robot_load.py +80 -0
  9. mx_bluesky/beamlines/i04/__init__.py +6 -2
  10. mx_bluesky/beamlines/i04/callbacks/murko_callback.py +27 -12
  11. mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py +87 -13
  12. mx_bluesky/beamlines/i04/external_interaction/__init__.py +0 -0
  13. mx_bluesky/beamlines/i04/external_interaction/config_server.py +15 -0
  14. mx_bluesky/beamlines/i04/oav_centering_plans/__init__.py +0 -0
  15. mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py +115 -0
  16. mx_bluesky/beamlines/i04/parameters/__init__.py +0 -0
  17. mx_bluesky/beamlines/i04/parameters/constants.py +21 -0
  18. mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py +24 -1
  19. mx_bluesky/beamlines/i04/thawing_plan.py +147 -152
  20. mx_bluesky/beamlines/i24/serial/dcid.py +4 -5
  21. mx_bluesky/beamlines/i24/serial/extruder/i24ssx_extruder_collect_py3v2.py +5 -2
  22. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl +11 -11
  23. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl +3 -3
  24. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl +142 -142
  25. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl +135 -135
  26. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/PMAC_Command.edl +8 -8
  27. mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl +13 -13
  28. mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_collect_py3v1.py +7 -4
  29. mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_manager_py3v1.py +35 -32
  30. mx_bluesky/beamlines/i24/serial/parameters/utils.py +5 -5
  31. mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py +113 -306
  32. mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py +8 -2
  33. mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py +1 -1
  34. mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py +1 -1
  35. mx_bluesky/beamlines/i24/serial/web_gui_plans/oav_plans.py +64 -0
  36. mx_bluesky/{hyperion/device_setup_plans/smargon.py → common/device_setup_plans/gonio.py} +9 -6
  37. mx_bluesky/common/device_setup_plans/manipulate_sample.py +8 -1
  38. mx_bluesky/common/device_setup_plans/robot_load_unload.py +1 -1
  39. mx_bluesky/common/device_setup_plans/setup_oav.py +8 -0
  40. mx_bluesky/common/device_setup_plans/setup_zebra_and_shutter.py +0 -5
  41. mx_bluesky/common/device_setup_plans/xbpm_feedback.py +8 -1
  42. mx_bluesky/common/experiment_plans/beamstop_check.py +229 -0
  43. mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py +2 -0
  44. mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py +5 -2
  45. mx_bluesky/common/experiment_plans/oav_snapshot_plan.py +0 -1
  46. mx_bluesky/{hyperion → common}/experiment_plans/pin_tip_centring_plan.py +20 -21
  47. mx_bluesky/common/external_interaction/callbacks/common/grid_detection_callback.py +5 -0
  48. mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py +10 -12
  49. mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py +3 -5
  50. mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py +5 -5
  51. mx_bluesky/common/external_interaction/config_server.py +2 -2
  52. mx_bluesky/common/external_interaction/ispyb/data_model.py +11 -4
  53. mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py +159 -2
  54. mx_bluesky/common/external_interaction/ispyb/ispyb_store.py +76 -166
  55. mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py +0 -14
  56. mx_bluesky/common/parameters/components.py +1 -0
  57. mx_bluesky/common/parameters/constants.py +3 -2
  58. mx_bluesky/common/parameters/device_composites.py +4 -2
  59. mx_bluesky/common/utils/exceptions.py +15 -0
  60. mx_bluesky/common/utils/log.py +9 -0
  61. mx_bluesky/common/utils/utils.py +48 -0
  62. mx_bluesky/hyperion/__main__.py +3 -13
  63. mx_bluesky/hyperion/baton_handler.py +23 -6
  64. mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py +5 -6
  65. mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py +3 -10
  66. mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py +4 -2
  67. mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py +8 -2
  68. mx_bluesky/hyperion/experiment_plans/set_energy_plan.py +2 -2
  69. mx_bluesky/hyperion/experiment_plans/udc_default_state.py +160 -0
  70. mx_bluesky/hyperion/external_interaction/agamemnon.py +1 -1
  71. mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py +2 -2
  72. mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py +1 -0
  73. mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py +1 -4
  74. mx_bluesky/hyperion/external_interaction/config_server.py +5 -5
  75. mx_bluesky/hyperion/parameters/constants.py +10 -3
  76. mx_bluesky/hyperion/parameters/device_composites.py +2 -2
  77. mx_bluesky/hyperion/parameters/robot_load.py +1 -9
  78. {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/METADATA +6 -5
  79. {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/RECORD +83 -69
  80. mx_bluesky/common/experiment_plans/inner_plans/udc_default_state.py +0 -86
  81. mx_bluesky/common/external_interaction/callbacks/common/logging_callback.py +0 -29
  82. {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/WHEEL +0 -0
  83. {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/entry_points.txt +0 -0
  84. {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/licenses/LICENSE +0 -0
  85. {mx_bluesky-1.5.11.dist-info → mx_bluesky-1.5.12.dist-info}/top_level.txt +0 -0
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl CHANGED
@@ -4,7 +4,7 @@ major 4
4
4
  minor 0
5
5
  release 1
6
6
  x 1203
7
- y 544
7
+ y 581
8
8
  w 550
9
9
  h 380
10
10
  font "arial-medium-r-18.0"
@@ -89,7 +89,7 @@ x 143
89
89
  y 82
90
90
  w 110
91
91
  h 30
92
- controlPv "BL24I-MO-IOC-01:GP6"
92
+ controlPv "BL24I-MO-IOC-13:GP6"
93
93
  font "arial-medium-r-18.0"
94
94
  fontAlign "right"
95
95
  fgColor index 25
@@ -180,7 +180,7 @@ x 144
180
180
  y 126
181
181
  w 110
182
182
  h 30
183
- controlPv "BL24I-MO-IOC-01:GP7"
183
+ controlPv "BL24I-MO-IOC-13:GP7"
184
184
  font "arial-medium-r-18.0"
185
185
  fontAlign "right"
186
186
  fgColor index 25
@@ -464,7 +464,7 @@ x 145
464
464
  y 171
465
465
  w 110
466
466
  h 30
467
- controlPv "BL24I-MO-IOC-01:GP8"
467
+ controlPv "BL24I-MO-IOC-13:GP8"
468
468
  font "arial-medium-r-18.0"
469
469
  fontAlign "right"
470
470
  fgColor index 25
@@ -580,7 +580,7 @@ h 144
580
580
  lineColor index 7
581
581
  fill
582
582
  fillColor index 7
583
- visPv "BL24I-MO-IOC-01:GP1"
583
+ visPv "BL24I-MO-IOC-13:GP1"
584
584
  visMin "0"
585
585
  visMax "2"
586
586
  endObjectProperties
@@ -598,7 +598,7 @@ h 143
598
598
  lineColor index 7
599
599
  fill
600
600
  fillColor index 7
601
- visPv "BL24I-MO-IOC-01:GP1"
601
+ visPv "BL24I-MO-IOC-13:GP1"
602
602
  visMin "0"
603
603
  visMax "2"
604
604
  endObjectProperties
@@ -618,7 +618,7 @@ fontAlign "center"
618
618
  fgColor index 14
619
619
  bgColor index 0
620
620
  useDisplayBg
621
- visPv "BL24I-MO-IOC-01:GP1"
621
+ visPv "BL24I-MO-IOC-13:GP1"
622
622
  visMin "0"
623
623
  visMax "2"
624
624
  value {
@@ -648,7 +648,7 @@ botShadowColor index 11
648
648
  font "arial-medium-r-18.0"
649
649
  numCmds 1
650
650
  command {
651
- 0 "caput BL24I-EA-CHIP-01:PMAC_STRING \\#5hmz\\#6hmz\\#7hmz"
651
+ 0 "caput BL24I-MO-IOC-13:PMAC:console \\#5hmz\\#6hmz\\#7hmz"
652
652
  }
653
653
  endObjectProperties
654
654
 
@@ -728,7 +728,7 @@ h 143
728
728
  lineColor index 7
729
729
  fill
730
730
  fillColor index 7
731
- visPv "BL24I-MO-IOC-01:GP1"
731
+ visPv "BL24I-MO-IOC-13:GP1"
732
732
  visMin "0"
733
733
  visMax "2"
734
734
  endObjectProperties
@@ -748,7 +748,7 @@ fontAlign "center"
748
748
  fgColor index 14
749
749
  bgColor index 0
750
750
  useDisplayBg
751
- visPv "BL24I-MO-IOC-01:GP1"
751
+ visPv "BL24I-MO-IOC-13:GP1"
752
752
  visMin "0"
753
753
  visMax "2"
754
754
  value {
@@ -792,7 +792,7 @@ x 146
792
792
  y 209
793
793
  w 110
794
794
  h 25
795
- controlPv "BL24I-MO-IOC-01:GP99"
795
+ controlPv "BL24I-MO-IOC-13:GP99"
796
796
  font "arial-medium-r-18.0"
797
797
  fontAlign "right"
798
798
  fgColor index 25
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl CHANGED
@@ -4,7 +4,7 @@ major 4
4
4
  minor 0
5
5
  release 1
6
6
  x 1205
7
- y 616
7
+ y 653
8
8
  w 450
9
9
  h 180
10
10
  font "arial-medium-r-18.0"
@@ -78,9 +78,9 @@ fgColour index 14
78
78
  bgColour index 4
79
79
  topShadowColour index 1
80
80
  botShadowColour index 8
81
- controlPv "BL24I-MO-IOC-01:GP101"
81
+ controlPv "BL24I-MO-IOC-13:GP101"
82
82
  font "arial-medium-r-18.0"
83
- numItems 2
83
+ numItems 1
84
84
  symbolTag {
85
85
  0 "Eiger"
86
86
  }