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

Updated

parent b36a894b

src/Recipe_multi.jl

+33 −5
Original line number Diff line number Diff line
@@ -201,15 +201,43 @@ function multi_fit(source::QSO{TRecipe}; ref_id=1) where TRecipe <: q1927p654 
        end



        # Patch parameters

        @patch! model[:OIII_4959].voff = model[:OIII_5007].voff

        @patch! begin

            # model[:NII_6549].norm = model[:NII_6583].norm / 3

            model[:NII_6549].voff = model[:NII_6583].voff

         # model[:OIII_4959].norm = model[:OIII_5007].norm / 3

         model[:OIII_4959].voff = model[:OIII_5007].voff

        end

        @patch! begin

            model[:OIII_5007_bw].voff += model[:OIII_5007].voff

            model[:OIII_5007_bw].fwhm += model[:OIII_5007].fwhm

        end

    @patch! begin

        # model[:OI_6300].norm = model[:OI_6364].norm / 3

        model[:OI_6300].voff = model[:OI_6364].voff

    end

    @patch! begin

        # model[:NII_6549].norm = model[:NII_6583].norm / 3

        model[:NII_6549].voff = model[:NII_6583].voff

    end

    @patch! begin

        # model[:SII_6716].norm = model[:SII_6731].norm / 1.5

        model[:SII_6716].voff = model[:SII_6731].voff

    end



    @patch! model[:na_Hb].voff = model[:na_Ha].voff



    # The following are required to avoid degeneracy with iron

    # template

    @patch! begin

        model[:Hg].voff = model[:br_Hb].voff

        model[:Hg].fwhm = model[:br_Hb].fwhm

    end

    @patch! begin

        model[:br_Hg].voff = model[:br_Hb].voff

        model[:br_Hg].fwhm = model[:br_Hb].fwhm

    end

    @patch! begin

        model[:na_Hg].voff = model[:na_Hb].voff

        model[:na_Hg].fwhm = model[:na_Hb].fwhm

    end



        # Ensure luminosity at peak of the broad base component is

        # smaller than the associated broad component:
@@ -226,8 +254,8 @@ function multi_fit(source::QSO{TRecipe}; ref_id=1) where TRecipe <: q1927p654 
            @patch! model[:bb_Ha].norm *= model[:br_Ha].norm / model[:br_Ha].fwhm * model[:bb_Ha].fwhm

        end



        # Avoid division by zero

        model[:br_Ha].norm.low = 1.e-10

    # Force Hg and Hb lines to have the same shape as Ha

    model[:br_Ha].norm.low = 1.e-10  # avoid division by zero



        @patch! begin

            model[:na_Hg].norm = model[:br_Hg].norm * (model[:na_Ha].norm / model[:br_Ha].norm)

src/Recipe_single.jl

+33 −5
Original line number Diff line number Diff line
@@ -175,15 +175,43 @@ function fit(source::QSO{TRecipe}; id=1) where TRecipe <: q1927p654 
    end



    # Patch parameters

    @patch! model[:OIII_4959].voff = model[:OIII_5007].voff

     @patch! begin

        # model[:NII_6549].norm = model[:NII_6583].norm / 3

        model[:NII_6549].voff = model[:NII_6583].voff

         # model[:OIII_4959].norm = model[:OIII_5007].norm / 3

         model[:OIII_4959].voff = model[:OIII_5007].voff

     end

    @patch! begin

        model[:OIII_5007_bw].voff += model[:OIII_5007].voff

        model[:OIII_5007_bw].fwhm += model[:OIII_5007].fwhm

    end

    @patch! begin

        # model[:OI_6300].norm = model[:OI_6364].norm / 3

        model[:OI_6300].voff = model[:OI_6364].voff

    end

    @patch! begin

        # model[:NII_6549].norm = model[:NII_6583].norm / 3

        model[:NII_6549].voff = model[:NII_6583].voff

    end

    @patch! begin

        # model[:SII_6716].norm = model[:SII_6731].norm / 1.5

        model[:SII_6716].voff = model[:SII_6731].voff

    end



    @patch! model[:na_Hb].voff = model[:na_Ha].voff



    # The following are required to avoid degeneracy with iron

    # template

    @patch! begin

        model[:Hg].voff = model[:br_Hb].voff

        model[:Hg].fwhm = model[:br_Hb].fwhm

    end

    @patch! begin

        model[:br_Hg].voff = model[:br_Hb].voff

        model[:br_Hg].fwhm = model[:br_Hb].fwhm

    end

    @patch! begin

        model[:na_Hg].voff = model[:na_Hb].voff

        model[:na_Hg].fwhm = model[:na_Hb].fwhm

    end



    # Ensure luminosity at peak of the broad base component is

    # smaller than the associated broad component:
@@ -200,8 +228,8 @@ function fit(source::QSO{TRecipe}; id=1) where TRecipe <: q1927p654 
        @patch! model[:bb_Ha].norm *= model[:br_Ha].norm / model[:br_Ha].fwhm * model[:bb_Ha].fwhm

    end



    # Avoid division by zero

    model[:br_Ha].norm.low = 1.e-10

    # Force Hg and Hb lines to have the same shape as Ha

    model[:br_Ha].norm.low = 1.e-10  # avoid division by zero



    @patch! begin

        model[:na_Hg].norm = model[:br_Hg].norm * (model[:na_Ha].norm / model[:br_Ha].norm)