From 6c1ced8134caf04649274b6aadea2a2e7d5f08eb Mon Sep 17 00:00:00 2001
From: Philipp Arras <parras@mpa-garching.mpg.de>
Date: Wed, 27 Jun 2018 17:03:04 +0200
Subject: [PATCH] Fixups
---
nifty5/__init__.py | 4 ++++
nifty5/library/__init__.py | 2 +-
nifty5/library/point_sources.py | 2 +-
nifty5/models/local_nonlinearity.py | 2 +-
nifty5/{library => }/nonlinearities.py | 2 +-
5 files changed, 8 insertions(+), 4 deletions(-)
rename nifty5/{library => }/nonlinearities.py (97%)
diff --git a/nifty5/__init__.py b/nifty5/__init__.py
index e2c02b6f7..1cf08445d 100644
--- a/nifty5/__init__.py
+++ b/nifty5/__init__.py
@@ -4,6 +4,9 @@ from . import dobj
from .domains import *
from .domain_tuple import DomainTuple
from .field import Field
+
+from .nonlinearities import Exponential, Linear, PositiveTanh, Tanh
+
from .models import *
from .operators import *
from .probing.utils import probe_with_posterior_samples, probe_diagonal, \
@@ -12,6 +15,7 @@ from .minimization import *
from .sugar import *
from .plotting.plot import plot
+
from . import library
from . import extra
diff --git a/nifty5/library/__init__.py b/nifty5/library/__init__.py
index 96b1e8ac6..7684980db 100644
--- a/nifty5/library/__init__.py
+++ b/nifty5/library/__init__.py
@@ -4,8 +4,8 @@ from .los_response import LOSResponse
from .noise_energy import NoiseEnergy
from .nonlinear_power_energy import NonlinearPowerEnergy
from .nonlinear_wiener_filter_energy import NonlinearWienerFilterEnergy
-from .nonlinearities import Exponential, Linear, PositiveTanh, Tanh
from .poisson_energy import PoissonEnergy
+from .point_sources import PointSources
from .poisson_log_likelihood import PoissonLogLikelihood
from .smooth_sky import make_smooth_mf_sky_model, make_smooth_sky_model
from .unit_log_gauss import UnitLogGauss
diff --git a/nifty5/library/point_sources.py b/nifty5/library/point_sources.py
index 13d9e5f18..eb7e4325a 100644
--- a/nifty5/library/point_sources.py
+++ b/nifty5/library/point_sources.py
@@ -3,7 +3,7 @@ from scipy.stats import invgamma, norm
from ..field import Field
from ..sugar import makeOp
from ..multi import MultiField
-from ..model import Model
+from ..models import Model
from ..operators import SelectionOperator
from ..utilities import memo
diff --git a/nifty5/models/local_nonlinearity.py b/nifty5/models/local_nonlinearity.py
index 5959479a6..4a860f86c 100644
--- a/nifty5/models/local_nonlinearity.py
+++ b/nifty5/models/local_nonlinearity.py
@@ -16,7 +16,7 @@
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
-from ..library.nonlinearities import Exponential, PositiveTanh, Tanh
+from ..nonlinearities import Exponential, PositiveTanh, Tanh
from ..sugar import makeOp
from .model import Model
diff --git a/nifty5/library/nonlinearities.py b/nifty5/nonlinearities.py
similarity index 97%
rename from nifty5/library/nonlinearities.py
rename to nifty5/nonlinearities.py
index 648290c8b..e206aa6a3 100644
--- a/nifty5/library/nonlinearities.py
+++ b/nifty5/nonlinearities.py
@@ -16,7 +16,7 @@
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
-from ..sugar import full, exp, tanh
+from .sugar import full, exp, tanh
class Linear(object):
--
GitLab