Skip to content

Comments

Tst pix 40#54

Merged
RussBerg merged 110 commits intomasterfrom
tst-pix-40
Dec 23, 2025
Merged

Tst pix 40#54
RussBerg merged 110 commits intomasterfrom
tst-pix-40

Conversation

@RussBerg
Copy link
Collaborator

@RussBerg RussBerg commented Dec 23, 2025

Following a first pass commissioning of the EPICS scans the merge includes the following main changes:

  • removal of EPICS constructs for focusing and creation of ophyd energy device
  • merged coarse and fine sample scans
  • implemented software controlled fine LxL and PxP scans
  • load stacks into contact sheet
  • fix focusing

RussBerg and others added 30 commits October 20, 2025 15:01
@RussBerg
added nx_server run script
35cec97
@RussBerg
remove commented code
39811f3
@RussBerg
pass polarization dict instead of letting it generate a default
05f5d4e
@RussBerg
display result msg from nx_server in log
5883cb0
@RussBerg
set coarse_only flag for limit checking
aa8874d
@RussBerg
using np.full() instead of np.empty() to create and init array to nans
a3c389e
@RussBerg
using start positions for sample x/y points
b20f4af
fix path to scan time estimation data
21f16bb
@RussBerg
if pixmap is None report it to logger and skip
639a5b4
@RussBerg
show reduced nxstxm msg after nx_server data export
ddc3bd7
@RussBerg
set coarse_only flag on call to check_scan_limits
81c001a
@RussBerg
cleanup, now calling run function for every supported and selected de…
7b0ab56 
…tector instead of assuming first detector only
@RussBerg
disable hardware scanning support
e2f4533
@RussBerg
cleanup, fix name for base scan class
c357a0a
@RussBerg
fix key error issue for saving generic scans
450024f
@RussBerg
cleanup, include scan_types.SAMPLE_IMAGE in three_d_scans so data wil…
14f0566 
…l be reshaped from 1D to 3D (ev, y, x)
@RussBerg
software controlled sample LxL and PxP scans implemented
a51f8ac
@RussBerg
more descriptive message
2ca61b0
@RussBerg
added run nx_server script
8fe862f
@RussBerg
remove test btn
f611d6d
@RussBerg
add path to record if hardware accell is used
4cc52a8
@RussBerg
retain the dict returned that contains next filenames and directories…
62296c8 
… for nx_server
@RussBerg
retain the dict returned that contains next filenames and directories…
de644ce 
… for nx_server
@RussBerg
add lxl and pxp and stack for soft controlled sample image scans, all…
7bc331d 
…ow for user selected hdw accel, scan plugin can pass complete ui path including .ui file to support custom scan plugin ui's
@RussBerg
add output error to console
28185be
@RussBerg
remove debugging
14edbb3
@RussBerg
renamed
18191ff
@RussBerg
support threaded moves to avoid stalling the Qt event loop
f12bc73
@RussBerg
enum module renamed to avoid shadow
d336a3e
@RussBerg
implement calling callback if passed
4b41418
@RussBerg
missed this for sample image scan merge
0ed4d4c
@RussBerg
improved messaging and removed warnings that were not needed
b31ac69
@RussBerg
improved messaging and removed warnings that were not needed
f7b13a1
@RussBerg
removed uneeded version files, fix version function to pull single ve…
1ad2935 
…rsion json
@RussBerg
removed uneeded version files, fix version function to pull single ve…
fe00008 
…rsion json
@RussBerg
removed uneeded files
66345f5
@RussBerg
cleanup
9f2a705
@RussBerg
update to correct name for A1 device
e075502
@RussBerg
update to correct name for A1 device
1721812
@RussBerg
disable details btn as per Jians request
f35df07
@RussBerg
improve directory navigation
ee1d4ed
@RussBerg
disable details btn as per Jians request
3c08a44
@RussBerg
refactor button name to load a directory
d9f1a19
@RussBerg
refactor button name to load a directory
4176d96
@RussBerg
finished off defocus beam implmentation, needs testing
ae6de59
@RussBerg
finished off defocus beam implmentation, needs testing
5fd1c3a
@RussBerg
fix pre scan range checking to full coarse range
77ddb1e
@RussBerg
uncomment to enable again
b0dbebf
@RussBerg
cleanup and fix names in primary data stream for positioner scan
3c2aa36
@RussBerg
remove unused bmps
be8ef8d
@RussBerg
added create_polygon, cleanup
2e17af6
@RussBerg
fix coarse PxP scan
73cbc17
@RussBerg
cleanup
faa6d9d
@RussBerg
osa and sample holders specified now in bl_config
a33d5a8
@RussBerg
cleanup
1375091
@RussBerg
fix rollback mistake
460552d
@RussBerg
added beamline config reader
f21b8bb
@RussBerg
settings file to mainatin shape positions
9500d0b
@RussBerg RussBerg merged commit fbaf64b into master Dec 23, 2025
1 check passed
@RussBerg RussBerg deleted the tst-pix-40 branch December 23, 2025 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@RussBerg