Merge remote-tracking branch 'origin/testsAndCoverage' into testsAndC…

…overage
g4edge · Jul 9, 2023 · 14783ed · 14783ed
2 parents c57cbf8 + 119b483
commit 14783ed
Show file tree

Hide file tree

Showing 136 changed files with 1,014 additions and 825 deletions.
diff --git a/tests/convert/Geant42FlukaConversion.py b/tests/convert/Geant42FlukaConversion.py
@@ -37,97 +37,157 @@
 
 class Geant42FlukaConversionTests(_unittest.TestCase):
     def test_Geant42FlukaConversion_T001_Box(self):
-        T001_geant4Box2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T001_geant4Box2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T002_Tubs(self):
-        T002_geant4Tubs2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T002_geant4Tubs2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T003_CutTubs(self):
-        T003_geant4CutTubs2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T003_geant4CutTubs2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T004_Cons(self):
-        T004_geant4Cons2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T004_geant4Cons2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T005_Para(self):
-        T005_geant4Para2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T005_geant4Para2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T006_Tdr(self):
-        T006_geant4Trd2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T006_geant4Trd2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T007_Trap(self):
-        T007_geant4Trap2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T007_geant4Trap2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T008_Sphere(self):
-        T008_geant4Sphere2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T008_geant4Sphere2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T009_Orb(self):
-        T009_geant4Orb2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T009_geant4Orb2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T010_Torus(self):
-        T010_geant4Torus2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T010_geant4Torus2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T011_Polycone(self):
-        T011_geant4Polycone2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T011_geant4Polycone2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T012_GenericPolycone(self):
-        T012_geant4GenericPolycone2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T012_geant4GenericPolycone2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T013_Polyhedra(self):
-        T013_geant4Polyhedra2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T013_geant4Polyhedra2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T014_GenericPolyhedra(self):
-        T014_geant4GenericPolyhedra2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T014_geant4GenericPolyhedra2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T015_EllipticalTube(self):
-        T015_geant4EllipticalTube2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T015_geant4EllipticalTube2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T016_Ellipsoid(self):
-        T016_geant4Ellipsoid2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T016_geant4Ellipsoid2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T017_EllipticalCone(self):
-        T017_geant4EllipticalCone2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T017_geant4EllipticalCone2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T018_Paraboloid(self):
-        T018_geant4Paraboloid2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T018_geant4Paraboloid2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T019_Hyperboloid(self):
-        T019_geant4Hyperboloid2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T019_geant4Hyperboloid2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T020_Tet(self):
-        T020_geant4Tet2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T020_geant4Tet2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T021_ExtrudedSolid(self):
-        T021_geant4ExtrudedSolid2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T021_geant4ExtrudedSolid2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     #    def test_Geant42FlukaConversion_T026_GenericTrap(self):
     #        T026_geant4GenericTrap2Fluka.Test(False,False,True)
 
     def test_Geant42FlukaConversion_T028_Union(self):
-        T028_geant4Union2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T028_geant4Union2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T029_Subtraction(self):
-        T029_geant4Subtraction2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T029_geant4Subtraction2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T030_Intersection(self):
-        T030_geant4Intersection2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T030_geant4Intersection2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T105_Assembly(self):
-        T105_geant4Assembly2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T105_geant4Assembly2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T106_replica_x(self):
-        T106_geant4ReplicaX2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T106_geant4ReplicaX2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T107_replica_y(self):
-        T107_geant4ReplicaY2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T107_geant4ReplicaY2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T108_replica_z(self):
-        T108_geant4ReplicaZ2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T108_geant4ReplicaZ2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T109_replica_phi(self):
-        T109_geant4ReplicaPhi2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T109_geant4ReplicaPhi2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
     def test_Geant42FlukaConversion_T110_replica_rho(self):
-        T110_geant4ReplicaRho2Fluka.Test(vis=False, interactive=False, fluka=True, outputPath=tmptestdir)
+        T110_geant4ReplicaRho2Fluka.Test(
+            vis=False, interactive=False, fluka=True, outputPath=tmptestdir
+        )
 
 
 if __name__ == "__main__":

diff --git a/tests/convert/T001_geant4Box2Fluka.py b/tests/convert/T001_geant4Box2Fluka.py
@@ -55,7 +55,7 @@ def Test(vis=False, interactive=False, fluka=True, outputPath=None):
         freg = _convert.geant4Reg2FlukaReg(reg)
         w = _fluka.Writer()
         w.addDetector(freg)
