Merge pull request #209 from MagneticResonanceImaging/floop_along_con…

…trast

* floop along contrast in MultiCoil reco

* fix remaining end

src/Reconstruction/IterativeReconstruction.jl

@@ -208,30 +208,28 @@ function reconstruction_multiCoil(acqData::AcquisitionData{T}
   # solve optimization problem
   Ireco = zeros(Complex{T}, prod(reconSize), numSl, numContr, numRep)
   let reg = reg # Fix @floop warning due to conditional/multiple assignment to reg
-    @floop executor(arrayType) for l = 1:numRep, k = 1:numSl
+    @floop executor(arrayType) for l = 1:numRep, k = 1:numSl,  j = 1:numContr
       if encodingOps != nothing
         E = encodingOps[:,k]
       else
         E = encodingOps_parallel(acqData, reconSize, senseMapsUnCorr; slice=k, encParams...)
       end
 
-      for j = 1:numContr
-        W = WeightingOp(Complex{T}; weights=weights[j], rep=numChan)
-        kdata = arrayType((multiCoilData(acqData, j, k, rep=l))) .* repeat(weights[j], numChan)
-        if !isnothing(L_inv)
-          kdata = vec(reshape(kdata, :, numChan) * L_inv')
-        end
+      W = WeightingOp(Complex{T}; weights=weights[j], rep=numChan)
+      kdata = arrayType((multiCoilData(acqData, j, k, rep=l))) .* repeat(weights[j], numChan)
+      if !isnothing(L_inv)
+        kdata = vec(reshape(kdata, :, numChan) * L_inv')
+      end
 
-        EFull = ∘(W, E[j])
-        EFullᴴEFull = normalOperator(EFull; normalOpParams(arrayType)...)
-        solv = createLinearSolver(solver, EFull; AHA=EFullᴴEFull, reg=reg, params...)
-        I = solve!(solv, kdata)
+      EFull = ∘(W, E[j])
+      EFullᴴEFull = normalOperator(EFull; normalOpParams(arrayType)...)
+      solv = createLinearSolver(solver, EFull; AHA=EFullᴴEFull, reg=reg, params...)
+      I = solve!(solv, kdata)
 
-        if isCircular( trajectory(acqData, j) )
-          circularShutter!(reshape(I, reconSize), 1.0)
-        end
-        Ireco[:,k,j,l] = Array(I)
+      if isCircular( trajectory(acqData, j) )
+        circularShutter!(reshape(I, reconSize), 1.0)
       end
+      Ireco[:,k,j,l] = Array(I)
     end
   end
   Ireco_ = reshape(Ireco, volumeSize(reconSize, numSl)..., numContr, 1,numRep)