Commit 93bfb93e authored by Rodrigo González-Castillo's avatar Rodrigo González-Castillo

Merge remote-tracking branch 'origin/feature/pcigale-plots'

# Conflicts:
#	pcigale_plots/__init__.py
parents 2e56519a c73f1be2
# Change Log
## Unreleased
### Added
### Changed
### Fixed
- Make sure we can plot the PDF of equivalent widths. (Médéric Boquien)
- Fix a crash when generating a mock catalogue containing intensive properties. (Médéric Boquien)
- In the `sfhdelayed` and `sfhdelayedbq` modules, provide the correct description for the sfr_A parameter (Médéric Boquien & Laure Ciesla)
### Optimised
## 2018.0 (2018-11-06)
### Added
- It is now possible to optionally indicate the distance in Mpc in the input file. If present it will be used in lieu of the distance computed from the redshift. This is especially useful in the nearby universe where the redshift is a very poor indicator of the actual distance. (Médéric Boquien)
......
......@@ -235,7 +235,7 @@ class ObservationsManagerPassbands(object):
np.fabs(self.table[err]))
for prop in self.intprops:
err = prop + '_err'
self.table[name] = np.random.normal(fits.best.intprop[prop],
self.table[prop] = np.random.normal(fits.best.intprop[prop],
np.fabs(self.table[err]))
for prop in self.extprops:
err = prop + '_err'
......
......@@ -63,7 +63,8 @@ class SFHDelayed(SedModule):
)),
("sfr_A", (
"cigale_list(minvalue=0.)",
"Value of SFR at t = 0 in M_sun/yr.",
"Multiplicative factor controlling the SFR if normalise is False. "
"For instance without any burst: SFR(t)=sfr_A×t×exp(-t/τ)/τ²",
1.
)),
("normalise", (
......
......@@ -59,7 +59,8 @@ class SFHDelayedBQ(SedModule):
)),
("sfr_A", (
"cigale_list(minvalue=0.)",
"Value of SFR at t = 0 in M_sun/yr.",
"Multiplicative factor controlling the SFR if normalise is False. "
"For instance without any burst/quench: SFR(t)=sfr_A×t×exp(-t/τ)/τ²",
1.
)),
("normalise", (
......
......@@ -100,7 +100,7 @@ class Configuration(object):
["* sfhdelayed (delayed SFH with optional exponential burst)"] +
["* sfhdelayedbq (delayed SFH with optional constant burst/quench)"
] +
["* sfhfromfile (abitrary SFH read from an input file)"] +
["* sfhfromfile (arbitrary SFH read from an input file)"] +
["* sfhperiodic (periodic SFH, exponential, rectangle or delayed"
")"] +
["SSP:"] +
......
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