Update for strain package

byu-cxi · Jul 29, 2024 · 9813ab1 · 9813ab1
1 parent 6a0b4d3
commit 9813ab1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/docs/make.jl b/docs/make.jl
@@ -3,7 +3,7 @@ include("DummyDocs.jl")
 using .DummyDocs
 
 makedocs(
-    sitename="BcdiCore.jl",
+    sitename="BcdiTrad.jl",
     format = Documenter.HTML(
         prettyurls = get(ENV, "CI", nothing) == "true"
     ),

diff --git a/src/State.jl b/src/State.jl
@@ -6,7 +6,7 @@ indicating trusted intensities need to be passed in.
 """
 struct State{T}
     realSpace::CuArray{ComplexF64, 3, CUDA.Mem.DeviceBuffer}
-    shift::Vector{Int64}
+    shift::Tuple{Int64,Int64,Int64}
     support::CuArray{Bool, 3, CUDA.Mem.DeviceBuffer}
     core::T
 
@@ -18,26 +18,24 @@ struct State{T}
 
     function State(intens, recSupport, support)
         s = size(intens)
-        shift = [0.,0,0]
-        for i in 1:s[1]
-            for j in 1:s[2]
-                for k in 1:s[3]
-                    shift[1] += i*sqrt(intens[i,j,k])
-                    shift[2] += j*sqrt(intens[i,j,k])
-                    shift[3] += k*sqrt(intens[i,j,k])
-                end
-            end
-        end
-        shift .= [1,1,1] .- round.(Int64, shift ./ mapreduce(sqrt, +, intens))
-        intens = CuArray{Float64, 3, CUDA.Mem.DeviceBuffer}(circshift(intens,shift))
-        recSupport = CuArray{Float64, 3, CUDA.Mem.DeviceBuffer}(circshift(recSupport,shift))
-        shift .*= -1
+        intens, recSupport, shift = BcdiCore.centerPeak(intens, recSupport, "corner")
 
         realSpace = CUDA.zeros(ComplexF64, s)
         core = BcdiCore.TradState("L2", false, realSpace, intens, recSupport)
         realSpace .= CUFFT.ifft(sqrt.(intens) .* recSupport)
 
         new{typeof(core)}(realSpace, shift, support, core)
     end
+
+    function State(intens, recSupport, support, core)
+        s = size(intens)
+        intens, recSupport, shift = BcdiCore.centerPeak(intens, recSupport, "corner")
+
+        newCore = BcdiCore.TradState(
+            core.losstype, core.scale, intens, core.plan, 
+            core.realSpace, recSupport, core.working, core.deriv
+        )
+        new{typeof(newCore)}(core.realSpace, shift, support, newCore)
+    end
 end