Skip to content

fix: fix tdim issue #46

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

Open
jamesrafe wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: fix tdim issue #46

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
cef8eb2
fix: fix tdim issue
jamesrafe Jul 31, 2026
c00fcc3
refactor: address comments
jamesrafe Aug 13, 2026
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
10 changes: 7 additions & 3 deletions src/hdu/bintable.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const BINARYTYPE = Dict(
ComplexF32 => "C", ComplexF64 => "M")

const POINTERTYPE = Dict("P" => Int32, "Q" => Int64, Int32 => "P", Int64 => "Q")
const TDIMFMT = r"^\((?<dims>\d+(?:,\d+)*)\)\s*$"

"""
BinaryField(name, pntr, type, slice, leng, supp, unit, disp, dims,
Expand Down Expand Up @@ -57,6 +58,9 @@ struct BinaryField <: AbstractField
lmax::Union{AbstractFloat, Nothing}
end

parse_tdim(value) = isempty(value) ? nothing :
Tuple(parse.(Int, split(match(TDIMFMT, value)[:dims], ',')))

function Base.read(io::IO, ::Type{Bintable}, format::DataFormat,
fields::Vector{BinaryField}; record::Bool = false, kwds...)

Expand Down Expand Up @@ -187,7 +191,7 @@ function FieldFormat(::Type{Bintable}, mankeys::DataFormat, reskeys::Dict{S, V},
supp = form[:a]
unit_ = get(reskeys, "TUNIT$j", "")
disp = get(reskeys, "TDISP$j", "")
dims = eval(Meta.parse(get(reskeys, "TDIM$j", "")))
dims = parse_tdim(get(reskeys, "TDIM$j", ""))
zero_ = least_float_type(get(reskeys, "TZERO$j",
type <: Union{Bool, BitVector, String} ? nothing : 0.0f0))
scale = least_float_type(get(reskeys, "TSCAL$j",
Expand Down Expand Up @@ -234,7 +238,7 @@ function FieldFormat(::Type{Bintable}, mankey::DataFormat, reskeys::Dict{S, V},
# get(reskeys, "TUNIT$j", "")
unit_ = get(reskeys, "TUNIT$j", "")
disp = get(reskeys, "TDISP$j", "")
dims = eval(Meta.parse(get(reskeys, "TDIM$j", "")))
dims = parse_tdim(get(reskeys, "TDIM$j", ""))
zero_ = least_float_type(get(reskeys, "TZERO$j",
type <: Union{Bool, BitVector, String} ? nothing : 0.0f0))
scale = least_float_type(get(reskeys, "TSCAL$j",
Expand Down Expand Up @@ -283,7 +287,7 @@ function FieldFormat(::Type{Bintable}, mankey::DataFormat, reskeys::Dict{S, V},
# get(reskeys, "TUNIT$j", "")
unit_ = get(reskeys, "TUNIT$j", "")
disp = get(reskeys, "TDISP$j", "")
dims = eval(Meta.parse(get(reskeys, "TDIM$j", "")))
dims = parse_tdim(get(reskeys, "TDIM$j", ""))
zero_ = least_float_type(get(reskeys, "TZERO$j",
type <: Union{Bool, BitVector, String} ? nothing : 0.0f0))
scale = least_float_type(get(reskeys, "TSCAL$j",
Expand Down
36 changes: 36 additions & 0 deletions test/bintable_hdu_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,42 @@
@test (length(hdu.data[1]) == 5 && length(hdu.data) == 3 &&
all([hdu.data[j][:par4] for j=1:3] .== [1.0, 2.0, 3.0]))

# test TDIM parsing
@test FITSFiles.parse_tdim("") === nothing
@test FITSFiles.parse_tdim("(3)") == (3,)
@test FITSFiles.parse_tdim("(5,14)") == (5, 14)
@test FITSFiles.parse_tdim("(5,14) ") == (5, 14)
@test_throws MethodError FITSFiles.parse_tdim("(5,x)")

# test one-dimensional TDIM values
cards = [Card("XTENSION", "BINTABLE"),
Card("BITPIX", 8),
Card("NAXIS", 2),
Card("NAXIS1", 24),
Card("NAXIS2", 2),
Card("PCOUNT", 0),
Card("GCOUNT", 1),
Card("TFIELDS", 1),
Card("TFORM1", "3D"),
Card("TTYPE1", "values"),
Card("TDIM1", "(3)")]
hdu = HDU(Bintable, missing, cards; record=true)

@test length(hdu.data) == 2
@test hdu.data[1].values == zeros(3)

cards = Card[Card("TDIM1", "(3)")]
records = [(values=[1.0, 2.0, 3.0],),
(values=[4.0, 5.0, 6.0],)]
hdu = HDU(Bintable, records, cards)

@test hdu.data == records

columns = (values=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]],)
hdu = HDU(Bintable, columns, cards)

@test hdu.data == columns

rm(temppath)

end
Loading