Refactoring of the main classes #10
Merged
Conversation
This file contains 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
… and derotation angles
…processing - extraction of rotation angles
… treated differently
Config file |
|
Thank you Joe, it seems that this issue might be related to a newer version of |
|
Otherwise was working okay on numpy 1.23.1, will try on 2.0 after the fix. I had a couple of warnings I will dump here in case they are relevant: |
JoeZiminski
approved these changes
Jul 25, 2024
There was a problem hiding this comment.
Hey @lauraporta all looks good to me, its very clear and easy to follow. I made a couple of suggestions but they are not critical so feel free to ignore!
| for i, (start, end) in enumerate( | ||
| zip(rotation_start[1:], rotation_end[:-1]) | ||
| ): | ||
| for start, end in zip(rotation_start[1:], rotation_end[:-1]): | ||
| self.interpolated_angles[end:start] = 0 |
There was a problem hiding this comment.
Just checking this is end:start and not start:end, its like the end of the first rotation to the start of the second?
There was a problem hiding this comment.
Yes that's what it is 😅 do you find it confusing?
There was a problem hiding this comment.
I don't think its so confusing and makes sense in the context, but for a reader not particularly familiar with the procedure like myself it might be initially a little unexpected (i.e. just seeing an array indexed end:start). Maybe just a brief clarifying comment above the line? or maybe the variables could be last_rotation_end, next_rotation_start if not too verbose.
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.
Description
What is this PR
Why is this PR needed?
Refactor the main analysis code.
What does this PR do?
Legend:
❌: removes
💭: changes
➕: adds
np.nonzerowithnp.where(just personal preference, they seem equivalent for my use-case);pandassyntaxcheck_rotation_number_after_interpolationin theIncrementalPipelineclassI can provide some datasets to test the pipeline locally.
Explanations
(1) : with "increments" I refer to the angle resolution of the motor, i.e. the smallest increment in angles that motor is able to report. 0.2 deg in our case.
How has this PR been tested?
Tested locally with tests that were made before.
Is this a breaking change?
No
Does this PR require an update to the documentation?
Not for now.
Checklist: