Skip to content
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.

Sign up for GitHub

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

Div2 #92

Merged
merged 2 commits into from
Mar 16, 2021
Merged

Div2 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
722cf90
fix ÷
JeffFessler Mar 16, 2021
24d7b12
doc v^
JeffFessler Mar 16, 2021
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
12 changes: 7 additions & 5 deletions docs/make.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ format = Documenter.HTML(
)


makedocs(
modules = [MIRT],
format = format,
makedocs(;
modules = [MIRT],
format,
sitename = "MIRT.jl",
pages = [
pages = [
"Home" => "index.md",
"Table of Contents" => "toc.md",
# "Examples" => examples,
Expand All @@ -26,6 +26,8 @@ makedocs(

# examples_cb()

deploydocs(
deploydocs(;
repo = "github.com/JeffFessler/MIRT.jl.git",
devbranch = "master",
versions = ["stable" => "v^", "dev" => "dev"],
)
9 changes: 3 additions & 6 deletions src/fbp/image_geom.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,20 +278,17 @@ end


"""
(n,d) = image_geom_down_round()
(n,d) = _down_round()
helper function needed to downsample `image_geom`
"""
function _down_round(
val::NTuple{D,Real},
dd::NTuple{D,Real},
down::NTuple{D,Real},
) where {D}
out = val ./ down
# for non-divisors make dim a multiple of 2
fun = out -> out == round(out) ? out : 2 * (out ÷ 2)
out = fun.(out)
dd = dd .* down
return Int.(out), dd
fun = r -> r == round(r) ? Int(r) : 2 * round(Int, r/2)
return @. fun(val / down), dd .* down
end


Expand Down