Commit b891254c authored by Theo Steininger's avatar Theo Steininger
Browse files

Update to Dockerfile and ConstantMagneticFieldFactory

parent a0b5abb5
...@@ -21,7 +21,7 @@ RUN ./configure --enable-threads --enable-openmp --enable-shared --prefix=/usr/l ...@@ -21,7 +21,7 @@ RUN ./configure --enable-threads --enable-openmp --enable-shared --prefix=/usr/l
WORKDIR .. WORKDIR ..
#GSL #GSL
RUN wget http://ftp.halifax.rwth-aachen.de/gnu/gsl/gsl-2.3.tar.gz && tar xzf gsl-2.3.tar.gz RUN wget http://nl.mirror.babylon.network/gnu/gsl/gsl-2.3.tar.gz && tar xzf gsl-2.3.tar.gz
WORKDIR gsl-2.3 WORKDIR gsl-2.3
RUN ./configure --enable-shared --prefix=/usr/local/ && make && make install RUN ./configure --enable-shared --prefix=/usr/local/ && make && make install
WORKDIR .. WORKDIR ..
...@@ -41,9 +41,12 @@ ENV HEALPIX /home/Downloads/Healpix_3.31 ...@@ -41,9 +41,12 @@ ENV HEALPIX /home/Downloads/Healpix_3.31
RUN pip install healpy RUN pip install healpy
#Hammurabi #Hammurabi
RUN wget https://sourceforge.net/code-snapshots/svn/h/ha/hammurabicode/code/hammurabicode-code-41-trunk.zip # RUN wget https://sourceforge.net/code-snapshots/svn/h/ha/hammurabicode/code/hammurabicode-code-41-trunk.zip
RUN unzip hammurabicode-code-41-trunk.zip # RUN unzip hammurabicode-code-41-trunk.zip
WORKDIR hammurabicode-code-41-trunk # WORKDIR hammurabicode-code-41-trunk
RUN wget https://sourceforge.net/code-snapshots/svn/h/ha/hammurabicode/code/hammurabicode-code-52-trunk.zip
RUN unzip hammurabicode-code-52-trunk.zip
WORKDIR hammurabicode-code-52-trunk
COPY hammurabi_Makefile Makefile COPY hammurabi_Makefile Makefile
RUN [ -r /root/.healpix/3_31_Linux/config ] && . /root/.healpix/3_31_Linux/config && make hammurabi && make clean RUN [ -r /root/.healpix/3_31_Linux/config ] && . /root/.healpix/3_31_Linux/config && make hammurabi && make clean
WORKDIR .. WORKDIR ..
...@@ -95,6 +98,8 @@ WORKDIR NIFTy ...@@ -95,6 +98,8 @@ WORKDIR NIFTy
RUN python setup.py install RUN python setup.py install
WORKDIR .. WORKDIR ..
#hampy
RUN pip install jupyter pandas
...@@ -22,6 +22,6 @@ class ConstantMagneticFieldFactory(MagneticFieldFactory): ...@@ -22,6 +22,6 @@ class ConstantMagneticFieldFactory(MagneticFieldFactory):
@property @property
def _initial_variable_to_parameter_mappings(self): def _initial_variable_to_parameter_mappings(self):
return {'b_x': [-np.inf, 0, np.inf], return {'b_x': [-100, 0, 100],
'b_y': [-np.inf, 0, np.inf], 'b_y': [-100, 0, 100],
'b_z': [-np.inf, 0, np.inf]} 'b_z': [-100, 0, 100]}
...@@ -4,5 +4,5 @@ from keepers import Loggable ...@@ -4,5 +4,5 @@ from keepers import Loggable
class Observer(Loggable, object): class Observer(Loggable, object):
def observe(magnetic_field): def __call__(magnetic_field):
raise NotImplementedError raise NotImplementedError
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