Switch back to ordered dictionaries for the input parameters after all. That...

Switch back to ordered dictionaries for the input parameters after all. That way the list of parameters is kept into a logical order when building the configuration file. The impact on performance is negligible.

pcigale/creation_modules/bc03.py

@@ -12,6 +12,7 @@ Populations.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 from ..data import Database
@@ -25,7 +26,7 @@ class BC03(CreationModule):
     component to the SED.
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("imf", (
             "int",
             "Initial mass function: 0 (Salpeter) or 1 (Chabrier).",

pcigale/creation_modules/casey2012.py

@@ -12,6 +12,7 @@ This module implements the Casey (2012) infra-red models.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 import scipy.constants as cst
 from . import CreationModule
@@ -26,7 +27,7 @@ class Casey2012(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("temperature", (
             "float",
             "Temperature of the dust in K.",

pcigale/creation_modules/dale2014.py

@@ -11,6 +11,7 @@ This module implements the Dale (2014) infra-red models.
 
 """
 
+from collections import OrderedDict
 from pcigale.data import Database
 from . import CreationModule
 
@@ -27,7 +28,7 @@ class Dale2014(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ('fracAGN', (
             'float',
             "AGN fraction. It is not recommended to combine this AGN emission "

pcigale/creation_modules/dl2007.py

@@ -12,6 +12,7 @@ This module implements the Draine and Li (2007) infra-red models.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from pcigale.data import Database
 from . import CreationModule
@@ -29,7 +30,7 @@ class DL2007(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ('qpah', (
             'float',
             "Mass fraction of PAH. Possible values are: 0.47, 1.12, 1.77, "

pcigale/creation_modules/dl2014.py

@@ -12,6 +12,7 @@ This module implements the updated Draine and Li (2007) infrared models.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from pcigale.data import Database
 from . import CreationModule
@@ -29,7 +30,7 @@ class DL2014(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ('qpah', (
             'float',
             "Mass fraction of PAH. Possible values are: 0.47, 1.12, 1.77, "

pcigale/creation_modules/dustatt_calzleit.py

@@ -13,6 +13,7 @@ attenuation formulae, adding an UV-bump and a power law.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 
@@ -178,7 +179,7 @@ class CalzLeit(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("E_BVs_young", (
             "float",
             "E(B-V)*, the colour excess of the stellar continuum light for "

pcigale/creation_modules/dustatt_powerlaw.py

@@ -13,6 +13,7 @@ in Charlot and Fall (2000) with a UV bump added.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 
@@ -104,7 +105,7 @@ class PowerLawAtt(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("Av_young", (
             "float",
             "V-band attenuation of the young population.",

pcigale/creation_modules/fritz2006.py

@@ -10,6 +10,7 @@ Fritz et al. (2006) AGN dust torus emission module
 This module implements the Fritz et al. (2006) models.
 
 """
+from collections import OrderedDict
 import numpy as np
 from pcigale.data import Database
 from . import CreationModule
@@ -38,7 +39,7 @@ class Fritz2006(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ('r_ratio', (
             'float',
             "Ratio of the maximum to minimum radii of the dust torus. "

pcigale/creation_modules/loadfile.py

@@ -12,6 +12,7 @@ This module reads a SED spectrum from a file.
 """
 
 from astropy.table import Table
+from collections import OrderedDict
 from ..utils import read_table
 from . import CreationModule
 
@@ -21,7 +22,7 @@ class LoadSpecFile(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("filename", (
             'str',
             "Name of the file to load and to add to the SED table. This "

pcigale/creation_modules/m2005.py

@@ -11,6 +11,7 @@ This module implements the Maraston (2005) Single Stellar Populations.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 from ..data import Database
@@ -38,7 +39,7 @@ class M2005(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ('imf', (
             'int',
             "Initial mass function: 0 (Salpeter) or 1 (Kroupa)",

pcigale/creation_modules/mbb.py

@@ -16,6 +16,7 @@ in dust and not visible in the wavelength range.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 import scipy.constants as cst
 from . import CreationModule
@@ -31,7 +32,7 @@ class MBB(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("epsilon_mbb", (
             "float",
             "Fraction [>= Ø] of L_dust(energy balance) in the MBB",

pcigale/creation_modules/nebular.py

@@ -3,6 +3,7 @@
 # Licensed under the CeCILL-v2 licence - see Licence_CeCILL_V2-en.txt
 # Author: Médéric Boquien <mboquien@ast.cam.ac.uk>
 
+from collections import OrderedDict
 import numpy as np
 from pcigale.data import Database
 import scipy.constants as cst
@@ -24,7 +25,7 @@ class NebularEmission(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ('logU', (
             'float',
             "Ionisation parameter",

pcigale/creation_modules/param.py

@@ -15,6 +15,7 @@ for all the physical processes at play to build the received total emission.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 
@@ -28,7 +29,7 @@ class Param(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("OK", (
             "boolean",
             "Are you here?.",

pcigale/creation_modules/radio.py

@@ -17,6 +17,7 @@ This module implements the radio emission of galaxies, taking into account only
 
 """
 
+from collections import OrderedDict
 import numpy as np
 import scipy.constants as cst
 from . import CreationModule
@@ -31,7 +32,7 @@ class Radio(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("qir", (
             "float",
             "The value of the FIR/radio correlation coefficient.",

pcigale/creation_modules/sfh2exp.py

@@ -12,6 +12,7 @@ decreasing exponentials.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 
@@ -28,7 +29,7 @@ class Sfh2Exp(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("tau_main", (
             "float",
             "e-folding time of the main stellar population model in Myr.",

pcigale/creation_modules/sfh_buat08.py

@@ -21,6 +21,7 @@ and interpolate the values of a, b and c.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 
@@ -38,7 +39,7 @@ class SfhBuat08(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("velocity", (
             "float",
             "Rotational velocity of the galaxy in km/s. Must be between 80 "

pcigale/creation_modules/sfh_quenching.py

@@ -14,6 +14,7 @@ constant.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 
@@ -29,7 +30,7 @@ class SfhQuench(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("quenching_age", (
             "integer",
             "Age of the galaxy at which the quenching happens in Myr.",

pcigale/creation_modules/sfhcomb_constant.py

@@ -12,6 +12,7 @@ regularly-spaced short constant SF events.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 
@@ -28,7 +29,7 @@ class SfhComb(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("N_events", (
             "integer",
             "Number of individual star formation events. ",

pcigale/creation_modules/sfhcomb_delayed.py

@@ -12,6 +12,7 @@ regularly-spaced short regularly-spaced delayed-SFH SF events.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 
@@ -28,7 +29,7 @@ class SfhComb(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("N_events", (
             "integer",
             "Number of individual star formation events. ",

pcigale/creation_modules/sfhdelayed.py

@@ -13,6 +13,7 @@ rise of the SFR up to a maximum, followed by an exponential decrease.
 
 """
 
+from collections import OrderedDict
 import numpy as np
 from . import CreationModule
 
@@ -29,7 +30,7 @@ class SFHDelayed(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("tau_main", (
             "float",
             "e-folding time of the main stellar population model in Myr.",

pcigale/creation_modules/sfhfromfile.py

@@ -12,6 +12,7 @@ This module reads the star formation history in a file.
 """
 
 from astropy.table import Table
+from collections import OrderedDict
 import numpy as np
 from ..utils import read_table
 from . import CreationModule
@@ -28,7 +29,7 @@ class SfhFromFile(CreationModule):
 
     """
 
-    parameter_list = dict([
+    parameter_list = OrderedDict([
         ("filename", (
             "str",
             "Name of the file containing the SFH. The first column must be "