From dbbce52e063713348983b8b4d206ee329b2e2f2a Mon Sep 17 00:00:00 2001 From: Martin Reinecke Date: Sun, 13 May 2018 14:12:11 +0200 Subject: [PATCH] step 1/n; not working --- imagine/__init__.py | 18 -------------- imagine/likelihoods/__init__.py | 24 +++---------------- .../ensemble_likelihood.py | 6 ++--- .../ensemble_likelihood/__init__.py | 19 --------------- .../{likelihood => }/likelihood.py | 9 +++---- imagine/likelihoods/likelihood/__init__.py | 19 --------------- .../simple_likelihood.py | 0 .../likelihoods/simple_likelihood/__init__.py | 19 --------------- imagine/magnetic_fields/__init__.py | 18 -------------- .../constant_magnetic_field.py | 3 +-- .../constant_magnetic_field_factory.py | 5 +--- .../magnetic_field/__init__.py | 18 -------------- .../wmap3yr_magnetic_field/__init__.py | 18 -------------- imagine/observables/__init__.py | 18 -------------- imagine/observers/__init__.py | 18 -------------- imagine/observers/hammurapy/__init__.py | 18 -------------- .../hammurapy/model_mixins/__init__.py | 18 -------------- .../hammurapy/observable_mixins/__init__.py | 18 -------------- imagine/observers/{observer => }/observer.py | 0 imagine/observers/observer/__init__.py | 19 --------------- imagine/priors/__init__.py | 22 ++--------------- imagine/priors/{flat_prior => }/flat_prior.py | 0 imagine/priors/flat_prior/__init__.py | 19 --------------- imagine/priors/{prior => }/prior.py | 0 imagine/priors/prior/__init__.py | 19 --------------- imagine/pymultinest_importer/__init__.py | 18 -------------- setup.py | 4 ++-- 27 files changed, 14 insertions(+), 353 deletions(-) rename imagine/likelihoods/{ensemble_likelihood => }/ensemble_likelihood.py (98%) delete mode 100644 imagine/likelihoods/ensemble_likelihood/__init__.py rename imagine/likelihoods/{likelihood => }/likelihood.py (86%) delete mode 100644 imagine/likelihoods/likelihood/__init__.py rename imagine/likelihoods/{simple_likelihood => }/simple_likelihood.py (100%) delete mode 100644 imagine/likelihoods/simple_likelihood/__init__.py rename imagine/observers/{observer => }/observer.py (100%) delete mode 100644 imagine/observers/observer/__init__.py rename imagine/priors/{flat_prior => }/flat_prior.py (100%) delete mode 100644 imagine/priors/flat_prior/__init__.py rename imagine/priors/{prior => }/prior.py (100%) delete mode 100644 imagine/priors/prior/__init__.py diff --git a/imagine/__init__.py b/imagine/__init__.py index 306b36d..dc303cb 100644 --- a/imagine/__init__.py +++ b/imagine/__init__.py @@ -1,21 +1,3 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from .version import __version__ from likelihoods import * diff --git a/imagine/likelihoods/__init__.py b/imagine/likelihoods/__init__.py index 0011378..8f127c9 100644 --- a/imagine/likelihoods/__init__.py +++ b/imagine/likelihoods/__init__.py @@ -1,21 +1,3 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - -from likelihood import Likelihood -from ensemble_likelihood import * -from simple_likelihood import SimpleLikelihood +from .likelihood import Likelihood +from .ensemble_likelihood import EnsemleLikelihood +from .simple_likelihood import SimpleLikelihood diff --git a/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py b/imagine/likelihoods/ensemble_likelihood.py similarity index 98% rename from imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py rename to imagine/likelihoods/ensemble_likelihood.py index 0044763..33e800c 100644 --- a/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py +++ b/imagine/likelihoods/ensemble_likelihood.py @@ -17,10 +17,8 @@ # and financially supported by the Studienstiftung des deutschen Volkes. import numpy as np - -from nifty import Field - -from imagine.likelihoods.likelihood import Likelihood +from nifty4 import Field +from .likelihood import Likelihood class EnsembleLikelihood(Likelihood): diff --git a/imagine/likelihoods/ensemble_likelihood/__init__.py b/imagine/likelihoods/ensemble_likelihood/__init__.py deleted file mode 100644 index ec45a38..0000000 --- a/imagine/likelihoods/ensemble_likelihood/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - -from ensemble_likelihood import EnsembleLikelihood diff --git a/imagine/likelihoods/likelihood/likelihood.py b/imagine/likelihoods/likelihood.py similarity index 86% rename from imagine/likelihoods/likelihood/likelihood.py rename to imagine/likelihoods/likelihood.py index cb988f2..903cde0 100644 --- a/imagine/likelihoods/likelihood/likelihood.py +++ b/imagine/likelihoods/likelihood.py @@ -17,10 +17,7 @@ # and financially supported by the Studienstiftung des deutschen Volkes. import abc - -from keepers import Loggable - -from nifty import FieldArray +import nifty4 as ift class Likelihood(Loggable, object): @@ -29,12 +26,12 @@ class Likelihood(Loggable, object): raise NotImplementedError def _strip_data(self, data): - # if the first element in the domain tuple is a FieldArray we must + # if the first element in the domain tuple is unstructured, we must # extract the data if not hasattr(data, 'domain'): return data - if isinstance(data.domain[0], FieldArray): + if isinstance(data.domain[0], ift.UnstructuredDomain): data = data.val.get_full_data()[0] else: data = data.val.get_full_data() diff --git a/imagine/likelihoods/likelihood/__init__.py b/imagine/likelihoods/likelihood/__init__.py deleted file mode 100644 index 8921774..0000000 --- a/imagine/likelihoods/likelihood/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - -from likelihood import Likelihood diff --git a/imagine/likelihoods/simple_likelihood/simple_likelihood.py b/imagine/likelihoods/simple_likelihood.py similarity index 100% rename from imagine/likelihoods/simple_likelihood/simple_likelihood.py rename to imagine/likelihoods/simple_likelihood.py diff --git a/imagine/likelihoods/simple_likelihood/__init__.py b/imagine/likelihoods/simple_likelihood/__init__.py deleted file mode 100644 index 8db1d06..0000000 --- a/imagine/likelihoods/simple_likelihood/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - -from simple_likelihood import SimpleLikelihood diff --git a/imagine/magnetic_fields/__init__.py b/imagine/magnetic_fields/__init__.py index 8baf878..0a9bf1d 100644 --- a/imagine/magnetic_fields/__init__.py +++ b/imagine/magnetic_fields/__init__.py @@ -1,21 +1,3 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from magnetic_field import MagneticField, \ MagneticFieldFactory diff --git a/imagine/magnetic_fields/constant_magnetic_field/constant_magnetic_field.py b/imagine/magnetic_fields/constant_magnetic_field/constant_magnetic_field.py index 73e5319..ab2a9c0 100644 --- a/imagine/magnetic_fields/constant_magnetic_field/constant_magnetic_field.py +++ b/imagine/magnetic_fields/constant_magnetic_field/constant_magnetic_field.py @@ -22,8 +22,7 @@ from imagine.magnetic_fields.magnetic_field import MagneticField class ConstantMagneticField(MagneticField): @property def parameter_list(self): - parameter_list = ['b_x', 'b_y', 'b_z'] - return parameter_list + return ['b_x', 'b_y', 'b_z'] def _create_field(self): val = self.cast(None) diff --git a/imagine/magnetic_fields/constant_magnetic_field/constant_magnetic_field_factory.py b/imagine/magnetic_fields/constant_magnetic_field/constant_magnetic_field_factory.py index f41a770..726a9fa 100644 --- a/imagine/magnetic_fields/constant_magnetic_field/constant_magnetic_field_factory.py +++ b/imagine/magnetic_fields/constant_magnetic_field/constant_magnetic_field_factory.py @@ -31,10 +31,7 @@ class ConstantMagneticFieldFactory(MagneticFieldFactory): @property def _initial_parameter_defaults(self): - defaults = {'b_x': 0, - 'b_y': 0, - 'b_z': 0} - return defaults + return dict(b_x=0, b_y=0, b_z=0) @property def _initial_variable_to_parameter_mappings(self): diff --git a/imagine/magnetic_fields/magnetic_field/__init__.py b/imagine/magnetic_fields/magnetic_field/__init__.py index 3b78db4..5faeff2 100644 --- a/imagine/magnetic_fields/magnetic_field/__init__.py +++ b/imagine/magnetic_fields/magnetic_field/__init__.py @@ -1,20 +1,2 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from magnetic_field import MagneticField from magnetic_field_factory import MagneticFieldFactory diff --git a/imagine/magnetic_fields/wmap3yr_magnetic_field/__init__.py b/imagine/magnetic_fields/wmap3yr_magnetic_field/__init__.py index 79a721e..e57e9bd 100644 --- a/imagine/magnetic_fields/wmap3yr_magnetic_field/__init__.py +++ b/imagine/magnetic_fields/wmap3yr_magnetic_field/__init__.py @@ -1,20 +1,2 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from wmap3yr_magnetic_field import WMAP3yrMagneticField from wmap3yr_magnetic_field_factory import WMAP3yrMagneticFieldFactory diff --git a/imagine/observables/__init__.py b/imagine/observables/__init__.py index cb2e83d..2f5b18d 100644 --- a/imagine/observables/__init__.py +++ b/imagine/observables/__init__.py @@ -1,19 +1 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from observable import Observable diff --git a/imagine/observers/__init__.py b/imagine/observers/__init__.py index 38f768b..74cb35f 100644 --- a/imagine/observers/__init__.py +++ b/imagine/observers/__init__.py @@ -1,20 +1,2 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from observer import Observer from hammurapy import * diff --git a/imagine/observers/hammurapy/__init__.py b/imagine/observers/hammurapy/__init__.py index 2308be8..ce7ea6e 100644 --- a/imagine/observers/hammurapy/__init__.py +++ b/imagine/observers/hammurapy/__init__.py @@ -1,21 +1,3 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from observable_mixins import * from model_mixins import * from hammurapy import Hammurapy diff --git a/imagine/observers/hammurapy/model_mixins/__init__.py b/imagine/observers/hammurapy/model_mixins/__init__.py index bce6fae..b51cb07 100644 --- a/imagine/observers/hammurapy/model_mixins/__init__.py +++ b/imagine/observers/hammurapy/model_mixins/__init__.py @@ -1,20 +1,2 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from magnetic_field_model import MagneticFieldModel from wmap3yr_mixin import WMAP3yrMixin diff --git a/imagine/observers/hammurapy/observable_mixins/__init__.py b/imagine/observers/hammurapy/observable_mixins/__init__.py index 64c4ae5..eddcb68 100644 --- a/imagine/observers/hammurapy/observable_mixins/__init__.py +++ b/imagine/observers/hammurapy/observable_mixins/__init__.py @@ -1,21 +1,3 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from observable_mixin import ObservableMixin from dm_mixin import DMMixin from fd_mixin import FDMixin diff --git a/imagine/observers/observer/observer.py b/imagine/observers/observer.py similarity index 100% rename from imagine/observers/observer/observer.py rename to imagine/observers/observer.py diff --git a/imagine/observers/observer/__init__.py b/imagine/observers/observer/__init__.py deleted file mode 100644 index fb2a219..0000000 --- a/imagine/observers/observer/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - -from observer import Observer diff --git a/imagine/priors/__init__.py b/imagine/priors/__init__.py index 26395c0..aca949c 100644 --- a/imagine/priors/__init__.py +++ b/imagine/priors/__init__.py @@ -1,20 +1,2 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - -from prior import Prior -from flat_prior import FlatPrior +from .prior import Prior +from .flat_prior import FlatPrior diff --git a/imagine/priors/flat_prior/flat_prior.py b/imagine/priors/flat_prior.py similarity index 100% rename from imagine/priors/flat_prior/flat_prior.py rename to imagine/priors/flat_prior.py diff --git a/imagine/priors/flat_prior/__init__.py b/imagine/priors/flat_prior/__init__.py deleted file mode 100644 index 4b16864..0000000 --- a/imagine/priors/flat_prior/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - -from flat_prior import FlatPrior diff --git a/imagine/priors/prior/prior.py b/imagine/priors/prior.py similarity index 100% rename from imagine/priors/prior/prior.py rename to imagine/priors/prior.py diff --git a/imagine/priors/prior/__init__.py b/imagine/priors/prior/__init__.py deleted file mode 100644 index 1635edc..0000000 --- a/imagine/priors/prior/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - -from prior import Prior diff --git a/imagine/pymultinest_importer/__init__.py b/imagine/pymultinest_importer/__init__.py index d2d1ae6..625f5b3 100644 --- a/imagine/pymultinest_importer/__init__.py +++ b/imagine/pymultinest_importer/__init__.py @@ -1,19 +1 @@ -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Copyright(C) 2013-2017 Max-Planck-Society -# -# IMAGINE is being developed at the Max-Planck-Institut fuer Astrophysik -# and financially supported by the Studienstiftung des deutschen Volkes. - from pymultinest_importer import pymultinest diff --git a/setup.py b/setup.py index 67b2309..a919e6f 100644 --- a/setup.py +++ b/setup.py @@ -41,8 +41,8 @@ setup(name = "imagine", package_data={'imagine.observers.hammurapy': ['input/*'],}, package_dir={"imagine": "imagine"}, dependency_links=[ - 'git+https://gitlab.mpcdf.mpg.de/ift/nifty.git/@NIFTy_3#egg=ift_nifty-3.0.3'], - install_requires=['ift_nifty>=3.0.3', 'simplejson'], + 'git+https://gitlab.mpcdf.mpg.de/ift/nifty.git/#egg=nifty4-4.2.0'], + install_requires=['nifty4>=4.2.0', 'simplejson'], zip_safe=False, classifiers=[ "Development Status :: 4 - Beta", -- GitLab