Merge pull request #30 from MagneticParticleImaging/JS/fix-warnings

Fix warnings due to removed parameters

src/LeastSquares.jl

@@ -35,10 +35,9 @@ function process(t::Type{<:AbstractMPIRecoAlgorithm}, params::LeastSquaresParame
   u = reshape(u, M, L)
   c = zeros(N, L)
 
-  args = toKwargs(params.solverParams)
-  reg = prepareRegularization(params.reg, params)
+  reg, args = prepareRegularization(params.reg, params)
   args[:reg] = reg
-  args[:sparseTrafo] = params.op
+
   solv = createLinearSolver(params.solver, params.S; args..., weights = params.weights)
 
   for l=1:L
@@ -54,23 +53,34 @@ function process(t::Type{<:AbstractMPIRecoAlgorithm}, params::LeastSquaresParame
 end
 
 function prepareRegularization(reg::Vector{R}, regLS::LeastSquaresParameters) where R<:AbstractRegularization
+  args = toKwargs(regLS.solverParams)
   params = regLS.solverParams
 
   result = AbstractRegularization[]
   push!(result, reg...)
 
   # Add further constraints
   if params.enforceReal && params.enforcePositive
-    push!(result, PositiveRegularization())
+    if !any([item isa PositiveRegularization for item ∈ reg])
+      push!(result, PositiveRegularization())
+    end
+
+    filter!(x -> !(x isa RealRegularization), reg)
   elseif params.enforceReal
-    push!(result, RealRegularization())
+    if !any([item isa RealRegularization for item ∈ reg])
+      push!(result, RealRegularization())
+    end
   end
 
+  pop!(args, :enforceReal)
+  pop!(args, :enforcePositive)
+
   # Add sparsity op
   if !isnothing(regLS.op)
     result = map(r -> TransformedRegularization(r, regLS.op), result)
   end
-  return result
+
+  return result, args
 end
 #=
 function process(t::Type{<:AbstractMPIRecoAlgorithm}, params::LeastSquaresParameters, threadInput::MultiThreadedInput)