WIP: move field class to new file

__init__.py

@@ -38,9 +38,9 @@ from config import about,\
 from d2o import distributed_data_object, d2o_librarian
 
 from nifty_cmaps import ncmap
+from nifty_field import field
 from nifty_core import space,\
-                    point_space,\
-                    field
+                    point_space
 
 from nifty_random import random
 from nifty_simple_math import *

lm/nifty_lm.py

@@ -42,8 +42,10 @@ from matplotlib.ticker import LogFormatter as lf
 from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES
 
 from nifty.nifty_core import space,\
-                             point_space,\
-                             field
+                             point_space
+
+from nifty.nifty_field import field
+
 from nifty.config import about,\
                          nifty_configuration as gc,\
                          dependency_injector as gdi

lm/nifty_power_conversion_lm.py

@@ -23,7 +23,7 @@
 import numpy as np
 from numpy import pi
 from nifty.config import about
-from nifty.nifty_core import field
+from nifty.nifty_field import field
 from nifty.nifty_simple_math import sqrt, exp, log
 
 

operators/nifty_los.py

@@ -12,8 +12,8 @@ from nifty.config import about,\
                          nifty_configuration as gc,\
                          dependency_injector as gdi
 
-from nifty.nifty_core import point_space,\
-                             field
+from nifty.nifty_core import point_space
+from nifty.nifty_field import field
 from nifty.rg import rg_space
 from nifty.operators import operator
 

operators/nifty_minimization.py

@@ -40,7 +40,7 @@ from __future__ import division
 #from nifty_core import *
 import numpy as np
 from nifty.config import notification, about
-from nifty.nifty_core import field
+from nifty.nifty_field import field
 from nifty.nifty_simple_math import vdot
 
 

operators/nifty_operators.py

@@ -22,9 +22,9 @@
 from __future__ import division
 import numpy as np
 from nifty.config import about
+from nifty.nifty_field import field
 from nifty.nifty_core import space, \
-    point_space, \
-    field
+    point_space
 from nifty_minimization import conjugate_gradient
 from nifty_probing import trace_prober,\
     inverse_trace_prober,\

operators/nifty_probing.py

@@ -22,8 +22,8 @@
 from __future__ import division
 
 from nifty.config import about
-from nifty.nifty_core import space, \
-                         field
+from nifty.nifty_core import space
+from nifty.nifty_field import field
 from nifty.nifty_utilities import direct_vdot
 
 

rg/nifty_power_conversion_rg.py

@@ -22,7 +22,7 @@
 
 import numpy as np
 from nifty.config import about
-from nifty.nifty_core import field
+from nifty.nifty_field import field
 
 
 def power_backward_conversion_rg(k_space, p, mean=None, bare=True):

rg/nifty_rg.py

@@ -43,8 +43,9 @@ from matplotlib.ticker import LogFormatter as lf
 
 from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES
 
-from nifty.nifty_core import point_space,\
-                             field
+from nifty.nifty_core import point_space
+from nifty.nifty_field import field
+
 import nifty_fft
 from nifty.config import about,\
                          nifty_configuration as gc,\

test/test_nifty_field.py

@@ -14,8 +14,9 @@ from nifty import space,\
     rg_space,\
     lm_space,\
     hp_space,\
-    gl_space,\
-    field
+    gl_space
+
+from nifty.nifty_field import field
 
 from nifty.nifty_core import POINT_DISTRIBUTION_STRATEGIES
 from nifty.rg.nifty_rg import RG_DISTRIBUTION_STRATEGIES,\

test/test_nifty_spaces.py

@@ -9,17 +9,18 @@ import unittest
 import itertools
 import numpy as np
 
-from nifty import space,\
-    point_space,\
-    rg_space,\
-    field,\
-    distributed_data_object
+from nifty.nifty_field import field
+
+from d2o import distributed_data_object
 
 from nifty.nifty_paradict import space_paradict
-from nifty.nifty_core import POINT_DISTRIBUTION_STRATEGIES
+from nifty.nifty_core import POINT_DISTRIBUTION_STRATEGIES,\
+    space,\
+    point_space
 
 from nifty.rg.nifty_rg import RG_DISTRIBUTION_STRATEGIES,\
-                              gc as RG_GC
+                              gc as RG_GC,\
+                              rg_space
 from nifty.lm.nifty_lm import LM_DISTRIBUTION_STRATEGIES,\
                               GL_DISTRIBUTION_STRATEGIES,\
                               HP_DISTRIBUTION_STRATEGIES