mx-bluesky 1.4.0__py3-none-any.whl → 1.4.1__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/i04/redis_to_murko_forwarder.py +178 -0
- mx_bluesky/beamlines/i04/thawing_plan.py +1 -1
- mx_bluesky/beamlines/i24/serial/dcid.py +143 -171
- mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl +1 -1
- mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py +54 -21
- mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl +2 -5
- mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py +0 -1
- mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py +67 -50
- mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py +26 -79
- mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py +0 -199
- mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py +4 -6
- mx_bluesky/beamlines/i24/serial/log.py +1 -1
- mx_bluesky/beamlines/i24/serial/parameters/__init__.py +4 -0
- mx_bluesky/beamlines/i24/serial/parameters/constants.py +6 -1
- mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py +42 -15
- mx_bluesky/beamlines/i24/serial/run_fixed_target.sh +4 -3
- mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py +2 -0
- mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py +103 -81
- mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py +1 -2
- mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py +24 -26
- mx_bluesky/beamlines/i24/serial/write_nexus.py +74 -72
- mx_bluesky/common/external_interaction/config_server.py +46 -0
- mx_bluesky/common/parameters/components.py +52 -15
- mx_bluesky/common/parameters/constants.py +11 -1
- mx_bluesky/common/parameters/gridscan.py +94 -0
- mx_bluesky/{hyperion → common}/parameters/robot_load.py +2 -2
- mx_bluesky/common/plans/do_fgs.py +2 -2
- mx_bluesky/common/utils/log.py +2 -0
- mx_bluesky/hyperion/__main__.py +2 -1
- mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py +21 -31
- mx_bluesky/hyperion/device_setup_plans/setup_panda.py +4 -4
- mx_bluesky/hyperion/device_setup_plans/setup_zebra.py +1 -1
- mx_bluesky/hyperion/device_setup_plans/smargon.py +3 -3
- mx_bluesky/hyperion/exceptions.py +13 -1
- mx_bluesky/hyperion/experiment_plans/__init__.py +4 -0
- mx_bluesky/hyperion/experiment_plans/change_aperture_then_move_plan.py +83 -0
- mx_bluesky/hyperion/experiment_plans/common/xrc_result.py +47 -0
- mx_bluesky/hyperion/experiment_plans/experiment_registry.py +9 -9
- mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py +133 -97
- mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py +42 -18
- mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py +75 -9
- mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py +2 -2
- mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py +1 -1
- mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py +2 -2
- mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py +36 -17
- mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py +5 -5
- mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py +28 -28
- mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py +64 -16
- mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py +11 -3
- mx_bluesky/hyperion/experiment_plans/set_energy_plan.py +10 -10
- mx_bluesky/hyperion/external_interaction/callbacks/__init__.py +0 -4
- mx_bluesky/hyperion/external_interaction/callbacks/__main__.py +4 -0
- mx_bluesky/hyperion/external_interaction/callbacks/common/abstract_event.py +66 -0
- mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py +5 -0
- mx_bluesky/hyperion/external_interaction/callbacks/grid_detection_callback.py +15 -15
- mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py +18 -10
- mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py +3 -1
- mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py +5 -3
- mx_bluesky/hyperion/external_interaction/callbacks/sample_handling/__init__.py +0 -0
- mx_bluesky/hyperion/external_interaction/callbacks/sample_handling/sample_handling_callback.py +84 -0
- mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py +15 -9
- mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/nexus_callback.py +5 -4
- mx_bluesky/hyperion/external_interaction/config_server.py +8 -37
- mx_bluesky/hyperion/external_interaction/exceptions.py +0 -9
- mx_bluesky/hyperion/external_interaction/ispyb/exp_eye_store.py +65 -15
- mx_bluesky/hyperion/parameters/components.py +4 -9
- mx_bluesky/hyperion/parameters/constants.py +0 -1
- mx_bluesky/hyperion/parameters/gridscan.py +33 -76
- mx_bluesky/hyperion/parameters/load_centre_collect.py +14 -9
- mx_bluesky/hyperion/parameters/rotation.py +15 -6
- {mx_bluesky-1.4.0.dist-info → mx_bluesky-1.4.1.dist-info}/METADATA +35 -34
- {mx_bluesky-1.4.0.dist-info → mx_bluesky-1.4.1.dist-info}/RECORD +77 -70
- {mx_bluesky-1.4.0.dist-info → mx_bluesky-1.4.1.dist-info}/WHEEL +1 -1
- mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Mapping_py3v1.py +0 -150
- {mx_bluesky-1.4.0.dist-info → mx_bluesky-1.4.1.dist-info}/LICENSE +0 -0
- {mx_bluesky-1.4.0.dist-info → mx_bluesky-1.4.1.dist-info}/entry_points.txt +0 -0
- {mx_bluesky-1.4.0.dist-info → mx_bluesky-1.4.1.dist-info}/top_level.txt +0 -0
|
@@ -1,38 +1,38 @@
|
|
|
1
1
|
mx_bluesky/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
|
|
2
2
|
mx_bluesky/__main__.py,sha256=RVqPnxDisFMIn_aoEi0drlThNHgKTJULnSrotouIKI0,480
|
|
3
|
-
mx_bluesky/_version.py,sha256=
|
|
3
|
+
mx_bluesky/_version.py,sha256=oFZsPxoSsCY6D2DiWMSueNvMDRRQN5ssWrPdQtlLJ_o,411
|
|
4
4
|
mx_bluesky/jupyter_example.ipynb,sha256=wpwvPrBvwtRMS5AIFk8F54cIlUoD0o4ji8tKK5cZHA4,1672
|
|
5
5
|
mx_bluesky/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
6
6
|
mx_bluesky/beamlines/i04/__init__.py,sha256=jZjAMN5_oOEjQoR3iTrnMFW3ElxlHhQ7pEQZIv21Y4I,129
|
|
7
|
-
mx_bluesky/beamlines/i04/
|
|
7
|
+
mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=10PKvDRKaaTtlOCfRG8T00XwpIFR9m8jk96QES13LpQ,5894
|
|
8
|
+
mx_bluesky/beamlines/i04/thawing_plan.py,sha256=YykXHXINBDnQ0wJ577v4XrXwcqlRRgoUSbaNuOKd1bc,5464
|
|
8
9
|
mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=ZIwkY6gdcmIE-aMBvehN8DVcjGRtb9wwzpgHJNMZ39Q,2125
|
|
9
10
|
mx_bluesky/beamlines/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
10
11
|
mx_bluesky/beamlines/i24/serial/__init__.py,sha256=9MDcY2aHUE1zZZkoNPSGxgYV1NIf5vsCM8jArR8d3fg,1226
|
|
11
12
|
mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=gwOfjzZMbcvpVH71CCyHaxr8hgPYCJIWWWfg1zErtmM,245
|
|
12
|
-
mx_bluesky/beamlines/i24/serial/dcid.py,sha256=
|
|
13
|
-
mx_bluesky/beamlines/i24/serial/log.py,sha256=
|
|
13
|
+
mx_bluesky/beamlines/i24/serial/dcid.py,sha256=iaReE06DJZSkxtdPqeHgRxN-JG7rW55ihKZzH9RWFHA,14525
|
|
14
|
+
mx_bluesky/beamlines/i24/serial/log.py,sha256=oK7HHjIeuiWdy1vNZL6p-mU8Y3kzeCAgsifCxhAYqOQ,4799
|
|
14
15
|
mx_bluesky/beamlines/i24/serial/run_extruder.sh,sha256=FXYsqdTpVgxB1-QrY4Tg5pl5Ex7PgUoXnuAcr9iDZTE,1078
|
|
15
|
-
mx_bluesky/beamlines/i24/serial/run_fixed_target.sh,sha256=
|
|
16
|
+
mx_bluesky/beamlines/i24/serial/run_fixed_target.sh,sha256=ZzxcVFoitBRvcqsJaBxjtepgkG-ZCGBW6X9xuV_Y478,1229
|
|
16
17
|
mx_bluesky/beamlines/i24/serial/run_serial.py,sha256=Zrudosavh2HnnBXd2CLtOPs3lyQFxaN8YyO_sradRGs,1511
|
|
17
18
|
mx_bluesky/beamlines/i24/serial/run_ssx.sh,sha256=0Ir5iQQ-xSN_5teHtxzht6G-mJ08mE1gxBS32vkh1eM,714
|
|
18
19
|
mx_bluesky/beamlines/i24/serial/set_visit_directory.sh,sha256=WuN5PUBxTofzuESk1-3gWtTcbPjOx-26JaQSVCsZhZs,1660
|
|
19
20
|
mx_bluesky/beamlines/i24/serial/start_blueapi.sh,sha256=4iBzQljTLXQiVIF4UO7drc9qUkP7KSRC6Mjh8hcGxpI,608
|
|
20
|
-
mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=
|
|
21
|
+
mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=4Z15qBwrbkcoTFIZd3CRmzOtA0lFHSEgcpDpjrgM0hg,4161
|
|
21
22
|
mx_bluesky/beamlines/i24/serial/extruder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
22
|
-
mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py,sha256=
|
|
23
|
+
mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py,sha256=AqHONcB465E_X6sl7FQFplBQ_xzjlii9b6XbQMbr3JM,18458
|
|
23
24
|
mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DetStage.edl,sha256=9L1CgEdxZD4N3QvM5HLlAlJTcxpzd4ahB2nVJ9jHujw,2013
|
|
24
|
-
mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl,sha256=
|
|
25
|
+
mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl,sha256=JaS-PvAHEOqHRuH3LbdpOk2T-TlO8Enq_uwzokQXzZU,31349
|
|
25
26
|
mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/microdrop_alignment.edl,sha256=K79vmGAcf9qVEQLXTgr0g4bZDWaJ7nFoK4e0Ex7qAwM,14690
|
|
26
27
|
mx_bluesky/beamlines/i24/serial/fixed_target/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
27
|
-
mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py,sha256=
|
|
28
|
-
mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=
|
|
29
|
-
mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=
|
|
30
|
-
mx_bluesky/beamlines/i24/serial/fixed_target/
|
|
31
|
-
mx_bluesky/beamlines/i24/serial/fixed_target/
|
|
32
|
-
mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=f7cwLsRkIxMB_Qs7t2pXSn4d5feygGiZaaIDUrUMDPg,6412
|
|
28
|
+
mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py,sha256=puO1vg0x-TPgv8FbEFg73ohJqbwDpcG50_2cLUTa2FA,1210
|
|
29
|
+
mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=KFDCGh4JDhghVxF8BErg8joBjNcV83eEE_HoLkOUB0g,28712
|
|
30
|
+
mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=rO1nGhCTk8PXSJ1gvnRK52KROHSwcAYDVoCvXfHumxc,33716
|
|
31
|
+
mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py,sha256=ZmwetrBxEr5qmeGKFDGHrRnPysA8KhcPr1O2rKzfsEs,3756
|
|
32
|
+
mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=qciUnif6yd5KwJ8_XvRgafHJOFnzJIMg5Bwfjp0VOzw,6418
|
|
33
33
|
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl,sha256=H9BVU1S3oy8tAVHtKvJvp7YTHA-4X-jtOtiu3jJ7of4,10348
|
|
34
34
|
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl,sha256=WBji5SaRQ5e0KFRgrPuv6IgaFxkal1jh7MZW8SqQN88,2016
|
|
35
|
-
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256
|
|
35
|
+
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256=-O_kRA5-m741Mja8OXQlGJWrRu9uBUkTvJ_uqUBjuFY,56616
|
|
36
36
|
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/ME14E-GeneralPurpose.edl,sha256=cpKpXfU668mGjIz35jUMTF8KAi0RI7WlVO2AR-EnJ8U,60868
|
|
37
37
|
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl,sha256=CPMPU-imtWeKERXydJn30svgx-s2u6SuuamsFRsstyM,38860
|
|
38
38
|
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/PMAC_Command.edl,sha256=2KUy2iEcX9AC07zSH3Sp97b5qauGIm8_HjvoQ4pkyCU,1417
|
|
@@ -42,9 +42,9 @@ mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/nudgechip.edl,sha256=IgL
|
|
|
42
42
|
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl,sha256=CrCo1nSIzT3OcSy4OXq1vu4lz5OvI4U8-yl-ruQ57m4,22665
|
|
43
43
|
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/short1-laser.png,sha256=wDNuKCa_8hUPy4W01vdIrfdZtCyQKT8qVS5AS6kOTmo,9740
|
|
44
44
|
mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/short2-laser.png,sha256=MrdiCFX7j-ODkfSdzc4NQ_8hj2Gs8i9gQqWyNXvdM5s,10189
|
|
45
|
-
mx_bluesky/beamlines/i24/serial/parameters/__init__.py,sha256=
|
|
46
|
-
mx_bluesky/beamlines/i24/serial/parameters/constants.py,sha256=
|
|
47
|
-
mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py,sha256=
|
|
45
|
+
mx_bluesky/beamlines/i24/serial/parameters/__init__.py,sha256=s1PGsVlXnBcCFxlSysA2EDOvvzFRnhD-PHZVfrCi-RM,534
|
|
46
|
+
mx_bluesky/beamlines/i24/serial/parameters/constants.py,sha256=HhAtuc6-Bd3RRwxxbMyijP6rKgWiRB-605mLPZAca7U,1552
|
|
47
|
+
mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py,sha256=pFHuCioe2bvGAwlAdUmc12nXrBJDSioG5oeAHRkoBtY,3417
|
|
48
48
|
mx_bluesky/beamlines/i24/serial/parameters/utils.py,sha256=IR1ulMWW0PEoF-kddqXtFVm8MoA7oB_MbS0XO7a-k4w,2118
|
|
49
49
|
mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json,sha256=xT3y7SSWjVTAJ58dzwNnEgBdn10A6T8umR18n5xt508,142
|
|
50
50
|
mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/motor_direction.txt,sha256=oIPpcQpqCrKz5dPZ-qQ5gQ2Sdqtj6nsnf66pN8PGU50,199
|
|
@@ -52,75 +52,83 @@ mx_bluesky/beamlines/i24/serial/parameters/fixed_target/pvar_files/minichip-oxfo
|
|
|
52
52
|
mx_bluesky/beamlines/i24/serial/parameters/fixed_target/pvar_files/oxford.pvar,sha256=pZbFOEiN_S5yiTEtqdNHmTMtnQY-W2ImXVBYCovPCx0,1842
|
|
53
53
|
mx_bluesky/beamlines/i24/serial/setup_beamline/__init__.py,sha256=UhBdMcPdJMzwV0d8DKOBzvYNd6TDSwcP9GJVqfGa7Jc,261
|
|
54
54
|
mx_bluesky/beamlines/i24/serial/setup_beamline/ca.py,sha256=H2gPmsLheYReFlGPFa5zzWbnyqdWbCmgKiAwcpVoYfk,1516
|
|
55
|
-
mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=
|
|
55
|
+
mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=aYgIKeBck2wliQyLq-uukuPiyN7WTkNutLAM6ys3WuM,15623
|
|
56
56
|
mx_bluesky/beamlines/i24/serial/setup_beamline/pv_abstract.py,sha256=WbD5ghgTG0F3-MR0XYm4nkiKYswVP5a2COYx_k_cngE,1806
|
|
57
|
-
mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=
|
|
58
|
-
mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=
|
|
59
|
-
mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=
|
|
57
|
+
mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=BPX6XB7p-qoLC4ycsHjFExasih4Y1HLhUbfQaPTZtns,19588
|
|
58
|
+
mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=riBXkgAg3lV6dqoCng_3IF8ZfhwvOHf0zqktJC0rfn0,3241
|
|
59
|
+
mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=_nTQvZmxcKxspeHmKfVcjXkJMtBzB5Qqq7tB0iSlQi4,17241
|
|
60
60
|
mx_bluesky/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
61
61
|
mx_bluesky/common/device_setup_plans/read_hardware_for_setup.py,sha256=P018shGBEdO0QWBufwITOk3p-sPUCy4P6UIkf6aUuho,583
|
|
62
|
-
mx_bluesky/common/
|
|
63
|
-
mx_bluesky/common/parameters/
|
|
62
|
+
mx_bluesky/common/external_interaction/config_server.py,sha256=7CwHr03idK5vAB_9acDgGPe6_1bX3bIelecnmsjC7V0,1937
|
|
63
|
+
mx_bluesky/common/parameters/components.py,sha256=ktEM1MrKRocbRYLleihcUdu4FwfgYbs7WadiI6GJXHY,7216
|
|
64
|
+
mx_bluesky/common/parameters/constants.py,sha256=SmkLsh2yq-x9rHiWkBKCCrzqCtD8n8Z6u0OXz8svwuo,4023
|
|
65
|
+
mx_bluesky/common/parameters/gridscan.py,sha256=AWGf_Wwx09i7I6DZty5nfzd8U-eUI2PUjlCb5BhM_WI,3232
|
|
66
|
+
mx_bluesky/common/parameters/robot_load.py,sha256=HWkMxCyD6R3qWuBU1jk-Zel2XGotvgAusMpTsVxYUe0,453
|
|
64
67
|
mx_bluesky/common/plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
|
|
65
|
-
mx_bluesky/common/plans/do_fgs.py,sha256=
|
|
66
|
-
mx_bluesky/common/utils/log.py,sha256=
|
|
68
|
+
mx_bluesky/common/plans/do_fgs.py,sha256=xT_o3nFjiB8bUBZld7k1YTlaBoj1eFUBDvWPjpkXYJs,5090
|
|
69
|
+
mx_bluesky/common/utils/log.py,sha256=ZqhcErN71AUXMCJy0865nWVz4FaKq7DFSoxgdXvC0-8,3566
|
|
67
70
|
mx_bluesky/common/utils/tracing.py,sha256=stnBZIvPuKiAm2wVc8lFr3ns7V5C52rUigULi9V-IFs,1171
|
|
68
71
|
mx_bluesky/hyperion/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
|
|
69
|
-
mx_bluesky/hyperion/__main__.py,sha256=
|
|
70
|
-
mx_bluesky/hyperion/exceptions.py,sha256=
|
|
72
|
+
mx_bluesky/hyperion/__main__.py,sha256=HbyWl_ea6CeZhNF2P5sIG1INgi_d0Jdhtx3F9Vr2pTw,13788
|
|
73
|
+
mx_bluesky/hyperion/exceptions.py,sha256=p6v49xg2O5hud0QiCf0rwWD4OvVb8lJaT5UpLj3zpc8,1579
|
|
71
74
|
mx_bluesky/hyperion/log.py,sha256=DkTW9lH-v_F4Tda5D3OhiSYQe-6Nhma2tqHbnr1mPno,416
|
|
72
75
|
mx_bluesky/hyperion/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
73
|
-
mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256
|
|
76
|
+
mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=oKv72jSX67OpahzCIPAXpX_a3lUplOh7LFexvYBd-uc,4565
|
|
74
77
|
mx_bluesky/hyperion/device_setup_plans/manipulate_sample.py,sha256=vJdlTs9LILfkifqNcn15sQgG4_OJbK30v70YzJq0B8c,3217
|
|
75
78
|
mx_bluesky/hyperion/device_setup_plans/position_detector.py,sha256=g2gJZFqOF2klH92uKQAMoyXRSD7ehloe9wToIVfV-CM,631
|
|
76
79
|
mx_bluesky/hyperion/device_setup_plans/read_hardware_for_setup.py,sha256=-bf3lRpvIQVsmT3-jRjb5jqaHDD3F3LSENmJVItixhA,2186
|
|
77
80
|
mx_bluesky/hyperion/device_setup_plans/setup_oav.py,sha256=pIXLM3FKpf7wYMEiEAOaGTm504XAt5N7nuuu9kKraBk,2914
|
|
78
|
-
mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256
|
|
79
|
-
mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=
|
|
80
|
-
mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=
|
|
81
|
+
mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=fpKqOiGODj0ltblZwvV3D9qNU8tljw8r9n2g9fKo8_E,7789
|
|
82
|
+
mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=JnPRRTycWEljEUx51xoJO1VzfP7QcrHHtn6DZ6tSLgc,9696
|
|
83
|
+
mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=NjgBnxkm-eluzMFamY0lMf7AwqBSY4TKCtrgV2BuX2E,1205
|
|
81
84
|
mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=Ha9vzI6xniaJZZ9HfjpXjx-N23glxfdEoDGzhSAy6hc,1953
|
|
82
85
|
mx_bluesky/hyperion/device_setup_plans/xbpm_feedback.py,sha256=3WfVaNjB6f6XGLiPl3WqTNe4KdXqDHu8NkYufRl0g0Q,3959
|
|
83
|
-
mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=
|
|
84
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
85
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
86
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
87
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
88
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
89
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
90
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
91
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
92
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
93
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
94
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
95
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
96
|
-
mx_bluesky/hyperion/experiment_plans/
|
|
86
|
+
mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=3ldTMxgz4yKHJH9iF3nw7uueyX2zQ5Z84V0dsCzW5us,1081
|
|
87
|
+
mx_bluesky/hyperion/experiment_plans/change_aperture_then_move_plan.py,sha256=4if5QruC2Q-rd8iInV9oiq0BjzjQW8IzBhXRcjxcAfg,3258
|
|
88
|
+
mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=uZaxI-Tib0caZpydXooWULyMzx1vGiyWk0_rcvprevs,3059
|
|
89
|
+
mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=eHwYhhuQ9eQhbB_jP0AOp3U5ddvdMhG96tHDCS00iQY,18643
|
|
90
|
+
mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=3yBIoWGlzw3R3MYL7OzpakuzCuDQ-XkIxay1asK9Nsc,8155
|
|
91
|
+
mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=Vnxj7V8Poql-CHA5pJmpaqBRwzUL05za0ZAtZ4ut9Dw,4404
|
|
92
|
+
mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py,sha256=UYFEPzW4QzpiyspMa9GnSjmrQ4qLSb0HllyPJ78ApvI,7642
|
|
93
|
+
mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=TfhZjnc_j6sqM7eeAkVNc8KG0O2L-CDjO0xoZWGeCA4,3126
|
|
94
|
+
mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=ORE60OyjhbXL1ul-IlMc9XnutNaTpiRGmc0YLegMX4c,16324
|
|
95
|
+
mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=LR365Xmc8bO-6Sz2ApQIbfaAGvMQLnMQxByXAP9s-kA,5014
|
|
96
|
+
mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=16psmBqV4Mz6QOHhiZqUBSvSIufyLu0Pda8UOX-5Djw,6166
|
|
97
|
+
mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=NA0-S23jyLP2lQ3T1DPttKNtdTIlpuTcDSFNxhwZn1k,8524
|
|
98
|
+
mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=OVBTzyV-ua_KbzSxMmiJZONKTtg_ldjnUi3iT4FEdgo,7431
|
|
99
|
+
mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=hJaUCQts0JZK6scLb4TNGwBsUGQUlnMrOZ-RTWwC-74,16260
|
|
100
|
+
mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=LgOTk7D2RKImejRMW4yG2KQNnr86tTh4RYaCrDFXXL8,1823
|
|
101
|
+
mx_bluesky/hyperion/experiment_plans/common/xrc_result.py,sha256=VwNbY9bzXoFUo-VYiQNscmF7l_6TFv1iRCYshHdla7w,1435
|
|
97
102
|
mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
|
|
98
|
-
mx_bluesky/hyperion/external_interaction/config_server.py,sha256=
|
|
99
|
-
mx_bluesky/hyperion/external_interaction/exceptions.py,sha256=
|
|
100
|
-
mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=
|
|
101
|
-
mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=
|
|
103
|
+
mx_bluesky/hyperion/external_interaction/config_server.py,sha256=bq_MPCDVcKswRzFbfgJUTErj11TrYaYHyrnkpknVE6M,640
|
|
104
|
+
mx_bluesky/hyperion/external_interaction/exceptions.py,sha256=Fl-XrVAsASDgGsDk_mzf4LewcilL2T9RetN2G1gkiDc,142
|
|
105
|
+
mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=1XHaxDljMveu_DYIlk7n963gHffyC6r4C_RhF6HA-N8,283
|
|
106
|
+
mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=20lBqng2NHg_g0mta8eL55vXIXFVAXd1M7ti9vo_5RY,5061
|
|
102
107
|
mx_bluesky/hyperion/external_interaction/callbacks/aperture_change_callback.py,sha256=pWd84QldTGLoxPdyqXZk6_SLhvF7O-CQRsiXqWDQEkg,837
|
|
103
|
-
mx_bluesky/hyperion/external_interaction/callbacks/grid_detection_callback.py,sha256=
|
|
108
|
+
mx_bluesky/hyperion/external_interaction/callbacks/grid_detection_callback.py,sha256=haWySSo0eHCU28i8bZ_uahg6K7ZVDlMy7X-mAsSP0oY,3090
|
|
104
109
|
mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py,sha256=Na00U4d1ZiuV1DlXKkoNOcwo1Bh89ONNgNQWl2H1YM4,9484
|
|
105
110
|
mx_bluesky/hyperion/external_interaction/callbacks/log_uid_tag_callback.py,sha256=pfZxQfS9SnXep3F2YAPptDX5bjjWvbXtgy5fINfsoTU,626
|
|
106
111
|
mx_bluesky/hyperion/external_interaction/callbacks/logging_callback.py,sha256=W5jO7uHvi84FmEwVC_wNk93oc3-SJ8pZq61cYS-qalU,708
|
|
107
112
|
mx_bluesky/hyperion/external_interaction/callbacks/plan_reactive_callback.py,sha256=7UtkXZluAag_Mx_JnESd7ODPSN3WrcNCgN8mquIpxjE,4086
|
|
108
113
|
mx_bluesky/hyperion/external_interaction/callbacks/zocalo_callback.py,sha256=Jwf_jFLnC1lRm-WIlZ6ZozbQyw_SHtXK_5HUA5RT7Fw,3960
|
|
109
114
|
mx_bluesky/hyperion/external_interaction/callbacks/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
110
|
-
mx_bluesky/hyperion/external_interaction/callbacks/common/
|
|
115
|
+
mx_bluesky/hyperion/external_interaction/callbacks/common/abstract_event.py,sha256=iBj4WNK5ikieZzTePBZ9AEu6ehlnpew1nDK3ONJqibI,2093
|
|
116
|
+
mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py,sha256=iAWmClHyGpWvvULZEJIpib9x_QxxjUbpDqLxOOjVRGI,2183
|
|
111
117
|
mx_bluesky/hyperion/external_interaction/callbacks/common/ispyb_mapping.py,sha256=DK6YqioQCwPF4MkVGMf8rtKsC1o7nWmVBdGaJOv2lhQ,2582
|
|
112
|
-
mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py,sha256=
|
|
118
|
+
mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py,sha256=pxxIxjZFaVTJOARUIOZm4SjelUW5QBiv1n8hwblt_6c,3966
|
|
113
119
|
mx_bluesky/hyperion/external_interaction/callbacks/rotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
114
|
-
mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=
|
|
120
|
+
mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=YBZYH3-yv1h1AhePJATtPTuouYL76QMcmxTI0vSEbGQ,7365
|
|
115
121
|
mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py,sha256=gXub8lt04ClC4sU_QGaBW4w3wrH8hJK7Tjy0AY4zf7g,718
|
|
116
|
-
mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sha256=
|
|
122
|
+
mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sha256=kamsFKVXVtbOfwkeepBzzvJCWgWUcDbYiWP9yhIwevc,4553
|
|
123
|
+
mx_bluesky/hyperion/external_interaction/callbacks/sample_handling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
124
|
+
mx_bluesky/hyperion/external_interaction/callbacks/sample_handling/sample_handling_callback.py,sha256=hNgiKbae5Qf10cGYhmYTJ09pjv1IszEsI4XlqUAaHiE,3266
|
|
117
125
|
mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
118
|
-
mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=
|
|
126
|
+
mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=TY115wEHFZhsuMWeEusAB__O0qfg4Jnun23a34kL0Jg,11661
|
|
119
127
|
mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sha256=8SiT3Yes58HJNro4CatIM1dcnyIvTBt0DNtAGbcEx7g,1818
|
|
120
|
-
mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=
|
|
128
|
+
mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=4I4Dp5CClu1Nwn5fzK-byjaZLivHPyqVSR8UZr0Xzl8,4499
|
|
121
129
|
mx_bluesky/hyperion/external_interaction/ispyb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
122
130
|
mx_bluesky/hyperion/external_interaction/ispyb/data_model.py,sha256=7P2Tz3Y9k-vKSGsdk8ppvKg15z1iBGGKbw3RNv_8y-E,2632
|
|
123
|
-
mx_bluesky/hyperion/external_interaction/ispyb/exp_eye_store.py,sha256=
|
|
131
|
+
mx_bluesky/hyperion/external_interaction/ispyb/exp_eye_store.py,sha256=wWRKz-IzUnOjH4MuLghxGVwwm5bonqNcyS8YblF4OHY,5950
|
|
124
132
|
mx_bluesky/hyperion/external_interaction/ispyb/ispyb_store.py,sha256=cDNUbdZfM491_OwSboW7BX_hSAm2xmIgeY0thPnek2Y,10322
|
|
125
133
|
mx_bluesky/hyperion/external_interaction/ispyb/ispyb_utils.py,sha256=2Vl5qvGoCvbZ-lJFJSSNpTkbE4YfHAhy79jP7Oap6gg,720
|
|
126
134
|
mx_bluesky/hyperion/external_interaction/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -128,19 +136,18 @@ mx_bluesky/hyperion/external_interaction/nexus/nexus_utils.py,sha256=dryKyQS7sxD
|
|
|
128
136
|
mx_bluesky/hyperion/external_interaction/nexus/write_nexus.py,sha256=77D2yD2VMm4CkGTzI_1OZHQR_byVwVeJ2MCRTfT5vKs,4134
|
|
129
137
|
mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67yxl9IVsfrr1LE,115
|
|
130
138
|
mx_bluesky/hyperion/parameters/cli.py,sha256=FGzvEB76YnQvBydUMPUNHJuqxvEe7Zc627w7gA2KODY,2125
|
|
131
|
-
mx_bluesky/hyperion/parameters/components.py,sha256=
|
|
132
|
-
mx_bluesky/hyperion/parameters/constants.py,sha256=
|
|
133
|
-
mx_bluesky/hyperion/parameters/gridscan.py,sha256=
|
|
134
|
-
mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=
|
|
135
|
-
mx_bluesky/hyperion/parameters/
|
|
136
|
-
mx_bluesky/hyperion/parameters/rotation.py,sha256=Gwt9gXAFOxcQAEd8vleXoCXtkqL5x4dSRKnr8HZWjkw,5804
|
|
139
|
+
mx_bluesky/hyperion/parameters/components.py,sha256=Uy-CZ81YhwJcatMOEZxQJmZD79SwQJbxgPUYxeNw_xQ,243
|
|
140
|
+
mx_bluesky/hyperion/parameters/constants.py,sha256=XVhYFHK8PZ81uNNjifNtzB__jcabNPOd4Cc_oLY8KXs,1810
|
|
141
|
+
mx_bluesky/hyperion/parameters/gridscan.py,sha256=q9N0cCw1B1gBw6hUF1RgBVnX2DT-11W3QBWD-EI9X1A,7006
|
|
142
|
+
mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=XtMCnH7eIoLy55CDi5U8NjejnedF_vLzkdfV6mffImY,1854
|
|
143
|
+
mx_bluesky/hyperion/parameters/rotation.py,sha256=eO5TAbH3jx0pj1AYMOA4jVf9z_qMuiyuAYX0oQjxKEE,6260
|
|
137
144
|
mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=xrhgok-9X2VXdyLEWiYOUEeRCBqhYM6IJFAefnNdgzw,26521
|
|
138
145
|
mx_bluesky/hyperion/utils/context.py,sha256=TYG3e4lu88ssngoNbsR5pfEXI0DveDemLWaBuThtvbI,2710
|
|
139
146
|
mx_bluesky/hyperion/utils/utils.py,sha256=q2uCaK1E8zLVk1BFmj7qlTnQf3JRKjCjyadIVnL1-4M,1180
|
|
140
147
|
mx_bluesky/hyperion/utils/validation.py,sha256=dTG7KmWsLSoR0c1mYuhhNByUT6Yj3_VBAreY9nUdQjQ,6483
|
|
141
|
-
mx_bluesky-1.4.
|
|
142
|
-
mx_bluesky-1.4.
|
|
143
|
-
mx_bluesky-1.4.
|
|
144
|
-
mx_bluesky-1.4.
|
|
145
|
-
mx_bluesky-1.4.
|
|
146
|
-
mx_bluesky-1.4.
|
|
148
|
+
mx_bluesky-1.4.1.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
|
|
149
|
+
mx_bluesky-1.4.1.dist-info/METADATA,sha256=3l5V3QL8BJbuzei0MmvBAe6VZx_lOhs2gm95seupDAw,17272
|
|
150
|
+
mx_bluesky-1.4.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
|
|
151
|
+
mx_bluesky-1.4.1.dist-info/entry_points.txt,sha256=Bt3iHCqzZtHYnnSKoh_qM2k3K4LbK1Uxr0gF8B34F98,528
|
|
152
|
+
mx_bluesky-1.4.1.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
|
|
153
|
+
mx_bluesky-1.4.1.dist-info/RECORD,,
|
|
@@ -1,150 +0,0 @@
|
|
|
1
|
-
"""
|
|
2
|
-
Chip mapping utilities for fixed target
|
|
3
|
-
|
|
4
|
-
This version changed to python3 March2020 by RLO
|
|
5
|
-
"""
|
|
6
|
-
|
|
7
|
-
import numpy as np
|
|
8
|
-
|
|
9
|
-
from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType
|
|
10
|
-
from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_StartUp_py3v1 import (
|
|
11
|
-
check_files,
|
|
12
|
-
get_shot_order,
|
|
13
|
-
get_xy,
|
|
14
|
-
read_parameter_file,
|
|
15
|
-
write_file,
|
|
16
|
-
)
|
|
17
|
-
from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER, log_on_entry
|
|
18
|
-
from mx_bluesky.beamlines.i24.serial.parameters import get_chip_format
|
|
19
|
-
from mx_bluesky.beamlines.i24.serial.parameters.constants import PARAM_FILE_PATH_FT
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
@log_on_entry
|
|
23
|
-
def read_file_make_dict(fid, chip_type, switch=False):
|
|
24
|
-
a_dict = {}
|
|
25
|
-
b_dict = {}
|
|
26
|
-
with open(fid) as f:
|
|
27
|
-
for line in f.readlines():
|
|
28
|
-
if line.startswith("#"):
|
|
29
|
-
continue
|
|
30
|
-
else:
|
|
31
|
-
entry = line.rstrip().split()
|
|
32
|
-
addr = entry[0][-5:]
|
|
33
|
-
pres = entry[4]
|
|
34
|
-
x, y = get_xy(addr, chip_type)
|
|
35
|
-
a_dict[x, y] = pres
|
|
36
|
-
b_dict[addr] = pres
|
|
37
|
-
if switch is True:
|
|
38
|
-
return b_dict
|
|
39
|
-
else:
|
|
40
|
-
return a_dict
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
@log_on_entry
|
|
44
|
-
def plot_file(plt, fid, chip_type):
|
|
45
|
-
chip_dict = read_file_make_dict(fid, chip_type)
|
|
46
|
-
x_list, y_list, z_list = [], [], []
|
|
47
|
-
for k in sorted(chip_dict.keys()):
|
|
48
|
-
x, y = k[0], k[1]
|
|
49
|
-
pres = chip_dict[k]
|
|
50
|
-
x_list.append(float(x))
|
|
51
|
-
y_list.append(float(y))
|
|
52
|
-
z_list.append(float(pres))
|
|
53
|
-
|
|
54
|
-
X = np.array(x_list)
|
|
55
|
-
Y = np.array(y_list)
|
|
56
|
-
Z = np.array(z_list)
|
|
57
|
-
xr = X.ravel()
|
|
58
|
-
yr = Y.ravel()
|
|
59
|
-
zr = Z.ravel()
|
|
60
|
-
|
|
61
|
-
fig = plt.figure(num=None, figsize=(12, 12), facecolor="0.6", edgecolor="k")
|
|
62
|
-
fig.subplots_adjust(
|
|
63
|
-
left=0.03, bottom=0.03, right=0.97, top=0.97, wspace=0, hspace=0
|
|
64
|
-
)
|
|
65
|
-
ax1 = fig.add_subplot(111, aspect="equal", axisbg="0.3")
|
|
66
|
-
ax1.scatter(xr, yr, c=zr, s=8, alpha=1, marker="s", linewidth=0.1, cmap="winter")
|
|
67
|
-
ax1.set_xlim(-1, 26)
|
|
68
|
-
ax1.set_ylim(-1, 26)
|
|
69
|
-
ax1.invert_yaxis()
|
|
70
|
-
check_files("i24", [f"{chip_type}.png"])
|
|
71
|
-
plt.savefig(f"{fid[:-5]}.png", dpi=200, bbox_inches="tight", pad_inches=0.05)
|
|
72
|
-
return 1
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
@log_on_entry
|
|
76
|
-
def convert_chip_to_hex(fid, chip_type):
|
|
77
|
-
chip_dict = read_file_make_dict(fid, chip_type, True)
|
|
78
|
-
chip_format = get_chip_format(ChipType(chip_type))
|
|
79
|
-
check_files("i24", [f"{chip_type}.full"])
|
|
80
|
-
with open(f"{fid[:-5]}.full", "w") as g:
|
|
81
|
-
# Normal
|
|
82
|
-
if chip_type in [ChipType.Oxford, ChipType.OxfordInner]:
|
|
83
|
-
shot_order_list = get_shot_order(chip_type)
|
|
84
|
-
SSX_LOGGER.info("Shot Order List: \n")
|
|
85
|
-
SSX_LOGGER.info(f"{shot_order_list[:14]}")
|
|
86
|
-
SSX_LOGGER.info(f"{shot_order_list[-14:]}")
|
|
87
|
-
for i, k in enumerate(shot_order_list):
|
|
88
|
-
if i % 20 == 0:
|
|
89
|
-
SSX_LOGGER.info("\n")
|
|
90
|
-
else:
|
|
91
|
-
SSX_LOGGER.info(f"{k}")
|
|
92
|
-
sorted_pres_list = []
|
|
93
|
-
for addr in shot_order_list:
|
|
94
|
-
sorted_pres_list.append(chip_dict[addr])
|
|
95
|
-
|
|
96
|
-
windows_per_block = chip_format.x_num_steps
|
|
97
|
-
number_of_lines = int(len(sorted_pres_list) / windows_per_block)
|
|
98
|
-
hex_length = windows_per_block / 4
|
|
99
|
-
pad = int(7 - hex_length)
|
|
100
|
-
for i in range(number_of_lines):
|
|
101
|
-
sublist = sorted_pres_list[
|
|
102
|
-
i * windows_per_block : (i * windows_per_block) + windows_per_block
|
|
103
|
-
]
|
|
104
|
-
if i % 2 == 0:
|
|
105
|
-
right_list = sublist
|
|
106
|
-
else:
|
|
107
|
-
right_list = sublist[::-1]
|
|
108
|
-
hex_string = (f"{{0:0>{hex_length}X}}").format(
|
|
109
|
-
int("".join(str(x) for x in right_list), 2)
|
|
110
|
-
)
|
|
111
|
-
hex_string = hex_string + (pad * "0")
|
|
112
|
-
pvar = 5001 + i
|
|
113
|
-
line = f"P{pvar}=${hex_string}"
|
|
114
|
-
g.write(line + "\n")
|
|
115
|
-
SSX_LOGGER.info("hex string: %s" % (hex_string + 4 * "0"))
|
|
116
|
-
SSX_LOGGER.info(f"line number= {i}")
|
|
117
|
-
SSX_LOGGER.info(
|
|
118
|
-
"right_list: \n{}\n".format("".join(str(x) for x in right_list))
|
|
119
|
-
)
|
|
120
|
-
SSX_LOGGER.info(f"PVAR: {line}")
|
|
121
|
-
if (i + 1) % windows_per_block == 0:
|
|
122
|
-
SSX_LOGGER.info(
|
|
123
|
-
"\n %s" % (40 * (" %i" % ((i / windows_per_block) + 2)))
|
|
124
|
-
)
|
|
125
|
-
SSX_LOGGER.info(f"hex_length: {hex_length}")
|
|
126
|
-
else:
|
|
127
|
-
SSX_LOGGER.warning("Chip type unknown, no conversion done.")
|
|
128
|
-
return 0
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
def main(plt):
|
|
132
|
-
params = read_parameter_file()
|
|
133
|
-
|
|
134
|
-
check_files("i24", [".spec"])
|
|
135
|
-
write_file(suffix=".spec", order="shot")
|
|
136
|
-
|
|
137
|
-
SSX_LOGGER.info(f"PARAMETER PATH = {PARAM_FILE_PATH_FT}")
|
|
138
|
-
fid = PARAM_FILE_PATH_FT / f"{params.filename}.spec"
|
|
139
|
-
SSX_LOGGER.info(f"FID = {fid}")
|
|
140
|
-
|
|
141
|
-
plot_file(plt, fid, params.chip.chip_type.value)
|
|
142
|
-
convert_chip_to_hex(fid, params.chip.chip_type.value)
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
if __name__ == "__main__":
|
|
146
|
-
from matplotlib import pyplot as plt
|
|
147
|
-
|
|
148
|
-
main(plt)
|
|
149
|
-
plt.show()
|
|
150
|
-
plt.close()
|
|
File without changes
|
|
File without changes
|
|
File without changes
|