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

Fix structural padding issue #167

Merged
merged 6 commits into from
Dec 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,24 @@ jobs:
shell: julia --color=yes --project=. {0}
run: |
using Pkg
Pkg.add(PackageSpec(path=pwd(), subdir="MRIBase"))
Pkg.add(PackageSpec(path=pwd(), subdir="MRIFiles"))
Pkg.add(PackageSpec(path=pwd(), subdir="MRISampling"))
Pkg.add(PackageSpec(path=pwd(), subdir="MRISimulation"))
Pkg.add(PackageSpec(path=pwd(), subdir="MRIOperators"))
Pkg.add(PackageSpec(path=pwd(), subdir="MRICoilSensitivities"))
Pkg.develop(PackageSpec(path=pwd(), subdir="MRIBase"))
Pkg.develop(PackageSpec(path=pwd(), subdir="MRIFiles"))
Pkg.develop(PackageSpec(path=pwd(), subdir="MRISampling"))
Pkg.develop(PackageSpec(path=pwd(), subdir="MRISimulation"))
Pkg.develop(PackageSpec(path=pwd(), subdir="MRIOperators"))
Pkg.develop(PackageSpec(path=pwd(), subdir="MRICoilSensitivities"))
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- name: Run subpackage tests
shell: bash
shell: julia --color=yes --project=. {0}
run: |
julia --project="MRIBase" -e "using Pkg; Pkg.develop(PackageSpec(path=\".\")); Pkg.update(); Pkg.test()"
julia --project="MRIFiles" -e "using Pkg; Pkg.develop(PackageSpec(path=\".\")); Pkg.update(); Pkg.test()"
julia --project="MRISampling" -e "using Pkg; Pkg.develop(PackageSpec(path=\".\")); Pkg.update(); Pkg.test()"
julia --project="MRISimulation" -e "using Pkg; Pkg.develop(PackageSpec(path=\".\")); Pkg.update(); Pkg.test()"
julia --project="MRIOperators" -e "using Pkg; Pkg.develop(PackageSpec(path=\".\")); Pkg.update(); Pkg.test()"
julia --project="MRICoilSensitivities" -e "using Pkg; Pkg.develop(PackageSpec(path=\".\")); Pkg.update(); Pkg.test()"
using Pkg
Pkg.test("MRIBase")
Pkg.test("MRIFiles")
Pkg.test("MRISampling")
Pkg.test("MRISimulation")
Pkg.test("MRIOperators")
Pkg.test("MRICoilSensitivities")
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion MRIBase/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MRIBase"
uuid = "f7771a9a-6e57-4e71-863b-6e4b6a2f17df"
author = ["Tobias Knopp <[email protected]>"]
version = "0.4.1"
version = "0.4.2"

[deps]
AbstractNFFTs = "7f219486-4aa7-41d6-80a7-e08ef20ceed7"
Expand Down
21 changes: 21 additions & 0 deletions MRIBase/src/Datatypes/RawAcqData.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
export RawAcquisitionData, EncodingCounters, AcquisitionHeader, Profile, minimalHeader, profileIdx
export Limit, MeasurementDependency, CoilDescription


"""
Encoding counters used in each Profile of a RawAcquisitionData object.
Expand Down Expand Up @@ -409,6 +411,25 @@ function minimalHeader(encodingSize, fov::NTuple{3,AbstractFloat};
return params
end

# The following three structs will be contained in the parameter dictionary when reading a full
# ISMRMRD file

struct Limit
minimum::Int
maximum::Int
center::Int
end

struct MeasurementDependency
dependencyType::String
measurementID::String
end

struct CoilDescription
number::Int
name::String
end

function profileIdx(acqData::AcquisitionData, contr::Int)
tr = trajectory(acqData, contr)
numSamp = numSamplingPerProfile(tr)
Expand Down
4 changes: 2 additions & 2 deletions MRIFiles/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MRIFiles"
uuid = "5a6f062f-bf45-497d-b654-ad17aae2a530"
author = ["Tobias Knopp <[email protected]>"]
version = "0.2.1"
version = "0.3"

[deps]
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Expand All @@ -14,7 +14,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"

[compat]
julia = "1.6"
MRIBase = "0.3, 0.4"
MRIBase = "0.4.2"
FileIO = "1.2"
HDF5 = "0.16, 0.17"
LightXML = "0.9"
Expand Down
Loading