-        w.write(outputPath  / "T001_geant4Box2Fluka.inp")
+        w.write(outputPath / "T001_geant4Box2Fluka.inp")
 
     # flair output file
     f = _fluka.Flair("T001_geant4Box2Fluka.inp", extentBB)

diff --git a/tests/convert/T002_geant4Tubs2Fluka.py b/tests/convert/T002_geant4Tubs2Fluka.py
@@ -8,12 +8,9 @@
 
 
 def Test(vis=True, interactive=False, fluka=True, outputPath=None):
-
-
     if not outputPath:
         outputPath = _pl.Path(__file__).parent
 
-
     # registry
     reg = _g4.Registry()
 
@@ -58,11 +55,11 @@ def Test(vis=True, interactive=False, fluka=True, outputPath=None):
         freg = _convert.geant4Reg2FlukaReg(reg)
         w = _fluka.Writer()
         w.addDetector(freg)
-        w.write(outputPath /  "T002_geant4Tubs2Fluka.inp")
+        w.write(outputPath / "T002_geant4Tubs2Fluka.inp")
 
     # flair output file
     f = _fluka.Flair("T002_geant4Tubs2Fluka.inp", extentBB)
-    f.write(outputPath /  "T002_geant4Tubs2Fluka.flair")
+    f.write(outputPath / "T002_geant4Tubs2Fluka.flair")
 
     if vis:
         v = _vi.VtkViewer()

diff --git a/tests/convert/T003_geant4CutTubs2Fluka.py b/tests/convert/T003_geant4CutTubs2Fluka.py
@@ -8,7 +8,6 @@
 
 
 def Test(vis=True, interactive=False, fluka=True, outputPath=None):
-
     if not outputPath:
         outputPath = _pl.Path(__file__).parent
 
@@ -73,11 +72,11 @@ def Test(vis=True, interactive=False, fluka=True, outputPath=None):
         freg = _convert.geant4Reg2FlukaReg(reg)
         w = _fluka.Writer()
         w.addDetector(freg)
-        w.write(outputPath /  "T003_geant4CutTubs2Fluka.inp")
+        w.write(outputPath / "T003_geant4CutTubs2Fluka.inp")
 
     # flair output file
     f = _fluka.Flair("T003_geant4CutTubs2Fluka.inp", extentBB)
-    f.write(outputPath /  "T003_geant4CutTubs2Fluka.flair")
+    f.write(outputPath / "T003_geant4CutTubs2Fluka.flair")
 
     if vis:
         v = _vi.VtkViewer()

diff --git a/tests/convert/T004_geant4Cons2Fluka.py b/tests/convert/T004_geant4Cons2Fluka.py
@@ -17,7 +17,6 @@
 
 
 def Test(vis=False, interactive=False, fluka=True, type=normal, outputPath=None):
-
     if not outputPath:
         outputPath = _pl.Path(__file__).parent
 
@@ -76,14 +75,14 @@ def Test(vis=False, interactive=False, fluka=True, type=normal, outputPath=None)
     # gdml output
     w = _gd.Writer()
     w.addDetector(reg)
-    w.write(outputPath /  "T004_geant4Cons2Fluka.gdml")
+    w.write(outputPath / "T004_geant4Cons2Fluka.gdml")
 
     # fluka conversion
     if fluka:
         freg = _convert.geant4Reg2FlukaReg(reg)
         w = _fluka.Writer()
         w.addDetector(freg)
-        w.write(outputPath /  "T004_geant4Cons2Fluka.inp")
+        w.write(outputPath / "T004_geant4Cons2Fluka.inp")
 
     # visualisation
     v = None

diff --git a/tests/convert/T005_geant4Para2Fluka.py b/tests/convert/T005_geant4Para2Fluka.py
@@ -8,7 +8,6 @@
 
 
 def Test(vis=False, interactive=False, fluka=True, outputPath=None):
-
     if not outputPath:
         outputPath = _pl.Path(__file__).parent
 
@@ -90,7 +89,7 @@ def Test(vis=False, interactive=False, fluka=True, outputPath=None):
     # gdml output
     w = _gd.Writer()
     w.addDetector(reg)
-    w.write(outputPath /  "T005_geant4Para2Fluka.gdml")
+    w.write(outputPath / "T005_geant4Para2Fluka.gdml")
 
     # fluka conversion
     if fluka:

diff --git a/tests/convert/T006_geant4Trd2Fluka.py b/tests/convert/T006_geant4Trd2Fluka.py
@@ -9,7 +9,6 @@
 
 
 def Test(vis=False, interactive=False, fluka=True, outputPath=None):
