diff --git a/nifty/domain_object.py b/nifty/domain_object.py index c6e32270fb7869f968bd8f025a435d67287f6077..ddf57c36bb881260da29c9acfd49066b2aeb006b 100644 --- a/nifty/domain_object.py +++ b/nifty/domain_object.py @@ -19,7 +19,6 @@ from __future__ import division import abc from .nifty_meta import NiftyMeta - from future.utils import with_metaclass @@ -137,7 +136,7 @@ class DomainObject(with_metaclass( """ raise NotImplementedError( - "There is no generic scalar_weight method for DomainObject.") + "There is no generic scalar_dvol method for DomainObject.") def dvol(self): """ Returns the volume factors of this domain, either as a floating diff --git a/nifty/spaces/power_space/power_space.py b/nifty/spaces/power_space/power_space.py index c823f5fcac3f980b03a78b98d7023691cd918867..a82529980fac45adf67e4e9a8355ba27125c76cb 100644 --- a/nifty/spaces/power_space/power_space.py +++ b/nifty/spaces/power_space/power_space.py @@ -198,11 +198,7 @@ class PowerSpace(Space): return self.shape[0] def scalar_dvol(self): - return None - - def dvol(self): - # MR FIXME: this will probably change to 1 soon - return np.asarray(self.rho, dtype=np.float64) + return 1. def get_k_length_array(self): return self.kindex.copy() diff --git a/test/test_spaces/test_power_space.py b/test/test_spaces/test_power_space.py index 597af9bc537aa705362fa156bdd21778fd361f4c..7f2cc1f74ac5ea9849346721c981b5c6fdb041cf 100644 --- a/test/test_spaces/test_power_space.py +++ b/test/test_spaces/test_power_space.py @@ -129,4 +129,4 @@ class PowerSpaceFunctionalityTest(unittest.TestCase): def test_dvol(self): p = PowerSpace(harmonic_partner=RGSpace(10,harmonic=True)) - assert_almost_equal(p.dvol(),p.rho) + assert_almost_equal(p.dvol(),1.)