rearrange

nifty/operators/__init__.py

@@ -24,9 +24,10 @@ from .diagonal_operator import DiagonalOperator
 
 from .endomorphic_operator import EndomorphicOperator
 
-from .smoothing_operator import *
+from .fft_smoothing_operator import FFTSmoothingOperator
+from .direct_smoothing_operator import DirectSmoothingOperator
 
-from .fft_operator import *
+from .fft_operator import FFTOperator
 
 from .invertible_operator_mixin import InvertibleOperatorMixin
 

nifty/operators/composed_operator/composed_operator.py → nifty/operators/composed_operator.py

@@ -17,8 +17,8 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from builtins import range
-from ..linear_operator import LinearOperator
-from ... import DomainTuple
+from .linear_operator import LinearOperator
+from .. import DomainTuple
 
 class ComposedOperator(LinearOperator):
     """ NIFTY class for composed operators.

nifty/operators/composed_operator/__init__.py

-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright(C) 2013-2017 Max-Planck-Society
-#
-# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
-# and financially supported by the Studienstiftung des deutschen Volkes.
-
-from .composed_operator import ComposedOperator

nifty/operators/diagonal_operator/diagonal_operator.py → nifty/operators/diagonal_operator.py

@@ -19,11 +19,10 @@
 from __future__ import division
 from builtins import range
 import numpy as np
-
-from ...field import Field
-from ...domain_tuple import DomainTuple
-from ..endomorphic_operator import EndomorphicOperator
-from ...nifty_utilities import cast_iseq_to_tuple
+from ..field import Field
+from ..domain_tuple import DomainTuple
+from .endomorphic_operator import EndomorphicOperator
+from ..nifty_utilities import cast_iseq_to_tuple
 
 class DiagonalOperator(EndomorphicOperator):
     """ NIFTY class for diagonal operators.

nifty/operators/diagonal_operator/__init__.py

-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright(C) 2013-2017 Max-Planck-Society
-#
-# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
-# and financially supported by the Studienstiftung des deutschen Volkes.
-
-from .diagonal_operator import DiagonalOperator

nifty/operators/smoothing_operator/direct_smoothing_operator.py → nifty/operators/direct_smoothing_operator.py

@@ -4,9 +4,9 @@ from __future__ import division
 from builtins import range
 import numpy as np
 
-from ..endomorphic_operator import EndomorphicOperator
-from ... import nifty_utilities as utilities
-from ... import Field, DomainTuple
+from .endomorphic_operator import EndomorphicOperator
+from .. import nifty_utilities as utilities
+from .. import Field, DomainTuple
 
 
 class DirectSmoothingOperator(EndomorphicOperator):

nifty/operators/endomorphic_operator/endomorphic_operator.py → nifty/operators/endomorphic_operator.py

@@ -17,8 +17,7 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 import abc
-
-from ..linear_operator import LinearOperator
+from .linear_operator import LinearOperator
 
 
 class EndomorphicOperator(LinearOperator):

nifty/operators/endomorphic_operator/__init__.py

-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright(C) 2013-2017 Max-Planck-Society
-#
-# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
-# and financially supported by the Studienstiftung des deutschen Volkes.
-
-from .endomorphic_operator import EndomorphicOperator

nifty/operators/fft_operator/fft_operator.py → nifty/operators/fft_operator.py

@@ -16,10 +16,10 @@
 # NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
-from ... import Field, DomainTuple, nifty_utilities as utilities
-from ...spaces import RGSpace, GLSpace, HPSpace, LMSpace
+from .. import Field, DomainTuple, nifty_utilities as utilities
+from ..spaces import RGSpace, GLSpace, HPSpace, LMSpace
 
-from ..linear_operator import LinearOperator
+from .linear_operator import LinearOperator
 from .fft_operator_support import RGRGTransformation,\
                                   LMGLTransformation,\
                                   LMHPTransformation,\

nifty/operators/fft_operator/__init__.py

-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright(C) 2013-2017 Max-Planck-Society
-#
-# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
-# and financially supported by the Studienstiftung des deutschen Volkes.
-
-from .fft_operator import FFTOperator

nifty/operators/fft_operator/fft_operator_support.py → nifty/operators/fft_operator_support.py

@@ -18,8 +18,8 @@
 
 from __future__ import division
 import numpy as np
-from ... import nifty_utilities as utilities
-from ...low_level_library import hartley
+from .. import nifty_utilities as utilities
+from ..low_level_library import hartley
 
 class Transformation(object):
     def __init__(self, domain, codomain):

nifty/operators/smoothing_operator/fft_smoothing_operator.py → nifty/operators/fft_smoothing_operator.py

@@ -3,9 +3,9 @@
 from builtins import range
 import numpy as np
 
-from ..endomorphic_operator import EndomorphicOperator
-from ..fft_operator import FFTOperator
-from ... import DomainTuple
+from .endomorphic_operator import EndomorphicOperator
+from .fft_operator import FFTOperator
+from .. import DomainTuple
 
 class FFTSmoothingOperator(EndomorphicOperator):
     def __init__(self, domain, sigma, space=None):

nifty/operators/invertible_operator_mixin/invertible_operator_mixin.py → nifty/operators/invertible_operator_mixin.py

@@ -17,8 +17,8 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from builtins import object
-from ...energies import QuadraticEnergy
-from ...field import Field
+from ..energies import QuadraticEnergy
+from ..field import Field
 
 
 class InvertibleOperatorMixin(object):

nifty/operators/invertible_operator_mixin/__init__.py

-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright(C) 2013-2017 Max-Planck-Society
-#
-# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
-# and financially supported by the Studienstiftung des deutschen Volkes.
-
-from .invertible_operator_mixin import InvertibleOperatorMixin

nifty/operators/laplace_operator/laplace_operator.py → nifty/operators/laplace_operator.py

@@ -17,11 +17,11 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 import numpy as np
-from ...field import Field
-from ...spaces.power_space import PowerSpace
-from ..endomorphic_operator import EndomorphicOperator
-from ... import DomainTuple
-from ... import nifty_utilities as utilities
+from ..field import Field
+from ..spaces.power_space import PowerSpace
+from .endomorphic_operator import EndomorphicOperator
+from .. import DomainTuple
+from .. import nifty_utilities as utilities
 
 
 class LaplaceOperator(EndomorphicOperator):

nifty/operators/laplace_operator/__init__.py

-# -*- coding: utf-8 -*-
-
-from .laplace_operator import LaplaceOperator

nifty/operators/linear_operator/linear_operator.py → nifty/operators/linear_operator.py

@@ -18,10 +18,9 @@
 
 from builtins import str
 import abc
-from ...nifty_meta import NiftyMeta
-
-from ...field import Field
-from ... import nifty_utilities as utilities
+from ..nifty_meta import NiftyMeta
+from ..field import Field
+from .. import nifty_utilities as utilities
 from future.utils import with_metaclass
 
 

nifty/operators/linear_operator/__init__.py

-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright(C) 2013-2017 Max-Planck-Society
-#
-# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
-# and financially supported by the Studienstiftung des deutschen Volkes.
-
-from .linear_operator import LinearOperator

nifty/operators/response_operator/response_operator.py → nifty/operators/response_operator.py

 from builtins import range
-from ... import Field,\
-                FieldArray,\
-                DomainTuple
-from ..linear_operator import LinearOperator
-from ..smoothing_operator import FFTSmoothingOperator
-from ..composed_operator import ComposedOperator
-from ..diagonal_operator import DiagonalOperator
+from .. import Field,\
+               FieldArray,\
+               DomainTuple
+from .linear_operator import LinearOperator
+from .fft_smoothing_operator import FFTSmoothingOperator
+from .composed_operator import ComposedOperator
+from .diagonal_operator import DiagonalOperator
 
 
 class ResponseOperator(LinearOperator):

nifty/operators/response_operator/__init__.py

-from .response_operator import ResponseOperator