Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Planwindows #218

Merged
merged 50 commits into from
Jun 7, 2024
Merged

Planwindows #218

merged 50 commits into from
Jun 7, 2024

Conversation

Cathyhjj
Copy link
Collaborator

Add grid_scan and included enhanced utilities #207 #210

Cathyhjj added 19 commits May 6, 2024 20:04
@Cathyhjj
add repeat scan num and sample notes
cf05754
@Cathyhjj
calculate total exposure time real time for xafs_scan
14a2533
@Cathyhjj
add pop up warning box that is_standard option will make the data public
a1781ae
@Cathyhjj
changed xafs_scan ui to include notes, repeat scans, total exposure time
5d3853c
@Cathyhjj
added notes md in test_xafs_scan
0abccbf
@Cathyhjj
disable weight box when k checkbox is not checked in xafs_scan plan w…
80eeb34 
…indow
@Cathyhjj
changed timeEdit into lables, add total time to include scan_repeat_num
ecbc6aa
@Cathyhjj
add yes and no option for the in_standard checkbox messagebox in xafs…
fd6a151 
…_scan
@Cathyhjj
refactor line_scan as a parent class for grid_scan
fda38c9
@Cathyhjj
add grid_scan window plan
7c16ac5
@Cathyhjj
remove weight for Erange
a8b91f4
@Cathyhjj
reset repeat_scan_num to 1 when hitting reset button in xafs_scan window
3bf652c
@Cathyhjj
changed the time calculator in xafs_scan, do merge energies first bef…
484d721 
…ore calculate time
@Cathyhjj
add time_calculator test in test_xafs_scan
8b65c56
@Cathyhjj
add notes, repeats, time_calculator into grid and line_scan ui
5a3871c
@Cathyhjj
add time calculator in line_scan
194f7b0
@Cathyhjj
modified grid_scan and add test_grid_scan
3baf9c4
@Cathyhjj
black, isort and flake8 formatting
610664b
@Cathyhjj
flake8 check
ee91ed0
@Cathyhjj Cathyhjj requested a review from canismarko May 28, 2024 16:21
canismarko
canismarko requested changes Jun 3, 2024
View reviewed changes
src/firefly/plans/line_scan.py Outdated Show resolved Hide resolved
src/firefly/plans/line_scan.py Outdated Show resolved Hide resolved
src/firefly/plans/line_scan.py Show resolved Hide resolved
src/firefly/plans/xafs_scan.py Outdated Show resolved Hide resolved
src/firefly/plans/xafs_scan.py Outdated Show resolved Hide resolved
src/firefly/plans/xafs_scan.py Outdated Show resolved Hide resolved
src/firefly/tests/test_grid_scan_window.py Outdated Show resolved Hide resolved
src/firefly/tests/test_line_scan_window.py Outdated Show resolved Hide resolved
src/firefly/plans/grid_scan.py Show resolved Hide resolved
src/firefly/plans/grid_scan.py
)

# get snake axes, if all unchecked, set it None
snake_axes = [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you checked that this actually works? According to the documentation:

The elements of the list are motors that are listed in args.

I read that to mean that the arguments should be the motors themselves, not their indices.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to be discussed

@Cathyhjj
removed unused imports and codes
dbed34f
@Cathyhjj
black, isort, flake8 formatting
b0b6007
@Cathyhjj
add test move motor file
ecbe349
@Cathyhjj
add util file in firefly plans, which includes time_converter and che…
f4ae770 
…cks whether md includes valid items such as non-empty strings
@Cathyhjj
removed time_converter and checked md in a more rebost way
317e98d
@Cathyhjj
removed time_converter and checked md in a more rebost wayin line_scan
145e5f8
@Cathyhjj
add time_calculator test in a seperate function
3690efc
@Cathyhjj
reduce try except block in xafs_scan
1913b05
@Cathyhjj
set one of the metadata to empty string to check whether it will be r…
a60a7ba 
…emoved from the metadata in test_xafs_scan
@Cathyhjj
removed redudent lines
b824e98
@Cathyhjj
black, isort formatting
6e8f54e
@Cathyhjj
add time calculator to grid_scan
53e6138
@Cathyhjj
add time calcultor to test_grid_scan
db31302
@Cathyhjj
fixed import
4dee9b5
@Cathyhjj
isort formatting
ae23181
@Cathyhjj
Merge branch 'main' into planwindows
3bda789
@Cathyhjj
include nan into the total_time_calculator
9356418
@Cathyhjj
added float conversion before int conversion for the time label.text(…
dc1ac21 
…) to prevent errors
canismarko
canismarko requested changes Jun 7, 2024
View reviewed changes
Copy link
Contributor

@canismarko canismarko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there. The only things I noticed are where the is_valid_value() function doesn't do what it says on the tin.

src/firefly/plans/xafs_scan.py Outdated Show resolved Hide resolved
src/firefly/plans/util.py Show resolved Hide resolved
src/firefly/plans/util.py Outdated Show resolved Hide resolved
src/firefly/plans/util.py Outdated Show resolved Hide resolved
canismarko
canismarko approved these changes Jun 7, 2024
View reviewed changes
Copy link
Contributor

@canismarko canismarko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Once the CI passes, we can merge.

@canismarko canismarko merged commit 7d27304 into main Jun 7, 2024
1 check failed
@canismarko canismarko deleted the planwindows branch June 7, 2024 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@canismarko canismarko canismarko approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Cathyhjj @canismarko