Repository navigation
Fix auxiliary scan ordering - #170
Open
jacob-williamson wants to merge 20 commits into
Open
jacob-williamson wants to merge 20 commits into
jacob-williamson wants to merge 20 commits into
Conversation
jacob-williamson
marked this pull request as ready for review
November 9, 2026 18:06
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #170 +/- ##
=======================================
Coverage 98.67% 98.68%
=======================================
Files 23 23
Lines 1286 1289 +3
=======================================
+ Hits 1269 1272 +3
Misses 17 17 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
jacob-williamson
commented
Nov 9, 2026
| requires=[air, empty_capillary], | ||
| ) | ||
|
|
||
| return [standard_sample, empty_capillary, air] |
Collaborator
Author
There was a problem hiding this comment.
We only really need to have a requirement of standard_sample now, as the others are nested inside it. Should we do that? Similarly StandardSample only needs to depend on empty_capillary. The advantage of having all of them is that tiled links will be added.
DominicOram
requested changes
Nov 10, 2026
DominicOram
left a comment
Contributor
There was a problem hiding this comment.
This is getting really quite complicated now. Can we have some proper docs on how we're doing auxillary collections in general? I think then it will be easier for me to review
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #164
Auxiliary scans can now themselves have required auxiliary scans. This allows us to ensure auxiliary scans are ran in the order
air -> empty capillary -> standard sample, and also keep the timing benefits of combining auxiliary scans where possible. This is also true in tiled - each auxiliary scan will have links to its own auxiliary scans.However, it makes things more complicated when looking for a suitable scan in tiled, because a standard sample scan in tiled is only suitable if the empty capillary scan that ran before it is also suitable to the experiment at hand. For this reason, we add the tiled scans own auxiliary scans to the
requiresfield when reconstructing the tiled auxiliary object, which allows the.is_suitablemethod to verify all the requirements match.There's quite a lot of recursion here but I can't think of a way to simplify things