adapt to new LinOpCol release

MagneticParticleImaging · Aug 30, 2023 · 79a7113 · 79a7113 · tknopp · Aug 30, 2023
1 parent a432812
commit 79a7113
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MPIFiles"
 uuid = "371237a9-e6c1-5201-9adb-3d8cfa78fa9f"
 authors = ["Tobias Knopp <[email protected]>"]
-version = "0.12.7"
+version = "0.12.8"
 
 [deps]
 AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
@@ -47,7 +47,7 @@ ImageAxes = "0.6"
 Inflate = "0.1.2"
 Interpolations = "0.12, 0.13, 0.14"
 Reexport = "1.0"
-LinearOperatorCollection = "1.0"
+LinearOperatorCollection = "1.1"
 StableRNGs = "1.0.0"
 Unitful = "0.17, 1.2"
 UnitfulAngles = "0.6.1"

diff --git a/src/Conversion.jl b/src/Conversion.jl
@@ -273,10 +273,8 @@ function compressCalibMDF(filenameOut::String, f::MPIFile, idx::Vector{Int64};
   if sparsityTrafoRedFactor == 1.0
     params[:measData] = data
   else
-    strToSparsityTrafo = Dict("DCT-I"=>(DCTOp{ComplexF32},1), "DCT-II"=>(DCTOp{ComplexF32},2), 
-                              "DCT-III"=>(DCTOp{ComplexF32},3), "DCT-IV"=>(DCTOp{ComplexF32},4))
-    trafo, dcttype = strToSparsityTrafo[sparsityTrafo]
-    B = createLinearOperator(trafo; shape=tuple(calibSize(f)...), dcttype)
+    B = createLinearOperator(sparsityTrafo, ComplexF32; shape=tuple(calibSize(f)...))
+
     N = prod(calibSize(f))
     NBG = size(data,1) - N
     D = size(data,3)

diff --git a/src/MDFCommon.jl b/src/MDFCommon.jl
@@ -44,10 +44,7 @@ function systemMatrix(f::Union{MDFFileV2, MDFv2InMemory}, rows, bgCorrection=tru
   if measIsSparsityTransformed(f)
     dataBackTrafo = similar(fgdata, prod(calibSize(f)), size(fgdata,2))
 
-    strToSparsityTrafo = Dict("DCT-I"=>(DCTOp{ComplexF32},1), "DCT-II"=>(DCTOp{ComplexF32},2), 
-                              "DCT-III"=>(DCTOp{ComplexF32},3), "DCT-IV"=>(DCTOp{ComplexF32},4))
-    trafo, dcttype = strToSparsityTrafo[measSparsityTransformation(f)]
-    B = createLinearOperator(trafo; shape=tuple(calibSize(f)...), dcttype)
+    B = createLinearOperator(measSparsityTransformation(f), ComplexF32; shape=tuple(calibSize(f)...))
 
     tmp = measSubsamplingIndices(f)
     subsamplingIndices_ = reshape(tmp, size(tmp,1),