Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
cigale
CIGALE
Commits
70331706
Commit
70331706
authored
Sep 15, 2013
by
Yannick Roehlly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Typo corrections
parent
21f74ec4
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
26 additions
and
26 deletions
+26
-26
database_builder/__init__.py
database_builder/__init__.py
+1
-1
pcigale/data/__init__.py
pcigale/data/__init__.py
+3
-3
pcigale/data/agn_fritz2006.py
pcigale/data/agn_fritz2006.py
+1
-1
pcigale/data/filters.py
pcigale/data/filters.py
+3
-3
pcigale/data/ssp_m2005.py
pcigale/data/ssp_m2005.py
+1
-1
pcigale/sed/__init__.py
pcigale/sed/__init__.py
+4
-4
pcigale/sed/modules/common.py
pcigale/sed/modules/common.py
+3
-3
pcigale/sed/modules/dl2007.py
pcigale/sed/modules/dl2007.py
+1
-1
pcigale/sed/modules/igmattenuation.py
pcigale/sed/modules/igmattenuation.py
+1
-1
pcigale/sed/modules/m2005.py
pcigale/sed/modules/m2005.py
+1
-1
pcigale/stats/common.py
pcigale/stats/common.py
+2
-2
pcigale/stats/psum.py
pcigale/stats/psum.py
+4
-4
pcigale/warehouse/__init__.py
pcigale/warehouse/__init__.py
+1
-1
No files found.
database_builder/__init__.py
View file @
70331706
...
...
@@ -29,7 +29,7 @@ def read_bc03_ssp(filename):
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
sepa
ted
ed by a space (or a carriage return). There are the time vector, 5
sepa
rat
ed 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,
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
...
...
pcigale/data/__init__.py
View file @
70331706
...
...
@@ -292,7 +292,7 @@ class Database(object):
def
add_dl2007
(
self
,
model
):
"""
Add a Draine and Li (2007) model to the databse.
Add a Draine and Li (2007) model to the datab
a
se.
Parameters
----------
...
...
@@ -461,7 +461,7 @@ class Database(object):
def
get_dl2007
(
self
,
qpah
,
umin
,
umax
):
"""
Get the Draine and Li (2007) model corresponding to the given set of
paramters.
param
e
ters.
Parameters
----------
...
...
@@ -491,7 +491,7 @@ class Database(object):
Returns
-------
names, lam
d
ba_eff : array, dictionary
names, lamb
d
a_eff : array, dictionary
names is the list of the filter names and lambda_eff is a
dictionary associating the effective wavelength (in nm) to the
filter name
...
...
pcigale/data/agn_fritz2006.py
View file @
70331706
...
...
@@ -11,7 +11,7 @@ import numpy as np
class
AgnFritz2006
(
object
):
"""Fritz et al. (2006) AGN dust torus emision model.
"""Fritz et al. (2006) AGN dust torus emis
s
ion model.
This class holds the UV-optical data associated with a Fritz et al. (2006)
AGN model.
...
...
pcigale/data/filters.py
View file @
70331706
...
...
@@ -20,8 +20,8 @@ class Filter(object):
the transmission table or the effective wavelength are not specified,
their value is set to None.
Param
tre
s
---------
Param
eter
s
---------
-
name : string
Name of the filter
description : string
...
...
@@ -51,7 +51,7 @@ class Filter(object):
if
value
in
[
'energy'
,
'photon'
]:
self
.
_trans_type
=
value
else
:
raise
ValueError
(
"Filter transmision type can only be "
raise
ValueError
(
"Filter transmis
s
ion type can only be "
"'energy' or 'photon'."
)
def
__str__
(
self
):
...
...
pcigale/data/ssp_m2005.py
View file @
70331706
...
...
@@ -82,7 +82,7 @@ class SspM2005(object):
along the whole SFR.
The time grid of the SFH is expected to be ordered and must not run
beyon
g
13.7 Gyr (the maximum time for Maraston 2005 SSP).
beyon
d
13.7 Gyr (the maximum time for Maraston 2005 SSP).
Parameters
----------
...
...
pcigale/sed/__init__.py
View file @
70331706
...
...
@@ -23,15 +23,15 @@ Such SED is characterised by:
the contribution (in the contribution_names list) and the index of the
second axis corresponds to the wavelength in the wavelength grid.
- lines: a diction
n
ary containing the emission lines associated with the SED.
A diction
n
ary is used to allow the storage of various sets of lines. The
- lines: a dictionary containing the emission lines associated with the SED.
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
wavelength [nm], axis 1 is the line luminosity [W] and axis 2 is the line
width [km.s-1].
- info: a diction
n
ary 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 diction
n
ary whose value
- mass_proportional_info: the list of keys in the info dictionary whose value
is proportional to the galaxy mass.
"""
...
...
pcigale/sed/modules/common.py
View file @
70331706
...
...
@@ -100,7 +100,7 @@ class SEDCreationModule(object):
module is used several times with different parameters in the SED
creation process.
The module parameters must be passed as keyword
ed
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
value, this value is used. If a parameter is missing or if an
unexpected parameter is given, an error will be raised.
...
...
@@ -110,10 +110,10 @@ class SEDCreationModule(object):
name : string
Name of the module.
blank : boolean
If true, return a non-paramet
e
rised module that will be used only
If true, return a non-parametrised module that will be used only
to query the module parameter list.
The module parameters must be given as keyword
ed
parameters.
The module parameters must be given as keyword parameters.
Raises
------
...
...
pcigale/sed/modules/dl2007.py
View file @
70331706
...
...
@@ -84,7 +84,7 @@ class Module(common.SEDCreationModule):
gamma
*
self
.
model_minmax
.
lumin
,
x
=
self
.
model_minmin
.
wave
)
# We want to be able to display the respective con
s
tributions of both
# We want to be able to display the respective contributions of both
# components, therefore we keep they separately.
self
.
model_minmin
.
lumin
*=
(
1.
-
gamma
)
/
self
.
emissivity
self
.
model_minmax
.
lumin
*=
gamma
/
self
.
emissivity
...
...
pcigale/sed/modules/igmattenuation.py
View file @
70331706
...
...
@@ -74,7 +74,7 @@ class Module(common.SEDCreationModule):
# We only want to add the redshift + IGM 'effect' to the SED
# object (even if this has no physical meaning). As the
# redshifting change the wavelength grid, we must regrid both
# before sub
s
tracting.
# before subtracting.
new_wavelen
=
utils
.
best_grid
(
sed
.
wavelength_grid
,
wavelen
)
init_l_lambda
=
np
.
interp
(
new_wavelen
,
sed
.
wavelength_grid
,
...
...
pcigale/sed/modules/m2005.py
View file @
70331706
...
...
@@ -22,7 +22,7 @@ class Module(common.SEDCreationModule):
"""Module computing the Star Formation History contribution based on the
Maraston (2005) models.
Implements the population syntesis based on the SSP described in Maraston,
Implements the population synt
h
esis based on the SSP described in Maraston,
2005, MNRAS, 362, 799.
Information added to the SED:
...
...
pcigale/stats/common.py
View file @
70331706
...
...
@@ -24,7 +24,7 @@ class AnalysisModule(object):
def
__init__
(
self
,
**
kwargs
):
"""Instantiate a analysis module
The module parameters values can be passed as keyword
ed
param
atre
s.
The module parameters values can be passed as keyword param
eter
s.
"""
# parameters is a dictionary containing the actual values for each
# module parameter.
...
...
@@ -75,7 +75,7 @@ class AnalysisModule(object):
given but exists in the parameter_list with a default value, this
value is used.
Paramet
r
es
Paramete
r
s
----------
data_file : string
Name of the file containing the observations to be fitted.
...
...
pcigale/stats/psum.py
View file @
70331706
...
...
@@ -10,7 +10,7 @@ programme of the Fortran Cigale code.
The models corresponding to all possible combinations of parameters are
computed are the integrated flux in the same filters as the observations are
used to compute the χ² of the fitting. This χ² give a pro
p
ability that is
used to compute the χ² of the fitting. This χ² give a pro
b
ability that is
associated with the model values for the parameters. At the end, for each
parameter, the (probability) weighted mean and standard deviation are computed
and the best fitting model (the one with the least reduced χ²) is given.
...
...
@@ -36,7 +36,7 @@ from ..data import Database
TOLERANCE
=
1.e-12
# Name of the fits file containing the results
RESULT_FILE
=
'psum_results.fits'
# Directory where the output files are stored
s
# Directory where the output files are stored
OUT_DIR
=
'out/'
# Wavelength limits (restframe) when plotting the best SED.
PLOT_L_MIN
=
91
...
...
@@ -125,7 +125,7 @@ class Module(common.AnalysisModule):
redshift_configuration : dictionary
Configuration dictionary for the module used to redshift the SED.
parameters: dictionary
Diction
n
ary containing the parameters.
Dictionary containing the parameters.
"""
...
...
@@ -247,7 +247,7 @@ class Module(common.AnalysisModule):
progress_bar
.
finish
()
# Loop over the observations to find the best fitting model and
# compute the paramet
r
e statistics.
# compute the paramete
r
statistics.
for
obs_index
,
obs_name
in
enumerate
(
obs_table
[
'id'
]):
# Convert the observation name to string, in case it is a number.
obs_name
=
str
(
obs_name
)
...
...
pcigale/warehouse/__init__.py
View file @
70331706
...
...
@@ -44,7 +44,7 @@ class SedWarehouse(object):
name : string
Module name.
The other keyword
ed
parameters are the module parameters.
The other keyword parameters are the module parameters.
Returns
-------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment