Commit 6efe858f authored by Theo Steininger's avatar Theo Steininger

Increased parameter range for WMAP model.

parent 05b2016b
...@@ -13,11 +13,11 @@ class WMAP3yrMagneticFieldFactory(MagneticFieldFactory): ...@@ -13,11 +13,11 @@ class WMAP3yrMagneticFieldFactory(MagneticFieldFactory):
@property @property
def _initial_parameter_defaults(self): def _initial_parameter_defaults(self):
defaults = {'b0': 3.0, defaults = {'b0': 6.0,
'psi0': 27.0, 'psi0': 27.0,
'psi1': 0.9, 'psi1': 0.9,
'chi0': 25.0, 'chi0': 25.0,
'random_rms': 1.0, 'random_rms': 2.0,
'random_rho': 0.5, 'random_rho': 0.5,
'random_a0': 1.7} 'random_a0': 1.7}
return defaults return defaults
...@@ -28,12 +28,12 @@ class WMAP3yrMagneticFieldFactory(MagneticFieldFactory): ...@@ -28,12 +28,12 @@ class WMAP3yrMagneticFieldFactory(MagneticFieldFactory):
def _generate_variable_to_parameter_mapping_defaults(self, n): def _generate_variable_to_parameter_mapping_defaults(self, n):
defaults = { defaults = {
'b0': self._positive_interval(3.0, 0.8, n), # b0 astro-ph/0603450 'b0': self._positive_interval(6.0, 1.9, n), # b0 astro-ph/0603450
'psi0': self._positive_interval(27.0, 5.0, n), # psi0 astro-ph/0603450 'psi0': self._positive_interval(27.0, 7.0, n), # psi0 astro-ph/0603450
'psi1': self._positive_interval(0.9, 5.0, n), # psi1 astro-ph/0603450 'psi1': self._positive_interval(0.9, 5.0, n), # psi1 astro-ph/0603450
'chi0': self._positive_interval(25, 5.0, n), # xsi0 astro-ph/0603450 'chi0': self._positive_interval(25, 8.0, n), # xsi0 astro-ph/0603450
'random_rms': self._positive_interval(1.0, 0.3, n), 'random_rms': self._positive_interval(2.0, 0.6, n),
'random_rho': self._positive_interval(0.5, 0.166, n), 'random_rho': self._positive_interval(0.5, 0.166, n),
'random_a0': self._positive_interval(1.7, 0.3, n) 'random_a0': self._positive_interval(1.7, 0.5, n)
} }
return defaults return defaults
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