-
     if not outputPath:
         outputPath = _pl.Path(__file__).parent
 
@@ -56,11 +55,11 @@ def Test(vis=False, interactive=False, fluka=True, outputPath=None):
         freg = _convert.geant4Reg2FlukaReg(reg)
         w = _fluka.Writer()
         w.addDetector(freg)
-        w.write(outputPath /  "T006_geant4Trd2Fluka.inp")
+        w.write(outputPath / "T006_geant4Trd2Fluka.inp")
 
     # flair output file
     f = _fluka.Flair("T006_geant4Trd2Fluka.inp", extentBB)
-    f.write(outputPath /  "T006_geant4Trd2Fluka.flair")
+    f.write(outputPath / "T006_geant4Trd2Fluka.flair")
 
     if vis:
         v = _vi.VtkViewer()

diff --git a/tests/convert/T007_geant4Trap2Fluka.py b/tests/convert/T007_geant4Trap2Fluka.py
@@ -9,7 +9,6 @@
 
 
 def Test(vis=False, interactive=False, fluka=True, outputPath=None):
-
     if not outputPath:
         outputPath = _pl.Path(__file__).parent
 
@@ -71,7 +70,7 @@ def Test(vis=False, interactive=False, fluka=True, outputPath=None):
 
     # flair output file
     f = _fluka.Flair("T007_geant4Trap2Fluka.inp", extentBB)
-    f.write(outputPath /  "T007_geant4Trap2Fluka.flair")
+    f.write(outputPath / "T007_geant4Trap2Fluka.flair")
 
     if vis:
         v = _vi.VtkViewer()

diff --git a/tests/convert/T008_geant4Sphere2Fluka.py b/tests/convert/T008_geant4Sphere2Fluka.py
@@ -7,8 +7,9 @@
 import pyg4ometry.fluka as _fluka
 
 
-def Test(vis=False, interactive=False, fluka=True, n_slice=10, n_stack=10, outputPath=None):
-
+def Test(
+    vis=False, interactive=False, fluka=True, n_slice=10, n_stack=10, outputPath=None
+):
     if not outputPath:
         outputPath = _pl.Path(__file__).parent
 

diff --git a/tests/convert/T009_geant4Orb2Fluka.py b/tests/convert/T009_geant4Orb2Fluka.py
@@ -7,8 +7,9 @@
 import pyg4ometry.visualisation as _vi
 
 
-def Test(vis=False, interactive=False, fluka=True, n_slice=16, n_stack=16, outputPath=None):
-
+def Test(
+    vis=False, interactive=False, fluka=True, n_slice=16, n_stack=16, outputPath=None
+):
     if not outputPath:
         outputPath = _pl.Path(__file__).parent
 
@@ -44,7 +45,7 @@ def Test(vis=False, interactive=False, fluka=True, n_slice=16, n_stack=16, outpu
     # gdml output
     w = _gd.Writer()
     w.addDetector(reg)
-    w.write(outputPath /  "T009_geant4Orb2Fluka.gdml")
+    w.write(outputPath / "T009_geant4Orb2Fluka.gdml")
 
     # fluka conversion
     if fluka:
@@ -55,7 +56,7 @@ def Test(vis=False, interactive=False, fluka=True, n_slice=16, n_stack=16, outpu
 
     # flair output file
     f = _fluka.Flair("T0019_geant4Orb2Fluka.inp", extentBB)
-    f.write(outputPath /  "T009_geant4Orb2Fluka.flair")
+    f.write(outputPath / "T009_geant4Orb2Fluka.flair")
 
     if vis:
         v = _vi.VtkViewer()

diff --git a/tests/convert/T010_geant4Torus2Fluka.py b/tests/convert/T010_geant4Torus2Fluka.py
@@ -8,8 +8,9 @@
 import numpy as _np
 
 
-def Test(vis=False, interactive=False, fluka=True, n_slice=30, n_stack=30, outputPath=None):
-
+def Test(
+    vis=False, interactive=False, fluka=True, n_slice=30, n_stack=30, outputPath=None
+):
     if not outputPath:
         outputPath = _pl.Path(__file__).parent
 
@@ -62,7 +63,7 @@ def Test(vis=False, interactive=False, fluka=True, n_slice=30, n_stack=30, outpu
     # gdml output
     w = _gd.Writer()
     w.addDetector(reg)
-    w.write(outputPath /  "T010_geant4Torus2Fluka.gdml")
+    w.write(outputPath / "T010_geant4Torus2Fluka.gdml")
 
     # fluka conversion
     if fluka: