Merge branch 'energy_tests' into 'NIFTy_4'
Energy tests See merge request ift/NIFTy!215
Showing
... | ... | @@ -22,7 +22,7 @@ from .spaces.power_space import PowerSpace |
from .field import Field, sqrt | ||
from .operators.diagonal_operator import DiagonalOperator | ||
from .operators.power_projection_operator import PowerProjectionOperator | ||
from .operators.fft_operator import FFTOperator | ||
from .operators.harmonic_transform_operator import HarmonicTransformOperator | ||
from .domain_tuple import DomainTuple | ||
from . import dobj, utilities | ||
... | ... | @@ -32,7 +32,7 @@ __all__ = ['PS_field', |
'power_synthesize_nonrandom', | ||
'create_power_field', | ||
'create_power_operator', | ||
'create_composed_fft_operator', | ||
'create_composed_ht_operator', | ||
'create_harmonic_smoothing_operator'] | ||
... | ... | @@ -241,18 +241,14 @@ def create_power_operator(domain, power_spectrum, space=None, dtype=None): |
spaces=space) | ||
def create_composed_fft_operator(domain, codomain=None, all_to='other'): | ||
def create_composed_ht_operator(domain, codomain=None): | ||
if codomain is None: | ||
codomain = [None]*len(domain) | ||
res = None | ||
for i, space in enumerate(domain): | ||
if not isinstance(space, Space): | ||
continue | ||
if (all_to == 'other' or | ||
(all_to == 'position' and space.harmonic) or | ||
(all_to == 'harmonic' and not space.harmonic)): | ||
if isinstance(space, Space) and space.harmonic: | ||
tdom = domain if res is None else res.target | ||
op = FFTOperator(domain=tdom, target=codomain[i], space=i) | ||
op = HarmonicTransformOperator(tdom, codomain[i], i) | ||
< |