Integrated WMAP model fully into imagine pipeline.

imagine/magnetic_fields/__init__.py

@@ -11,3 +11,6 @@ from jaffe13_magnetic_field import Jaffe13MagneticField, \
 
 from jf12_magnetic_field import JF12MagneticField, \
                                 JF12MagneticFieldFactory
+
+from wmap3yr_magnetic_field import WMAP3yrMagneticField, \
+                                   WMAP3yrMagneticFieldFactory

imagine/magnetic_fields/magnetic_field/magnetic_field.py

@@ -8,7 +8,7 @@ from nifty import Field, FieldArray, RGSpace
 
 
 class MagneticField(Field):
-    def __init__(self, parameters=[], domain=None, val=None, dtype=None,
+    def __init__(self, parameters={}, domain=None, val=None, dtype=None,
                  distribution_strategy=None, copy=False, random_seed=None):
 
         super(MagneticField, self).__init__(

imagine/magnetic_fields/wmap3yr_magnetic_field/__init__.py

 # -*- coding: utf-8 -*-
 
 from wmap3yr_magnetic_field import WMAP3yrMagneticField
-from wmap3yr_magnetic_field_factory import WMAP3yrMagneticFieldFactory
\ No newline at end of file
+from wmap3yr_magnetic_field_factory import WMAP3yrMagneticFieldFactory

imagine/observers/hammurapy/hammurapy.py

@@ -37,7 +37,8 @@ class Hammurapy(Observer):
                                  'obs_shell_index_numb': '1',
                                  'total_shell_numb': '3',
                                  'vec_size_R': '500',
-                                 'max_radius': '35',
+                                 'max_radius': '30',
+                                 'max_z': '15',
                                  'B_field_transform_lon': '-999',
                                  'B_field_transform_lat': '-999',
                                  'TE_grid_filename': 'negrid_n400.bin',

imagine/observers/hammurapy/model_mixins/__init__.py

@@ -2,3 +2,4 @@
 
 from jaffe13_mixin import Jaffe13Mixin
 from jf12_mixin import JF12Mixin
+from wmap3yr_mixin import WMAP3yrMixin