Commit 05f87bd4 authored by Theo Steininger's avatar Theo Steininger

updated WMAP parameter defaults

parent d5859a78
...@@ -13,7 +13,9 @@ class WMAP3yrMagneticField(MagneticField): ...@@ -13,7 +13,9 @@ class WMAP3yrMagneticField(MagneticField):
'psi1': ['./MagneticField/Regular/WMAP/psi1', 'value'], 'psi1': ['./MagneticField/Regular/WMAP/psi1', 'value'],
'chi0': ['./MagneticField/Regular/WMAP/chi0', 'value'], 'chi0': ['./MagneticField/Regular/WMAP/chi0', 'value'],
'random_rms': ['./MagneticField/Random/Global/rms', 'value'], 'random_rms': ['./MagneticField/Random/Global/rms', 'value'],
'random_rho': ['./MagneticField/Random/Global/rho', 'value']} 'random_rho': ['./MagneticField/Random/Global/rho', 'value'],
'random_a0': ['./MagneticField/Random/Global/a0', 'value']
}
return lookup return lookup
def _create_field(self): def _create_field(self):
......
...@@ -13,12 +13,13 @@ class WMAP3yrMagneticFieldFactory(MagneticFieldFactory): ...@@ -13,12 +13,13 @@ class WMAP3yrMagneticFieldFactory(MagneticFieldFactory):
@property @property
def _initial_parameter_defaults(self): def _initial_parameter_defaults(self):
defaults = {'b0': 6, defaults = {'b0': 3.0,
'psi0': 27, 'psi0': 27.0,
'psi1': 0.9, 'psi1': 0.9,
'chi0': 25, 'chi0': 25.0,
'random_rms': 1.0, 'random_rms': 1.0,
'random_rho': 0.5} 'random_rho': 0.5,
'random_a0': 1.7}
return defaults return defaults
@property @property
...@@ -27,11 +28,12 @@ class WMAP3yrMagneticFieldFactory(MagneticFieldFactory): ...@@ -27,11 +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(6.0, 1.8, n), # b0 astro-ph/0603450 'b0': self._positive_interval(3.0, 0.8, n), # b0 astro-ph/0603450
'psi0': self._positive_interval(27.0, 5.0, n), # psi0 astro-ph/0603450 'psi0': self._positive_interval(27.0, 5.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, 5.0, n), # xsi0 astro-ph/0603450
'random_rms': self._positive_interval(1.0, 0.3, n), 'random_rms': self._positive_interval(1.0, 0.3, 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)
} }
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