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.

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

Allow user to skip pixelcal after pixelcal #517

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Conversation

rboston628
Copy link
Contributor

@rboston628 rboston628 commented Dec 6, 2024

Description of work

If the user performs pixel calibration, but sees that it did not do anything positive, allow the user from the tweak peak stage to elect to skip pixel calibration and recalculate.

Explanation of work

After all the other changes, this was very trivial.

Add a new button to tweak peak view for skipping pixel calibration, and add a check if the user changes their initial selection.

If the initial selection changes, recalculate with/without pixel calibration.

To test

Dev testing

Run diffraction with 46680, skip pixel toggle set to False.

It should fail. In the workspace list, open the two table workspaces, diffract_consts_default_v0 and diffract_const_046680. Compare, and ensure these are not equal workspaces.

Right-click on diffract_const_046680 and rename it to something obvious so that it is not overwritten.

Set Skip Pixel Cal toggle to True and continue. There may be a warning about a workspace already loaded.

Set Skip Pixel Cal toggle to False and press Recalculate. The same warning will come up. Close it.

Compare the new diffract_const_046680 to the original. They should be identical. This proves the workflow is being re-run without skipping pixel calibration.

Change the grouping and recalculate. Make sure it works.

Change the grouping and a dMin and recalculate. Make sure it works.

Change only a dMin and recalculate. Make sure it works.

Continue to save. You'll have to set Skip Pixel Cal to True and change the FWHM to 4 and Recalculate to continue.

CIS testing

As above, but I suggest 58882. Make sure to inspect the before/after files in slice viewer. Make sure you can find them and they make sense.

Link to EWM item

EWM#7712

Verification

  • the author has read the EWM story and acceptance critera
  • the reviewer has read the EWM story and acceptance criteria
  • the reviewer certifies the acceptance criteria below reflect the criteria in EWM

Acceptance Criteria

This list is for ease of reference, and does not replace reading the EWM story as part of the review. Verify this list matches the EWM story before reviewing.

NOTE Following conversation with Malcolm, the behavior of iterating pixelcal is not necessary as there are no parameters to adjust.

  • after pixel calibration, user has available two d-spacing unfocussed workspaces reflecting separately the input calibration and the output calibration (i.e. application of the pixel-calibration-generated DIFC values). already met in PR After completion of pixel calibration, show unfocused before and after  #511
  • The user can continue to next stage of workflow if desired already met
  • Or, the user can repeat pixel calibration, opting to completey reset DIFCs to their original values
  • The user has access to a UI element to select from the above options
  • The user can repeat pixel calibration an arbitrary number of times (note: they can, but it doesn't do much)
  • Conducting N iterations, where N>2 should not cause further increase in RAM usage

@rboston628 rboston628 marked this pull request as ready for review December 6, 2024 20:45
Copy link

codecov bot commented Dec 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.69%. Comparing base (80ea2e0) to head (3256292).
Report is 2 commits behind head on next.

Additional details and impacted files
@@            Coverage Diff             @@
##             next     #517      +/-   ##
==========================================
+ Coverage   95.61%   95.69%   +0.07%     
==========================================
  Files          67       67              
  Lines        5012     5012              
==========================================
+ Hits         4792     4796       +4     
+ Misses        220      216       -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@dlcaballero16 dlcaballero16 left a comment

Choose a reason for hiding this comment

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

Tested and functions as expected.

@walshmm walshmm merged commit 0ad840a into next Dec 12, 2024
8 checks passed
@walshmm walshmm deleted the ewm7712-user-selection branch December 12, 2024 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants