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

Move scaling to KTrajectory #582

Merged
merged 23 commits into from
Dec 17, 2024
Merged

Move scaling to KTrajectory #582

merged 23 commits into from
Dec 17, 2024

Conversation

fzimmermann89
Copy link
Member

@fzimmermann89 fzimmermann89 commented Dec 16, 2024

There is a bit of duplicaiton for KTrajectoryRawShape and KTrajectory, but inherting one from the other makes KData more complicated. I might remove this duplication in #560

I also added the ability to load in Trajectories with the wrong, i.e. not zyx, order.

@fzimmermann89 fzimmermann89 added the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
@pre-commit-ci pre-commit-ci bot removed the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
@fzimmermann89 fzimmermann89 added the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
@pre-commit-ci pre-commit-ci bot removed the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
@fzimmermann89 fzimmermann89 added the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
@pre-commit-ci pre-commit-ci bot removed the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
@fzimmermann89 fzimmermann89 added the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
@pre-commit-ci pre-commit-ci bot removed the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
@fzimmermann89 fzimmermann89 added the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
@pre-commit-ci pre-commit-ci bot removed the pre-commit.ci autofix run autofix in this PR label Dec 16, 2024
Copy link
Contributor

github-actions bot commented Dec 16, 2024

Coverage

Coverage Report
FileStmtsMissCoverMissing
src/mrpro/algorithms/csm
   inati.py24196%44
   walsh.py16194%34
src/mrpro/algorithms/dcf
   dcf_voronoi.py53492%15, 48–49, 76
src/mrpro/algorithms/optimizers
   adam.py20195%69
src/mrpro/algorithms/reconstruction
   DirectReconstruction.py281643%51–71, 85
   IterativeSENSEReconstruction.py13192%76
   Reconstruction.py502256%42, 54–56, 80–87, 104–113
   RegularizedIterativeSENSEReconstruction.py411759%96–100, 114–139
src/mrpro/data
   AcqInfo.py128398%26, 169, 207
   CsmData.py29390%15, 82–84
   DcfData.py45882%18, 66, 78–83
   IData.py67987%119, 125, 129, 159–167
   IHeader.py75791%75, 109, 127–131
   KHeader.py1531789%25, 119–123, 150, 199, 210, 217–218, 221, 228, 260–271
   KNoise.py311552%39–52, 56–61
   KTrajectory.py811285%108–113, 116–118, 203–207
   MoveDataMixin.py1401887%15, 113, 129, 143–145, 207, 323–325, 338, 417, 437–438, 440, 455–456, 458
   QData.py39782%42, 65–73
   Rotation.py6743595%100, 198, 335, 433, 477, 495, 581, 583, 592, 626, 628, 691, 768, 773, 776, 791, 808, 813, 889, 1077, 1082, 1085, 1109, 1113, 1240, 1242, 1250–1251, 1315, 1397, 1690, 1846, 1881, 1885, 1996
   SpatialDimension.py2322191%34, 104, 141, 148, 154, 274–276, 289–291, 325, 343, 356, 369, 382, 395, 404–405, 420, 429
   acq_filters.py12192%47
src/mrpro/data/_kdata
   KData.py1341887%109–110, 125, 132, 142, 150, 204–205, 243, 248–249, 268–279
   KDataRemoveOsMixin.py29293%44, 46
   KDataSelectMixin.py19289%48, 63
   KDataSplitMixin.py48394%53, 84, 93
src/mrpro/data/traj_calculators
   KTrajectoryCalculator.py25292%23, 45
   KTrajectoryIsmrmrd.py13285%41, 50
   KTrajectoryPulseq.py23196%55
src/mrpro/operators
   CartesianSamplingOp.py89397%118, 157, 280
   ConstraintsOp.py60297%46, 48
   EndomorphOperator.py65297%228, 234
   FiniteDifferenceOp.py27293%40, 105
   FourierOp.py158398%263, 381, 386
   Functional.py71593%20–22, 117, 119
   GridSamplingOp.py136993%72–73, 82–83, 90–91, 94, 96, 98
   LinearOperator.py1681094%55, 91, 190, 220, 261, 270, 278, 287, 295, 320
   LinearOperatorMatrix.py1581690%82, 119, 152, 161, 166, 175–178, 191–194, 203, 215, 304, 331, 359
   MultiIdentityOp.py13285%43, 48
   Operator.py78297%25, 74
   ProximableFunctionalSeparableSum.py39392%50, 103, 110
   SliceProjectionOp.py173895%44, 61, 63, 69, 206, 227, 260, 300
   WaveletOp.py120596%152, 170, 205, 210, 233
   ZeroPadOp.py16194%30
src/mrpro/utils
   filters.py62297%44, 49
   reshape.py60198%191
   slice_profiles.py46687%20, 36, 113–116, 149
   sliding_window.py34197%34
   split_idx.py10280%43, 47
   summarize_tensorvalues.py11918%20–29
   typing.py181139%8–23
   zero_pad_or_crop.py31681%26, 30, 54, 57, 60, 63
TOTAL493336093% 

Tests Skipped Failures Errors Time
2262 0 💤 0 ❌ 0 🔥 2m 10s ⏱️

@fzimmermann89 fzimmermann89 marked this pull request as ready for review December 16, 2024 15:07
@fzimmermann89 fzimmermann89 marked this pull request as draft December 16, 2024 15:08
Copy link
Contributor

github-actions bot commented Dec 16, 2024

📚 Documentation

📁 Download as zip
🔍 View online

@fzimmermann89 fzimmermann89 marked this pull request as ready for review December 16, 2024 17:20
@fzimmermann89
Copy link
Member Author

Would be nice to get this in before the release @schuenke

Copy link
Collaborator

@schuenke schuenke left a comment

Choose a reason for hiding this comment

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

See my suggestions as discussed before. Use same/similar docstrings in other class as well.
But code works nice. Tested with the MAGMA review notebook!

src/mrpro/data/KTrajectory.py Outdated Show resolved Hide resolved
src/mrpro/data/KTrajectory.py Outdated Show resolved Hide resolved
src/mrpro/data/KTrajectory.py Outdated Show resolved Hide resolved
src/mrpro/data/KTrajectory.py Outdated Show resolved Hide resolved
src/mrpro/data/KTrajectory.py Outdated Show resolved Hide resolved
@schuenke schuenke mentioned this pull request Dec 17, 2024
@schuenke schuenke merged commit 92e3193 into main Dec 17, 2024
21 checks passed
@schuenke schuenke deleted the scaling branch December 17, 2024 16:07
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.

2 participants