From 05f87bd426b86fb81e2272d3ca43dbb098290ae9 Mon Sep 17 00:00:00 2001 From: Theo Steininger Date: Fri, 8 Dec 2017 23:03:04 +0100 Subject: [PATCH] updated WMAP parameter defaults --- .../wmap3yr_magnetic_field.py | 4 +++- .../wmap3yr_magnetic_field_factory.py | 14 ++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/imagine/magnetic_fields/wmap3yr_magnetic_field/wmap3yr_magnetic_field.py b/imagine/magnetic_fields/wmap3yr_magnetic_field/wmap3yr_magnetic_field.py index 528cbcd..6f961b3 100644 --- a/imagine/magnetic_fields/wmap3yr_magnetic_field/wmap3yr_magnetic_field.py +++ b/imagine/magnetic_fields/wmap3yr_magnetic_field/wmap3yr_magnetic_field.py @@ -13,7 +13,9 @@ class WMAP3yrMagneticField(MagneticField): 'psi1': ['./MagneticField/Regular/WMAP/psi1', 'value'], 'chi0': ['./MagneticField/Regular/WMAP/chi0', '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 def _create_field(self): diff --git a/imagine/magnetic_fields/wmap3yr_magnetic_field/wmap3yr_magnetic_field_factory.py b/imagine/magnetic_fields/wmap3yr_magnetic_field/wmap3yr_magnetic_field_factory.py index 4ecab8c..f76c232 100644 --- a/imagine/magnetic_fields/wmap3yr_magnetic_field/wmap3yr_magnetic_field_factory.py +++ b/imagine/magnetic_fields/wmap3yr_magnetic_field/wmap3yr_magnetic_field_factory.py @@ -13,12 +13,13 @@ class WMAP3yrMagneticFieldFactory(MagneticFieldFactory): @property def _initial_parameter_defaults(self): - defaults = {'b0': 6, - 'psi0': 27, + defaults = {'b0': 3.0, + 'psi0': 27.0, 'psi1': 0.9, - 'chi0': 25, + 'chi0': 25.0, 'random_rms': 1.0, - 'random_rho': 0.5} + 'random_rho': 0.5, + 'random_a0': 1.7} return defaults @property @@ -27,11 +28,12 @@ class WMAP3yrMagneticFieldFactory(MagneticFieldFactory): def _generate_variable_to_parameter_mapping_defaults(self, n): 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 '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 '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 -- GitLab