Merge pull request #19 from christiangil/main: add Spectra2DExtended struct

adding Spectra2DExtended struct

Author: eford

src/types/spectra.jl

@@ -50,6 +50,20 @@ struct Spectra2DBasic{T1<:Real,T2<:Real,T3<:Real,
     metadata::MetadataT # Dict{Symbol,Any}
 end
 
+""" Basic struct for Spectra2D (or region of specturm)
+    Instruments can specialize their own if additional data is avaliable. """
+struct Spectra2DExtended{T1<:Real,T2<:Real,T3<:Real,
+     AA1<:AbstractArray{T1,2},AA2<:AbstractArray{T2,2},AA3<:AbstractArray{T3,2},
+     InstT<:AbstractInstrument
+    } <: AbstractSpectra2D
+    λ::AA1
+    λ_obs::AA1
+    flux::AA2
+    var::AA3
+    inst::InstT
+    metadata::MetadataT # Dict{Symbol,Any}
+end
+
 
 function Spectra1DBasic(λ::A1, flux::A2, var::A3, inst::InstT;
         metadata::Dict{Symbol,Any} = Dict{Symbol,Any}() ) where {
@@ -73,3 +87,13 @@ function Spectra2DBasic(λ::A1, flux::A2, var::A3, inst::InstT;
     @assert 1 <= min_pixel_in_order(inst) <= max_pixel_in_order(inst)
     Spectra2DBasic{eltype(λ),eltype(flux),eltype(var),typeof(λ),typeof(flux),typeof(var),typeof(inst)}(λ,flux,var,inst,metadata)
 end
+
+function Spectra2DExtended(λ::A1, λ_obs::A1, flux::A2, var::A3, inst::InstT;
+     metadata::MetadataT = MetadataT() ) where {
+     T1<:Real, T2<:Real, T3<:Real, A1<:AbstractArray{T1,2}, A2<:AbstractArray{T2,2}, A3<:AbstractArray{T3,2},
+     InstT<:AbstractInstrument  }
+    @assert size(λ) == size(λ_obs) == size(flux) == size(var)
+    @assert 1 <= size(λ,1) <= max_pixel_in_order(inst)-min_pixel_in_order(inst)+1
+    @assert 1 <= size(λ,2) <= max_order(inst)-min_order(inst)+1
+    Spectra2DExtended{eltype(λ),eltype(flux),eltype(var),typeof(λ),typeof(flux),typeof(var),typeof(inst)}(λ,λ_obs,flux,var,inst,metadata)
+end

src/types/types.jl

@@ -6,7 +6,7 @@ export AbstractInstrument, AbstractInstrument1D, AbstractInstrument2D
 
 include("spectra.jl")
 export AbstractSpectra, AbstractSpectra1D, AbstractSpectra2D
-export Spectra1DBasic, Spectra2DBasic
+export Spectra1DBasic, Spectra2DBasic, Spectra2DExtended
 
 include("chunks.jl")
 export AbstractChunkOfSpectrum, ChunkOfSpectrum