mx-bluesky 0.0.2__py3-none-any.whl → 0.3.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.
Files changed (82) hide show
  1. mx_bluesky/__main__.py +1 -2
  2. mx_bluesky/_version.py +14 -2
  3. mx_bluesky/example.py +4 -4
  4. mx_bluesky/i04/__init__.py +3 -0
  5. mx_bluesky/i04/callbacks/murko_callback.py +45 -0
  6. mx_bluesky/i04/thawing_plan.py +84 -0
  7. mx_bluesky/i24/serial/__init__.py +49 -0
  8. mx_bluesky/i24/serial/blueapi_config.yaml +12 -0
  9. mx_bluesky/{I24 → i24}/serial/dcid.py +53 -41
  10. mx_bluesky/{I24 → i24}/serial/extruder/EX-gui-edm/DetStage.edl +1 -2
  11. mx_bluesky/{I24 → i24}/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl +28 -32
  12. mx_bluesky/{I24 → i24}/serial/extruder/EX-gui-edm/microdrop_alignment.edl +0 -1
  13. mx_bluesky/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py +513 -0
  14. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl +1 -2
  15. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/DetStage.edl +1 -2
  16. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl +46 -41
  17. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/ME14E-GeneralPurpose.edl +0 -1
  18. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl +10 -11
  19. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/PMAC_Command.edl +0 -1
  20. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/Shutter_Control.edl +0 -1
  21. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/microdrop_alignment.edl +0 -1
  22. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/nudgechip.edl +0 -1
  23. mx_bluesky/{I24 → i24}/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl +273 -143
  24. mx_bluesky/i24/serial/fixed_target/FT-gui-edm/short1-laser.png +0 -0
  25. mx_bluesky/i24/serial/fixed_target/FT-gui-edm/short2-laser.png +0 -0
  26. mx_bluesky/{I24 → i24}/serial/fixed_target/ft_utils.py +24 -1
  27. mx_bluesky/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py +798 -0
  28. mx_bluesky/{I24 → i24}/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py +374 -412
  29. mx_bluesky/{I24 → i24}/serial/fixed_target/i24ssx_Chip_Mapping_py3v1.py +34 -40
  30. mx_bluesky/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py +325 -0
  31. mx_bluesky/{I24 → i24}/serial/fixed_target/i24ssx_moveonclick.py +39 -41
  32. mx_bluesky/i24/serial/log.py +156 -0
  33. mx_bluesky/i24/serial/parameters/__init__.py +15 -0
  34. mx_bluesky/i24/serial/parameters/constants.py +47 -0
  35. mx_bluesky/i24/serial/parameters/experiment_parameters.py +124 -0
  36. mx_bluesky/i24/serial/parameters/fixed_target/cs/cs_maker.json +9 -0
  37. mx_bluesky/{I24 → i24}/serial/parameters/fixed_target/cs/motor_direction.txt +1 -1
  38. mx_bluesky/{I24 → i24}/serial/parameters/fixed_target/pvar_files/minichip-oxford.pvar +1 -1
  39. mx_bluesky/i24/serial/parameters/utils.py +40 -0
  40. mx_bluesky/i24/serial/run_extruder.sh +19 -0
  41. mx_bluesky/i24/serial/run_fixed_target.sh +22 -0
  42. mx_bluesky/i24/serial/run_serial.py +36 -0
  43. mx_bluesky/{I24 → i24}/serial/set_visit_directory.sh +6 -1
  44. mx_bluesky/{I24 → i24}/serial/setup_beamline/pv.py +1 -62
  45. mx_bluesky/{I24 → i24}/serial/setup_beamline/pv_abstract.py +6 -7
  46. mx_bluesky/{I24 → i24}/serial/setup_beamline/setup_beamline.py +90 -269
  47. mx_bluesky/{I24 → i24}/serial/setup_beamline/setup_detector.py +47 -40
  48. mx_bluesky/i24/serial/setup_beamline/setup_zebra_plans.py +459 -0
  49. mx_bluesky/i24/serial/start_blueapi.sh +28 -0
  50. mx_bluesky/i24/serial/write_nexus.py +102 -0
  51. mx_bluesky/parameters/__init__.py +31 -0
  52. mx_bluesky/parameters/components.py +200 -0
  53. {mx_bluesky-0.0.2.dist-info → mx_bluesky-0.3.1.dist-info}/METADATA +33 -27
  54. mx_bluesky-0.3.1.dist-info/RECORD +67 -0
  55. {mx_bluesky-0.0.2.dist-info → mx_bluesky-0.3.1.dist-info}/WHEEL +1 -1
  56. mx_bluesky-0.3.1.dist-info/entry_points.txt +4 -0
  57. mx_bluesky/I24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py +0 -476
  58. mx_bluesky/I24/serial/fixed_target/FT-gui-edm/ME14E-motors.edl +0 -1874
  59. mx_bluesky/I24/serial/fixed_target/__init__.py +0 -0
  60. mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py +0 -706
  61. mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py +0 -463
  62. mx_bluesky/I24/serial/log.py +0 -101
  63. mx_bluesky/I24/serial/parameters/__init__.py +0 -5
  64. mx_bluesky/I24/serial/parameters/constants.py +0 -39
  65. mx_bluesky/I24/serial/parameters/fixed_target/cs/cs_maker.json +0 -9
  66. mx_bluesky/I24/serial/parameters/fixed_target/cs/fiducial_1.txt +0 -4
  67. mx_bluesky/I24/serial/parameters/fixed_target/cs/fiducial_2.txt +0 -4
  68. mx_bluesky/I24/serial/parameters/fixed_target/litemaps/currentchip.map +0 -81
  69. mx_bluesky/I24/serial/parameters/fixed_target/parameters.txt +0 -13
  70. mx_bluesky/I24/serial/run_serial.py +0 -52
  71. mx_bluesky/I24/serial/write_nexus.py +0 -113
  72. mx_bluesky-0.0.2.dist-info/RECORD +0 -58
  73. mx_bluesky-0.0.2.dist-info/entry_points.txt +0 -4
  74. /mx_bluesky/{I24 → i24}/__init__.py +0 -0
  75. /mx_bluesky/{I24/serial → i24/serial/extruder}/__init__.py +0 -0
  76. /mx_bluesky/{I24/serial/extruder → i24/serial/fixed_target}/__init__.py +0 -0
  77. /mx_bluesky/{I24 → i24}/serial/parameters/fixed_target/pvar_files/oxford.pvar +0 -0
  78. /mx_bluesky/{I24 → i24}/serial/run_ssx.sh +0 -0
  79. /mx_bluesky/{I24 → i24}/serial/setup_beamline/__init__.py +0 -0
  80. /mx_bluesky/{I24 → i24}/serial/setup_beamline/ca.py +0 -0
  81. {mx_bluesky-0.0.2.dist-info → mx_bluesky-0.3.1.dist-info}/LICENSE +0 -0
  82. {mx_bluesky-0.0.2.dist-info → mx_bluesky-0.3.1.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 3174
7
- y 381
6
+ x 2970
7
+ y 362
8
8
  w 900
9
9
  h 700
10
10
  font "arial-medium-r-18.0"
@@ -86,7 +86,7 @@ major 4
86
86
  minor 1
87
87
  release 1
88
88
  x 6
89
- y 305
89
+ y 333
90
90
  w 271
91
91
  h 27
92
92
  font "arial-bold-r-24.0"
@@ -106,8 +106,8 @@ beginObjectProperties
106
106
  major 4
107
107
  minor 1
108
108
  release 1
109
- x 8
110
- y 402
109
+ x 21
110
+ y 430
111
111
  w 128
112
112
  h 21
113
113
  font "arial-medium-r-18.0"
@@ -127,8 +127,8 @@ beginObjectProperties
127
127
  major 4
128
128
  minor 1
129
129
  release 1
130
- x 9
131
- y 439
130
+ x 22
131
+ y 467
132
132
  w 276
133
133
  h 42
134
134
  font "arial-medium-r-18.0"
@@ -149,8 +149,8 @@ beginObjectProperties
149
149
  major 4
150
150
  minor 3
151
151
  release 0
152
- x 117
153
- y 488
152
+ x 128
153
+ y 518
154
154
  w 122
155
155
  h 37
156
156
  fgColor index 14
@@ -160,7 +160,7 @@ botShadowColor index 11
160
160
  font "arial-medium-r-18.0"
161
161
  numCmds 1
162
162
  command {
163
- 0 "python SCRIPTS_LOCATION/fixed_target/i24ssx_Chip_Manager_py3v1.py pumpprobe_calc"
163
+ 0 "blueapi -c CONFIG_LOCATION controller run pumpprobe_calc"
164
164
  }
165
165
  endObjectProperties
166
166
 
@@ -170,8 +170,8 @@ beginObjectProperties
170
170
  major 4
171
171
  minor 1
172
172
  release 1
173
- x 139
174
- y 496
173
+ x 152
174
+ y 524
175
175
  w 79
176
176
  h 21
177
177
  font "arial-medium-r-18.0"
@@ -191,8 +191,8 @@ beginObjectProperties
191
191
  major 4
192
192
  minor 6
193
193
  release 0
194
- x 142
195
- y 400
194
+ x 155
195
+ y 428
196
196
  w 75
197
197
  h 25
198
198
  controlPv "ME14E-MO-CHIP-01:expTime"
@@ -212,8 +212,8 @@ beginObjectProperties
212
212
  major 4
213
213
  minor 6
214
214
  release 0
215
- x 426
216
- y 382
215
+ x 422
216
+ y 398
217
217
  w 75
218
218
  h 25
219
219
  controlPv "ME14E-MO-IOC-01:GP104"
@@ -233,8 +233,8 @@ beginObjectProperties
233
233
  major 4
234
234
  minor 1
235
235
  release 1
236
- x 338
237
- y 384
236
+ x 334
237
+ y 400
238
238
  w 71
239
239
  h 21
240
240
  font "arial-medium-r-18.0"
@@ -254,8 +254,8 @@ beginObjectProperties
254
254
  major 4
255
255
  minor 1
256
256
  release 1
257
- x 338
258
- y 417
257
+ x 334
258
+ y 433
259
259
  w 72
260
260
  h 21
261
261
  font "arial-medium-r-18.0"
@@ -275,8 +275,8 @@ beginObjectProperties
275
275
  major 4
276
276
  minor 1
277
277
  release 1
278
- x 505
279
- y 384
278
+ x 501
279
+ y 400
280
280
  w 9
281
281
  h 21
282
282
  font "arial-medium-r-18.0"
@@ -296,8 +296,8 @@ beginObjectProperties
296
296
  major 4
297
297
  minor 1
298
298
  release 1
299
- x 505
300
- y 417
299
+ x 501
300
+ y 433
301
301
  w 9
302
302
  h 21
303
303
  font "arial-medium-r-18.0"
@@ -317,8 +317,8 @@ beginObjectProperties
317
317
  major 4
318
318
  minor 1
319
319
  release 1
320
- x 338
321
- y 449
320
+ x 334
321
+ y 465
322
322
  w 71
323
323
  h 21
324
324
  font "arial-medium-r-18.0"
@@ -338,8 +338,8 @@ beginObjectProperties
338
338
  major 4
339
339
  minor 1
340
340
  release 1
341
- x 338
342
- y 482
341
+ x 334
342
+ y 498
343
343
  w 71
344
344
  h 21
345
345
  font "arial-medium-r-18.0"
@@ -359,8 +359,8 @@ beginObjectProperties
359
359
  major 4
360
360
  minor 1
361
361
  release 1
362
- x 505
363
- y 449
362
+ x 501
363
+ y 465
364
364
  w 9
365
365
  h 21
366
366
  font "arial-medium-r-18.0"
@@ -380,8 +380,8 @@ beginObjectProperties
380
380
  major 4
381
381
  minor 1
382
382
  release 1
383
- x 505
384
- y 482
383
+ x 501
384
+ y 498
385
385
  w 9
386
386
  h 21
387
387
  font "arial-medium-r-18.0"
@@ -401,8 +401,8 @@ beginObjectProperties
401
401
  major 4
402
402
  minor 1
403
403
  release 1
404
- x 338
405
- y 513
404
+ x 334
405
+ y 529
406
406
  w 82
407
407
  h 21
408
408
  font "arial-medium-r-18.0"
@@ -422,8 +422,8 @@ beginObjectProperties
422
422
  major 4
423
423
  minor 1
424
424
  release 1
425
- x 505
426
- y 513
425
+ x 501
426
+ y 529
427
427
  w 9
428
428
  h 21
429
429
  font "arial-medium-r-18.0"
@@ -444,7 +444,7 @@ major 4
444
444
  minor 1
445
445
  release 1
446
446
  x 548
447
- y 382
447
+ y 398
448
448
  w 49
449
449
  h 21
450
450
  font "arial-medium-r-18.0"
@@ -465,7 +465,7 @@ major 4
465
465
  minor 1
466
466
  release 1
467
467
  x 557
468
- y 407
468
+ y 423
469
469
  w 308
470
470
  h 108
471
471
  font "arial-medium-r-16.0"
@@ -490,7 +490,7 @@ major 4
490
490
  minor 0
491
491
  release 0
492
492
  x 542
493
- y 412
493
+ y 428
494
494
  w 10
495
495
  h 10
496
496
  lineColor index 12
@@ -505,7 +505,7 @@ major 4
505
505
  minor 0
506
506
  release 0
507
507
  x 542
508
- y 446
508
+ y 462
509
509
  w 10
510
510
  h 10
511
511
  lineColor index 12
@@ -520,7 +520,7 @@ major 4
520
520
  minor 0
521
521
  release 0
522
522
  x 542
523
- y 464
523
+ y 480
524
524
  w 10
525
525
  h 10
526
526
  lineColor index 12
@@ -535,7 +535,7 @@ major 4
535
535
  minor 0
536
536
  release 0
537
537
  x 542
538
- y 483
538
+ y 499
539
539
  w 10
540
540
  h 10
541
541
  lineColor index 12
@@ -549,8 +549,8 @@ beginObjectProperties
549
549
  major 4
550
550
  minor 6
551
551
  release 0
552
- x 426
553
- y 415
552
+ x 422
553
+ y 431
554
554
  w 75
555
555
  h 25
556
556
  controlPv "ME14E-MO-IOC-01:GP105"
@@ -570,8 +570,8 @@ beginObjectProperties
570
570
  major 4
571
571
  minor 6
572
572
  release 0
573
- x 426
574
- y 448
573
+ x 422
574
+ y 464
575
575
  w 75
576
576
  h 25
577
577
  controlPv "ME14E-MO-IOC-01:GP106"
@@ -591,8 +591,8 @@ beginObjectProperties
591
591
  major 4
592
592
  minor 6
593
593
  release 0
594
- x 426
595
- y 479
594
+ x 422
595
+ y 495
596
596
  w 75
597
597
  h 25
598
598
  controlPv "ME14E-MO-IOC-01:GP107"
@@ -612,8 +612,8 @@ beginObjectProperties
612
612
  major 4
613
613
  minor 6
614
614
  release 0
615
- x 426
616
- y 510
615
+ x 422
616
+ y 526
617
617
  w 75
618
618
  h 25
619
619
  controlPv "ME14E-MO-IOC-01:GP108"
@@ -633,8 +633,8 @@ beginObjectProperties
633
633
  major 4
634
634
  minor 1
635
635
  release 1
636
- x 6
637
- y 346
636
+ x 19
637
+ y 374
638
638
  w 122
639
639
  h 42
640
640
  font "arial-medium-r-18.0"
@@ -654,8 +654,8 @@ beginObjectProperties
654
654
  major 4
655
655
  minor 6
656
656
  release 0
657
- x 143
658
- y 354
657
+ x 156
658
+ y 382
659
659
  w 75
660
660
  h 25
661
661
  controlPv "ME14E-MO-IOC-01:GP103"
@@ -682,7 +682,7 @@ major 4
682
682
  minor 0
683
683
  release 0
684
684
  x 542
685
- y 501
685
+ y 517
686
686
  w 10
687
687
  h 10
688
688
  lineColor index 12
@@ -707,7 +707,7 @@ botShadowColor index 14
707
707
  font "arial-medium-r-18.0"
708
708
  numCmds 1
709
709
  command {
710
- 0 "python SCRIPTS_LOCATION/fixed_target/i24ssx_Chip_Manager_py3v1.py moveto laser1off"
710
+ 0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1off\"\}'"
711
711
  }
712
712
  endObjectProperties
713
713
 
@@ -749,7 +749,7 @@ botShadowColor index 14
749
749
  font "arial-medium-r-18.0"
750
750
  numCmds 1
751
751
  command {
752
- 0 "python SCRIPTS_LOCATION/fixed_target/i24ssx_Chip_Manager_py3v1.py moveto laser1on"
752
+ 0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1on\"\}'"
753
753
  }
754
754
  endObjectProperties
755
755
 
@@ -800,8 +800,8 @@ beginObjectProperties
800
800
  major 4
801
801
  minor 1
802
802
  release 1
803
- x 13
804
- y 574
803
+ x 11
804
+ y 594
805
805
  w 189
806
806
  h 27
807
807
  font "arial-bold-r-24.0"
@@ -822,7 +822,7 @@ major 4
822
822
  minor 1
823
823
  release 1
824
824
  x 283
825
- y 305
825
+ y 333
826
826
  w 68
827
827
  h 27
828
828
  font "arial-bold-i-24.0"
@@ -862,8 +862,8 @@ beginObjectProperties
862
862
  major 4
863
863
  minor 6
864
864
  release 0
865
- x 143
866
- y 617
865
+ x 141
866
+ y 637
867
867
  w 75
868
868
  h 25
869
869
  controlPv "ME14E-MO-IOC-01:GP109"
@@ -889,8 +889,8 @@ beginObjectProperties
889
889
  major 4
890
890
  minor 1
891
891
  release 1
892
- x 23
893
- y 619
892
+ x 21
893
+ y 639
894
894
  w 112
895
895
  h 21
896
896
  font "arial-medium-r-18.0"
@@ -930,8 +930,8 @@ beginObjectProperties
930
930
  major 4
931
931
  minor 1
932
932
  release 1
933
- x 234
934
- y 614
933
+ x 232
934
+ y 634
935
935
  w 142
936
936
  h 36
937
937
  font "arial-medium-r-16.0"
@@ -951,8 +951,8 @@ beginObjectProperties
951
951
  major 4
952
952
  minor 0
953
953
  release 0
954
- x 317
955
- y 349
954
+ x 313
955
+ y 365
956
956
  w 207
957
957
  h 191
958
958
  lineColor index 14
@@ -976,7 +976,7 @@ botShadowColor index 14
976
976
  font "arial-medium-r-18.0"
977
977
  numCmds 1
978
978
  command {
979
- 0 "python SCRIPTS_LOCATION/fixed_target/i24ssx_Chip_Manager_py3v1.py moveto laser2off"
979
+ 0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2off\"\}'"
980
980
  }
981
981
  endObjectProperties
982
982
 
@@ -1018,7 +1018,7 @@ botShadowColor index 14
1018
1018
  font "arial-medium-r-18.0"
1019
1019
  numCmds 1
1020
1020
  command {
1021
- 0 "python SCRIPTS_LOCATION/fixed_target/i24ssx_Chip_Manager_py3v1.py moveto laser2on"
1021
+ 0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2on\"\}'"
1022
1022
  }
1023
1023
  endObjectProperties
1024
1024
 
@@ -1049,8 +1049,8 @@ beginObjectProperties
1049
1049
  major 4
1050
1050
  minor 1
1051
1051
  release 1
1052
- x 216
1053
- y 574
1052
+ x 214
1053
+ y 594
1054
1054
  w 90
1055
1055
  h 27
1056
1056
  font "arial-bold-r-24.0"
@@ -1073,8 +1073,8 @@ beginObjectProperties
1073
1073
  major 4
1074
1074
  minor 1
1075
1075
  release 1
1076
- x 351
1077
- y 352
1076
+ x 347
1077
+ y 368
1078
1078
  w 150
1079
1079
  h 21
1080
1080
  font "arial-medium-r-18.0"
@@ -1093,8 +1093,8 @@ beginObjectProperties
1093
1093
  major 4
1094
1094
  minor 1
1095
1095
  release 1
1096
- x 225
1097
- y 355
1096
+ x 238
1097
+ y 383
1098
1098
  w 9
1099
1099
  h 21
1100
1100
  font "arial-medium-r-18.0"
@@ -1134,8 +1134,8 @@ beginObjectProperties
1134
1134
  major 4
1135
1135
  minor 1
1136
1136
  release 1
1137
- x 17
1138
- y 155
1137
+ x 20
1138
+ y 127
1139
1139
  w 98
1140
1140
  h 21
1141
1141
  font "arial-medium-r-18.0"
@@ -1154,8 +1154,8 @@ beginObjectProperties
1154
1154
  major 4
1155
1155
  minor 6
1156
1156
  release 0
1157
- x 141
1158
- y 152
1157
+ x 144
1158
+ y 124
1159
1159
  w 75
1160
1160
  h 25
1161
1161
  controlPv "ME14E-MO-IOC-01:GP103"
@@ -1181,8 +1181,8 @@ beginObjectProperties
1181
1181
  major 4
1182
1182
  minor 1
1183
1183
  release 1
1184
- x 223
1185
- y 153
1184
+ x 226
1185
+ y 125
1186
1186
  w 9
1187
1187
  h 21
1188
1188
  font "arial-medium-r-18.0"
@@ -1201,9 +1201,9 @@ beginObjectProperties
1201
1201
  major 4
1202
1202
  minor 1
1203
1203
  release 1
1204
- x 281
1205
- y 70
1206
- w 204
1204
+ x 273
1205
+ y 71
1206
+ w 135
1207
1207
  h 36
1208
1208
  font "arial-medium-r-16.0"
1209
1209
  fgColor index 13
@@ -1211,7 +1211,7 @@ bgColor index 0
1211
1211
  useDisplayBg
1212
1212
  value {
1213
1213
  "Short 1: "
1214
- "pulse before X-ray images"
1214
+ "pulse before XRD"
1215
1215
  }
1216
1216
  autoSize
1217
1217
  endObjectProperties
@@ -1243,8 +1243,8 @@ beginObjectProperties
1243
1243
  major 4
1244
1244
  minor 1
1245
1245
  release 1
1246
- x 56
1247
- y 641
1246
+ x 54
1247
+ y 661
1248
1248
  w 46
1249
1249
  h 18
1250
1250
  font "arial-bold-r-16.0"
@@ -1263,8 +1263,8 @@ beginObjectProperties
1263
1263
  major 4
1264
1264
  minor 1
1265
1265
  release 1
1266
- x 52
1267
- y 215
1266
+ x 55
1267
+ y 187
1268
1268
  w 45
1269
1269
  h 18
1270
1270
  font "arial-bold-r-16.0"
@@ -1334,7 +1334,7 @@ botShadowColor index 14
1334
1334
  font "arial-medium-r-18.0"
1335
1335
  numCmds 1
1336
1336
  command {
1337
- 0 "python SCRIPTS_LOCATION/fixed_target/i24ssx_Chip_Manager_py3v1.py moveto laser1burn"
1337
+ 0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1burn\"\}'"
1338
1338
  }
1339
1339
  endObjectProperties
1340
1340
 
@@ -1376,7 +1376,7 @@ botShadowColor index 14
1376
1376
  font "arial-medium-r-18.0"
1377
1377
  numCmds 1
1378
1378
  command {
1379
- 0 "python SCRIPTS_LOCATION/fixed_target/i24ssx_Chip_Manager_py3v1.py moveto laser2burn"
1379
+ 0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2burn\"\}'"
1380
1380
  }
1381
1381
  endObjectProperties
1382
1382
 
@@ -1407,8 +1407,8 @@ beginObjectProperties
1407
1407
  major 4
1408
1408
  minor 1
1409
1409
  release 1
1410
- x 17
1411
- y 186
1410
+ x 20
1411
+ y 158
1412
1412
  w 100
1413
1413
  h 21
1414
1414
  font "arial-medium-r-18.0"
@@ -1427,8 +1427,8 @@ beginObjectProperties
1427
1427
  major 4
1428
1428
  minor 1
1429
1429
  release 1
1430
- x 223
1431
- y 184
1430
+ x 226
1431
+ y 156
1432
1432
  w 9
1433
1433
  h 21
1434
1434
  font "arial-medium-r-18.0"
@@ -1447,8 +1447,8 @@ beginObjectProperties
1447
1447
  major 4
1448
1448
  minor 6
1449
1449
  release 0
1450
- x 141
1451
- y 183
1450
+ x 144
1451
+ y 155
1452
1452
  w 75
1453
1453
  h 25
1454
1454
  controlPv "ME14E-MO-IOC-01:GP110"
@@ -1474,9 +1474,9 @@ beginObjectProperties
1474
1474
  major 4
1475
1475
  minor 1
1476
1476
  release 1
1477
- x 538
1477
+ x 484
1478
1478
  y 71
1479
- w 203
1479
+ w 134
1480
1480
  h 36
1481
1481
  font "arial-medium-r-16.0"
1482
1482
  fgColor index 13
@@ -1484,7 +1484,7 @@ bgColor index 0
1484
1484
  useDisplayBg
1485
1485
  value {
1486
1486
  "Short 2: "
1487
- "pulse during X-ray images"
1487
+ "pulse during XRD"
1488
1488
  }
1489
1489
  autoSize
1490
1490
  endObjectProperties
@@ -1495,17 +1495,18 @@ beginObjectProperties
1495
1495
  major 4
1496
1496
  minor 1
1497
1497
  release 1
1498
- x 292
1499
- y 257
1500
- w 168
1498
+ x 276
1499
+ y 255
1500
+ w 123
1501
1501
  h 36
1502
1502
  font "arial-medium-r-16.0"
1503
+ fontAlign "center"
1503
1504
  fgColor index 13
1504
1505
  bgColor index 0
1505
1506
  useDisplayBg
1506
1507
  value {
1507
- "Note: X-ray shutter is "
1508
- " open throughout"
1508
+ "X-ray shutter is "
1509
+ "open throughout"
1509
1510
  }
1510
1511
  autoSize
1511
1512
  endObjectProperties
@@ -1516,11 +1517,11 @@ beginObjectProperties
1516
1517
  major 4
1517
1518
  minor 0
1518
1519
  release 0
1519
- x 296
1520
- y 110
1520
+ x 275
1521
+ y 111
1521
1522
  w 175
1522
1523
  h 139
1523
- file "/home/xfk23773/Downloads/short1-laser.png"
1524
+ file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/short1-laser.png"
1524
1525
  endObjectProperties
1525
1526
 
1526
1527
  # (PNG Image)
@@ -1529,11 +1530,11 @@ beginObjectProperties
1529
1530
  major 4
1530
1531
  minor 0
1531
1532
  release 0
1532
- x 561
1533
+ x 486
1533
1534
  y 111
1534
1535
  w 172
1535
1536
  h 139
1536
- file "/home/xfk23773/Downloads/short2-laser.png"
1537
+ file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/short2-laser.png"
1537
1538
  endObjectProperties
1538
1539
 
1539
1540
  # (Static Text)
@@ -1542,39 +1543,18 @@ beginObjectProperties
1542
1543
  major 4
1543
1544
  minor 1
1544
1545
  release 1
1545
- x 560
1546
- y 262
1547
- w 316
1548
- h 72
1546
+ x 487
1547
+ y 254
1548
+ w 170
1549
+ h 54
1549
1550
  font "arial-medium-r-16.0"
1550
1551
  fgColor index 13
1551
1552
  bgColor index 0
1552
1553
  useDisplayBg
1553
1554
  value {
1554
- "Now working (BETA)"
1555
- "CHECK desired triggers on scope"
1556
- "You WILL see strange behavior if:"
1557
- " laser delay+dwell > total X-ray exposure"
1558
- }
1559
- autoSize
1560
- endObjectProperties
1561
-
1562
- # (Static Text)
1563
- object activeXTextClass
1564
- beginObjectProperties
1565
- major 4
1566
- minor 1
1567
- release 1
1568
- x 6
1569
- y 275
1570
- w 191
1571
- h 27
1572
- font "arial-bold-r-24.0"
1573
- fgColor index 12
1574
- bgColor index 0
1575
- useDisplayBg
1576
- value {
1577
- "Checker Pattern"
1555
+ "Ensure:"
1556
+ "laser delay+ dwell "
1557
+ "< total X-ray exposure"
1578
1558
  }
1579
1559
  autoSize
1580
1560
  endObjectProperties
@@ -1585,10 +1565,10 @@ beginObjectProperties
1585
1565
  major 4
1586
1566
  minor 1
1587
1567
  release 0
1588
- x 207
1589
- y 276
1590
- w 82
1591
- h 24
1568
+ x 164
1569
+ y 220
1570
+ w 96
1571
+ h 28
1592
1572
  fgColor index 14
1593
1573
  bgColor index 3
1594
1574
  topShadowColor index 1
@@ -1610,3 +1590,153 @@ value0 {
1610
1590
  }
1611
1591
  endObjectProperties
1612
1592
 
1593
+ # (PNG Image)
1594
+ object activePngClass
1595
+ beginObjectProperties
1596
+ major 4
1597
+ minor 0
1598
+ release 0
1599
+ x 695
1600
+ y 111
1601
+ w 175
1602
+ h 139
1603
+ file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/short1-laser.png"
1604
+ endObjectProperties
1605
+
1606
+ # (Static Text)
1607
+ object activeXTextClass
1608
+ beginObjectProperties
1609
+ major 4
1610
+ minor 1
1611
+ release 1
1612
+ x 690
1613
+ y 71
1614
+ w 173
1615
+ h 36
1616
+ font "arial-medium-r-16.0"
1617
+ fgColor index 13
1618
+ bgColor index 0
1619
+ useDisplayBg
1620
+ value {
1621
+ "Medium 1: "
1622
+ "pulse long before XRD"
1623
+ }
1624
+ autoSize
1625
+ endObjectProperties
1626
+
1627
+ # (Static Text)
1628
+ object activeXTextClass
1629
+ beginObjectProperties
1630
+ major 4
1631
+ minor 1
1632
+ release 1
1633
+ x 13
1634
+ y 226
1635
+ w 135
1636
+ h 21
1637
+ font "arial-medium-r-18.0"
1638
+ fgColor index 14
1639
+ bgColor index 0
1640
+ useDisplayBg
1641
+ value {
1642
+ "Checker Pattern"
1643
+ }
1644
+ autoSize
1645
+ endObjectProperties
1646
+
1647
+ # (Static Text)
1648
+ object activeXTextClass
1649
+ beginObjectProperties
1650
+ major 4
1651
+ minor 1
1652
+ release 1
1653
+ x 696
1654
+ y 277
1655
+ w 192
1656
+ h 54
1657
+ font "arial-medium-r-16.0"
1658
+ fgColor index 13
1659
+ bgColor index 0
1660
+ useDisplayBg
1661
+ value {
1662
+ "X-ray shutter closes"
1663
+ "every position."
1664
+ "User for delay >= 100ms"
1665
+ }
1666
+ autoSize
1667
+ endObjectProperties
1668
+
1669
+ # (Lines)
1670
+ object activeLineClass
1671
+ beginObjectProperties
1672
+ major 4
1673
+ minor 0
1674
+ release 1
1675
+ x 696
1676
+ y 131
1677
+ w 160
1678
+ h 69
1679
+ lineColor index 38
1680
+ fillColor index 0
1681
+ lineWidth 2
1682
+ lineStyle "dash"
1683
+ numPoints 7
1684
+ xPoints {
1685
+ 0 696
1686
+ 1 703
1687
+ 2 777
1688
+ 3 791
1689
+ 4 813
1690
+ 5 829
1691
+ 6 856
1692
+ }
1693
+ yPoints {
1694
+ 0 133
1695
+ 1 200
1696
+ 2 200
1697
+ 3 131
1698
+ 4 131
1699
+ 5 199
1700
+ 6 199
1701
+ }
1702
+ endObjectProperties
1703
+
1704
+ # (Static Text)
1705
+ object activeXTextClass
1706
+ beginObjectProperties
1707
+ major 4
1708
+ minor 1
1709
+ release 1
1710
+ x 817
1711
+ y 123
1712
+ w 41
1713
+ h 13
1714
+ font "arial-medium-r-12.0"
1715
+ fgColor index 38
1716
+ bgColor index 0
1717
+ useDisplayBg
1718
+ value {
1719
+ "SHTR1"
1720
+ }
1721
+ autoSize
1722
+ endObjectProperties
1723
+
1724
+ # (Static Text)
1725
+ object activeXTextClass
1726
+ beginObjectProperties
1727
+ major 4
1728
+ minor 1
1729
+ release 1
1730
+ x 696
1731
+ y 256
1732
+ w 40
1733
+ h 21
1734
+ font "arial-bold-i-18.0"
1735
+ fgColor index 13
1736
+ bgColor index 0
1737
+ useDisplayBg
1738
+ value {
1739
+ "Beta"
1740
+ }
1741
+ autoSize
1742
+ endObjectProperties