Merge pull request #199 from stewartboogert/relativeImports

Relative imports and coverage

src/pyg4ometry/compare/_Compare.py

@@ -3,10 +3,9 @@
 import enum as _enum
 import re as _re
 
-from pyg4ometry.gdml.Defines import evaluateToFloat as _evaluateToFloat
-from pyg4ometry.geant4 import Material as _Material
-from pyg4ometry.geant4 import Element as _Element
-from pyg4ometry.gdml import Units as _Units
+from ..geant4 import Material as _Material
+from ..geant4 import Element as _Element
+from ..gdml import Units as _Units
 
 
 class Tests:
@@ -268,7 +267,7 @@ def gdmlFiles(referenceFile, otherFile, tests=Tests(), includeAllTestResults=Fal
     :param includeAllTestResults: document all tests attempted in result.
     :type  includeAllTestResults: bool.
     """
-    import pyg4ometry.gdml as gd
+    from .. import gdml as gd
 
     referenceReader = gd.Reader(referenceFile)
     referenceReg = referenceReader.getRegistry()
@@ -1233,7 +1232,7 @@ def _copyNumber(pvname, c1, c2, tests, includeAllTestResults=False):
 def _getBoundingBox(obj):
     # not the full actual path as Mesh is imported one level higher up...
     # so not Mesh.Mesh as it actually exists
-    import pyg4ometry.visualisation as _vis
+    from .. import visualisation as _vis
 
     if type(obj) is _vis.Mesh:
         return obj.getBoundingBox()
@@ -1242,7 +1241,7 @@ def _getBoundingBox(obj):
 
 
 def _getRawMesh(obj):
-    import pyg4ometry.visualisation as _vis
+    from .. import visualisation as _vis
 
     if type(obj) is _vis.Mesh:
         return obj.localmesh

src/pyg4ometry/convert/__init__.py

@@ -1,10 +1,9 @@
-from pyg4ometry.convert.fluka2Geant4 import fluka2Geant4
-from pyg4ometry.convert.geant42Fluka import *
-import pyg4ometry.convert.geant42FlukaBake as geant42FlukaBake
-from pyg4ometry.convert.freecad2Fluka import *
-from pyg4ometry.convert.stl2gdml import *
-from pyg4ometry.convert.geant42Geant4 import *
-from pyg4ometry.convert.gdml2stl import *
-from pyg4ometry.convert.geant42Vtk import *
-from pyg4ometry.convert.oce2Geant4 import *
-from pyg4ometry.convert.vis2oce import *
+from .fluka2Geant4 import fluka2Geant4
+from .geant42Fluka import *
+from .freecad2Fluka import *
+from .stl2gdml import *
+from .geant42Geant4 import *
+from .gdml2stl import *
+from .geant42Vtk import *
+from .oce2Geant4 import *
+from .vis2oce import *

src/pyg4ometry/convert/fluka2Geant4.py

@@ -7,17 +7,16 @@
 import warnings as _warnings
 
 from .fluka2g4materials import makeFlukaToG4MaterialsMap as _makeFlukaToG4MaterialsMap
-from pyg4ometry.fluka.vector import areAABBsOverlapping as _areAABBsOverlapping
-import pyg4ometry.fluka as _fluka
-import pyg4ometry.geant4 as _g4
-import pyg4ometry.transformation as _trans
-
-import pyg4ometry.config as _config
+from ..fluka.vector import areAABBsOverlapping as _areAABBsOverlapping
+from .. import fluka as _fluka
+from .. import geant4 as _g4
+from .. import transformation as _trans
+from .. import config as _config
 
 if _config.meshing == _config.meshingType.cgal_sm:
-    from pyg4ometry.pycgal.core import do_intersect as _do_intersect
+    from ..pycgal.core import do_intersect as _do_intersect
 elif _config.meshing == _config.meshingType.pycsg:
-    from pyg4ometry.pycsg.core import do_intersect as _do_intersect
+    from ..pycsg.core import do_intersect as _do_intersect
 
 logger = _logging.getLogger(__name__)
 logger.setLevel(_logging.INFO)

src/pyg4ometry/convert/fluka2g4materials.py

@@ -1,5 +1,5 @@
-import pyg4ometry.geant4 as _g4
-from pyg4ometry.exceptions import FLUKAError as _FLUKAError
+from .. import geant4 as _g4
+from ..exceptions import FLUKAError as _FLUKAError
 
 _periodicTable = None
 
@@ -114,7 +114,7 @@ def addPredefinedElements(self):
 
     def convertAll(self):
         # delayed import as possibly heavy
-        from pyg4ometry.fluka import material as _fluMat
+        from ..fluka import material as _fluMat
 
         for name, material in self.freg.materials.items():
             if isinstance(material, _fluMat.BuiltIn):

src/pyg4ometry/convert/freecad2Fluka.py

@@ -1,4 +1,4 @@
-import pyg4ometry.fluka as _fluka
+from .. import fluka as _fluka
 
 
 def freecadDoc2Fluka(fcd):

src/pyg4ometry/convert/gdml2stl.py

@@ -1,9 +1,9 @@
-import pyg4ometry as _pyg4
+from .. import convert as _convert
 
 
 def gdml2stl(gdmlFileName, stlFileName="output.gdml", solidName="ws"):
     r = _pyg4.gdml.Reader(gdmlFileName)
     reg = r.getRegistry()
     s = reg.solidDict[solidName]
 
-    _pyg4.convert.pycsgMeshToStl(s.mesh(), stlFileName)
+    _convert.pycsgMeshToStl(s.mesh(), stlFileName)

src/pyg4ometry/convert/geant42Fluka.py

@@ -1,17 +1,17 @@
-import pyg4ometry.transformation as _transformation
-import pyg4ometry.geant4 as _geant4
-import pyg4ometry.fluka as _fluka
-import pyg4ometry.pycgal as _pycgal
-from pyg4ometry.pycgal.core import PolygonProcessing as _PolygonProcessing
-from pyg4ometry.fluka.directive import (
+from .. import transformation as _transformation
+from .. import geant4 as _geant4
+from .. import fluka as _fluka
+from .. import pycgal as _pycgal
+from ..pycgal.core import PolygonProcessing as _PolygonProcessing
+from ..fluka.directive import (
     rotoTranslationFromTra2 as _rotoTranslationFromTra2,
 )
 import numpy as _np
 import copy as _copy
 import scipy.linalg as _la
 
 # this should be refactored to rename namespaced (privately)
-from pyg4ometry.fluka.body import *
+from ..fluka.body import *
 
 # import matplotlib.pyplot as _plt
 
@@ -307,7 +307,7 @@ def geant4Solid2FlukaRegion(
     commentName="",
     bakeTransforms=False,
 ):
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     name = format(flukaNameCount, "04")
 
@@ -932,7 +932,7 @@ def geant4Box2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -1009,7 +1009,7 @@ def geant4Tubs2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -1240,7 +1240,7 @@ def geant4CutTubs2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -1445,7 +1445,7 @@ def geant4Cons2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -1703,7 +1703,7 @@ def geant4Sphere2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -2012,7 +2012,7 @@ def geant4Orb2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -2064,7 +2064,7 @@ def geant4Torus2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -2238,7 +2238,7 @@ def geant4Polycone2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -2449,7 +2449,7 @@ def geant4Extruded2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -2662,7 +2662,7 @@ def geant4Polyhedra2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -2861,7 +2861,7 @@ def geant4EllipticalTube2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -2919,7 +2919,7 @@ def geant4Ellipsoid2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -3040,7 +3040,7 @@ def geant4EllipticalCone2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -3160,7 +3160,7 @@ def geant4Paraboloid2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -3277,7 +3277,7 @@ def geant4Hype2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -3438,7 +3438,7 @@ def geant4Tet2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)
@@ -3499,7 +3499,7 @@ def geant4GenericTrap2Fluka(
     pseudoVector = _np.linalg.det(mtra)
     name = format(flukaNameCount, "04")
 
-    import pyg4ometry.gdml.Units as _Units  # TODO move circular import
+    from ..gdml import Units as _Units  # TODO move circular import
 
     rotation = _transformation.matrix2tbxyz(mtra)
     transform = _rotoTranslationFromTra2("T" + name, [rotation, tra], flukaregistry=flukaRegistry)