Fixups

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
 

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

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

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

nifty5/library/nonlinearities.py → 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):