Skip to content
Open
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
2 changes: 1 addition & 1 deletion config/SinglePatch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ _type = "RecoPlan{SinglePatchParameters}"

[parameter.reco.sfLoad.param]
_module = "MPIReco"
_type = "RecoPlan{DenseSystemMatixLoadingParameter}"
_type = "RecoPlan{DenseSystemMatrixLoadingParameter}"

[parameter.reco.sfLoad.param.freqFilter]
_module = "MPIReco"
Expand Down
2 changes: 1 addition & 1 deletion config/SinglePatchHandsFree.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ _type = "RecoPlan{SinglePatchParameters}"

[parameter.reco.sfLoad.param]
_module = "MPIReco"
_type = "RecoPlan{DenseSystemMatixLoadingParameter}"
_type = "RecoPlan{DenseSystemMatrixLoadingParameter}"

[parameter.reco.sfLoad.param.freqFilter]
_module = "MPIReco"
Expand Down
2 changes: 1 addition & 1 deletion src/Algorithms/HandsFreeAlgorithms/HandsFreeSinglePatch.jl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function process(algo::SinglePatchReconstructionAlgorithm, params::SinglePatchHa
return gridresult(result, algo.grid, algo.sf)
end

function getLinearOperator(algo::SinglePatchReconstructionAlgorithm, params::SinglePatchHandsFreeReconstructionParameter{<:DenseSystemMatixLoadingParameter, S}) where {S}
function getLinearOperator(algo::SinglePatchReconstructionAlgorithm, params::SinglePatchHandsFreeReconstructionParameter{<:DenseSystemMatrixLoadingParameter, S}) where {S}
return nothing
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function process(algo::SinglePatchReconstructionAlgorithm, params::Union{W, Proc
return algo.weights
end

function getLinearOperator(algo::SinglePatchReconstructionAlgorithm, params::SinglePatchReconstructionParameter{<:DenseSystemMatixLoadingParameter, S}) where {S}
function getLinearOperator(algo::SinglePatchReconstructionAlgorithm, params::SinglePatchReconstructionParameter{<:DenseSystemMatrixLoadingParameter, S}) where {S}
return nothing
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export SinglePatchBGEstimationAlgorithm, SinglePatchBGEstimationReconstructionParameter
Base.@kwdef struct SinglePatchBGEstimationReconstructionParameter{L<:DenseSystemMatixLoadingParameter,
Base.@kwdef struct SinglePatchBGEstimationReconstructionParameter{L<:DenseSystemMatrixLoadingParameter,
SP<:AbstractSolverParameters, arrT <: AbstractArray} <: AbstractSinglePatchReconstructionParameters
# File
sf::MPIFile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export SinglePatchTemporalRegularizationAlgorithm, SinglePatchTemporalRegularizationReconstructionParameter
Base.@kwdef struct SinglePatchTemporalRegularizationReconstructionParameter{L<:DenseSystemMatixLoadingParameter,
Base.@kwdef struct SinglePatchTemporalRegularizationReconstructionParameter{L<:DenseSystemMatrixLoadingParameter,
SP<:AbstractSolverParameters, arrT <: AbstractArray} <: AbstractSinglePatchReconstructionParameters
# File
sf::MPIFile
Expand Down
8 changes: 4 additions & 4 deletions src/SystemMatrix/SystemMatrix.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ defaultParameterCalibFov(new::Missing) = missing
export AbstractSystemMatrixLoadingParameter
abstract type AbstractSystemMatrixLoadingParameter <: AbstractSystemMatrixParameter end

export DenseSystemMatixLoadingParameter
Base.@kwdef struct DenseSystemMatixLoadingParameter{F<:AbstractFrequencyFilterParameter, G<:AbstractSystemMatrixGriddingParameter} <: AbstractSystemMatrixLoadingParameter
export DenseSystemMatrixLoadingParameter
Base.@kwdef struct DenseSystemMatrixLoadingParameter{F<:AbstractFrequencyFilterParameter, G<:AbstractSystemMatrixGriddingParameter} <: AbstractSystemMatrixLoadingParameter
freqFilter::F
gridding::G
bgCorrection::Bool = false
tfCorrection::Union{Bool, Nothing} = nothing
loadasreal::Bool = false
end
function process(t::Type{<:AbstractMPIRecoAlgorithm}, params::DenseSystemMatixLoadingParameter, sf::MPIFile)
function process(t::Type{<:AbstractMPIRecoAlgorithm}, params::DenseSystemMatrixLoadingParameter, sf::MPIFile)
# Construct freqFilter
frequencies = process(t, params.freqFilter, sf)
return frequencies, process(t, params, sf, frequencies)...
end
function process(t::Type{<:AbstractMPIRecoAlgorithm}, params::DenseSystemMatixLoadingParameter, sf::MPIFile, frequencies::Vector{CartesianIndex{2}})
function process(t::Type{<:AbstractMPIRecoAlgorithm}, params::DenseSystemMatrixLoadingParameter, sf::MPIFile, frequencies::Vector{CartesianIndex{2}})
S, grid = getSF(sf, frequencies, nothing; toKwargs(params, default = Dict{Symbol, Any}(:tfCorrection => rxHasTransferFunction(sf)))...)
@info "Loading SM"
return S, grid
Expand Down
Loading