Commit 5e8bbb4b authored by BURGARELLA Denis's avatar BURGARELLA Denis

Update CIGALE to clean anything related to 'average_sfr' and replace it by...

Update CIGALE to clean anything related to 'average_sfr' and replace it by 'sfr10Myrs' and 'sfr100Myrs'
parent 868e668a
......@@ -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",
......
......@@ -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)))
......
......@@ -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."),
......
......@@ -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.'),
......
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