gjankowiak/tsa_saxs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PLUV.jl take computation of I outside of loop

Browse source
This commit is contained in:
Gaspard Jankowiak 2024-03-15 13:43:38 +01:00
parent 94c05c3d6f
commit 248db3bc68
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PLUV.jl
View file

@ -280,12 +280,13 @@ function intensity(P::AbstractArray{Float64}, q)
############### Ensemble average ############### Ensemble average
# multiply each columns of Am by Normal and sum along the columns, # multiply each columns of Am by Normal and sum along the columns,
# then multiply by integration step # then multiply by integration step
end
I = vec(sum(Am .^ 2 .* Normal'; dims=2)) * integration_step I = vec(sum(Am .^ 2 .* Normal'; dims=2)) * integration_step
alp = Rm / (Z + 1) alp = Rm / (Z + 1)
return @. (Norm * nv * 1e-6) * I * (16 * pi^2 * mu4(q, Z, alp)) + Con * (0.99 * (1.0 / (1 + exp(-8 * (q - 1.0)))) + 0.01) return @. (Norm * nv * 1e-6) * I * (16 * pi^2 * mu4(q, Z, alp)) + Con * (0.99 * (1.0 / (1 + exp(-8 * (q - 1.0)))) + 0.01)
end end
end
################## ##################
function negative_water(P::NamedTuple) function negative_water(P::NamedTuple)