Commit 24ff68bf authored by Theo Steininger's avatar Theo Steininger
Browse files

Fixed parameters.

parent 88debf7f
...@@ -61,7 +61,7 @@ RUN apt-get update && apt-get install -y libblas3 libblas-dev \ ...@@ -61,7 +61,7 @@ RUN apt-get update && apt-get install -y libblas3 libblas-dev \
gfortran\ gfortran\
python-tk python-tk
#RUN apt-get install -y libopenmpi-dev openmpi-bin openmpi-doc #RUN apt-get install -y libopenmpi-dev openmpi-bin openmpi-doc
RUN pip install numpy scipy matplotlib progressbar ipython RUN pip install numpy scipy matplotlib progressbar ipython==5.3.0
RUN git clone https://github.com/JohannesBuchner/MultiNest.git RUN git clone https://github.com/JohannesBuchner/MultiNest.git
WORKDIR MultiNest/build WORKDIR MultiNest/build
......
...@@ -27,7 +27,7 @@ class Observable(Field): ...@@ -27,7 +27,7 @@ class Observable(Field):
return self._ensemble_mean return self._ensemble_mean
def _to_hdf5(self, hdf5_group): def _to_hdf5(self, hdf5_group):
if self._ensemble_mean is not None: if hasattr(self, _ensemble_mean):
return_dict = {'ensemble_mean': self._ensemble_mean} return_dict = {'ensemble_mean': self._ensemble_mean}
else: else:
return_dict = {} return_dict = {}
......
...@@ -169,7 +169,7 @@ class Hammurapy(Observer): ...@@ -169,7 +169,7 @@ class Hammurapy(Observer):
parameter_dict = self.basic_parameters.copy() parameter_dict = self.basic_parameters.copy()
# set the parameters for a numerical run # set the parameters for a numerical run
parameter_dict['B_field_interp'] = 'T' parameter_dict['B_field_interp'] = 'F'
parameter_dict['use_B_analytic'] = 'F' parameter_dict['use_B_analytic'] = 'F'
self._build_parameter_dict( self._build_parameter_dict(
......
...@@ -10,7 +10,7 @@ class WMAP3yrMixin(object): ...@@ -10,7 +10,7 @@ class WMAP3yrMixin(object):
self.__parameter_dict = {'B_field_type': '1', self.__parameter_dict = {'B_field_type': '1',
'B_field_do_random': 'T', 'B_field_do_random': 'T',
'B_field_z_antisym': '0', 'B_field_z_antisym': 'F',
} }
super(WMAP3yrMixin, self).__init__(hammurabi_executable, super(WMAP3yrMixin, self).__init__(hammurabi_executable,
conf_directory, conf_directory,
......
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