From 1b1611a017148ef6d44dc23ba972f9121553844f Mon Sep 17 00:00:00 2001 From: Niklas Hackelberg Date: Wed, 16 Jul 2025 10:38:27 +0200 Subject: [PATCH] Fix typo in DenseSystemMatrixLoadingParameter --- config/SinglePatch.toml | 2 +- config/SinglePatchHandsFree.toml | 2 +- .../HandsFreeAlgorithms/HandsFreeSinglePatch.jl | 2 +- .../SinglePatchAlgorithms/SinglePatchAlgorithm.jl | 2 +- .../SinglePatchBGEstimationAlgorithm.jl | 2 +- .../SinglePatchTemporalRegularizationAlgorithm.jl | 2 +- src/SystemMatrix/SystemMatrix.jl | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/SinglePatch.toml b/config/SinglePatch.toml index 18a2e01..90db04e 100644 --- a/config/SinglePatch.toml +++ b/config/SinglePatch.toml @@ -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" diff --git a/config/SinglePatchHandsFree.toml b/config/SinglePatchHandsFree.toml index 80207a7..7a72884 100644 --- a/config/SinglePatchHandsFree.toml +++ b/config/SinglePatchHandsFree.toml @@ -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" diff --git a/src/Algorithms/HandsFreeAlgorithms/HandsFreeSinglePatch.jl b/src/Algorithms/HandsFreeAlgorithms/HandsFreeSinglePatch.jl index 25513cb..61473ed 100644 --- a/src/Algorithms/HandsFreeAlgorithms/HandsFreeSinglePatch.jl +++ b/src/Algorithms/HandsFreeAlgorithms/HandsFreeSinglePatch.jl @@ -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 diff --git a/src/Algorithms/SinglePatchAlgorithms/SinglePatchAlgorithm.jl b/src/Algorithms/SinglePatchAlgorithms/SinglePatchAlgorithm.jl index 9946de6..06e0ddb 100644 --- a/src/Algorithms/SinglePatchAlgorithms/SinglePatchAlgorithm.jl +++ b/src/Algorithms/SinglePatchAlgorithms/SinglePatchAlgorithm.jl @@ -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 diff --git a/src/Algorithms/SinglePatchAlgorithms/SinglePatchBGEstimationAlgorithm.jl b/src/Algorithms/SinglePatchAlgorithms/SinglePatchBGEstimationAlgorithm.jl index a2040e5..0f355f0 100644 --- a/src/Algorithms/SinglePatchAlgorithms/SinglePatchBGEstimationAlgorithm.jl +++ b/src/Algorithms/SinglePatchAlgorithms/SinglePatchBGEstimationAlgorithm.jl @@ -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 diff --git a/src/Algorithms/SinglePatchAlgorithms/SinglePatchTemporalRegularizationAlgorithm.jl b/src/Algorithms/SinglePatchAlgorithms/SinglePatchTemporalRegularizationAlgorithm.jl index 9d9f1db..fd19d02 100644 --- a/src/Algorithms/SinglePatchAlgorithms/SinglePatchTemporalRegularizationAlgorithm.jl +++ b/src/Algorithms/SinglePatchAlgorithms/SinglePatchTemporalRegularizationAlgorithm.jl @@ -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 diff --git a/src/SystemMatrix/SystemMatrix.jl b/src/SystemMatrix/SystemMatrix.jl index 4a94bbe..c301c93 100644 --- a/src/SystemMatrix/SystemMatrix.jl +++ b/src/SystemMatrix/SystemMatrix.jl @@ -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