Skip to content

Add Dirac #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ImagePhantoms"
uuid = "71a99df6-f52c-4da1-bd2a-69d6f37f3252"
authors = ["Jeff Fessler <[email protected]> and contributors"]
version = "0.3.0"
version = "0.4.0"

[deps]
LazyGrids = "7031d0ef-c40d-4431-b2f8-61a8d2f650db"
Expand Down
4 changes: 3 additions & 1 deletion src/ImagePhantoms.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ include("object2.jl")
include("object3.jl")
include("jinc.jl")

# shapes:
# 2d:
include("dirac2.jl")
include("ellipse.jl")
include("gauss2.jl")
include("rect.jl")
include("triangle.jl")

# 3d:
include("dirac3.jl")
include("ellipsoid.jl")
include("gauss3.jl")
include("cuboid.jl")
Expand Down
3 changes: 0 additions & 3 deletions src/cuboid.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ actually a rectangular cuboid https://en.wikipedia.org/wiki/Cuboid
=#


#using ImagePhantoms #: Object, Object3d

export Cuboid, cuboid, cube
export phantom, radon, spectrum


"""
Expand Down
1 change: 0 additions & 1 deletion src/cylinder.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ cylinder.jl


export Cylinder, cylinder
export phantom, radon, spectrum


"""
Expand Down
67 changes: 67 additions & 0 deletions src/dirac2.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#=
dirac2.jl
=#

export Dirac2, dirac2
#export Dirac


"""
Dirac{D} <: AbstractShape{D}
"""
struct Dirac{D} <: AbstractShape{D} end

const Dirac2 = Dirac{2}


# constructor


"""
dirac2(...)
Construct `Object2d{Dirac2}` from parameters;
here `width` is a scale factor: `δ((x - c)/w) = w * δ(x - c)`.
"""
dirac2(args... ; kwargs...) = Object(Dirac2(), args...; kwargs...)
# dirac(D::Int, args... ; kwargs...) = Object(Dirac{D}(), args...; kwargs...)


# methods


area1(::Dirac2) = 1

ℓmax1(::Dirac) = 1 # max line integral


#=
"""
phantom1(ob::Object2d{Dirac2}, (x,y))
Evaluate Dirac at `(x,y)`,
for unitless coordinates.
Caution: this method is meaningless
because the Dirac impulse is not a function!
"""
phantom1(ob::Object2d{Dirac2}, xy::NTuple{2,Real}) = (xy == (0,0)) ? 1 : 0
=#


#=
"""
xray1(::Dirac2, r::Real, ϕ::RealU)
X-ray transform (line integral) of Dirac.
`r` should be unitless
Caution: this method is meaningless
because the Dirac impulse is not a function!
"""
xray1(::Dirac2, r::Real, ϕ::RealU) = (r == 0) ? 1 : 0
=#


"""
spectrum1(::Object2d{Dirac2}, (kx,ky))
Spectrum of Dirac2 at `(kx,ky)`,
for unitless spatial frequency coordinates.
"""
spectrum1(::Object2d{Dirac2}, kxy::NTuple{2,Real}) = 1
#spectrum1(::Object{Dirac, D, V}, kxy::NTuple{D,Real}) where {D, V} = one(V)
58 changes: 58 additions & 0 deletions src/dirac3.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#=
dirac3.jl
=#

export Dirac3, dirac3

const Dirac3 = Dirac{3}


# constructor


"""
dirac3(...)
Construct `Object3d{Dirac3}` from parameters;
here `width` is a scale factor: `δ((x - c)/w) = w * δ(x - c)`.
"""
dirac3(args... ; kwargs...) = Object(Dirac3(), args...; kwargs...)


# methods


volume1(::Dirac3) = 1

# ℓmax1(::Dirac) = 1 # max line integral


#=
"""
phantom1(ob::Object3d{Dirac3}, (x,y))
Evaluate Dirac at `(x,y,z)`,
for unitless coordinates.
Caution: this method is meaningless
because the Dirac impulse is not a function!
"""
phantom1(ob::Object3d{Dirac3}, xyz::NTuple{3,Real}) = (xyz == (0,0,0)) ? 1 : 0
=#


#=
"""
xray1(::Dirac3, r::Real, ϕ::RealU)
X-ray transform (line integral) of Dirac.
`r` should be unitless
Caution: this method is meaningless
because the Dirac impulse is not a function!
"""
xray1(::Dirac3, u::Real, v::Real, ϕ::RealU, θ::RealU) = ((u,v) == (0,0)) ? 1 : 0
=#


"""
spectrum1(::Object3d{Dirac3}, (kx,ky,kz))
Spectrum of Dirac3 at `(kx,ky,kz)`,
for unitless spatial frequency coordinates.
"""
spectrum1(::Object3d{Dirac3}, kxyz::NTuple{3,Real}) = 1
4 changes: 0 additions & 4 deletions src/ellipse.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
ellipse.jl
=#


#using ImagePhantoms #: Object, Object2d

export Ellipse, ellipse, circle
export phantom, radon, spectrum


"""
Expand Down
4 changes: 0 additions & 4 deletions src/ellipsoid.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
ellipsoid.jl
=#


#using ImagePhantoms #: Object, Object3d

export Ellipsoid, ellipsoid, sphere
export phantom, radon, spectrum


"""
Expand Down
4 changes: 0 additions & 4 deletions src/gauss2.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
gauss2.jl
=#


#using ImagePhantoms #: Object, Object2d

export Gauss2, gauss2
export phantom, radon, spectrum, fwhm2spread


"""
Expand Down
4 changes: 0 additions & 4 deletions src/gauss3.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
gauss3.jl
=#


#using ImagePhantoms #: Object, Object3d

export Gauss3, gauss3
export phantom, radon, spectrum


"""
Expand Down
3 changes: 0 additions & 3 deletions src/rect.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ rect.jl
=#


#using ImagePhantoms #: Object, Object2d

export Rect, rect, square
export phantom, radon, spectrum


"""
Expand Down
4 changes: 0 additions & 4 deletions src/triangle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ triangle.jl
2D triangle shape
=#


#using ImagePhantoms #: Object, Object2d, AbstractShape

export Triangle, triangle
export phantom, radon, spectrum

const sqrt3 = sqrt(3)

Expand Down
Loading