Revert "Added averaging check for API to convert y/n to True/False"

This reverts commit 23c88cee25.
Reverting because this commit caused a circular dependency between
hash_cmds_geometry.py and the UserObject files in cmds_geometry/

gprMax/cmds_geometry/box.py

@@ -23,7 +23,6 @@ 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
 
@@ -88,7 +87,6 @@ class Box(UserObjectGeometry):
         try:
             # Try user-specified averaging
             averagebox = self.kwargs["averaging"]
-            averagebox = check_averaging(averagebox)
         except KeyError:
             # Otherwise go with the grid default
             averagebox = grid.averagevolumeobjects

gprMax/cmds_geometry/cone.py

@@ -21,7 +21,6 @@ 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
 
@@ -62,11 +61,10 @@ class Cone(UserObjectGeometry):
         # Check averaging
         try:
             # Try user-specified averaging
-            averagecone = self.kwargs["averaging"]
+            averagecylinder = self.kwargs["averaging"]
-            averagecone = check_averaging(averagecone)
         except KeyError:
             # Otherwise go with the grid default
-            averagecone = grid.averagevolumeobjects
+            averagecylinder = grid.averagevolumeobjects
 
         # Check materials have been specified
         # Isotropic case
@@ -112,7 +110,7 @@ class Cone(UserObjectGeometry):
 
         # Isotropic case
         if len(materials) == 1:
-            averaging = materials[0].averagable and averagecone
+            averaging = materials[0].averagable and averagecylinder
             numID = numIDx = numIDy = numIDz = materials[0].numID
 
         # Uniaxial anisotropic case

gprMax/cmds_geometry/cylinder.py

@@ -21,7 +21,6 @@ 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
 
@@ -60,7 +59,6 @@ class Cylinder(UserObjectGeometry):
         try:
             # Try user-specified averaging
             averagecylinder = self.kwargs["averaging"]
-            averagecylinder = check_averaging(averagecylinder)
         except KeyError:
             # Otherwise go with the grid default
             averagecylinder = grid.averagevolumeobjects

gprMax/cmds_geometry/cylindrical_sector.py

@@ -21,7 +21,6 @@ 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
 
@@ -75,7 +74,6 @@ class CylindricalSector(UserObjectGeometry):
         try:
             # Try user-specified averaging
             averagecylindricalsector = self.kwargs["averaging"]
-            averagecylindricalsector = check_averaging(averagecylindricalsector)
         except KeyError:
             # Otherwise go with the grid default
             averagecylindricalsector = grid.averagevolumeobjects

gprMax/cmds_geometry/ellipsoid.py

@@ -21,7 +21,6 @@ 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
 
@@ -61,7 +60,6 @@ class Ellipsoid(UserObjectGeometry):
         try:
             # Try user-specified averaging
             averageellipsoid = self.kwargs["averaging"]
-            averageellipsoid = check_averaging(averageellipsoid)
         except KeyError:
             # Otherwise go with the grid default
             averageellipsoid = grid.averagevolumeobjects

gprMax/cmds_geometry/sphere.py

@@ -21,7 +21,6 @@ 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
 
@@ -56,7 +55,6 @@ class Sphere(UserObjectGeometry):
         try:
             # Try user-specified averaging
             averagesphere = self.kwargs["averaging"]
-            averagesphere = check_averaging(averagesphere)
         except KeyError:
             # Otherwise go with the grid default
             averagesphere = grid.averagevolumeobjects

gprMax/cmds_geometry/triangle.py

@@ -21,7 +21,6 @@ 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
 
@@ -81,7 +80,6 @@ class Triangle(UserObjectGeometry):
         try:
             # Try user-specified averaging
             averagetriangularprism = self.kwargs["averaging"]
-            averagetriangularprism = check_averaging(averagetriangularprism)
         except KeyError:
             # Otherwise go with the grid default
             averagetriangularprism = grid.averagevolumeobjects