diff --git a/scripts/orbitdetermination.jl b/scripts/orbitdetermination.jl index cf7edd5..82e97b8 100644 --- a/scripts/orbitdetermination.jl +++ b/scripts/orbitdetermination.jl @@ -86,11 +86,11 @@ end params = Vector{NEOParameters{Float64}}(undef, 2) params[1] = NEOParameters( coeffstol = Inf, bwdoffset = 0.042, fwdoffset = 0.042, # Propagation - gaussorder = 6, gaussQmax = 2.0, # Gauss method - adamiter = 500, adamQtol = 1e-5, tsaQmax = 2.0, # ADAM + gaussorder = 6, gaussQmax = 1.0, # Gauss method + adamiter = 500, adamQtol = 1e-5, tsaQmax = 1.0, # ADAM jtlsiter = 20, lsiter = 10, # Least squares outrej = true, χ2_rec = 7.0, χ2_rej = 8.0, # Outlier rejection - fudge = 10.0, max_per = 34.0 + fudge = 400.0, max_per = 20.0 ) params[2] = NEOParameters(params[1]; coeffstol = 10.0, adamiter = 200, adamQtol = 0.01, diff --git a/src/orbitdetermination/leastsquares/outlierrejection.jl b/src/orbitdetermination/leastsquares/outlierrejection.jl index f7b9375..7fab074 100644 --- a/src/orbitdetermination/leastsquares/outlierrejection.jl +++ b/src/orbitdetermination/leastsquares/outlierrejection.jl @@ -88,7 +88,7 @@ function outlier_rejection!(res::AbstractVector{OpticalResidual{T, TaylorN{T}}}, N_drop = count(mask) N_sel = L - N_drop # Maximum allowed drops - max_drop = ceil(Int, max_per * L / 100) + max_drop = round(Int, max_per * L / 100) # Sort χ2s idxs = sortperm(χ2s, rev = true) # Rejection threshold