Merge remote-tracking branch 'origin/redesigning_resolve' into redesign

nifty5/library/amplitude_model.py

@@ -24,7 +24,6 @@ from ..compat import *
 from ..domains.power_space import PowerSpace
 from ..domains.unstructured_domain import UnstructuredDomain
 from ..field import Field
-from ..multi_field import MultiField
 from ..multi_domain import MultiDomain
 from ..sugar import makeOp, sqrt
 from ..operators.operator import Operator
@@ -149,3 +148,7 @@ class AmplitudeModel(Operator):
     @property
     def ceps(self):
         return self._ceps
+
+    @property
+    def norm_phi_mean(self):
+        return self._norm_phi_mean

nifty5/library/inverse_gamma_model.py

@@ -56,11 +56,19 @@ class InverseGammaModel(Operator):
         return Linearization(points, jac)
 
     @staticmethod
-    def IG(self, field, alpha, q):
+    def IG(field, alpha, q):
         foo = invgamma.ppf(norm.cdf(field.local_data), alpha, scale=q)
         return Field.from_local_data(field.domain, foo)
 
     @staticmethod
-    def inverseIG(self, u, alpha, q):
+    def inverseIG(u, alpha, q):
         res = norm.ppf(invgamma.cdf(u.local_data, alpha, scale=q))
         return Field.from_local_data(u.domain, res)
+
+    @property
+    def alpha(self):
+        return self._alpha
+
+    @property
+    def q(self):
+        return self._q

nifty5/linearization.py

@@ -6,7 +6,6 @@ from .compat import *
 from .field import Field
 from .multi_field import MultiField
 from .sugar import makeOp
-from .domain_tuple import DomainTuple
 
 
 class Linearization(object):
@@ -110,7 +109,6 @@ class Linearization(object):
         return self.__mul__(other)
 
     def vdot(self, other):
-        from .domain_tuple import DomainTuple
         from .operators.simple_linear_operators import VdotOperator
         if isinstance(other, (Field, MultiField)):
             return Linearization(
@@ -123,7 +121,6 @@ class Linearization(object):
 
     def sum(self):
         from .operators.simple_linear_operators import SumReductionOperator
-        from .sugar import full
         return Linearization(
             Field.scalar(self._val.sum()),
             SumReductionOperator(self._jac.target)(self._jac))