rearrange probing

nifty/probing/__init__.py

@@ -17,4 +17,5 @@
 # and financially supported by the Studienstiftung des deutschen Volkes.
 
 from .prober import Prober
-from .mixin_classes import *
+from .diagonal_prober_mixin import DiagonalProberMixin
+from .trace_prober_mixin import TraceProberMixin

nifty/probing/mixin_classes/diagonal_prober_mixin.py → nifty/probing/diagonal_prober_mixin.py

@@ -18,7 +18,7 @@
 
 from __future__ import division
 from builtins import object
-from ...sugar import create_composed_fft_operator
+from ..sugar import create_composed_fft_operator
 
 
 class DiagonalProberMixin(object):

nifty/probing/mixin_classes/__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_prober_mixin import DiagonalProberMixin
-from .trace_prober_mixin import TraceProberMixin

nifty/probing/prober/prober.py → nifty/probing/prober.py

@@ -20,9 +20,8 @@ from builtins import str
 from builtins import range
 from builtins import object
 import numpy as np
-
-from ...field import Field, DomainTuple
-from ... import nifty_utilities as utilities
+from ..field import Field, DomainTuple
+from .. import nifty_utilities as utilities
 
 
 class Prober(object):

nifty/probing/prober/__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 .prober import Prober

nifty/probing/mixin_classes/trace_prober_mixin.py → nifty/probing/trace_prober_mixin.py

@@ -18,7 +18,7 @@
 
 from __future__ import division
 from builtins import object
-from ...sugar import create_composed_fft_operator
+from ..sugar import create_composed_fft_operator
 
 
 class TraceProberMixin(object):