Commit 11d96ddd authored by Guang's avatar Guang

add units to the new properties in X-CIGALE

parent 5b724f98
......@@ -350,7 +350,7 @@ class Fritz2006(SedModule):
sed.add_info('agn.fracAGN', self.fracAGN)
sed.add_info('agn.law', self.law)
sed.add_info('agn.EBV', self.EBV)
sed.add_info('agn.temperature', self.temperature)
sed.add_info('agn.temperature', self.temperature, unit='K')
sed.add_info('agn.emissivity', self.emissivity)
# Compute the AGN luminosity
......@@ -366,12 +366,12 @@ class Fritz2006(SedModule):
raise Exception("AGN fraction is exactly 1. Behaviour "
"undefined.")
sed.add_info('agn.therm_luminosity', l_agn_therm, True)
sed.add_info('agn.scatt_luminosity', l_agn_scatt, True)
sed.add_info('agn.disk_luminosity', l_agn_agn, True)
sed.add_info('agn.luminosity', l_agn_total, True)
sed.add_info('agn.accretion_power', l_agn_intrin_agn, True)
sed.add_info('agn.intrin_Lnu_2500A', l_agn_2500A, True)
sed.add_info('agn.therm_luminosity', l_agn_therm, True, unit='W')
sed.add_info('agn.scatt_luminosity', l_agn_scatt, True, unit='W')
sed.add_info('agn.disk_luminosity', l_agn_agn, True, unit='W')
sed.add_info('agn.luminosity', l_agn_total, True, unit='W')
sed.add_info('agn.accretion_power', l_agn_intrin_agn, True, unit='W')
sed.add_info('agn.intrin_Lnu_2500A', l_agn_2500A, True, unit='W/Hz')
sed.add_contribution('agn.fritz2006_therm', self.fritz2006.wave,
agn_power * self.fritz2006.lumin_therm)
......
......@@ -249,14 +249,14 @@ class SKIRTOR2016(SedModule):
sed.add_info('agn.t', self.t)
sed.add_info('agn.pl', self.pl)
sed.add_info('agn.q', self.q)
sed.add_info('agn.oa', self.oa)
sed.add_info('agn.oa', self.oa, unit='deg')
sed.add_info('agn.R', self.R)
sed.add_info('agn.Mcl', self.Mcl)
sed.add_info('agn.i', self.i)
sed.add_info('agn.i', self.i, unit='deg')
sed.add_info('agn.fracAGN', self.fracAGN)
sed.add_info('agn.law', self.law)
sed.add_info('agn.EBV', self.EBV)
sed.add_info('agn.temperature', self.temperature)
sed.add_info('agn.temperature', self.temperature, unit='K')
sed.add_info('agn.emissivity', self.emissivity)
# Compute the AGN luminosity
......@@ -275,11 +275,11 @@ class SKIRTOR2016(SedModule):
raise Exception("AGN fraction is exactly 1. Behaviour "
"undefined.")
sed.add_info('agn.dust_luminosity', lumin_dust, True)
sed.add_info('agn.disk_luminosity', lumin_disk, True)
sed.add_info('agn.luminosity', lumin, True)
sed.add_info('agn.accretion_power', power_accretion, True)
sed.add_info('agn.intrin_Lnu_2500A', l_agn_2500A, True)
sed.add_info('agn.dust_luminosity', lumin_dust, True, unit='W')
sed.add_info('agn.disk_luminosity', lumin_disk, True, unit='W')
sed.add_info('agn.luminosity', lumin, True, unit='W')
sed.add_info('agn.accretion_power', power_accretion, True, unit='W')
sed.add_info('agn.intrin_Lnu_2500A', l_agn_2500A, True, unit='W/Hz')
sed.add_contribution('agn.SKIRTOR2016_dust', self.SKIRTOR2016.wave,
agn_power * self.SKIRTOR2016.dust)
......
......@@ -133,7 +133,7 @@ class Xray(SedModule):
alpha_ox = self.parameters['alpha_ox']
# AGN 2500A intrinsic luminosity
if 'agn.intrin_Lnu_2500A' not in sed.info:
sed.add_info('agn.intrin_Lnu_2500A', 1., True)
sed.add_info('agn.intrin_Lnu_2500A', 1., True, unit='W/Hz')
Lnu_2500A = sed.info['agn.intrin_Lnu_2500A']
# Add the configuration for X-ray module
......@@ -165,12 +165,12 @@ class Xray(SedModule):
l_agn_xray_2to10keV = self.l_agn_xray_2to10keV * L_lam_2keV
# Save the results
sed.add_info("xray.hotgas_Lx_0p5to2keV", l_hotgas_xray_0p5to2keV, True)
sed.add_info("xray.hmxb_Lx_2to10keV", l_hmxb_xray_2to10keV, True)
sed.add_info("xray.lmxb_Lx_2to10keV", l_lmxb_xray_2to10keV, True)
sed.add_info("xray.agn_Lx_total", l_agn_xray_total, True)
sed.add_info("xray.agn_Lx_2to10keV", l_agn_xray_2to10keV, True)
sed.add_info("xray.agn_Lnu_2keV", Lnu_2keV, True)
sed.add_info("xray.hotgas_Lx_0p5to2keV", l_hotgas_xray_0p5to2keV, True, unit='W')
sed.add_info("xray.hmxb_Lx_2to10keV", l_hmxb_xray_2to10keV, True, unit='W')
sed.add_info("xray.lmxb_Lx_2to10keV", l_lmxb_xray_2to10keV, True, unit='W')
sed.add_info("xray.agn_Lx_total", l_agn_xray_total, True, unit='W')
sed.add_info("xray.agn_Lx_2to10keV", l_agn_xray_2to10keV, True, unit='W')
sed.add_info("xray.agn_Lnu_2keV", Lnu_2keV, True, unit='W/Hz')
# Add the SED components
sed.add_contribution('xray.galaxy', self.wave,
self.lumin_hotgas*l_hotgas_xray_0p5to2keV + \
......
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