Test : remove returns from tests

Author: stewartboogert

test/pyg4/test_T100_Extrusion.py

@@ -7,7 +7,7 @@
 import matplotlib.pyplot as _plt
 import os as _os
 
-def test_T100_Extrusion(vis = False, writeNISTMaterials=True) :
+def make_T100_Extrusion(vis = False, writeNISTMaterials=True) :
     this_dir = _os.path.dirname(_os.path.abspath(__file__))
 
     # g4 registry
@@ -107,7 +107,8 @@ def test_T100_Extrusion(vis = False, writeNISTMaterials=True) :
 
     return [yokeCoordindates, coilCoordinates, beampipeInnerCoordinates, beampipeOuterCoordinates]
 
-
+def test_T100_Extrusion(vis = False, writeNISTMaterials=True) :
+    make_T100_Extrusion(vis, writeNISTMaterials)
 
 
 

test/pyg4/test_T101_Extruder.py

@@ -9,7 +9,7 @@
 import matplotlib.pyplot as _plt
 import os as _os
 
-from test_T100_Extrusion import test_T100_Extrusion  as _test_T100_Extrusion
+from test_T100_Extrusion import make_T100_Extrusion  as _make_T100_Extrusion
 
 def test_T101_Extruder(vis=False, interactive=False, fluka=True, writeNISTMaterials=True) :
     this_dir = _os.path.dirname(_os.path.abspath(__file__))
@@ -23,7 +23,7 @@ def test_T101_Extruder(vis=False, interactive=False, fluka=True, writeNISTMateri
     wz = _gd.Constant("wz", "1001", reg, True)
 
     [yokeCoordinates, coilCoordinates,
-     beampipeInnerCoordinates, beampipeOuterCoordinates] =  _test_T100_Extrusion(vis=False)
+     beampipeInnerCoordinates, beampipeOuterCoordinates] =  _make_T100_Extrusion(vis=False)
 
     # materials
     if writeNISTMaterials:
@@ -111,6 +111,4 @@ def test_T101_Extruder(vis=False, interactive=False, fluka=True, writeNISTMateri
 
         w = _flu.Writer()
         w.addDetector(freg)
-        w.write(this_dir+"/T101_Extruder.inp")
-
-    return es
+        w.write(this_dir+"/T101_Extruder.inp")

test/pyg4/test_T102_ExtruderAngle.py

@@ -8,7 +8,7 @@
 import pyg4ometry.convert as _con
 import matplotlib.pyplot as _plt
 import os as _os
-from test_T100_Extrusion import test_T100_Extrusion  as _test_T100_Extrusion
+from test_T100_Extrusion import make_T100_Extrusion  as _make_T100_Extrusion
 
 def test_T102_ExtruderAngle(vis=False, interactive=False, fluka=True, writeNISTMaterials=True) :
     this_dir = _os.path.dirname(_os.path.abspath(__file__))
@@ -22,7 +22,7 @@ def test_T102_ExtruderAngle(vis=False, interactive=False, fluka=True, writeNISTM
     wz = _gd.Constant("wz", "1001", reg, True)
 
     [yokeCoordinates, coilCoordinates,
-     beampipeInnerCoordinates, beampipeOuterCoordinates] =  _test_T100_Extrusion(vis=False)
+     beampipeInnerCoordinates, beampipeOuterCoordinates] =  _make_T100_Extrusion(vis=False)
 
     # materials
     if writeNISTMaterials:
@@ -109,6 +109,4 @@ def test_T102_ExtruderAngle(vis=False, interactive=False, fluka=True, writeNISTM
 
         w = _flu.Writer()
         w.addDetector(freg)
-        w.write(this_dir+"/T102_ExtruderAngle.inp")
-
-    return es
+        w.write(this_dir+"/T102_ExtruderAngle.inp")