Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
cigale
CIGALE
Commits
8c85aeba
Commit
8c85aeba
authored
Mar 06, 2014
by
BURGARELLA Denis
Browse files
Merge branch 'scaling' of gitlab.oamp.dev:yannick/pcigale into develop
parents
2f066dd7
fc4431b9
Changes
4
Hide whitespace changes
Inline
Side-by-side
pcigale/analysis_modules/pdf_analysis/__init__.py
View file @
8c85aeba
...
...
@@ -419,11 +419,12 @@ class PdfAnalysis(AnalysisModule):
))
for
index
,
name
in
enumerate
(
model_info_names
):
best_model_table
.
add_column
(
Column
(
[
model_info
[
model_idx
][
index
]
for
model_idx
in
best_model_index
],
name
=
name
))
column
=
Column
([
list
(
model_info
[
model_idx
])[
index
]
for
model_idx
in
best_model_index
],
name
=
name
)
if
name
in
sed
.
mass_proportional_info
:
column
*=
(
normalisation_factors
[
best_model_index
,
range
(
len
(
best_model_index
))])
best_model_table
.
add_column
(
column
)
best_model_table
.
write
(
OUT_DIR
+
BEST_MODEL_FILE
)
...
...
pcigale/creation_modules/bc03.py
View file @
8c85aeba
...
...
@@ -107,7 +107,7 @@ class BC03(CreationModule):
sed
.
add_info
(
"stellar.m_star_young"
,
young_info
[
"m_star"
],
True
)
sed
.
add_info
(
"stellar.m_gas_young"
,
young_info
[
"m_gas"
],
True
)
sed
.
add_info
(
"stellar.n_ly_young"
,
young_info
[
"n_ly"
])
sed
.
add_info
(
"stellar.n_ly_young"
,
young_info
[
"n_ly"
]
,
True
)
sed
.
add_info
(
"stellar.b_400_young"
,
young_info
[
"b_4000"
])
sed
.
add_info
(
"stellar.b4_vn_young"
,
young_info
[
"b4_vn"
])
sed
.
add_info
(
"stellar.b4_sdss_young"
,
young_info
[
"b4_sdss"
])
...
...
@@ -115,7 +115,7 @@ class BC03(CreationModule):
sed
.
add_info
(
"stellar.m_star_old"
,
old_info
[
"m_star"
],
True
)
sed
.
add_info
(
"stellar.m_gas_old"
,
old_info
[
"m_gas"
],
True
)
sed
.
add_info
(
"stellar.n_ly_old"
,
old_info
[
"n_ly"
])
sed
.
add_info
(
"stellar.n_ly_old"
,
old_info
[
"n_ly"
]
,
True
)
sed
.
add_info
(
"stellar.b_400_old"
,
old_info
[
"b_4000"
])
sed
.
add_info
(
"stellar.b4_vn_old"
,
old_info
[
"b4_vn"
])
sed
.
add_info
(
"stellar.b4_sdss_old"
,
old_info
[
"b4_sdss"
])
...
...
pcigale/creation_modules/dustatt_calzleit.py
View file @
8c85aeba
...
...
@@ -289,12 +289,12 @@ class CalzLeit(CreationModule):
sed
.
add_module
(
self
.
name
,
self
.
parameters
)
sed
.
add_info
(
"attenuation.E_BVs."
+
contrib
,
ebvs
[
age
])
sed
.
add_info
(
"attenuation."
+
contrib
,
attenuation
)
sed
.
add_info
(
"attenuation."
+
contrib
,
attenuation
,
True
)
sed
.
add_contribution
(
"attenuation."
+
contrib
,
wavelength
,
attenuation_spectrum
)
# Total attenuation
sed
.
add_info
(
"attenuation.total"
,
attenuation_total
)
sed
.
add_info
(
"attenuation.total"
,
attenuation_total
,
True
)
# Fλ fluxes (only from continuum) in each filter after attenuation.
flux_att
=
{}
...
...
pcigale/creation_modules/dustatt_powerlaw.py
View file @
8c85aeba
...
...
@@ -214,12 +214,12 @@ class PowerLawAtt(CreationModule):
sed
.
add_module
(
self
.
name
,
self
.
parameters
)
sed
.
add_info
(
"attenuation.Av."
+
contrib
,
av
[
age
])
sed
.
add_info
(
"attenuation."
+
contrib
,
attenuation
)
sed
.
add_info
(
"attenuation."
+
contrib
,
attenuation
,
True
)
sed
.
add_contribution
(
"attenuation."
+
contrib
,
wavelength
,
attenuation_spectrum
)
# Total attenuation
sed
.
add_info
(
"attenuation.total"
,
attenuation_total
)
sed
.
add_info
(
"attenuation.total"
,
attenuation_total
,
True
)
# Fλ fluxes (only in continuum) in each filter after attenuation.
flux_att
=
{}
...
...
Write
Preview
Supports
Markdown
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