Commit 56b4bd33 authored by Giorgio Calderone's avatar Giorgio Calderone
Browse files

Added final call to reduce(); Avoid showing model

parent 3ae0b0b9

Manifest.toml

+8 −2
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ uuid = "f6369f11-7733-5829-9624-2563aa707210" 
version = "0.10.18"



[[GFit]]

deps = ["CMPFit", "DataStructures", "Dates", "Distributions", "LsqFit", "MacroTools", "PrettyTables", "Printf", "Random", "Statistics"]

deps = ["CMPFit", "DataStructures", "Dates", "Dierckx", "Distributions", "LsqFit", "MacroTools", "PrettyTables", "Printf", "ProgressMeter", "QuadGK", "Random", "Statistics"]

path = "/home/gcalderone/.julia/dev/GFit"

uuid = "ac42e6ba-c0bf-4fcf-827d-deea44b16255"

version = "0.1.0"
@@ -501,8 +501,14 @@ version = "1.0.1" 
deps = ["Unicode"]

uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"



[[ProgressMeter]]

deps = ["Distributed", "Printf"]

git-tree-sha1 = "afadeba63d90ff223a6a48d2009434ecee2ec9e8"

uuid = "92933f4c-e287-5a05-a399-4b506db050ca"

version = "1.7.1"



[[QSFit]]

deps = ["CMPFit", "Cosmology", "DSP", "DataStructures", "Dates", "DelimitedFiles", "Dierckx", "FITSIO", "GFit", "GFitViewer", "Pkg", "Printf", "QuadGK", "Statistics", "Unitful", "UnitfulAstro"]

deps = ["CMPFit", "Cosmology", "DSP", "DataStructures", "Dates", "DelimitedFiles", "Dierckx", "FITSIO", "GFit", "GFitViewer", "Pkg", "Printf", "Statistics", "Unitful", "UnitfulAstro"]

path = "/home/gcalderone/.julia/dev/QSFit"

uuid = "fea25315-b951-4667-83c9-50e53efab241"

version = "0.1.0"

src/CL_1ES_1927p654.jl

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ module CL_1ES_1927p654 


using QSFit, DataStructures, GFit, Statistics, Dierckx

import QSFit: AbstractSpectralLine, DefaultRecipe, CombinedLine, NarrowLine, BroadLine, BroadBaseLine, ComboBroadLine,

    default_options, qso_cont_component, line_component, line_group_name, known_spectral_lines, fit, multi_fit, spectral_coverage

    default_options, qso_cont_component, line_component, line_group_name, known_spectral_lines, fit, multi_fit, spectral_coverage, reduce



abstract type q1927p654 <: DefaultRecipe end

src/Recipe_multi.jl

+2 −4
Original line number Diff line number Diff line
@@ -395,11 +395,9 @@ function multi_fit(source::QSO{TRecipe}; ref_id=1) where TRecipe <: q1927p654 
    end

    if needs_fitting

        println(source.log, "\nRe-run fit...")

        bestfit = fit!(model, source.data, minimizer=mzer); show(source.log, bestfit)

        bestfit = fit!(model, source.data, minimizer=mzer)

    end



    println(source.log, "\nFinal model and bestfit:")

    show(source.log, model)

    println(source.log)

    show(source.log, bestfit)
@@ -407,5 +405,5 @@ function multi_fit(source::QSO{TRecipe}; ref_id=1) where TRecipe <: q1927p654 
    println(source.log, "\nElapsed time: $elapsed s")

    QSFit.close_log(source)



    return (model, bestfit)

    return reduce(source, model, bestfit)

end

src/Recipe_single.jl

+2 −4
Original line number Diff line number Diff line
@@ -352,11 +352,9 @@ function fit(source::QSO{TRecipe}; id=1) where TRecipe <: q1927p654 
    end

    if needs_fitting

        println(source.log, "\nRe-run fit...")

        bestfit = fit!(model, source.data, minimizer=mzer); show(source.log, bestfit)

        bestfit = fit!(model, source.data, minimizer=mzer)

    end



    println(source.log, "\nFinal model and bestfit:")

    show(source.log, model)

    println(source.log)

    show(source.log, bestfit)
@@ -364,5 +362,5 @@ function fit(source::QSO{TRecipe}; id=1) where TRecipe <: q1927p654 
    println(source.log, "\nElapsed time: $elapsed s")

    QSFit.close_log(source)



    return (model, bestfit)

    return reduce(source, model, bestfit)

end