From aadf4691fa3cb04c746ea1bc25b7c75fb87b4877 Mon Sep 17 00:00:00 2001 From: Tamoor Shahid Date: Mon, 20 Apr 2026 12:01:27 +0100 Subject: [PATCH 1/2] Update of pump probe edm --- .../FT-gui-edm/pumpprobe-py3v1.edl | 465 +++++++++++++----- 1 file changed, 350 insertions(+), 115 deletions(-) diff --git a/src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl b/src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl index 472c13a58a..32e9e8ddc1 100644 --- a/src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl +++ b/src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl @@ -3,8 +3,8 @@ beginScreenProperties major 4 minor 0 release 1 -x 830 -y 274 +x 5061 +y 706 w 900 h 700 font "arial-medium-r-18.0" @@ -212,8 +212,8 @@ beginObjectProperties major 4 minor 6 release 0 -x 422 -y 398 +x 718 +y 343 w 75 h 25 controlPv "BL24I-MO-IOC-13:GP104" @@ -233,8 +233,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 334 -y 400 +x 630 +y 345 w 71 h 21 font "arial-medium-r-18.0" @@ -254,8 +254,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 334 -y 433 +x 631 +y 373 w 72 h 21 font "arial-medium-r-18.0" @@ -275,8 +275,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 501 -y 400 +x 797 +y 345 w 9 h 21 font "arial-medium-r-18.0" @@ -296,8 +296,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 501 -y 433 +x 798 +y 373 w 9 h 21 font "arial-medium-r-18.0" @@ -317,8 +317,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 334 -y 465 +x 631 +y 405 w 71 h 21 font "arial-medium-r-18.0" @@ -338,8 +338,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 334 -y 498 +x 631 +y 438 w 71 h 21 font "arial-medium-r-18.0" @@ -359,8 +359,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 501 -y 465 +x 798 +y 405 w 9 h 21 font "arial-medium-r-18.0" @@ -380,8 +380,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 501 -y 498 +x 798 +y 438 w 9 h 21 font "arial-medium-r-18.0" @@ -401,8 +401,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 334 -y 529 +x 631 +y 469 w 82 h 21 font "arial-medium-r-18.0" @@ -422,8 +422,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 501 -y 529 +x 798 +y 469 w 9 h 21 font "arial-medium-r-18.0" @@ -443,11 +443,11 @@ beginObjectProperties major 4 minor 1 release 1 -x 548 -y 398 -w 49 +x 458 +y 510 +w 48 h 21 -font "arial-medium-r-18.0" +font "arial-medium-i-18.0" fontAlign "center" fgColor index 14 bgColor index 0 @@ -464,93 +464,31 @@ beginObjectProperties major 4 minor 1 release 1 -x 557 -y 423 -w 308 -h 108 +x 568 +y 500 +w 272 +h 72 font "arial-medium-r-16.0" fgColor index 13 bgColor index 0 useDisplayBg value { - "The repeat is the number of pairs" - "of lines in a repeat" "Currently X-ray shutter always open" - "Timings assume apertures 125 um apart" "Mapping lite will be used" "Repeat3 misses some chip rows" + "Short Repeat 1 -4 are BETA" } autoSize endObjectProperties -# (Circle) -object activeCircleClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 542 -y 428 -w 10 -h 10 -lineColor index 12 -fill -fillColor index 12 -endObjectProperties - -# (Circle) -object activeCircleClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 542 -y 462 -w 10 -h 10 -lineColor index 12 -fill -fillColor index 12 -endObjectProperties - -# (Circle) -object activeCircleClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 542 -y 480 -w 10 -h 10 -lineColor index 12 -fill -fillColor index 12 -endObjectProperties - -# (Circle) -object activeCircleClass -beginObjectProperties -major 4 -minor 0 -release 0 -x 542 -y 499 -w 10 -h 10 -lineColor index 12 -fill -fillColor index 12 -endObjectProperties - # (Text Monitor) object activeXTextDspClass:noedit beginObjectProperties major 4 minor 6 release 0 -x 422 -y 431 +x 719 +y 371 w 75 h 25 controlPv "BL24I-MO-IOC-13:GP105" @@ -570,8 +508,8 @@ beginObjectProperties major 4 minor 6 release 0 -x 422 -y 464 +x 719 +y 404 w 75 h 25 controlPv "BL24I-MO-IOC-13:GP106" @@ -591,8 +529,8 @@ beginObjectProperties major 4 minor 6 release 0 -x 422 -y 495 +x 719 +y 435 w 75 h 25 controlPv "BL24I-MO-IOC-13:GP107" @@ -612,8 +550,8 @@ beginObjectProperties major 4 minor 6 release 0 -x 422 -y 526 +x 719 +y 466 w 75 h 25 controlPv "BL24I-MO-IOC-13:GP108" @@ -681,8 +619,8 @@ beginObjectProperties major 4 minor 0 release 0 -x 542 -y 517 +x 540 +y 504 w 10 h 10 lineColor index 12 @@ -909,8 +847,8 @@ beginObjectProperties major 4 minor 1 release 1 -x 412 -y 571 +x 564 +y 580 w 179 h 27 font "arial-bold-r-24.0" @@ -951,10 +889,10 @@ beginObjectProperties major 4 minor 0 release 0 -x 313 -y 365 -w 207 -h 191 +x 369 +y 338 +w 454 +h 159 lineColor index 14 fillColor index 0 endObjectProperties @@ -1073,11 +1011,11 @@ beginObjectProperties major 4 minor 1 release 1 -x 347 -y 368 -w 150 +x 429 +y 344 +w 162 h 21 -font "arial-medium-r-18.0" +font "arial-bold-r-18.0" fgColor index 14 bgColor index 0 useDisplayBg @@ -1740,3 +1678,300 @@ value { } autoSize endObjectProperties + +# (Static Text) +object activeXTextClass +beginObjectProperties +major 4 +minor 1 +release 1 +x 401 +y 373 +w 120 +h 21 +font "arial-medium-r-18.0" +fontAlign "center" +fgColor index 14 +bgColor index 0 +useDisplayBg +value { + "Short Repeat1" +} +autoSize +endObjectProperties + +# (Static Text) +object activeXTextClass +beginObjectProperties +major 4 +minor 1 +release 1 +x 607 +y 372 +w 9 +h 21 +font "arial-medium-r-18.0" +fontAlign "center" +fgColor index 14 +bgColor index 0 +useDisplayBg +value { + "s" +} +autoSize +endObjectProperties + +# (Static Text) +object activeXTextClass +beginObjectProperties +major 4 +minor 1 +release 1 +x 401 +y 404 +w 121 +h 21 +font "arial-medium-r-18.0" +fontAlign "center" +fgColor index 14 +bgColor index 0 +useDisplayBg +value { + "Short Repeat2" +} +autoSize +endObjectProperties + +# (Static Text) +object activeXTextClass +beginObjectProperties +major 4 +minor 1 +release 1 +x 401 +y 437 +w 120 +h 21 +font "arial-medium-r-18.0" +fontAlign "center" +fgColor index 14 +bgColor index 0 +useDisplayBg +value { + "Short Repeat3" +} +autoSize +endObjectProperties + +# (Static Text) +object activeXTextClass +beginObjectProperties +major 4 +minor 1 +release 1 +x 607 +y 404 +w 9 +h 21 +font "arial-medium-r-18.0" +fontAlign "center" +fgColor index 14 +bgColor index 0 +useDisplayBg +value { + "s" +} +autoSize +endObjectProperties + +# (Static Text) +object activeXTextClass +beginObjectProperties +major 4 +minor 1 +release 1 +x 607 +y 437 +w 9 +h 21 +font "arial-medium-r-18.0" +fontAlign "center" +fgColor index 14 +bgColor index 0 +useDisplayBg +value { + "s" +} +autoSize +endObjectProperties + +# (Text Monitor) +object activeXTextDspClass:noedit +beginObjectProperties +major 4 +minor 6 +release 0 +x 528 +y 370 +w 75 +h 25 +controlPv "BL24I-MO-IOC-13:GP113" +font "arial-medium-r-16.0" +fgColor index 16 +bgColor index 10 +limitsFromDb +nullColor index 0 +useHexPrefix +newPos +objType "monitors" +endObjectProperties + +# (Text Monitor) +object activeXTextDspClass:noedit +beginObjectProperties +major 4 +minor 6 +release 0 +x 528 +y 403 +w 75 +h 25 +controlPv "BL24I-MO-IOC-13:GP114" +font "arial-medium-r-16.0" +fgColor index 16 +bgColor index 10 +limitsFromDb +nullColor index 0 +useHexPrefix +newPos +objType "monitors" +endObjectProperties + +# (Text Monitor) +object activeXTextDspClass:noedit +beginObjectProperties +major 4 +minor 6 +release 0 +x 528 +y 434 +w 75 +h 25 +controlPv "BL24I-MO-IOC-13:GP115" +font "arial-medium-r-16.0" +fgColor index 16 +bgColor index 10 +limitsFromDb +nullColor index 0 +useHexPrefix +newPos +objType "monitors" +endObjectProperties + +# (Circle) +object activeCircleClass +beginObjectProperties +major 4 +minor 0 +release 0 +x 540 +y 522 +w 10 +h 10 +lineColor index 12 +fill +fillColor index 12 +endObjectProperties + +# (Circle) +object activeCircleClass +beginObjectProperties +major 4 +minor 0 +release 0 +x 540 +y 540 +w 10 +h 10 +lineColor index 12 +fill +fillColor index 12 +endObjectProperties + +# (Circle) +object activeCircleClass +beginObjectProperties +major 4 +minor 0 +release 0 +x 540 +y 558 +w 10 +h 10 +lineColor index 12 +fill +fillColor index 12 +endObjectProperties + +# (Static Text) +object activeXTextClass +beginObjectProperties +major 4 +minor 1 +release 1 +x 606 +y 467 +w 9 +h 21 +font "arial-medium-r-18.0" +fontAlign "center" +fgColor index 14 +bgColor index 0 +useDisplayBg +value { + "s" +} +autoSize +endObjectProperties + +# (Text Monitor) +object activeXTextDspClass:noedit +beginObjectProperties +major 4 +minor 6 +release 0 +x 527 +y 464 +w 75 +h 25 +controlPv "BL24I-MO-IOC-13:GP116" +font "arial-medium-r-16.0" +fgColor index 16 +bgColor index 10 +limitsFromDb +nullColor index 0 +useHexPrefix +newPos +objType "monitors" +endObjectProperties + +# (Static Text) +object activeXTextClass +beginObjectProperties +major 4 +minor 1 +release 1 +x 400 +y 467 +w 120 +h 21 +font "arial-medium-r-18.0" +fontAlign "center" +fgColor index 14 +bgColor index 0 +useDisplayBg +value { + "Short Repeat4" +} +autoSize +endObjectProperties From 00f35616aa94fb5f69e3f1598321edee7988e0e7 Mon Sep 17 00:00:00 2001 From: Tamoor Shahid Date: Mon, 20 Apr 2026 12:07:23 +0100 Subject: [PATCH 2/2] Update of main edm --- .../FT-gui-edm/DiamondChipI24-py3v1.edl | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl b/src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl index 4e5cb7472b..28180258c8 100644 --- a/src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl +++ b/src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl @@ -3,8 +3,8 @@ beginScreenProperties major 4 minor 0 release 1 -x 389 -y 257 +x 4517 +y 815 w 1030 h 950 font "arial-medium-r-18.0" @@ -1198,7 +1198,7 @@ topShadowColor index 1 botShadowColor index 8 controlPv "BL24I-MO-IOC-13:GP4" font "arial-medium-r-18.0" -numItems 9 +numItems 13 symbolTag { 0 "None" 1 "Short1" @@ -1209,6 +1209,10 @@ symbolTag { 6 "Repeat5" 7 "Repeat10" 8 "Medium1" + 9 "ShortRepeat1" + 10 "ShortRepeat2" + 11 "ShortRepeat3" + 12 "ShortRepeat4" } symbol0 { 0 "na" @@ -1220,6 +1224,10 @@ symbol0 { 6 "R5" 7 "R10" 8 "M1" + 9 "SR1" + 10 "SR2" + 11 "SR3" + 12 "SR4" } value0 { 0 "None" @@ -1231,6 +1239,10 @@ value0 { 6 "Repeat5" 7 "Repeat10" 8 "Medium1" + 9 "ShortRepeat1" + 10 "ShortRepeat2" + 11 "ShortRepeat3" + 12 "ShortRepeat4" } endObjectProperties @@ -4083,7 +4095,7 @@ x 415 y 880 w 68 h 18 -controlPv "BL24I-MO-DET-01:Z.RBV" +controlPv "BL24I-EA-DET-01:Z.RBV" font "arial-medium-r-16.0" fgColor index 16 bgColor index 10