Commit 70331706 authored by Yannick Roehlly's avatar Yannick Roehlly
Browse files

Typo corrections

parent 21f74ec4
...@@ -29,7 +29,7 @@ def read_bc03_ssp(filename): ...@@ -29,7 +29,7 @@ def read_bc03_ssp(filename):
The ASCII SSP files of Bruzual and Charlot 2003 have se special structure. The ASCII SSP files of Bruzual and Charlot 2003 have se special structure.
A vector is stored with the number of values followed by the values A vector is stored with the number of values followed by the values
sepateded by a space (or a carriage return). There are the time vector, 5 separated by a space (or a carriage return). There are the time vector, 5
(for Chabrier IMF) or 6 lines (for Salpeter IMF) that we don't care of, (for Chabrier IMF) or 6 lines (for Salpeter IMF) that we don't care of,
then the wavelength vector, then the luminosity vectors, each followed by then the wavelength vector, then the luminosity vectors, each followed by
a 52 value table, then a bunch of other table of information that are also a 52 value table, then a bunch of other table of information that are also
......
...@@ -292,7 +292,7 @@ class Database(object): ...@@ -292,7 +292,7 @@ class Database(object):
def add_dl2007(self, model): def add_dl2007(self, model):
""" """
Add a Draine and Li (2007) model to the databse. Add a Draine and Li (2007) model to the database.
Parameters Parameters
---------- ----------
...@@ -461,7 +461,7 @@ class Database(object): ...@@ -461,7 +461,7 @@ class Database(object):
def get_dl2007(self, qpah, umin, umax): def get_dl2007(self, qpah, umin, umax):
""" """
Get the Draine and Li (2007) model corresponding to the given set of Get the Draine and Li (2007) model corresponding to the given set of
paramters. parameters.
Parameters Parameters
---------- ----------
...@@ -491,7 +491,7 @@ class Database(object): ...@@ -491,7 +491,7 @@ class Database(object):
Returns Returns
------- -------
names, lamdba_eff : array, dictionary names, lambda_eff : array, dictionary
names is the list of the filter names and lambda_eff is a names is the list of the filter names and lambda_eff is a
dictionary associating the effective wavelength (in nm) to the dictionary associating the effective wavelength (in nm) to the
filter name filter name
......
...@@ -11,7 +11,7 @@ import numpy as np ...@@ -11,7 +11,7 @@ import numpy as np
class AgnFritz2006(object): class AgnFritz2006(object):
"""Fritz et al. (2006) AGN dust torus emision model. """Fritz et al. (2006) AGN dust torus emission model.
This class holds the UV-optical data associated with a Fritz et al. (2006) This class holds the UV-optical data associated with a Fritz et al. (2006)
AGN model. AGN model.
......
...@@ -20,8 +20,8 @@ class Filter(object): ...@@ -20,8 +20,8 @@ class Filter(object):
the transmission table or the effective wavelength are not specified, the transmission table or the effective wavelength are not specified,
their value is set to None. their value is set to None.
Paramtres Parameters
--------- ----------
name : string name : string
Name of the filter Name of the filter
description : string description : string
...@@ -51,7 +51,7 @@ class Filter(object): ...@@ -51,7 +51,7 @@ class Filter(object):
if value in ['energy', 'photon']: if value in ['energy', 'photon']:
self._trans_type = value self._trans_type = value
else: else:
raise ValueError("Filter transmision type can only be " raise ValueError("Filter transmission type can only be "
"'energy' or 'photon'.") "'energy' or 'photon'.")
def __str__(self): def __str__(self):
......
...@@ -82,7 +82,7 @@ class SspM2005(object): ...@@ -82,7 +82,7 @@ class SspM2005(object):
along the whole SFR. along the whole SFR.
The time grid of the SFH is expected to be ordered and must not run The time grid of the SFH is expected to be ordered and must not run
beyong 13.7 Gyr (the maximum time for Maraston 2005 SSP). beyond 13.7 Gyr (the maximum time for Maraston 2005 SSP).
Parameters Parameters
---------- ----------
......
...@@ -23,15 +23,15 @@ Such SED is characterised by: ...@@ -23,15 +23,15 @@ Such SED is characterised by:
the contribution (in the contribution_names list) and the index of the the contribution (in the contribution_names list) and the index of the
second axis corresponds to the wavelength in the wavelength grid. second axis corresponds to the wavelength in the wavelength grid.
- lines: a dictionnary containing the emission lines associated with the SED. - lines: a dictionary containing the emission lines associated with the SED.
A dictionnary is used to allow the storage of various sets of lines. The A dictionary is used to allow the storage of various sets of lines. The
lines are stored in a three axis numpy array: axis 0 is the central lines are stored in a three axis numpy array: axis 0 is the central
wavelength [nm], axis 1 is the line luminosity [W] and axis 2 is the line wavelength [nm], axis 1 is the line luminosity [W] and axis 2 is the line
width [km.s-1]. width [km.s-1].
- info: a dictionnary containing various information about the SED. - info: a dictionary containing various information about the SED.
- mass_proportional_info: the list of keys in the info dictionnary whose value - mass_proportional_info: the list of keys in the info dictionary whose value
is proportional to the galaxy mass. is proportional to the galaxy mass.
""" """
......
...@@ -100,7 +100,7 @@ class SEDCreationModule(object): ...@@ -100,7 +100,7 @@ class SEDCreationModule(object):
module is used several times with different parameters in the SED module is used several times with different parameters in the SED
creation process. creation process.
The module parameters must be passed as keyworded parameters. If a The module parameters must be passed as keyword parameters. If a
parameter is not given but exists in the parameter_list with a default parameter is not given but exists in the parameter_list with a default
value, this value is used. If a parameter is missing or if an value, this value is used. If a parameter is missing or if an
unexpected parameter is given, an error will be raised. unexpected parameter is given, an error will be raised.
...@@ -110,10 +110,10 @@ class SEDCreationModule(object): ...@@ -110,10 +110,10 @@ class SEDCreationModule(object):
name : string name : string
Name of the module. Name of the module.
blank : boolean blank : boolean
If true, return a non-parameterised module that will be used only If true, return a non-parametrised module that will be used only
to query the module parameter list. to query the module parameter list.
The module parameters must be given as keyworded parameters. The module parameters must be given as keyword parameters.
Raises Raises
------ ------
......
...@@ -84,7 +84,7 @@ class Module(common.SEDCreationModule): ...@@ -84,7 +84,7 @@ class Module(common.SEDCreationModule):
gamma * self.model_minmax.lumin, gamma * self.model_minmax.lumin,
x=self.model_minmin.wave) x=self.model_minmin.wave)
# We want to be able to display the respective constributions of both # We want to be able to display the respective contributions of both
# components, therefore we keep they separately. # components, therefore we keep they separately.
self.model_minmin.lumin *= (1. - gamma) / self.emissivity self.model_minmin.lumin *= (1. - gamma) / self.emissivity
self.model_minmax.lumin *= gamma / self.emissivity self.model_minmax.lumin *= gamma / self.emissivity
......
...@@ -74,7 +74,7 @@ class Module(common.SEDCreationModule): ...@@ -74,7 +74,7 @@ class Module(common.SEDCreationModule):
# We only want to add the redshift + IGM 'effect' to the SED # We only want to add the redshift + IGM 'effect' to the SED
# object (even if this has no physical meaning). As the # object (even if this has no physical meaning). As the
# redshifting change the wavelength grid, we must regrid both # redshifting change the wavelength grid, we must regrid both
# before substracting. # before subtracting.
new_wavelen = utils.best_grid(sed.wavelength_grid, wavelen) new_wavelen = utils.best_grid(sed.wavelength_grid, wavelen)
init_l_lambda = np.interp(new_wavelen, sed.wavelength_grid, init_l_lambda = np.interp(new_wavelen, sed.wavelength_grid,
......
...@@ -22,7 +22,7 @@ class Module(common.SEDCreationModule): ...@@ -22,7 +22,7 @@ class Module(common.SEDCreationModule):
"""Module computing the Star Formation History contribution based on the """Module computing the Star Formation History contribution based on the
Maraston (2005) models. Maraston (2005) models.
Implements the population syntesis based on the SSP described in Maraston, Implements the population synthesis based on the SSP described in Maraston,
2005, MNRAS, 362, 799. 2005, MNRAS, 362, 799.
Information added to the SED: Information added to the SED:
......
...@@ -24,7 +24,7 @@ class AnalysisModule(object): ...@@ -24,7 +24,7 @@ class AnalysisModule(object):
def __init__(self, **kwargs): def __init__(self, **kwargs):
"""Instantiate a analysis module """Instantiate a analysis module
The module parameters values can be passed as keyworded paramatres. The module parameters values can be passed as keyword parameters.
""" """
# parameters is a dictionary containing the actual values for each # parameters is a dictionary containing the actual values for each
# module parameter. # module parameter.
...@@ -75,7 +75,7 @@ class AnalysisModule(object): ...@@ -75,7 +75,7 @@ class AnalysisModule(object):
given but exists in the parameter_list with a default value, this given but exists in the parameter_list with a default value, this
value is used. value is used.
Parametres Parameters
---------- ----------
data_file : string data_file : string
Name of the file containing the observations to be fitted. Name of the file containing the observations to be fitted.
......
...@@ -10,7 +10,7 @@ programme of the Fortran Cigale code. ...@@ -10,7 +10,7 @@ programme of the Fortran Cigale code.
The models corresponding to all possible combinations of parameters are The models corresponding to all possible combinations of parameters are
computed are the integrated flux in the same filters as the observations are computed are the integrated flux in the same filters as the observations are
used to compute the χ² of the fitting. This χ² give a propability that is used to compute the χ² of the fitting. This χ² give a probability that is
associated with the model values for the parameters. At the end, for each associated with the model values for the parameters. At the end, for each
parameter, the (probability) weighted mean and standard deviation are computed parameter, the (probability) weighted mean and standard deviation are computed
and the best fitting model (the one with the least reduced χ²) is given. and the best fitting model (the one with the least reduced χ²) is given.
...@@ -36,7 +36,7 @@ from ..data import Database ...@@ -36,7 +36,7 @@ from ..data import Database
TOLERANCE = 1.e-12 TOLERANCE = 1.e-12
# Name of the fits file containing the results # Name of the fits file containing the results
RESULT_FILE = 'psum_results.fits' RESULT_FILE = 'psum_results.fits'
# Directory where the output files are storeds # Directory where the output files are stored
OUT_DIR = 'out/' OUT_DIR = 'out/'
# Wavelength limits (restframe) when plotting the best SED. # Wavelength limits (restframe) when plotting the best SED.
PLOT_L_MIN = 91 PLOT_L_MIN = 91
...@@ -125,7 +125,7 @@ class Module(common.AnalysisModule): ...@@ -125,7 +125,7 @@ class Module(common.AnalysisModule):
redshift_configuration : dictionary redshift_configuration : dictionary
Configuration dictionary for the module used to redshift the SED. Configuration dictionary for the module used to redshift the SED.
parameters: dictionary parameters: dictionary
Dictionnary containing the parameters. Dictionary containing the parameters.
""" """
...@@ -247,7 +247,7 @@ class Module(common.AnalysisModule): ...@@ -247,7 +247,7 @@ class Module(common.AnalysisModule):
progress_bar.finish() progress_bar.finish()
# Loop over the observations to find the best fitting model and # Loop over the observations to find the best fitting model and
# compute the parametre statistics. # compute the parameter statistics.
for obs_index, obs_name in enumerate(obs_table['id']): for obs_index, obs_name in enumerate(obs_table['id']):
# Convert the observation name to string, in case it is a number. # Convert the observation name to string, in case it is a number.
obs_name = str(obs_name) obs_name = str(obs_name)
......
...@@ -44,7 +44,7 @@ class SedWarehouse(object): ...@@ -44,7 +44,7 @@ class SedWarehouse(object):
name : string name : string
Module name. Module name.
The other keyworded parameters are the module parameters. The other keyword parameters are the module parameters.
Returns Returns
------- -------
......
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