Skip to content

Commit 6b4359d

Browse files
committed
Merge branch 'master' of https://github.com/juliaastro/PSFKernels.jl into master
2 parents 05e0185 + c08579d commit 6b4359d

File tree

4 files changed

+23
-14
lines changed

4 files changed

+23
-14
lines changed

.github/workflows/register.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Register Package
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
version:
6+
description: Version to register or component to bump
7+
required: true
8+
jobs:
9+
register:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: julia-actions/RegisterAction@latest
13+
with:
14+
token: ${{ secrets.GITHUB_TOKEN }}

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "PSFModels"
22
uuid = "9ba017d1-7760-46cd-84a3-1e79e9ae9ddc"
33
authors = ["Miles Lucas <[email protected]> and contributors"]
4-
version = "0.1.1"
4+
version = "0.1.2"
55

66
[deps]
77
CoordinateTransformations = "150eb455-5306-5404-9cee-2592286d6298"

src/PSFModels.jl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,18 +170,13 @@ Base.getindex(model::PSFModel, idx::Vararg{<:Number,2}) = model(reverse(idx))
170170
Broadcast.combine_axes(kern::PSFModel, other) = axes(other)
171171
Broadcast.combine_axes(other, kern::PSFModel) = axes(other)
172172

173-
function indices_from_extent(pos, fwhm, maxsize)
174-
halfextent = @. maxsize * fwhm / 2
175-
lower = @. floor(Int, pos - halfextent)
176-
upper = @. ceil(Int, pos + halfextent)
177-
return (first(lower):first(upper), last(lower):last(upper))
178-
end
173+
indices_from_extent(pos, fwhm, maxsize) = indices_from_extent(pos, maxsize .* fwhm)
179174

180175
function indices_from_extent(pos, extent)
181176
halfextent = @. extent / 2
182177
lower = @. round(Int, pos - halfextent)
183178
upper = @. round(Int, pos + halfextent)
184-
return (first(lower):first(upper), last(lower):last(upper))
179+
return last(lower):last(upper), first(lower):first(upper)
185180
end
186181

187182
# TODO

test/runtests.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ function test_model_interface(K)
2424
m = K(12, 13, 10)
2525
@test m == K((12, 13), 10) == K(SA[12, 13], 10)
2626
@test size(m) == (31, 31)
27-
@test axes(m) == (-3:27, -2:28)
27+
@test axes(m) == (-2:28, -3:27)
2828
@test m.pos SA[12, 13]
2929
@test eltype(m) == Float64
3030

3131
# test diagonal fwhm
3232
m = K((10, 9))
3333
@test m == K((10, 9)) == K(SA[10, 9])
34-
@test size(m) == (31, 29)
35-
@test axes(m) == (-15:15, -14:14)
34+
@test size(m) == (29, 31)
35+
@test axes(m) == (-14:14, -15:15)
3636
@test m.pos SA[0, 0]
3737
@test eltype(m) == Float64
3838

3939
# test different maxsize
4040
m = K((10, 9); maxsize=2)
41-
@test size(m) == (21, 19)
42-
@test axes(m) == (-10:10, -9:9)
41+
@test size(m) == (19, 21)
42+
@test axes(m) == (-9:9, -10:10)
4343
@test m.pos SA[0, 0]
4444
@test eltype(m) == Float64
4545

@@ -113,4 +113,4 @@ end
113113
wdist = (1/5)^2 + (2/4.5)^2
114114
expected = inv(1 + wdist)
115115
@test m[2, 1] m(1, 2) expected
116-
end
116+
end

0 commit comments

Comments
 (0)