Commit 323e37b4 authored by Laure Ciesla's avatar Laure Ciesla Committed by Yannick Roehlly
Browse files

Updates to be consistent with other modules

parent 0e229b7c
......@@ -84,10 +84,10 @@ class Fritz2006(CreationModule):
out_parameter_list = OrderedDict([
('fracAGN', 'Contribution of the AGN'),
('L_AGN_therm', 'Luminosity of the AGN contribution due to the dust torus'),
('L_AGN_scatt', 'Luminosity of the AGN contribution due to the photon scattering'),
('L_AGN_agn', 'Luminosity of the AGN contribution due to the central source'),
('L_AGN_tot', 'Total luminosity of the AGN contribution')
('l_agn_therm', 'Luminosity of the AGN contribution due to the dust torus'),
('l_agn_scatt', 'Luminosity of the AGN contribution due to the photon scattering'),
('l_agn_agn', 'Luminosity of the AGN contribution due to the central source'),
('l_agn_tot', 'Total luminosity of the AGN contribution')
])
def _init_code(self):
......@@ -130,25 +130,25 @@ class Fritz2006(CreationModule):
# Compute the AGN luminosity
if fracAGN < 1.:
L_AGN_therm = luminosity * (1./(1.-fracAGN) - 1.)
L_AGN_scatt = self.fritz2006.norm_scatt * L_AGN_therm
L_AGN_agn = self.fritz2006.norm_agn * L_AGN_therm
L_AGN_total = L_AGN_therm + L_AGN_scatt + L_AGN_agn
l_agn_therm = luminosity * (1./(1.-fracAGN) - 1.)
l_agn_scatt = self.fritz2006.norm_scatt * l_agn_therm
l_agn_agn = self.fritz2006.norm_agn * l_agn_therm
l_agn_total = l_agn_therm + l_agn_scatt + l_agn_agn
else:
raise Exception("AGN fraction is exactly 1. Behaviour "
"undefined.")
sed.add_info('L_AGN_therm', L_AGN_therm)
sed.add_info('L_AGN_scatt', L_AGN_scatt)
sed.add_info('L_AGN_agn', L_AGN_agn)
sed.add_info('L_AGN_total', L_AGN_total)
sed.add_contribution('agn_fritz2006_therm', self.fritz2006.wave,
L_AGN_therm * self.fritz2006.lumin_therm)
sed.add_contribution('agn_fritz2006_scatt', self.fritz2006.wave,
L_AGN_therm * self.fritz2006.lumin_scatt)
sed.add_contribution('agn_fritz2006_agn', self.fritz2006.wave,
L_AGN_therm * self.fritz2006.lumin_agn)
sed.add_info('l_agn_therm', l_agn_therm)
sed.add_info('l_agn_scatt', l_agn_scatt)
sed.add_info('l_agn_agn', l_agn_agn)
sed.add_info('l_agn_total', l_agn_total)
sed.add_contribution('agn.fritz2006_therm', self.fritz2006.wave,
l_agn_therm * self.fritz2006.lumin_therm)
sed.add_contribution('agn.fritz2006_scatt', self.fritz2006.wave,
l_agn_therm * self.fritz2006.lumin_scatt)
sed.add_contribution('agn.fritz2006_agn', self.fritz2006.wave,
l_agn_therm * self.fritz2006.lumin_agn)
# CreationModule to be returned by get_module
Module = Fritz2006
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment