Commit c6bf1d99 authored by Giorgio Calderone's avatar Giorgio Calderone
Browse files

Updated

parent feb66cdf

Manifest.toml

+7 −6
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ version = "3.1.17" 
[[Artifacts]]

uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"



[[BSON]]

git-tree-sha1 = "92b8a8479128367aaab2620b8e73dff632f5ae69"

uuid = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"

version = "0.3.3"



[[Base64]]

uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -274,7 +269,7 @@ uuid = "ac42e6ba-c0bf-4fcf-827d-deea44b16255" 
version = "0.1.0"



[[GFitViewer]]

deps = ["BSON", "DataStructures", "DefaultApplication", "GFit", "JSON", "Pkg", "Statistics"]

deps = ["DataStructures", "DefaultApplication", "GFit", "JLD2", "JSON", "Pkg", "Statistics"]

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

uuid = "5d93b50e-5cc7-4feb-a740-ec85257caa01"

version = "0.1.0"
@@ -328,6 +323,12 @@ git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" 
uuid = "82899510-4779-5014-852e-03e436cf321d"

version = "1.0.0"



[[JLD2]]

deps = ["DataStructures", "FileIO", "MacroTools", "Mmap", "Pkg", "Printf", "Reexport", "TranscodingStreams", "UUIDs"]

git-tree-sha1 = "a605ca7aac73ccbba3208c49ca4d5eb78c8f4c74"

uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"

version = "0.4.10"



[[JLLWrappers]]

deps = ["Preferences"]

git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e"

run.jl

+11 −8
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ Pkg.activate(".") 
Z = 0.019422

EBV = 0.077



using Revise, Statistics, Serialization, Dierckx, DataFrames

using Revise, Statistics, Dierckx, DataFrames

using QSFit, GFit, Gnuplot, GFitViewer, MyAstroUtils

using CL_1ES_1927p654

using Dates

using TextParse

import StatsBase

import StatsBase, JLD2



path = "output-" * readlines(`git branch --show-current`)[1]

mkdir("$(path)")
@@ -83,9 +83,9 @@ if !isfile("$(path)/scale_fwhm.dat") 
        end

    end

    all_scale[.!isfinite.(all_fwhm)] .= NaN

    serialize("$(path)/scale_fwhm.dat", (all_scale, all_fwhm))

    JLD2.save_object("$(path)/scale_fwhm.dat", (all_scale, all_fwhm))

else

    (all_scale, all_fwhm) = deserialize("$(path)/scale_fwhm.dat")

    (all_scale, all_fwhm) = JLD2.load_object("$(path)/scale_fwhm.dat")

end



@gp :prenorm "set key bottom right" "set grid" xlab="Epoch" ylab="Value" :-
@@ -138,7 +138,7 @@ resolution = Dict( 
job = :all

chosen_epochs = dict_chosen_epochs[job]

Nloop = 6

(all_scale, all_fwhm) = deserialize("$(path)/scale_fwhm.dat")

(all_scale, all_fwhm) = JLD2.load_object("$(path)/scale_fwhm.dat")

for loop in 1:Nloop

    file = "$(path)/results_$(job)_$(loop).dat"

    if !isfile(file)
@@ -176,9 +176,12 @@ for loop in 1:Nloop 
            OIII_norm[id] = bestfit2[id][:OIII_5007].norm.val

            all_scale[chosen_epochs[id]] *= bestfit2[id][:OIII_5007].norm.val

        end

        serialize(file, (res, all_scale, OIII_norm))

        JLD2.jldsave(file; res, all_scale, OIII_norm)

    else

        (res, all_scale, OIII_norm) = deserialize(file);

        # res       = JLD2.load(file, "res")

        # all_scale = JLD2.load(file, "all_scale")

        # OIII_norm = JLD2.load(file, "OIII_norm")

        res, all_scale, OIII_norm = values(JLD2.load(file))

    end

end
@@ -186,7 +189,7 @@ end 
OIII_norm_evol = fill(NaN, length(chosen_epochs))

for loop in 1:Nloop

    file = "$(path)/results_$(job)_$(loop).dat"

    (res, all_scale, OIII_norm) = deserialize(file);

    res, all_scale, OIII_norm = values(JLD2.load(file))

    OIII_norm_evol = hcat(OIII_norm_evol, OIII_norm)

    println(res.bestfit.cost / res.bestfit.dof)

end