-
Notifications
You must be signed in to change notification settings - Fork 1
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
actually skip pixel calibration, using default calibration as startin… #486
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## next #486 +/- ##
==========================================
- Coverage 59.51% 59.48% -0.03%
==========================================
Files 64 64
Lines 4836 4840 +4
==========================================
+ Hits 2878 2879 +1
- Misses 1958 1961 +3 ☔ View full report in Codecov by Sentry. 🚨 Try these New Features:
|
PR #488 went in, so this should be safe to work on again |
7b4df8c
to
5d1191c
Compare
@@ -8,4 +8,3 @@ | |||
class SimpleDiffCalRequest(BaseModel): | |||
ingredients: DiffractionCalibrationIngredients | |||
groceries: Dict[str, str] | |||
skipPixelCalibration: bool |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it'd actually be better to remove this from the ingredients instead. It is only used within the service layer
0d3dd5e
to
bb7a20a
Compare
Some of this was taken over in PR #497 , and so this PR might no longer be needed, |
Since merger of PR #497, running from Open diffraction calibration. Run for 46680 with skip pixel calibration on. The workspace list is empty. Continuing, it loads the default diffcal table and goes to tweak peak. Continuing, it gets to the save screen. Saving completes successfully. However, trying to run without skipping, hitting error, then running again with skipping, generates this error: |
PR #507 fixed the remaining defect. From Then flip the toggle to ON, continue. Able to finish workflow: |
…g point.
Description of work
This pushes the
skipPixelCalibration
flag to just one place, and then actually sets the utilized place, ie oningredients
Since pixel calibration was now actually being successfully skipped DiffractionCalibration ran into the issue of not having a starting diffcal table that pixel calibration would normally provide.
As per consultation of Malcolm, the default diffcal table is loaded from disk and used as the base in this case.
This has the secondary purpose of priming calibration for when we eventually add the ability to choose a starting calibration.
To test
Currently I kinda need help examining the data to confirm that it does what is expected.
I have confirmed codewise that pixel calibration is successfuly skipped when toggled, but the output workspace I was inspecting still kinda just looked the same.
I used the following in the diffcal flow.
59039
LA11b6
Link to EWM item
EWM#7617
Verification
Acceptance Criteria
The story is lacking explicit acceptance criteria, the title may suffice.
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.