refactoring

Author: aquatiko

src/Reproject.jl

@@ -1,14 +1,7 @@
-__precompile__()
-
 module Reproject
 
 using FITSIO, WCS
 
 include("parsers.jl")
 
-export 
-    parse_input_data,
-    parse_output_projection
-
 end # module
-

src/parsers.jl

@@ -14,24 +14,14 @@ function parse_input_data(input_data::ImageHDU)
     return read(input_data), WCS.from_header(read_header(input_data, String))[1]
 end
 
-function parse_input_data(input_data::String; hdu_in = nothing)
-    return parse_input_data(FITS(input_data), hdu_in = hdu_in)
+function parse_input_data(input_data::String, hdu_in)
+    return parse_input_data(FITS(input_data), hdu_in)
 end
 
-function parse_input_data(input_data::FITS; hdu_in = nothing)
-   if hdu_in === nothing
-        if length(input_data) > 1
-            throw(ArgumentError("More than one HDU is present, please specify which HDU to use with 'hdu_in' option"))
-        else
-            hdu_in = 1
-        end
-    end
+function parse_input_data(input_data::FITS, hdu_in)
     return parse_input_data(input_data[hdu_in])
 end
 
-function parse_input_data(input_data; hdu_in = nothing)
-    throw(ArgumentError("Input should be in Union{String, FITS, ImageHDU}"))
-end
 
 # TODO: extend support for passing FITSHeader when FITSHeader to WCSTransform support is possible.
 
@@ -49,17 +39,15 @@ Parse output projection and returns a WCS object and shape of output.
 - `shape_out`: shape of the output image.
 - `hdu_number`: specifies HDU number when file name is given as input.
 """
-function parse_output_projection(output_projection::WCSTransform; shape_out = nothing)
-    if shape_out === nothing
-        throw(ArgumentError("Need to specify shape when specifying output_projection as WCS object"))
-    elseif length(shape_out) == 0
+function parse_output_projection(output_projection::WCSTransform, shape_out)
+    if length(shape_out) == 0
         throw(DomainError(shape_out, "The shape of the output image should not be an empty tuple"))
     end
 
     return output_projection, shape_out
 end
 
-function parse_output_projection(output_projection::ImageHDU; shape_out = nothing)
+function parse_output_projection(output_projection::ImageHDU, shape_out)
     wcs_out = WCS.from_header(read_header(output_projection, String))[1]
     if shape_out === nothing
         shape_out = size(output_projection)
@@ -70,25 +58,19 @@ function parse_output_projection(output_projection::ImageHDU; shape_out = nothin
     return wcs_out, shape_out
 end
 
-function parse_output_projection(output_projection::String; hdu_number = nothing)
-    hdu_list = FITS(output_projection)
-    if hdu_number === nothing
-        wcs_out = WCS.from_header(read_header(hdu_list[1], String))[1]
-        hdu_number = 1
-    else
-        wcs_out = WCS.from_header(read_header(hdu_list[hdu_number], String))[1]
-    end
+function parse_output_projection(output_projection::String, hdu_number)
+    parse_output_projection(FITS(output_projection), hdu_number)
+end
+
+function parse_output_projection(output_projection::FITS, hdu_number)
+    wcs_out = WCS.from_header(read_header(output_projection[hdu_number], String))[1]
 
-    if hdu_list[hdu_number] isa ImageHDU
-        shape_out = size(hdu_list[hdu_number])
+    if output_projection[hdu_number] isa ImageHDU
+        shape_out = size(output_projection[hdu_number])
     else    
         throw(ArgumentError("Given FITS file doesn't have ImageHDU"))
     end
 
     return wcs_out, shape_out
 end
 
-function parse_output_projection(output_projection; shape_out = nothing)
-    throw(ArgumentError("output_projection should be in  Union{String, WCSTransform, FITSHeader}"))
-end
-

test/parsers.jl

@@ -1,3 +1,4 @@
+using Reproject: parse_input_data, parse_output_projection
 @testset "input parser" begin
     fname = tempname() * ".fits"
     f = FITS(fname, "w")
@@ -21,14 +22,14 @@
     end
 
     @testset "Single HDU FITS file" begin
-        result = parse_input_data(f)
+        result = parse_input_data(f, 1)
         @test result[1] isa Array
         @test result[2] isa WCSTransform
     end
     close(f)
 
     @testset "String filename input" begin
-        result = parse_input_data(fname)
+        result = parse_input_data(fname, 1)
         @test result[1] isa Array
         @test result[2] isa WCSTransform
     end
@@ -38,24 +39,15 @@
     write(f, indata; header=inhdr)
 
     @testset "Multiple HDU FITS file" begin
-        
-        @test_throws ArgumentError parse_input_data(f) 
-
-        result = parse_input_data(f, hdu_in = 2)
+        result = parse_input_data(f, 2)
         @test result[1] isa Array
         @test result[2] isa WCSTransform
 
         close(f)
-        result = parse_input_data(fname, hdu_in = 1)
+        result = parse_input_data(fname, 1)
         @test result[1] isa Array
         @test result[2] isa WCSTransform
-        @test_throws ArgumentError parse_input_data(fname)
-    end
-    
-    @testset "invalid input" begin
-        @test_throws ArgumentError parse_input_data(1:40, hdu_in = 12)
-    end
-        
+    end   
 end
 
 @testset "output parser" begin
@@ -75,22 +67,17 @@ end
     write(f, indata; header=inhdr)
 
     @testset "ImageHDU type" begin
-        result = parse_output_projection(f[1])
+        result = parse_output_projection(f[1], (12,12))
         @test result[1] isa WCSTransform
         @test result[2] isa Tuple
-        @test parse_output_projection(f[1], shape_out = (12,12))[1] isa WCSTransform
+        @test_throws DomainError parse_output_projection(f[1], ())
     end
     close(f)
 
     @testset "String filename" begin
-        result = parse_output_projection(fname)
+        result = parse_output_projection(fname, 1)
         @test result[1] isa WCSTransform
         @test result[2] isa Tuple
-        @test parse_output_projection(fname, hdu_number = 1)[1] isa WCSTransform
-    end
-    
-    @testset "invalid input" begin
-        @test_throws ArgumentError parse_output_projection(1:40, shape_out = (12,12))
     end
 
     wcs = WCSTransform(2;
@@ -101,13 +88,10 @@ end
                           pv    = [(2, 1, 45.0)])
 
     @testset "WCSTransform input" begin
-        @test_throws ArgumentError parse_output_projection(wcs)
-        @test_throws DomainError parse_output_projection(wcs, shape_out = ())
-        
-        result = parse_output_projection(wcs, shape_out = (12,12))
+        result = parse_output_projection(wcs, (12,12))
         @test result[1] isa WCSTransform
         @test result[2] isa Tuple
+        @test_throws DomainError parse_output_projection(wcs, ())
     end
-        
 end