Fixed check_averaging circular import and sorted import ordering

gprMax/cmds_geometry/box.py

@@ -23,9 +23,9 @@ import numpy as np
 import gprMax.config as config
 
 from ..cython.geometry_primitives import build_box
-from ..hash_cmds_geometry import check_averaging
 from ..materials import Material
-from .cmds_geometry import UserObjectGeometry, rotate_2point_object
+from .cmds_geometry import (UserObjectGeometry, check_averaging,
+                            rotate_2point_object)
 
 logger = logging.getLogger(__name__)
 

gprMax/cmds_geometry/cmds_geometry.py

@@ -64,6 +64,27 @@ class UserObjectGeometry:
             return ""
 
 
+def check_averaging(averaging):
+    """Check and set material averaging value.
+
+    Args:
+        averaging: string for input value from hash command - should be 'y'
+                    or 'n'.
+
+    Returns:
+        averaging: boolean for geometry object material averaging.
+    """
+
+    if averaging == "y":
+        averaging = True
+    elif averaging == "n":
+        averaging = False
+    else:
+        logger.exception("Averaging should be either y or n")
+
+    return averaging
+
+
 def rotate_point(p, axis, angle, origin=(0, 0, 0)):
     """Rotates a point.
 

gprMax/cmds_geometry/cone.py

@@ -21,9 +21,8 @@ import logging
 import numpy as np
 
 from ..cython.geometry_primitives import build_cone
-from ..hash_cmds_geometry import check_averaging
 from ..materials import Material
-from .cmds_geometry import UserObjectGeometry
+from .cmds_geometry import UserObjectGeometry, check_averaging
 
 logger = logging.getLogger(__name__)
 

gprMax/cmds_geometry/cylinder.py

@@ -21,9 +21,8 @@ import logging
 import numpy as np
 
 from ..cython.geometry_primitives import build_cylinder
-from ..hash_cmds_geometry import check_averaging
 from ..materials import Material
-from .cmds_geometry import UserObjectGeometry
+from .cmds_geometry import UserObjectGeometry, check_averaging
 
 logger = logging.getLogger(__name__)
 

gprMax/cmds_geometry/cylindrical_sector.py

@@ -21,9 +21,8 @@ import logging
 import numpy as np
 
 from ..cython.geometry_primitives import build_cylindrical_sector
-from ..hash_cmds_geometry import check_averaging
 from ..materials import Material
-from .cmds_geometry import UserObjectGeometry
+from .cmds_geometry import UserObjectGeometry, check_averaging
 
 logger = logging.getLogger(__name__)
 

gprMax/cmds_geometry/edge.py

@@ -20,7 +20,8 @@ import logging
 
 import numpy as np
 
-from ..cython.geometry_primitives import build_edge_x, build_edge_y, build_edge_z
+from ..cython.geometry_primitives import (build_edge_x, build_edge_y,
+                                          build_edge_z)
 from .cmds_geometry import UserObjectGeometry, rotate_2point_object
 
 logger = logging.getLogger(__name__)

gprMax/cmds_geometry/ellipsoid.py

@@ -21,9 +21,8 @@ import logging
 import numpy as np
 
 from ..cython.geometry_primitives import build_ellipsoid
-from ..hash_cmds_geometry import check_averaging
 from ..materials import Material
-from .cmds_geometry import UserObjectGeometry
+from .cmds_geometry import UserObjectGeometry, check_averaging
 
 logger = logging.getLogger(__name__)
 

gprMax/cmds_geometry/fractal_box.py

@@ -21,11 +21,13 @@ import logging
 import numpy as np
 
 import gprMax.config as config
-from gprMax.cmds_geometry.cmds_geometry import UserObjectGeometry, rotate_2point_object
+from gprMax.cmds_geometry.cmds_geometry import (UserObjectGeometry,
+                                                rotate_2point_object)
 from gprMax.fractals import FractalVolume
 from gprMax.materials import ListMaterial
 
-from ..cython.geometry_primitives import build_voxels_from_array, build_voxels_from_array_mask
+from ..cython.geometry_primitives import (build_voxels_from_array,
+                                          build_voxels_from_array_mask)
 
 logger = logging.getLogger(__name__)
 

gprMax/cmds_geometry/plate.py

@@ -20,7 +20,8 @@ import logging
 
 import numpy as np
 
-from ..cython.geometry_primitives import build_face_xy, build_face_xz, build_face_yz
+from ..cython.geometry_primitives import (build_face_xy, build_face_xz,
+                                          build_face_yz)
 from .cmds_geometry import UserObjectGeometry, rotate_2point_object
 
 logger = logging.getLogger(__name__)

gprMax/cmds_geometry/sphere.py

@@ -21,9 +21,8 @@ import logging
 import numpy as np
 
 from ..cython.geometry_primitives import build_sphere
-from ..hash_cmds_geometry import check_averaging
 from ..materials import Material
-from .cmds_geometry import UserObjectGeometry
+from .cmds_geometry import UserObjectGeometry, check_averaging
 
 logger = logging.getLogger(__name__)
 

gprMax/cmds_geometry/triangle.py

@@ -21,9 +21,8 @@ import logging
 import numpy as np
 
 from ..cython.geometry_primitives import build_triangle
-from ..hash_cmds_geometry import check_averaging
 from ..materials import Material
-from .cmds_geometry import UserObjectGeometry, rotate_point
+from .cmds_geometry import UserObjectGeometry, check_averaging, rotate_point
 
 logger = logging.getLogger(__name__)
 

gprMax/hash_cmds_geometry.py

@@ -33,32 +33,12 @@ from .cmds_geometry.fractal_box import FractalBox
 from .cmds_geometry.plate import Plate
 from .cmds_geometry.sphere import Sphere
 from .cmds_geometry.triangle import Triangle
+from .cmds_geometry.cmds_geometry import check_averaging
 from .utilities.utilities import round_value
 
 logger = logging.getLogger(__name__)
 
 
-def check_averaging(averaging):
-    """Check and set material averaging value.
-
-    Args:
-        averaging: string for input value from hash command - should be 'y'
-                    or 'n'.
-
-    Returns:
-        averaging: boolean for geometry object material averaging.
-    """
-
-    if averaging == "y":
-        averaging = True
-    elif averaging == "n":
-        averaging = False
-    else:
-        logger.exception("Averaging should be either y or n")
-
-    return averaging
-
-
 def process_geometrycmds(geometry):
     """Checks the validity of command parameters, creates instances of classes
         of parameters, and calls functions to directly set arrays solid, rigid