Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
CIGALE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
12
Issues
12
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cigale
CIGALE
Commits
2f9d9be7
Commit
2f9d9be7
authored
Apr 28, 2015
by
Yannick Roehlly
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v0.5.1'
parents
4851956f
4484d1f8
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
57 additions
and
48 deletions
+57
-48
database_builder/filters/SCUBA450.dat
database_builder/filters/SCUBA450.dat
+26
-26
pcigale/analysis_modules/pdf_analysis/__init__.py
pcigale/analysis_modules/pdf_analysis/__init__.py
+1
-1
pcigale/analysis_modules/pdf_analysis/workers.py
pcigale/analysis_modules/pdf_analysis/workers.py
+1
-1
pcigale/analysis_modules/savefluxes/__init__.py
pcigale/analysis_modules/savefluxes/__init__.py
+3
-2
pcigale/creation_modules/bc03.py
pcigale/creation_modules/bc03.py
+4
-2
pcigale/creation_modules/dale2014.py
pcigale/creation_modules/dale2014.py
+3
-2
pcigale/creation_modules/m2005.py
pcigale/creation_modules/m2005.py
+3
-1
pcigale/sed/__init__.py
pcigale/sed/__init__.py
+3
-1
pcigale_plots/__init__.py
pcigale_plots/__init__.py
+4
-4
setup.py
setup.py
+9
-8
No files found.
database_builder/filters/SCUBA450.dat
View file @
2f9d9be7
# SCUBA450
#photon
# SCUBA 450um
375000
.0
0 1.0E-4
380035
.4
7 2.0E-4
390015
.6
0 4.0E-4
400000
.0
0 0.0012
410004
.1
0 0.0046
420050
.4
1 0.0178
430045
.8
7 0.1134
435034
.8
0 0.2508
440011
.7
3 0.3843
445037
.8
3 0.4042
450045
.0
0 0.3963
455028
.0
6 0.3803
460052
.1
4 0.2996
465044
.1
8 0.1942
470072
.0
8 0.1072
475059
.3
8 0.0482
480000
.0
0 0.0212
485044
.4
6 0.0117
490035
.9
4 0.0105
500000
.0
0 0.0074
510030
.6
0 0.0047
520020
.8
0 0.0029
540054
.0
0 9.0E-4
560014
.9
3 3.0E-4
580046
.4
0 2.0E-4
600000
.0
0 1.0E-4
375000
0.
0 1.0E-4
380035
4.
7 2.0E-4
390015
6.
0 4.0E-4
400000
0.
0 0.0012
410004
1.
0 0.0046
420050
4.
1 0.0178
430045
8.
7 0.1134
435034
8.
0 0.2508
440011
7.
3 0.3843
445037
8.
3 0.4042
450045
0.
0 0.3963
455028
0.
6 0.3803
460052
1.
4 0.2996
465044
1.
8 0.1942
470072
0.
8 0.1072
475059
3.
8 0.0482
480000
0.
0 0.0212
485044
4.
6 0.0117
490035
9.
4 0.0105
500000
0.
0 0.0074
510030
6.
0 0.0047
520020
8.
0 0.0029
540054
0.
0 9.0E-4
560014
9.
3 3.0E-4
580046
4.
0 2.0E-4
600000
0.
0 1.0E-4
pcigale/analysis_modules/pdf_analysis/__init__.py
View file @
2f9d9be7
...
...
@@ -60,7 +60,7 @@ class PdfAnalysis(AnalysisModule):
"array of strings"
,
"List of the variables (in the SEDs info dictionaries) for which "
"the statistical analysis will be done."
,
[
"sfr"
,
"
average_sfr
"
]
[
"sfr"
,
"
sfr10Myrs"
,
"sfr100Myrs
"
]
)),
(
"save_best_sed"
,
(
"boolean"
,
...
...
pcigale/analysis_modules/pdf_analysis/workers.py
View file @
2f9d9be7
...
...
@@ -338,7 +338,7 @@ def analysis(idx, obs):
# We check how many unique parameter values are analysed and if less
# than Npdf (= 100), the PDF is initally built assuming a number of
# bins equal to the number of unique values for a given parameter
# (e.g.,
average_
sfr, age, attenuation.uv_bump_amplitude,
# (e.g., sfr, age, attenuation.uv_bump_amplitude,
# dust.luminosity, attenuation.FUV, etc.).
Npdf
=
100
var
=
np
.
empty
((
Npdf
,
len
(
analysed_averages
)))
...
...
pcigale/analysis_modules/savefluxes/__init__.py
View file @
2f9d9be7
...
...
@@ -48,12 +48,13 @@ class SaveFluxes(AnalysisModule):
parameter_list
=
OrderedDict
([
(
"output_file"
,
(
"string"
,
"Name of the output file."
,
"Name of the output file that contains the parameters of the model(s) "
"and the flux densities in the bands"
,
"computed_fluxes.txt"
)),
(
"save_sed"
,
(
"boolean"
,
"If True, save the generated
SED
."
,
"If True, save the generated
spectrum for each model
."
,
"False"
)),
(
"output_format"
,
(
...
...
pcigale/creation_modules/bc03.py
View file @
2f9d9be7
...
...
@@ -50,8 +50,10 @@ class BC03(CreationModule):
out_parameter_list
=
OrderedDict
([
(
"sfr"
,
"Instantaneous Star Formation Rate in solar mass per year, "
"at the age of the galaxy."
),
(
"average_sfr"
,
"Average SFR in the last 100 Myr (default) of the "
"galaxy history."
),
(
'sfr10Myrs'
,
'Average SFR in the last 10 Myr (default) of the '
'galaxy history.'
),
(
'sfr100Myrs'
,
'Average SFR in the last 100 Myr (default) of the '
'galaxy history.'
),
(
"ssp_m_star"
,
"Total mass in stars in Solar mass."
),
(
"ssp_m_gas"
,
"Mass returned to the ISM by evolved stars in Solar "
"mass."
),
...
...
pcigale/creation_modules/dale2014.py
View file @
2f9d9be7
...
...
@@ -31,8 +31,9 @@ class Dale2014(CreationModule):
parameter_list
=
OrderedDict
([
(
'fracAGN'
,
(
'float'
,
"AGN fraction."
,
0.1
"AGN fraction "
"[it is not recommended to combine this AGN emission with that of Fritz et al. (2006)]"
,
0.0
)),
(
'alpha'
,
(
'float'
,
...
...
pcigale/creation_modules/m2005.py
View file @
2f9d9be7
...
...
@@ -62,7 +62,9 @@ class M2005(CreationModule):
out_parameter_list
=
OrderedDict
([
(
'sfr'
,
'Instantaneous Star Formation Rate in solar mass per year, '
'at the age of the galaxy.'
),
(
'average_sfr'
,
'Average SFR in the last 100 Myr (default) of the '
(
'sfr10Myrs'
,
'Average SFR in the last 10 Myr (default) of the '
'galaxy history.'
),
(
'sfr100Myrs'
,
'Average SFR in the last 100 Myr (default) of the '
'galaxy history.'
),
(
'mass_total'
,
'Total stellar mass of the galaxy in solar mass.'
),
(
'mass_alive'
,
'Mass of alive stars in solar mass.'
),
...
...
pcigale/sed/__init__.py
View file @
2f9d9be7
...
...
@@ -85,7 +85,9 @@ class SED(object):
sfh_age
=
sfh_time
[
-
1
]
-
sfh_time
self
.
_sfh
=
value
self
.
add_info
(
"sfr"
,
sfh_sfr
[
-
1
],
True
,
True
)
self
.
add_info
(
"average_sfr"
,
np
.
mean
(
sfh_sfr
[
-
AV_LAPSE
:]),
self
.
add_info
(
"sfr10Myrs"
,
np
.
mean
(
sfh_sfr
[
-
10
:]),
True
,
True
)
self
.
add_info
(
"sfr100Myrs"
,
np
.
mean
(
sfh_sfr
[
-
100
:]),
True
,
True
)
self
.
add_info
(
"age"
,
sfh_time
[
-
1
],
False
,
True
)
...
...
pcigale_plots/__init__.py
View file @
2f9d9be7
...
...
@@ -188,11 +188,11 @@ def _sed_worker(obs, mod, filters, sed_type, nologo):
label
=
"Dust emission"
,
color
=
'r'
,
marker
=
None
,
nonposy
=
'clip'
,
linestyle
=
'-'
,
linewidth
=
0.5
)
# AGN emission Fritz
if
'agn
_
fritz2006_therm'
in
sed
.
columns
:
if
'agn
.
fritz2006_therm'
in
sed
.
columns
:
ax1
.
loglog
(
wavelength_spec
[
wsed
],
(
sed
[
'agn
_
fritz2006_therm'
][
wsed
]
+
sed
[
'agn
_
fritz2006_scatt'
][
wsed
]
+
sed
[
'agn
_
fritz2006_agn'
][
wsed
]),
(
sed
[
'agn
.
fritz2006_therm'
][
wsed
]
+
sed
[
'agn
.
fritz2006_scatt'
][
wsed
]
+
sed
[
'agn
.
fritz2006_agn'
][
wsed
]),
label
=
"AGN emission"
,
color
=
'g'
,
marker
=
None
,
nonposy
=
'clip'
,
linestyle
=
'-'
,
linewidth
=
0.5
)
# Radio emission
...
...
setup.py
View file @
2f9d9be7
...
...
@@ -3,9 +3,10 @@
# Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
# Author: Yannick Roehlly
from
setuptools
import
setup
,
find_packages
from
distutils.command.build
import
build
from
setuptools
import
find_packages
,
setup
class
custom_build
(
build
):
def
run
(
self
):
...
...
@@ -17,12 +18,13 @@ class custom_build(build):
build
.
run
(
self
)
entry_points
=
{
'console_scripts'
:
[
'pcigale = pcigale:main'
,
'pcigale-plots = pcigale_plots:main'
]
'console_scripts'
:
[
'pcigale = pcigale:main'
,
'pcigale-plots = pcigale_plots:main'
]
}
setup
(
name
=
"pcigale"
,
version
=
"0.
1a
"
,
version
=
"0.
5.1
"
,
packages
=
find_packages
(
exclude
=
[
"database_builder"
]),
install_requires
=
[
'numpy'
,
'scipy'
,
'sqlalchemy'
,
'matplotlib'
,
...
...
@@ -30,14 +32,13 @@ setup(
entry_points
=
entry_points
,
include_package_data
=
True
,
cmdclass
=
{
"build"
:
custom_build
},
package_data
=
{
'pcigale'
:
[
'data/data.db'
],
'pcigale-plots'
:[
'data/CIGALE.png'
]},
package_data
=
{
'pcigale'
:
[
'data/data.db'
],
'pcigale_plots'
:
[
'data/CIGALE.png'
]},
author
=
"
Yannick Roehlly
"
,
author_email
=
"
yannick.roehlly@oamp
.fr"
,
author
=
"
The CIGALE team
"
,
author_email
=
"
cigale@lam
.fr"
,
description
=
"Python Code Investigating Galaxy Emission"
,
license
=
"CeCILL-V2"
,
keywords
=
"astrophysics, galaxy, SED fitting"
)
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