Commit 64cfb717 authored by Médéric Boquien's avatar Médéric Boquien

Make models naming shorter and more consistent.

parent 4a8bc160
......@@ -19,7 +19,7 @@ import itertools
import numpy as np
from scipy import interpolate
import scipy.constants as cst
from pcigale.data import (Database, Filter, SspM2005, SspBC03, AgnFritz2006,
from pcigale.data import (Database, Filter, M2005, BC03, Fritz2006,
Dale2014, DL2007, NebularLines, NebularContinuum)
......@@ -229,8 +229,8 @@ def build_m2005(base):
0.0: 0.02,
0.35: 0.04}[metallicity]
base.add_ssp_m2005(SspM2005(imf, metallicity, age_grid,
lambda_grid, mass_table, flux_age))
base.add_m2005(M2005(imf, metallicity, age_grid, lambda_grid,
mass_table, flux_age))
def build_bc2003(base):
......@@ -278,7 +278,7 @@ def build_bc2003(base):
ssp_lumin = interpolate.interp1d(ssp_time,
ssp_lumin)(time_grid)
base.add_ssp_bc03(SspBC03(
base.add_bc03(BC03(
imf,
metallicity[key],
time_grid,
......@@ -317,7 +317,7 @@ def build_dh2002(base):
data = (alpha_grid, lambda_grid, templates)
base.add_dh2002_infrared_templates(data)
base.add_dh2002(data)
def build_dale2014(base):
......@@ -482,10 +482,10 @@ def build_fritz2006(base):
# Convert the luminosity from erg/s^-1/Å to W/nm
lumin = lumin * 10 * 1.e-7
agn = AgnFritz2006(model_nb, agn_type, r_ratio, tau, beta, gamma,
agn = Fritz2006(model_nb, agn_type, r_ratio, tau, beta, gamma,
theta, psy, wave, lumin)
base.add_fritz2006_agn(agn)
base.add_fritz2006(agn)
def build_nebular(base):
......
......@@ -67,7 +67,7 @@ class BC03(CreationModule):
imf = self.parameters["imf"]
metallicity = float(self.parameters["metallicity"])
with Database() as database:
self.ssp = database.get_ssp_bc03(imf, metallicity)
self.ssp = database.get_bc03(imf, metallicity)
def process(self, sed):
"""Add the convolution of a Bruzual and Charlot SSP to the SED
......
......@@ -49,7 +49,7 @@ class DH2002(CreationModule):
def _init_code(self):
"""Get the template set out of the database"""
with Database() as database:
self.dh2002 = database.get_dh2002_infrared_templates()
self.dh2002 = database.get_dh2002()
def process(self, sed):
"""Add the IR re-emission contributions
......
......@@ -105,7 +105,7 @@ class M2005(CreationModule):
imf = self.parameters["imf"]
metallicity = float(self.parameters["metallicity"])
with Database() as database:
self.ssp = database.get_ssp_m2005(imf, metallicity)
self.ssp = database.get_m2005(imf, metallicity)
def process(self, sed):
"""Add the convolution of a Maraston 2005 SSP to the SED
......
This diff is collapsed.
......@@ -6,7 +6,7 @@
import numpy as np
class AgnFritz2006(object):
class Fritz2006(object):
"""Fritz et al. (2006) AGN dust torus emission model.
This class holds the UV-optical data associated with a Fritz et al. (2006)
......
......@@ -7,7 +7,7 @@ import numpy as np
from scipy import interpolate
class IrTemplatesDH2002(object):
class DH2002(object):
"""Dale an Helou 2002 infra-red templates
This class holds the data associated with the Dale and Helou (2002)
......
......@@ -6,7 +6,7 @@
import numpy as np
class SspBC03(object):
class BC03(object):
"""Single Stellar Population as defined in Bruzual and Charlot (2003)
This class holds the data associated with a single stellar population
......
......@@ -6,7 +6,7 @@
import numpy as np
class SspM2005(object):
class M2005(object):
"""Single Stellar Population as defined in Maraston (2005)
This class holds the data associated with a single stellar population
......
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