@@ -64,12 +64,15 @@ function apply_doppler_boost!(spectra::AS, dict::AbstractDict ) where { AS<:Abst
6464 elseif haskey (dict,:ssb_rv )
6565 doppler_factor *= calc_doppler_factor (dict[:ssb_rv ])
6666 end
67+ #=
68+ # Now plan to apply correction at end, rather than to wavelength
6769 if !haskey(dict,:diff_ext_rv ) && !have_issued_diffext_warning
6870 @info "apply_doppler_boost! didn't find :diff_ext_rv to apply."
6971 have_issued_diffext_warning = true
7072 end
7173 if haskey(dict,:diff_ext_rv) doppler_factor *= calc_doppler_factor.(dict[:diff_ext_rv]) end
7274 apply_doppler_boost!(spectra,doppler_factor)
75+ =#
7376 return spectra
7477end
7578
@@ -79,6 +82,7 @@ function apply_doppler_boost!(spectra::AbstractArray{AS}, df::DataFrame ) where
7982 local doppler_factor = ones (size (spectra))
8083 # if !hasproperty(df,:drift) @info "apply_doppler_boost! didn't find :drift to apply." end
8184 # if hasproperty(df,:drift) doppler_factor .*= calc_doppler_factor.(df[!,:drift]) end
85+ #= NEID drift model is now included in wavelengths provided
8286 if !haskey(dict,:drift_rv) && !haskey(dict,:drift_z ) && !have_issued_drift_warning
8387 @info "apply_doppler_boost! didn't find :drift_rv or :drivft_z to apply."
8488 have_issued_drift_warning = true
@@ -88,7 +92,7 @@ function apply_doppler_boost!(spectra::AbstractArray{AS}, df::DataFrame ) where
8892 elseif haskey(dict,:drift_rv)
8993 doppler_factor *= calc_doppler_factor(dict[:drift_rv])
9094 end
91-
95+ =#
9296 if ! hasproperty (df,:ssb_rv ) && ! hasproperty (df,:ssbz ) && ! have_issued_ssb_warning
9397 @info " apply_doppler_boost! didn't find :ssb_rv or :ssbz to apply."
9498 have_issued_ssb_warning = true
@@ -98,11 +102,13 @@ function apply_doppler_boost!(spectra::AbstractArray{AS}, df::DataFrame ) where
98102 elseif hasproperty (df,:ssb_rv )
99103 doppler_factor .*= calc_doppler_factor .(df[! ,:ssb_rv ])
100104 end
105+ #= Now plan to apply correction at end, rather than to wavelength
101106 if !hasproperty(df,:drift) && !have_issued_diffext_warning
102107 @info "apply_doppler_boost! didn't find :diff_ext_rv to apply."
103108 have_issued_diffext_warning = true
104109 end
105110 if hasproperty(df,:diff_ext_rv) doppler_factor .*= calc_doppler_factor.(df[!,:diff_ext_rv]) end
111+ =#
106112 map (x-> apply_doppler_boost! (x[1 ],x[2 ]), zip (spectra,doppler_factor) );
107113end
108114
0 commit comments