diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 02c25d059..b1528d80b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/psf/black-pre-commit-mirror - rev: "25.9.0" + rev: "26.3.1" hooks: - id: black-jupyter args: ["--line-length", "100"] @@ -34,19 +34,19 @@ repos: additional_dependencies: [black==23.3.0] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.13.3" + rev: "v0.15.12" hooks: - id: ruff args: ["--fix", "--show-fixes"] - repo: https://github.com/mgedmin/check-manifest - rev: "0.50" + rev: "0.51" hooks: - id: check-manifest stages: [manual] - repo: https://github.com/codespell-project/codespell - rev: "v2.4.1" + rev: "v2.4.2" hooks: - id: codespell args: ["-L", "commun,precess"] @@ -76,7 +76,7 @@ repos: types_or: [yaml, markdown, html, css, scss, javascript, json] - repo: https://github.com/kynan/nbstripout - rev: "0.8.1" + rev: "0.9.1" hooks: - id: nbstripout args: @@ -87,7 +87,7 @@ repos: ] - repo: https://github.com/pre-commit/mirrors-clang-format - rev: "v21.1.2" + rev: "v22.1.4" hooks: - id: clang-format types_or: [c++, c, cuda] diff --git a/examples/cbpm.py b/examples/cbpm.py index 5995cc4b8..98372118c 100644 --- a/examples/cbpm.py +++ b/examples/cbpm.py @@ -68,7 +68,11 @@ def Test(vis=False, interactive=False, gdml=True, fluka=False): "wg_sub3", wg_sub2, wg_cut_solid, [[0, 0, _np.pi], [-wg_centre, 0, 0]], reg ) wg_sub4 = _g4.solid.Subtraction( - "wg_sub4", wg_sub3, wg_cut_solid, [[0, 0, 3.0 / 2.0 * _np.pi], [0, -wg_centre, 0]], reg + "wg_sub4", + wg_sub3, + wg_cut_solid, + [[0, 0, 3.0 / 2.0 * _np.pi], [0, -wg_centre, 0]], + reg, ) wg_sub5 = _g4.solid.Subtraction( @@ -86,7 +90,12 @@ def Test(vis=False, interactive=False, gdml=True, fluka=False): wg_logical = _g4.LogicalVolume(wg_sub8, "G4_Cu", "wg_logical", reg) wg_physical = _g4.PhysicalVolume( - [0, 0, 0], [0, 0, -wg_length / 2.0], wg_logical, "wg_physical", world_logical, reg + [0, 0, 0], + [0, 0, -wg_length / 2.0], + wg_logical, + "wg_physical", + world_logical, + reg, ) ################################ @@ -121,7 +130,12 @@ def Test(vis=False, interactive=False, gdml=True, fluka=False): ca_solid = _g4.solid.Tubs("ca_solid", ca_innerr, wg_outerr, ca_length, 0, 2 * _np.pi, reg) ca_logical = _g4.LogicalVolume(ca_solid, "G4_Cu", "ca_logical", reg) ca_physical = _g4.PhysicalVolume( - [0, 0, 0], [0, 0, ca_length / 2.0 + safety], ca_logical, "ca_physical", world_logical, reg + [0, 0, 0], + [0, 0, ca_length / 2.0 + safety], + ca_logical, + "ca_physical", + world_logical, + reg, ) ################################ diff --git a/examples/hep_detector.py b/examples/hep_detector.py index dab9b4931..9e037a0d7 100644 --- a/examples/hep_detector.py +++ b/examples/hep_detector.py @@ -41,7 +41,12 @@ def HepDetector(siBarrel=True, siEndcaps=True, ecalBarrel=True, solenoid=True): for i in range(4): zOffset = 0.5 * siBarrelLength * 1.02 + (i * endcapLayerSeparation) pyg4ometry.geant4.PhysicalVolume( - [0, 0, 0], [0, 0, zOffset], endcapLV, "endcap_" + str(i) + "_left_pv", worldLV, reg + [0, 0, 0], + [0, 0, zOffset], + endcapLV, + "endcap_" + str(i) + "_left_pv", + worldLV, + reg, ) pyg4ometry.geant4.PhysicalVolume( [0, 0, 0], @@ -113,7 +118,12 @@ def SiBarrelTracker(reg=None): name="barrelAv1", moduleAv=siTrackerModuleAv, radius=0.15, nAzimuth=15, reg=reg ) siTrackerLayer1Pv = pyg4ometry.geant4.PhysicalVolume( - [_np.pi / 2.0, 0, 0], [0, 0, 0], siTrackerLayer1Av, "siTrackerLayer1Pv", siTrackerLv, reg + [_np.pi / 2.0, 0, 0], + [0, 0, 0], + siTrackerLayer1Av, + "siTrackerLayer1Pv", + siTrackerLv, + reg, ) siTrackerLayer2Av = SiTrackerBarrelLayer( @@ -124,7 +134,12 @@ def SiBarrelTracker(reg=None): reg=reg, ) siTrackerLayer2Pv = pyg4ometry.geant4.PhysicalVolume( - [_np.pi / 2.0, 0, 0], [0, 0, 0], siTrackerLayer2Av, "siTrackerLayer2Pv", siTrackerLv, reg + [_np.pi / 2.0, 0, 0], + [0, 0, 0], + siTrackerLayer2Av, + "siTrackerLayer2Pv", + siTrackerLv, + reg, ) siTrackerLayer3Av = SiTrackerBarrelLayer( @@ -135,7 +150,12 @@ def SiBarrelTracker(reg=None): reg=reg, ) siTrackerLayer3Pv = pyg4ometry.geant4.PhysicalVolume( - [_np.pi / 2.0, 0, 0], [0, 0, 0], siTrackerLayer3Av, "siTrackerLayer3Pv", siTrackerLv, reg + [_np.pi / 2.0, 0, 0], + [0, 0, 0], + siTrackerLayer3Av, + "siTrackerLayer3Pv", + siTrackerLv, + reg, ) return siTrackerLv @@ -180,7 +200,12 @@ def SiTrackerBarrelLayer( def SiTrackerBarrelModule( - sensorSize=0.08, sensorGap=3e-3, pcbLength=0.015, pcbGap=0.005, tiltAngleDeg=5, reg=None + sensorSize=0.08, + sensorGap=3e-3, + pcbLength=0.015, + pcbGap=0.005, + tiltAngleDeg=5, + reg=None, ): reg = pyg4ometry.geant4.Registry() if reg is None else reg @@ -272,7 +297,15 @@ def SiTrackerEndcapLayer( dAzimuth = 2 * _np.pi / nAzimuth siTrackerECTubs = pyg4ometry.geant4.solid.Tubs( - name + "_siTrackerECTubs", innerRadius, outerRadius, 0.025, 0, 2 * _np.pi, reg, "m", "rad" + name + "_siTrackerECTubs", + innerRadius, + outerRadius, + 0.025, + 0, + 2 * _np.pi, + reg, + "m", + "rad", ) siTrackerECLv = pyg4ometry.geant4.LogicalVolume( siTrackerECTubs, "G4_Galactic", "siTrackerECLv", reg @@ -310,10 +343,20 @@ def SiTrackerEndcapModule( ) sensorPv1 = pyg4ometry.geant4.PhysicalVolume( - [0, 0, 0], [0, sensorGap / 2, 0, "m"], sensorLv, "sensorEndcapPv1", moduleAv, reg + [0, 0, 0], + [0, sensorGap / 2, 0, "m"], + sensorLv, + "sensorEndcapPv1", + moduleAv, + reg, ) sensorPv2 = pyg4ometry.geant4.PhysicalVolume( - [0, 0, 0], [0, -sensorGap / 2, 0, "m"], sensorLv, "sensorEndcapPv2", moduleAv, reg + [0, 0, 0], + [0, -sensorGap / 2, 0, "m"], + sensorLv, + "sensorEndcapPv2", + moduleAv, + reg, ) return moduleAv @@ -346,7 +389,13 @@ def Solenoid(innerRadius, thickness, length, constants, reg=None): """ reg = pyg4ometry.geant4.Registry() if reg is None else reg solenoidSolid = pyg4ometry.geant4.solid.Tubs( - "solenoid_solid", innerRadius, innerRadius + thickness, length, 0, constants["twopi"], reg + "solenoid_solid", + innerRadius, + innerRadius + thickness, + length, + 0, + constants["twopi"], + reg, ) aluminium = pyg4ometry.geant4.MaterialPredefined("G4_Al") solenoidLV = pyg4ometry.geant4.LogicalVolume(solenoidSolid, aluminium, "solenoid_lv", reg) @@ -358,7 +407,13 @@ def Solenoid(innerRadius, thickness, length, constants, reg=None): nCoils = int(length.eval() / (2 * coilLengthZ.eval())) nCoilsEven = nCoils if (nCoils % 2 == 0) else nCoils - 1 coilSolid = pyg4ometry.geant4.solid.Tubs( - "coil_solid", coilInnerRadius, coilOuterRadius, coilLengthZ, 0, constants["twopi"], reg + "coil_solid", + coilInnerRadius, + coilOuterRadius, + coilLengthZ, + 0, + constants["twopi"], + reg, ) nbti = pyg4ometry.geant4.MaterialCompound("nbti", 5.7, 2, reg) nbti.set_state("solid") @@ -377,11 +432,21 @@ def Solenoid(innerRadius, thickness, length, constants, reg=None): zOffset = i * 2 * coilLengthZ iCoil += 1 pyg4ometry.geant4.PhysicalVolume( - [0, 0, 0], [0, 0, zOffset], coilLV, "coil_" + str(iCoil) + "_pv", solenoidLV, reg + [0, 0, 0], + [0, 0, zOffset], + coilLV, + "coil_" + str(iCoil) + "_pv", + solenoidLV, + reg, ) iCoil += 1 pyg4ometry.geant4.PhysicalVolume( - [0, 0, 0], [0, 0, -zOffset], coilLV, "coil_" + str(iCoil) + "_pv", solenoidLV, reg + [0, 0, 0], + [0, 0, -zOffset], + coilLV, + "coil_" + str(iCoil) + "_pv", + solenoidLV, + reg, ) return solenoidLV @@ -390,7 +455,13 @@ def Solenoid(innerRadius, thickness, length, constants, reg=None): def ECALBarrel(innerRadius, outerRadius, length, nModulesPhi, nModulesZ, constants, reg): # container LV ecalBarrelSolid = pyg4ometry.geant4.solid.Tubs( - "ecal_barrel_solid", innerRadius, outerRadius, length, 0, constants["twopi"], reg + "ecal_barrel_solid", + innerRadius, + outerRadius, + length, + 0, + constants["twopi"], + reg, ) air = pyg4ometry.geant4.MaterialPredefined("G4_AIR") ecalBarrelLV = pyg4ometry.geant4.LogicalVolume(ecalBarrelSolid, air, "ecal_barrel_lv", reg) @@ -439,13 +510,24 @@ def ECALBarrel(innerRadius, outerRadius, length, nModulesPhi, nModulesZ, constan for i in range(nModulesZ): iModuleName = "ecal_mod_" + str(i) iModule = pyg4ometry.geant4.solid.Tubs( - iModuleName + "_solid", innerR2, outerR2, 0.95 * dz, startAngle, sweepAngle, reg + iModuleName + "_solid", + innerR2, + outerR2, + 0.95 * dz, + startAngle, + sweepAngle, + reg, ) iModuleLV = pyg4ometry.geant4.LogicalVolume( iModule, leadTungstate, iModuleName + "_lv", reg ) pyg4ometry.geant4.PhysicalVolume( - [0, 0, 0], [0, 0, iz + 0.5 * dz], iModuleLV, iModuleName + "_pv", segmentLV, reg + [0, 0, 0], + [0, 0, iz + 0.5 * dz], + iModuleLV, + iModuleName + "_pv", + segmentLV, + reg, ) iz += dz @@ -453,7 +535,12 @@ def ECALBarrel(innerRadius, outerRadius, length, nModulesPhi, nModulesZ, constan for i in range(nModulesPhi): angle = i * segmentAngle pyg4ometry.geant4.PhysicalVolume( - [0, 0, angle], [0, 0, 0], segmentLV, "ecal_segment_" + str(i) + "_pv", ecalBarrelLV, reg + [0, 0, angle], + [0, 0, 0], + segmentLV, + "ecal_segment_" + str(i) + "_pv", + ecalBarrelLV, + reg, ) return ecalBarrelLV diff --git a/examples/lhc_blm.py b/examples/lhc_blm.py index aba2fcdd2..031c0382a 100644 --- a/examples/lhc_blm.py +++ b/examples/lhc_blm.py @@ -157,7 +157,11 @@ def electrode_profile(): ) electrode_arc_points = circle_points( - ele_rad, 0, 0, right_tap_angle, ele_cut_da - cut_angle_halfspan - tap_angle_halfspan + ele_rad, + 0, + 0, + right_tap_angle, + ele_cut_da - cut_angle_halfspan - tap_angle_halfspan, ) # Rotate the ready segment to position @@ -312,7 +316,16 @@ def make_lhc_blm(vis=False, interactive=False, n_slice=16): gas_r = _gd.Constant("gas_r", blm_rad + safety, reg) gas_solid = _g4.solid.Tubs( - "gas_volume", zero, gas_r, gas_len, zero, twopi, reg, "mm", "rad", nslice=n_slice + "gas_volume", + zero, + gas_r, + gas_len, + zero, + twopi, + reg, + "mm", + "rad", + nslice=n_slice, ) gas_material = blm_gas_material @@ -350,7 +363,16 @@ def make_lhc_blm(vis=False, interactive=False, n_slice=16): tank_rout = _gd.Constant("tank_r_out", tank_r_out - safety, reg) tank_solid = _g4.solid.Tubs( - "tank", tank_rin, tank_rout, tank_z, zero, twopi, reg, "mm", "rad", nslice=n_slice + "tank", + tank_rin, + tank_rout, + tank_z, + zero, + twopi, + reg, + "mm", + "rad", + nslice=n_slice, ) tank_material = _g4.Material(name="G4_STAINLESS-STEEL") @@ -364,7 +386,16 @@ def make_lhc_blm(vis=False, interactive=False, n_slice=16): endcap_s_r = _gd.Constant("encap_s_radius", endcap_s_rad - safety, reg) endcap_s_solid = _g4.solid.Tubs( - "endcap_s", zero, endcap_s_r, endcap_s_z, zero, twopi, reg, "mm", "rad", nslice=n_slice + "endcap_s", + zero, + endcap_s_r, + endcap_s_z, + zero, + twopi, + reg, + "mm", + "rad", + nslice=n_slice, ) endcap_s_material = _g4.Material(name="G4_STAINLESS-STEEL") @@ -382,7 +413,16 @@ def make_lhc_blm(vis=False, interactive=False, n_slice=16): endcap_e_r = _gd.Constant("encap_e_radius", endcap_e_rad - safety, reg) endcap_e_solid = _g4.solid.Tubs( - "endcap_e", zero, endcap_e_r, endcap_e_z, zero, twopi, reg, "mm", "rad", nslice=n_slice + "endcap_e", + zero, + endcap_e_r, + endcap_e_z, + zero, + twopi, + reg, + "mm", + "rad", + nslice=n_slice, ) endcap_e_material = _g4.Material(name="G4_STAINLESS-STEEL") @@ -402,7 +442,16 @@ def make_lhc_blm(vis=False, interactive=False, n_slice=16): insulator_hole_r = _gd.Constant("insulator_hole_r", ins_hole_rad - safety, reg) insulator_base = _g4.solid.Tubs( - "insulator_base", zero, insulator_r, ins_l, zero, twopi, reg, "mm", "rad", nslice=n_slice + "insulator_base", + zero, + insulator_r, + ins_l, + zero, + twopi, + reg, + "mm", + "rad", + nslice=n_slice, ) insulator_cut = _g4.solid.Tubs( @@ -443,7 +492,12 @@ def make_lhc_blm(vis=False, interactive=False, n_slice=16): ) insulator_solid = _g4.solid.Subtraction( - "insulator_solid", interim_solid, insulator_hole, [[0, 0, 0], [0, 0, -0.5]], reg, "mm" + "insulator_solid", + interim_solid, + insulator_hole, + [[0, 0, 0], [0, 0, -0.5]], + reg, + "mm", ) insulator_lv = _g4.LogicalVolume(insulator_solid, insulator_material, "insulator_lv", reg) @@ -534,7 +588,10 @@ def make_lhc_blm(vis=False, interactive=False, n_slice=16): "spacer_a_interim", sp_a_base, sp_a_notch, sp_a_notch1_tra, reg, "mm" ) - sp_a_notch2_tra = [[0, 0, _np.pi / 2], [0, 0, -spacer_a_l / 2.0 + spacer_a_notch_l / 2.0]] + sp_a_notch2_tra = [ + [0, 0, _np.pi / 2], + [0, 0, -spacer_a_l / 2.0 + spacer_a_notch_l / 2.0], + ] spacer_a_solid = _g4.solid.Subtraction( "spacer_a_solid", sp_a_int, sp_a_notch, sp_a_notch2_tra, reg, "mm" ) diff --git a/examples/support.py b/examples/support.py index 16c026e07..8d3c0cce4 100644 --- a/examples/support.py +++ b/examples/support.py @@ -5,14 +5,18 @@ import pyg4ometry.visualisation as _vis import numpy as _np - lengthSafety = 1e-8 def SupportMagnet( name="supportMagnet", shape="polygonal", - parameters={"nface": 3, "thickness": 10, "angles": [-45, 0, 45], "distances": [300, 300, 300]}, + parameters={ + "nface": 3, + "thickness": 10, + "angles": [-45, 0, 45], + "distances": [300, 300, 300], + }, ): pass @@ -197,7 +201,6 @@ def SupportTable( ) for iSupport in range(0, nSupport, 1): - z = iSupport * (supportZ - sectionSize) / (nSupport - 1) - (supportZ - sectionSize) / 2.0 supportXSectionPhysical1 = _g4.PhysicalVolume( [0, _np.pi / 2.0, 0], diff --git a/examples/vacuum_systems.py b/examples/vacuum_systems.py index 86bd94abb..6f39dc8e0 100644 --- a/examples/vacuum_systems.py +++ b/examples/vacuum_systems.py @@ -130,7 +130,15 @@ def CF_BlankFlange(name="flange1", cf_dn="DN16", reg=None, vis=False, write=True ) cfSolid = _g4.solid.Tubs( - name + "_cf", 0, data["innerDiameter1"] / 2.0, data["height1"], 0, "2*pi", reg, "mm", "rad" + name + "_cf", + 0, + data["innerDiameter1"] / 2.0, + data["height1"], + 0, + "2*pi", + reg, + "mm", + "rad", ) flangeSolid = _g4.solid.Subtraction( name + "_sub_" + str(data["holeNumber"]), @@ -176,7 +184,15 @@ def CF_BeamPipe( reg = _g4.Registry() bpSolid = _g4.solid.Tubs( - name + "_bp", bpId / 2, bpId / 2 + bpThickness, bpLength, 0, "2*pi", reg, "mm", "rad" + name + "_bp", + bpId / 2, + bpId / 2 + bpThickness, + bpLength, + 0, + "2*pi", + reg, + "mm", + "rad", ) bpSolidInner = _g4.solid.Tubs( name + "_bpInner", 0, bpId / 2, bpLength, 0, "2*pi", reg, "mm", "rad" @@ -191,7 +207,11 @@ def CF_BeamPipe( # cut through flange flange1Solid = _g4.solid.Subtraction( - flange1Solid.name + "_cut", flange1Solid, bpSolidInner, [[0, 0, 0], [0, 0, 0]], reg + flange1Solid.name + "_cut", + flange1Solid, + bpSolidInner, + [[0, 0, 0], [0, 0, 0]], + reg, ) # union with beam pipe @@ -212,7 +232,11 @@ def CF_BeamPipe( # cut through flange flange2Solid = _g4.solid.Subtraction( - flange2Solid.name + "_cut", flange2Solid, bpSolidInner, [[0, 0, 0], [0, 0, 0]], reg + flange2Solid.name + "_cut", + flange2Solid, + bpSolidInner, + [[0, 0, 0], [0, 0, 0]], + reg, ) # union with beam pipe @@ -307,7 +331,11 @@ def CF_CuboidalChamber( reg, ) chamberBodySolid = _g4.solid.Subtraction( - name + "_chamberBody", chamberBodyOuter, chamberBodyInner, [[0, 0, 0], [0, 0, 0]], reg + name + "_chamberBody", + chamberBodyOuter, + chamberBodyInner, + [[0, 0, 0], [0, 0, 0]], + reg, ) chamberFlangeOuter = _g4.solid.Box( @@ -321,21 +349,31 @@ def CF_CuboidalChamber( reg, ) chamberFlangeSolid = _g4.solid.Subtraction( - name + "_flangeBody", chamberFlangeOuter, chamberFlangeInner, [[0, 0, 0], [0, 0, 0]], reg + name + "_flangeBody", + chamberFlangeOuter, + chamberFlangeInner, + [[0, 0, 0], [0, 0, 0]], + reg, ) chamberSolid1 = _g4.solid.Union( name + "_chamberSolid1", chamberBodySolid, chamberFlangeSolid, - [[0, 0, 0], [0, height / 2 - 2 * thickness + thickness / 2.0 - lengthSafety, 0]], + [ + [0, 0, 0], + [0, height / 2 - 2 * thickness + thickness / 2.0 - lengthSafety, 0], + ], reg, ) chamberSolid2 = _g4.solid.Union( name + "_chamberSolid2", chamberSolid1, chamberFlangeSolid, - [[0, 0, 0], [0, -(height / 2 - 2 * thickness + thickness / 2.0 - lengthSafety), 0]], + [ + [0, 0, 0], + [0, -(height / 2 - 2 * thickness + thickness / 2.0 - lengthSafety), 0], + ], reg, ) @@ -376,7 +414,10 @@ def CF_CuboidalChamber( name + "_chamberSolid4_" + k, chamberSolid2, bpSolid, - [[0, rotn, 0], [lengthPort / 2 * _np.sin(rotn), 0, lengthPort / 2 * _np.cos(rotn)]], + [ + [0, rotn, 0], + [lengthPort / 2 * _np.sin(rotn), 0, lengthPort / 2 * _np.cos(rotn)], + ], reg, ) chamberSolid2 = _g4.solid.Subtraction( @@ -499,7 +540,11 @@ def CF_SphericalChamber( ) bpSolid = _g4.solid.Subtraction( - bpSolid.name + "_sub1", bpSolid, chamberCutSolid, [[0, 0, 0], [0, 0, -outerRadius]], reg + bpSolid.name + "_sub1", + bpSolid, + chamberCutSolid, + [[0, 0, 0], [0, 0, -outerRadius]], + reg, ) pos = list(_tr.tbxyz2matrix(rotn).dot(_np.array([0, 0, outerRadius]))) diff --git a/src/pyg4ometry/analysis/Plot.py b/src/pyg4ometry/analysis/Plot.py index 0daaed2f5..6521f600b 100644 --- a/src/pyg4ometry/analysis/Plot.py +++ b/src/pyg4ometry/analysis/Plot.py @@ -15,7 +15,12 @@ def plotEventSection(geometryFile, flukaFile=None, bdsimFile=None): def plotScoringMeshSection( - geometryFile, planeAxis=1, flukaFile=None, flukaBin=None, bdsimFile=None, bdsimHisto=None + geometryFile, + planeAxis=1, + flukaFile=None, + flukaBin=None, + bdsimFile=None, + bdsimHisto=None, ): v = _VtkViewerNew() r = _GdmlReader(geometryFile) diff --git a/src/pyg4ometry/analysis/flukaData.py b/src/pyg4ometry/analysis/flukaData.py index 6aee21ba2..bea2a8a0c 100644 --- a/src/pyg4ometry/analysis/flukaData.py +++ b/src/pyg4ometry/analysis/flukaData.py @@ -60,14 +60,14 @@ def read_header(self, fd): data_size = len(data) if data_size == 116: - (self.title, self.time, self.weight) = _struct.unpack("=80s32sf", data) + self.title, self.time, self.weight = _struct.unpack("=80s32sf", data) self.ncase = 1 self.nbatch = 1 elif data_size == 120: - (self.title, self.time, self.weight, self.ncase) = _struct.unpack("=80s32sfi", data) + self.title, self.time, self.weight, self.ncase = _struct.unpack("=80s32sfi", data) self.nbatch = 1 elif data_size == 124: - (self.title, self.time, self.weight, self.ncase, self.nbatch) = _struct.unpack( + self.title, self.time, self.weight, self.ncase, self.nbatch = _struct.unpack( "=80s32sfii", data ) elif data_size == 128: @@ -176,7 +176,9 @@ def read_stats(self, fd): for det in self.detector: data = fortran_read(fd) det.errors = _np.reshape( - _np.frombuffer(data, _np.float32), (det.e1n, det.e2n, det.e3n), order="F" + _np.frombuffer(data, _np.float32), + (det.e1n, det.e2n, det.e3n), + order="F", ) def read_header(self, fd): diff --git a/src/pyg4ometry/bdsim/gmad.py b/src/pyg4ometry/bdsim/gmad.py index efbcab445..63f8a76ba 100644 --- a/src/pyg4ometry/bdsim/gmad.py +++ b/src/pyg4ometry/bdsim/gmad.py @@ -1,6 +1,12 @@ class Gmad: def __init__( - self, beamline=None, beam=None, options=None, samplers=None, scorers=[], scorer_meshes=[] + self, + beamline=None, + beam=None, + options=None, + samplers=None, + scorers=[], + scorer_meshes=[], ): self.beamline = beamline self.beam = beam diff --git a/src/pyg4ometry/cli.py b/src/pyg4ometry/cli.py index 82795ee90..c13769af6 100644 --- a/src/pyg4ometry/cli.py +++ b/src/pyg4ometry/cli.py @@ -268,7 +268,16 @@ def cli( errMsg = "pyg4> clip must be supplied with exactly 3 numbers" raise ValueError(errMsg) clipBoxes = _pyg4.misc.NestedBoxes( - "clipper", clip[0], clip[1], clip[2], reg, "mm", 1e-3, 1e-3, 1e-3, wl.depth() + "clipper", + clip[0], + clip[1], + clip[2], + reg, + "mm", + 1e-3, + 1e-3, + 1e-3, + wl.depth(), ) wl.clipGeometry(clipBoxes, r, t) @@ -495,11 +504,15 @@ def main(testArgs=None, testing=False): metavar="LVNAME", ) parser.add_option( - "-z", "--citation", help="print citation text", dest="citation", action="store_true" + "-z", + "--citation", + help="print citation text", + dest="citation", + action="store_true", ) # features - (options, _args) = parser.parse_args(args=testArgs) + options, _args = parser.parse_args(args=testArgs) verbose = options.__dict__["verbose"] if verbose: diff --git a/src/pyg4ometry/config.py b/src/pyg4ometry/config.py index 2fb12ad01..0faec6ddf 100644 --- a/src/pyg4ometry/config.py +++ b/src/pyg4ometry/config.py @@ -6,6 +6,7 @@ We check that sweep angles aren't greater than 2 pi. This is the tolerance for rounding errors. The default is around float precision. """ + twoPiComparisonTolerance = 1e-7 diff --git a/src/pyg4ometry/convert/geant42Fluka.py b/src/pyg4ometry/convert/geant42Fluka.py index 75434cb11..86f6e1f97 100644 --- a/src/pyg4ometry/convert/geant42Fluka.py +++ b/src/pyg4ometry/convert/geant42Fluka.py @@ -131,7 +131,12 @@ def geant4Logical2Fluka(logicalVolume, flukaRegistry=None, bakeTransforms=False) new_tra = mtra @ pvtra + tra flukaDaughterOuterRegion, flukaNameCount = geant4PhysicalVolume2Fluka( - dv, new_mtra, new_tra, flukaRegistry, flukaNameCount, bakeTransforms=bakeTransforms + dv, + new_mtra, + new_tra, + flukaRegistry, + flukaNameCount, + bakeTransforms=bakeTransforms, ) # subtract daughters from black body @@ -709,7 +714,6 @@ def geant4Solid2FlukaRegion( fregion.addZone(zone1) elif solid.type == "MultiUnion": - fregion = _fluka.Region("R" + name) r1, flukaNameCount = geant4Solid2FlukaRegion( @@ -726,7 +730,6 @@ def geant4Solid2FlukaRegion( fregion.addZone(zone) for solid, trans in zip(solid.objects[1:], solid.transformations): - bsrot = trans[0].eval() bspos = trans[1].eval() @@ -3334,8 +3337,8 @@ def geant4Hype2Fluka( # x^2 + y^2 - b^2z^2 + c = 0; r^2 = x^2+y^2. cOuter = -(outerRadius**2) cInner = -(innerRadius**2) - czzOuter = -_np.tan(outerStereo) ** 2 - czzInner = -_np.tan(innerStereo) ** 2 + czzOuter = -(_np.tan(outerStereo) ** 2) + czzInner = -(_np.tan(innerStereo) ** 2) cxx = 1 cyy = 1 @@ -3558,7 +3561,10 @@ def geant4GenericTrap2Fluka( if bakeTransform: transform = _rotoTranslationFromTra2( - "IDENT", [[0.0, 0, 0], [0, 0, 0]], flukaregistry=flukaRegistry, allowZero=True + "IDENT", + [[0.0, 0, 0], [0, 0, 0]], + flukaregistry=flukaRegistry, + allowZero=True, ) verts_tuple = tuple(tuple(vert) for vert in verts) diff --git a/src/pyg4ometry/convert/oce2Geant4.py b/src/pyg4ometry/convert/oce2Geant4.py index 0de398c7b..843ec1f0f 100644 --- a/src/pyg4ometry/convert/oce2Geant4.py +++ b/src/pyg4ometry/convert/oce2Geant4.py @@ -375,7 +375,12 @@ def _oce2Geant4_traverse( def oce2Geant4( - shapeTool, shapeName, materialMap={}, labelToSkipList=[], meshQualityMap={}, oceName=False + shapeTool, + shapeName, + materialMap={}, + labelToSkipList=[], + meshQualityMap={}, + oceName=False, ): """ Convert CAD geometry starting from shapeName diff --git a/src/pyg4ometry/fluka/RegionExpression/RegionParser.py b/src/pyg4ometry/fluka/RegionExpression/RegionParser.py index e4faed7c3..7b46c6fc9 100644 --- a/src/pyg4ometry/fluka/RegionExpression/RegionParser.py +++ b/src/pyg4ometry/fluka/RegionExpression/RegionParser.py @@ -1,4 +1,6 @@ # Generated from RegionParser.g4 by ANTLR 4.13.1 +from __future__ import annotations + from antlr4 import * from io import StringIO import sys @@ -814,7 +816,15 @@ class RegionParser(Parser): RULE_subZone = 5 RULE_unaryExpression = 6 - ruleNames = ["regions", "region", "zoneUnion", "zone", "expr", "subZone", "unaryExpression"] + ruleNames = [ + "regions", + "region", + "zoneUnion", + "zone", + "expr", + "subZone", + "unaryExpression", + ] EOF = Token.EOF Whitespace = 1 @@ -845,7 +855,7 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int super().__init__(parent, invokingState) self.parser = parser - def region(self, i: Optional[int] = None): + def region(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(RegionParser.RegionContext) else: @@ -994,13 +1004,13 @@ def __init__( super().__init__(parser) self.copyFrom(ctx) - def zone(self, i: Optional[int] = None): + def zone(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(RegionParser.ZoneContext) else: return self.getTypedRuleContext(RegionParser.ZoneContext, i) - def Bar(self, i: Optional[int] = None): + def Bar(self, i: int | None = None): if i is None: return self.getTokens(RegionParser.Bar) else: @@ -1019,13 +1029,13 @@ def __init__( super().__init__(parser) self.copyFrom(ctx) - def Bar(self, i: Optional[int] = None): + def Bar(self, i: int | None = None): if i is None: return self.getTokens(RegionParser.Bar) else: return self.getToken(RegionParser.Bar, i) - def zone(self, i: Optional[int] = None): + def zone(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(RegionParser.ZoneContext) else: diff --git a/src/pyg4ometry/fluka/card.py b/src/pyg4ometry/fluka/card.py index 7d42b9fe6..0ffe30721 100644 --- a/src/pyg4ometry/fluka/card.py +++ b/src/pyg4ometry/fluka/card.py @@ -77,7 +77,9 @@ def fromFixed(cls, line): # column positions are multiples of 10 up to 80 inclusive. positions = [10 * x for x in range(9)] # Split the line into a list of strings according to the positions - columns = [line[start:stop] for start, stop in zip(positions, positions[1:])] + columns = [ + line[start:stop] for start, stop in zip(positions, positions[1:]) # noqa: RUF007 + ] # remove trailing/leading whitepace columns = [column.strip() for column in columns] # Empty strings -> None diff --git a/src/pyg4ometry/fluka/extruder.py b/src/pyg4ometry/fluka/extruder.py index fb88dd3c2..196610eb4 100644 --- a/src/pyg4ometry/fluka/extruder.py +++ b/src/pyg4ometry/fluka/extruder.py @@ -16,7 +16,13 @@ class Extruder(solid.SolidBase): def __init__( - self, name="", length=1000, angle=0.0, regions=None, materials=None, registry=None + self, + name="", + length=1000, + angle=0.0, + regions=None, + materials=None, + registry=None, ): super().__init__(name, "extruder", registry) diff --git a/src/pyg4ometry/fluka/fluka_registry.py b/src/pyg4ometry/fluka/fluka_registry.py index a2ab90d02..e1ee83ddb 100644 --- a/src/pyg4ometry/fluka/fluka_registry.py +++ b/src/pyg4ometry/fluka/fluka_registry.py @@ -360,7 +360,12 @@ def addStart( def addPhotonuc(self, what1, mat_low, mat_high, mat_step, sdum=""): c = _card.Card( - "PHOTONUC", what1=what1, what4=mat_low, what5=mat_high, what6=mat_step, sdum=sdum + "PHOTONUC", + what1=what1, + what4=mat_low, + what5=mat_high, + what6=mat_step, + sdum=sdum, ) self.addCard(c) @@ -524,7 +529,9 @@ def bodySetRename(body_set, old_name, new_name): # update regions if body name has changed for regionKey in flukaRegistry.regionDict: bodySetRename( - flukaRegistry.regionDict[regionKey].bodies(), old_body_name, new_body_name + flukaRegistry.regionDict[regionKey].bodies(), + old_body_name, + new_body_name, ) # update merged counter diff --git a/src/pyg4ometry/fluka/reader.py b/src/pyg4ometry/fluka/reader.py index 8a4f29e3a..f788bb0fb 100644 --- a/src/pyg4ometry/fluka/reader.py +++ b/src/pyg4ometry/fluka/reader.py @@ -26,7 +26,6 @@ from ..exceptions import FLUKAError, FLUKAInputError from .material import Material, Compound - _BODY_NAMES = { "RPP", "BOX", diff --git a/src/pyg4ometry/gdml/GdmlExpression/GdmlExpressionParser.py b/src/pyg4ometry/gdml/GdmlExpression/GdmlExpressionParser.py index bcf8b6d73..bbee217db 100644 --- a/src/pyg4ometry/gdml/GdmlExpression/GdmlExpressionParser.py +++ b/src/pyg4ometry/gdml/GdmlExpression/GdmlExpressionParser.py @@ -1,4 +1,6 @@ # Generated from GdmlExpression.g4 by ANTLR 4.13.1 +from __future__ import annotations + from antlr4 import * from io import StringIO import sys @@ -1158,7 +1160,7 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int super().__init__(parent, invokingState) self.parser = parser - def expression(self, i: Optional[int] = None): + def expression(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(GdmlExpressionParser.ExpressionContext) else: @@ -1202,7 +1204,7 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int super().__init__(parent, invokingState) self.parser = parser - def multiplyingExpression(self, i: Optional[int] = None): + def multiplyingExpression(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(GdmlExpressionParser.MultiplyingExpressionContext) else: @@ -1210,7 +1212,7 @@ def multiplyingExpression(self, i: Optional[int] = None): GdmlExpressionParser.MultiplyingExpressionContext, i ) - def operatorAddSub(self, i: Optional[int] = None): + def operatorAddSub(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(GdmlExpressionParser.OperatorAddSubContext) else: @@ -1260,13 +1262,13 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int super().__init__(parent, invokingState) self.parser = parser - def powExpression(self, i: Optional[int] = None): + def powExpression(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(GdmlExpressionParser.PowExpressionContext) else: return self.getTypedRuleContext(GdmlExpressionParser.PowExpressionContext, i) - def operatorMulDiv(self, i: Optional[int] = None): + def operatorMulDiv(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(GdmlExpressionParser.OperatorMulDivContext) else: @@ -1402,13 +1404,13 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int super().__init__(parent, invokingState) self.parser = parser - def signedAtom(self, i: Optional[int] = None): + def signedAtom(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(GdmlExpressionParser.SignedAtomContext) else: return self.getTypedRuleContext(GdmlExpressionParser.SignedAtomContext, i) - def POW(self, i: Optional[int] = None): + def POW(self, i: int | None = None): if i is None: return self.getTokens(GdmlExpressionParser.POW) else: @@ -1648,7 +1650,7 @@ def variable(self): def LBRACKET(self): return self.getToken(GdmlExpressionParser.LBRACKET, 0) - def expression(self, i: Optional[int] = None): + def expression(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(GdmlExpressionParser.ExpressionContext) else: @@ -1657,7 +1659,7 @@ def expression(self, i: Optional[int] = None): def RBRACKET(self): return self.getToken(GdmlExpressionParser.RBRACKET, 0) - def COMMA(self, i: Optional[int] = None): + def COMMA(self, i: int | None = None): if i is None: return self.getTokens(GdmlExpressionParser.COMMA) else: @@ -1799,7 +1801,7 @@ def funcname(self): def LPAREN(self): return self.getToken(GdmlExpressionParser.LPAREN, 0) - def expression(self, i: Optional[int] = None): + def expression(self, i: int | None = None): if i is None: return self.getTypedRuleContexts(GdmlExpressionParser.ExpressionContext) else: @@ -1808,7 +1810,7 @@ def expression(self, i: Optional[int] = None): def RPAREN(self): return self.getToken(GdmlExpressionParser.RPAREN, 0) - def COMMA(self, i: Optional[int] = None): + def COMMA(self, i: int | None = None): if i is None: return self.getTokens(GdmlExpressionParser.COMMA) else: diff --git a/src/pyg4ometry/gdml/Reader.py b/src/pyg4ometry/gdml/Reader.py index d1cfc4a77..07abf60fc 100644 --- a/src/pyg4ometry/gdml/Reader.py +++ b/src/pyg4ometry/gdml/Reader.py @@ -209,19 +209,19 @@ def getMatrix(def_attrs): value = df.childNodes[0].nodeValue _defines.Expression(name, value, self._registry, True) elif define_type == "position": - (x, y, z, u) = getXYZ(def_attrs) + x, y, z, u = getXYZ(def_attrs) unit = u if u else "mm" _defines.Position(name, x, y, z, unit, self._registry, True) elif define_type == "rotation": - (x, y, z, u) = getXYZ(def_attrs) + x, y, z, u = getXYZ(def_attrs) unit = u if u else "rad" _defines.Rotation(name, x, y, z, unit, self._registry, True) elif define_type == "scale": - (x, y, z, u) = getXYZ(def_attrs) + x, y, z, u = getXYZ(def_attrs) unit = u if u else "none" _defines.Scale(name, x, y, z, unit, self._registry, True) elif define_type == "matrix": - (coldim, values) = getMatrix(def_attrs) + coldim, values = getMatrix(def_attrs) _defines.Matrix(name, coldim, values, self._registry, True) else: _log.warning("unrecognised define: %s", define_type) @@ -633,7 +633,9 @@ def parseSolids(self, xmldoc): # self.parseSolidLoop(node) else: _log.warning( - "unrecognized solid %s (name=%s)", solid_type, node.attributes["name"].value + "unrecognized solid %s (name=%s)", + solid_type, + node.attributes["name"].value, ) def parseBox(self, node): diff --git a/src/pyg4ometry/geant4/LogicalVolume.py b/src/pyg4ometry/geant4/LogicalVolume.py index 7c2bd3679..23d5df97f 100644 --- a/src/pyg4ometry/geant4/LogicalVolume.py +++ b/src/pyg4ometry/geant4/LogicalVolume.py @@ -810,9 +810,11 @@ def checkOverlaps( # coplanar with solid if coplanar: for i in range(len(transformedMeshes)): - _log.debug( - f"LogicalVolume.checkOverlaps> full daughter-mother coplanar test {transformedMeshesNames[i]}" - ), + ( + _log.debug( + f"LogicalVolume.checkOverlaps> full daughter-mother coplanar test {transformedMeshesNames[i]}" + ), + ) # cullCoplanar = self.mesh.localboundingmesh.coplanarIntersection(transformedBoundingMeshes[i]) # if cullCoplanar.vertexCount() == 0 : diff --git a/src/pyg4ometry/geant4/_Material.py b/src/pyg4ometry/geant4/_Material.py index c02ebb245..6938f25dd 100644 --- a/src/pyg4ometry/geant4/_Material.py +++ b/src/pyg4ometry/geant4/_Material.py @@ -412,7 +412,8 @@ def __init__(self, **kwargs): # this behaviour is to match Geant4's tolerance of 0 density which if forbids # if loaded in Geant4, it would enforce a minimum without an exception _log.warning( - "Material : '%s' density set to 0, ensuring minimum of 1e-20", self.name + "Material : '%s' density set to 0, ensuring minimum of 1e-20", + self.name, ) self.density = 1e-20 self.type = "simple" diff --git a/src/pyg4ometry/mcnp/Surfaces.py b/src/pyg4ometry/mcnp/Surfaces.py index c94475d99..ae949e040 100644 --- a/src/pyg4ometry/mcnp/Surfaces.py +++ b/src/pyg4ometry/mcnp/Surfaces.py @@ -513,7 +513,21 @@ class BOX: """ def __init__( - self, vx, vy, vz, a1x, a1y, a1z, a2x, a2y, a2z, a3x, a3y, a3z, reg=None, surfaceNumber=None + self, + vx, + vy, + vz, + a1x, + a1y, + a1z, + a2x, + a2y, + a2z, + a3x, + a3y, + a3z, + reg=None, + surfaceNumber=None, ): self.vx = vx self.vy = vy @@ -687,7 +701,21 @@ class REC: """ def __init__( - self, vx, vy, vz, hx, hy, hz, v1x, v1y, v1z, v2x, v2y, v2z, reg=None, surfaceNumber=None + self, + vx, + vy, + vz, + hx, + hy, + hz, + v1x, + v1y, + v1z, + v2x, + v2y, + v2z, + reg=None, + surfaceNumber=None, ): self.vx = vx self.vy = vy @@ -788,7 +816,21 @@ class WED: """ def __init__( - self, vx, vy, vz, v1x, v1y, v1z, v2x, v2y, v2z, v3x, v3y, v3z, reg=None, surfaceNumber=None + self, + vx, + vy, + vz, + v1x, + v1y, + v1z, + v2x, + v2y, + v2z, + v3x, + v3y, + v3z, + reg=None, + surfaceNumber=None, ): self.vx = vx self.vy = vy diff --git a/src/pyg4ometry/usd/solid/SolidBase.py b/src/pyg4ometry/usd/solid/SolidBase.py index 8e32d5a53..b73b6d905 100644 --- a/src/pyg4ometry/usd/solid/SolidBase.py +++ b/src/pyg4ometry/usd/solid/SolidBase.py @@ -6,7 +6,6 @@ class SolidBase(UsdGeomMesh): - def __init__(self, stage, path): if UsdGeomMesh is object: msg = "Failed to import open usd" diff --git a/src/pyg4ometry/visualisation/BlenderViewer.py b/src/pyg4ometry/visualisation/BlenderViewer.py index 8c6276d87..f58b75fcd 100644 --- a/src/pyg4ometry/visualisation/BlenderViewer.py +++ b/src/pyg4ometry/visualisation/BlenderViewer.py @@ -27,7 +27,6 @@ def createBlenderObjects(self, option="unique"): def createBlenderObjectsUnique(self): for motherKey in self.instancePlacements: - placements = self.instancePlacements[motherKey] for placement in placements: diff --git a/src/pyg4ometry/visualisation/Plot.py b/src/pyg4ometry/visualisation/Plot.py index 9c0fab7f9..4012d6ba3 100644 --- a/src/pyg4ometry/visualisation/Plot.py +++ b/src/pyg4ometry/visualisation/Plot.py @@ -6,7 +6,13 @@ def AddCutterDataToPlot( - filename, projection="zx", ax=None, unitsFactor=1.0, colour="k", linewidth=0.5, alpha=1.0 + filename, + projection="zx", + ax=None, + unitsFactor=1.0, + colour="k", + linewidth=0.5, + alpha=1.0, ): """ Add cutter data to a plot or draw in a new figure if no axis object given. @@ -68,7 +74,13 @@ def AddCutterDataToPlot( def AddCutterDataToPlotNoConectivity( - filename, projection="zx", ax=None, unitsFactor=1.0, colour="k", linewidth=0.5, alpha=1.0 + filename, + projection="zx", + ax=None, + unitsFactor=1.0, + colour="k", + linewidth=0.5, + alpha=1.0, ): r = _vtk.vtkPolyDataReader() r.SetFileName(filename) diff --git a/src/pyg4ometry/visualisation/UsdViewer.py b/src/pyg4ometry/visualisation/UsdViewer.py index 263ac9466..b98cfb10e 100644 --- a/src/pyg4ometry/visualisation/UsdViewer.py +++ b/src/pyg4ometry/visualisation/UsdViewer.py @@ -102,7 +102,6 @@ def traverseHierarchy(self, volume=None, motherPrim=None, scale=1000.00): prim = self.stage.DefinePrim(motherPrim.GetPath().AppendPath(volume.name), "Xform") if type(volume) is _g4.LogicalVolume: - print("traverseHierarchy> process logical volume") # add mesh prim @@ -125,7 +124,6 @@ def traverseHierarchy(self, volume=None, motherPrim=None, scale=1000.00): # loop over all daughters for daughter in volume.daughterVolumes: - # check if lv and we have already encountered, if so use # existing prim if daughter.logicalVolume.name in self.lvNameToPrimDict: diff --git a/src/pyg4ometry/visualisation/ViewerHierarchyBase.py b/src/pyg4ometry/visualisation/ViewerHierarchyBase.py index 6e957802c..510bf391f 100644 --- a/src/pyg4ometry/visualisation/ViewerHierarchyBase.py +++ b/src/pyg4ometry/visualisation/ViewerHierarchyBase.py @@ -26,7 +26,11 @@ def getVisOptions(self, pv): Return a set of vis options according to the precedence of pv, lv, default. """ # take the first non-None set of visOptions - orderOfPrecedence = [pv.visOptions, pv.logicalVolume.visOptions, self.defaultVisOptions] + orderOfPrecedence = [ + pv.visOptions, + pv.logicalVolume.visOptions, + self.defaultVisOptions, + ] return next(item for item in orderOfPrecedence if item is not None) def getVisOptionsLV(self, lv): diff --git a/src/pyg4ometry/visualisation/VtkViewer.py b/src/pyg4ometry/visualisation/VtkViewer.py index 2fc16bff9..54594fd72 100644 --- a/src/pyg4ometry/visualisation/VtkViewer.py +++ b/src/pyg4ometry/visualisation/VtkViewer.py @@ -1151,7 +1151,12 @@ class VtkViewerColoured(VtkViewer): """ def __init__( - self, *args, defaultColour=None, defaultAlpha=0.5, materialVisOptions=None, **kwargs + self, + *args, + defaultColour=None, + defaultAlpha=0.5, + materialVisOptions=None, + **kwargs, ): kwargs["interpolation"] = kwargs.get("interpolation", "flat") super().__init__(*args, **kwargs) diff --git a/tests/cli/test_cli.py b/tests/cli/test_cli.py index 6a08a4725..6f8385b95 100644 --- a/tests/cli/test_cli.py +++ b/tests/cli/test_cli.py @@ -83,14 +83,24 @@ def test_cli_checkoverlaps_long(testdata): def test_cli_clip_short(testdata): _cli.main( - ["-i", testdata["gdml/CompoundExamples/bdsim/vkickers.gdml"], "-C", "50,70,200"], + [ + "-i", + testdata["gdml/CompoundExamples/bdsim/vkickers.gdml"], + "-C", + "50,70,200", + ], testing=True, ) def test_cli_clip_long(testdata): _cli.main( - ["-i", testdata["gdml/CompoundExamples/bdsim/vkickers.gdml"], "--clip", "50,70,200"], + [ + "-i", + testdata["gdml/CompoundExamples/bdsim/vkickers.gdml"], + "--clip", + "50,70,200", + ], testing=True, ) @@ -131,26 +141,38 @@ def test_cli_clip_short_rot_tra_long(testdata): def test_cli_compare_short(testdata): _cli.main( - ["-i", testdata["gdml/001_box.gdml"], "-d", testdata["gdml/001_box.gdml"]], testing=True + ["-i", testdata["gdml/001_box.gdml"], "-d", testdata["gdml/001_box.gdml"]], + testing=True, ) def test_cli_compare_long(testdata): _cli.main( - ["-i", testdata["gdml/001_box.gdml"], "--compare", testdata["gdml/001_box.gdml"]], + [ + "-i", + testdata["gdml/001_box.gdml"], + "--compare", + testdata["gdml/001_box.gdml"], + ], testing=True, ) def test_cli_append_short(testdata): _cli.main( - ["-i", testdata["gdml/001_box.gdml"], "-e", testdata["gdml/001_box.gdml"]], testing=True + ["-i", testdata["gdml/001_box.gdml"], "-e", testdata["gdml/001_box.gdml"]], + testing=True, ) def test_cli_append_long(testdata): _cli.main( - ["-i", testdata["gdml/001_box.gdml"], "--append", testdata["gdml/001_box.gdml"]], + [ + "-i", + testdata["gdml/001_box.gdml"], + "--append", + testdata["gdml/001_box.gdml"], + ], testing=True, ) @@ -260,12 +282,16 @@ def test_cli_materials_long(testdata): def test_cli_nullmesh_exception_short(testdata): - _cli.main(["-i", testdata["gdml/CompoundExamples/bdsim/vkickers.gdml"], "-n"], testing=True) + _cli.main( + ["-i", testdata["gdml/CompoundExamples/bdsim/vkickers.gdml"], "-n"], + testing=True, + ) def test_cli_nullmesh_exception_long(testdata): _cli.main( - ["-i", testdata["gdml/CompoundExamples/bdsim/vkickers.gdml"], "--nullmesh"], testing=True + ["-i", testdata["gdml/CompoundExamples/bdsim/vkickers.gdml"], "--nullmesh"], + testing=True, ) @@ -275,28 +301,39 @@ def test_cli_output_short_gl(testdata): @pytest.mark.skipif(_skip_html_tests, reason="requires jinja2 to run") def test_cli_output_short_html(testdata, tmptestdir): - _cli.main(["-i", testdata["gdml/001_box.gdml"], "-o", str(tmptestdir / "o.html")], testing=True) + _cli.main( + ["-i", testdata["gdml/001_box.gdml"], "-o", str(tmptestdir / "o.html")], + testing=True, + ) def test_cli_output_short_gdml(testdata, tmptestdir): - _cli.main(["-i", testdata["gdml/001_box.gdml"], "-o", str(tmptestdir / "o.gdml")], testing=True) + _cli.main( + ["-i", testdata["gdml/001_box.gdml"], "-o", str(tmptestdir / "o.gdml")], + testing=True, + ) def test_cli_output_long_gdml(testdata, tmptestdir): _cli.main( - ["-i", testdata["gdml/001_box.gdml"], "--output", str(tmptestdir / "o.gdml")], testing=True + ["-i", testdata["gdml/001_box.gdml"], "--output", str(tmptestdir / "o.gdml")], + testing=True, ) def test_cli_output_short_inp(testdata, tmptestdir): - _cli.main(["-i", testdata["gdml/001_box.gdml"], "-o", str(tmptestdir / "o.inp")], testing=True) + _cli.main( + ["-i", testdata["gdml/001_box.gdml"], "-o", str(tmptestdir / "o.inp")], + testing=True, + ) def test_cli_output_short_usd(testdata, tmptestdir): # TODO - change once implemented with pytest.raises(NotImplementedError) as ex: _cli.main( - ["-i", testdata["gdml/001_box.gdml"], "-o", str(tmptestdir / "o.usd")], testing=True + ["-i", testdata["gdml/001_box.gdml"], "-o", str(tmptestdir / "o.usd")], + testing=True, ) assert ex.type is NotImplementedError @@ -353,7 +390,10 @@ def test_cli_planecutter_long2(testdata, tmptestdir): def test_cli_planecutter_short_wrong(testdata): with pytest.raises(ValueError, match="pyg4> must specify -P or --planeCutterOutput file") as ex: # no -P given for output - should complain - _cli.main(["-i", testdata["gdml/001_box.gdml"], "-p", "0,0,0,0,1,0", "-V"], testing=True) + _cli.main( + ["-i", testdata["gdml/001_box.gdml"], "-p", "0,0,0,0,1,0", "-V"], + testing=True, + ) assert ex.type is ValueError @@ -361,7 +401,14 @@ def test_cli_solid_substitution_short_gdml(testdata): # TODO - change once implemented with pytest.raises(NotImplementedError) as ex: _cli.main( - ["-i", testdata["gdml/001_box.gdml"], "-s", "Box,px=10,py=20,pz=30", "-x", "box1Vol"], + [ + "-i", + testdata["gdml/001_box.gdml"], + "-s", + "Box,px=10,py=20,pz=30", + "-x", + "box1Vol", + ], testing=True, ) assert ex.type is NotImplementedError diff --git a/tests/convert/T001_geant4Box2Fluka.py b/tests/convert/T001_geant4Box2Fluka.py index 7e998be8a..0e1116dac 100644 --- a/tests/convert/T001_geant4Box2Fluka.py +++ b/tests/convert/T001_geant4Box2Fluka.py @@ -10,7 +10,12 @@ def Test( - vis=False, interactive=False, fluka=True, outputPath=None, refFilePath=None, bakeTransform=False + vis=False, + interactive=False, + fluka=True, + outputPath=None, + refFilePath=None, + bakeTransform=False, ): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/convert/T017_geant4EllipticalCone2Fluka.py b/tests/convert/T017_geant4EllipticalCone2Fluka.py index acea27401..2c3d7c473 100644 --- a/tests/convert/T017_geant4EllipticalCone2Fluka.py +++ b/tests/convert/T017_geant4EllipticalCone2Fluka.py @@ -8,7 +8,6 @@ import pyg4ometry.visualisation as _vi import pyg4ometry.misc as _mi - normal = 1 zcut_outofrange = 2 diff --git a/tests/convert/T026_geant4GenericTrap2Fluka.py b/tests/convert/T026_geant4GenericTrap2Fluka.py index 5ec4ef2c0..a776c8a52 100644 --- a/tests/convert/T026_geant4GenericTrap2Fluka.py +++ b/tests/convert/T026_geant4GenericTrap2Fluka.py @@ -8,7 +8,6 @@ import pyg4ometry.visualisation as _vi import pyg4ometry.misc as _mi - normal = 1 zero_area_quad = 2 diff --git a/tests/convert/T028_geant4Union2Fluka.py b/tests/convert/T028_geant4Union2Fluka.py index 4ac11a77f..75d378e91 100644 --- a/tests/convert/T028_geant4Union2Fluka.py +++ b/tests/convert/T028_geant4Union2Fluka.py @@ -10,7 +10,12 @@ def Test( - vis=False, interactive=False, fluka=True, disjoint=False, outputPath=None, refFilePath=None + vis=False, + interactive=False, + fluka=True, + disjoint=False, + outputPath=None, + refFilePath=None, ): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/convert/T029_geant4Subtraction2Fluka.py b/tests/convert/T029_geant4Subtraction2Fluka.py index 19e29d34f..87f843372 100644 --- a/tests/convert/T029_geant4Subtraction2Fluka.py +++ b/tests/convert/T029_geant4Subtraction2Fluka.py @@ -9,7 +9,12 @@ def Test( - vis=False, interactive=False, fluka=True, nullMesh=False, outputPath=None, refFilePath=None + vis=False, + interactive=False, + fluka=True, + nullMesh=False, + outputPath=None, + refFilePath=None, ): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/convert/T030_geant4Intersection2Fluka.py b/tests/convert/T030_geant4Intersection2Fluka.py index 294a73ce1..396bb4dcd 100644 --- a/tests/convert/T030_geant4Intersection2Fluka.py +++ b/tests/convert/T030_geant4Intersection2Fluka.py @@ -11,7 +11,14 @@ non_intersecting = 2 -def Test(vis=False, interactive=False, fluka=True, type=normal, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + fluka=True, + type=normal, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/convert/T031_geant4MultiUnion2Fluka.py b/tests/convert/T031_geant4MultiUnion2Fluka.py index 1af1e3d91..b079bf949 100644 --- a/tests/convert/T031_geant4MultiUnion2Fluka.py +++ b/tests/convert/T031_geant4MultiUnion2Fluka.py @@ -11,7 +11,12 @@ def Test( - vis=False, interactive=False, fluka=True, outputPath=None, refFilePath=None, bakeTransform=False + vis=False, + interactive=False, + fluka=True, + outputPath=None, + refFilePath=None, + bakeTransform=False, ): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/fluka/T410_XYP_expansion.py b/tests/fluka/T410_XYP_expansion.py index 0e941e526..17bbb37f7 100644 --- a/tests/fluka/T410_XYP_expansion.py +++ b/tests/fluka/T410_XYP_expansion.py @@ -2,7 +2,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import XYP, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + XYP, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/fluka/T410_XZP_expansion.py b/tests/fluka/T410_XZP_expansion.py index 3856022c0..372f0821f 100644 --- a/tests/fluka/T410_XZP_expansion.py +++ b/tests/fluka/T410_XZP_expansion.py @@ -2,7 +2,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import XZP, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + XZP, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/fluka/T410_YZP_expansion.py b/tests/fluka/T410_YZP_expansion.py index ce399a64d..30e484eb7 100644 --- a/tests/fluka/T410_YZP_expansion.py +++ b/tests/fluka/T410_YZP_expansion.py @@ -2,7 +2,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import YZP, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + YZP, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/fluka/T411_PLA_expansion.py b/tests/fluka/T411_PLA_expansion.py index 078c76cb6..22c5b8695 100644 --- a/tests/fluka/T411_PLA_expansion.py +++ b/tests/fluka/T411_PLA_expansion.py @@ -2,7 +2,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import PLA, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + PLA, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/fluka/T414_QUA_expansion.py b/tests/fluka/T414_QUA_expansion.py index 30ca5f61b..c4f875da6 100644 --- a/tests/fluka/T414_QUA_expansion.py +++ b/tests/fluka/T414_QUA_expansion.py @@ -2,7 +2,17 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import QUA, Region, Zone, FlukaRegistry, AABB, XYP, XZP, Transform, Writer +from pyg4ometry.fluka import ( + QUA, + Region, + Zone, + FlukaRegistry, + AABB, + XYP, + XZP, + Transform, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/fluka/T510_XYP_translation.py b/tests/fluka/T510_XYP_translation.py index b228c9b47..f1b1074d1 100644 --- a/tests/fluka/T510_XYP_translation.py +++ b/tests/fluka/T510_XYP_translation.py @@ -2,7 +2,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import XZP, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + XZP, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/fluka/T510_XZP_translation.py b/tests/fluka/T510_XZP_translation.py index fb2a8c5c8..43f415e11 100644 --- a/tests/fluka/T510_XZP_translation.py +++ b/tests/fluka/T510_XZP_translation.py @@ -2,7 +2,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import XZP, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + XZP, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/fluka/T510_YZP_translation.py b/tests/fluka/T510_YZP_translation.py index 244241431..0e6f0d269 100644 --- a/tests/fluka/T510_YZP_translation.py +++ b/tests/fluka/T510_YZP_translation.py @@ -2,7 +2,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import YZP, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + YZP, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/fluka/T511_PLA_translation.py b/tests/fluka/T511_PLA_translation.py index 30fc09726..cb9a1c02b 100644 --- a/tests/fluka/T511_PLA_translation.py +++ b/tests/fluka/T511_PLA_translation.py @@ -2,7 +2,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import PLA, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + PLA, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) import pyg4ometry.fluka.body import pyg4ometry.misc as _mi diff --git a/tests/fluka/T514_QUA_translation.py b/tests/fluka/T514_QUA_translation.py index c2abdb577..66dadd877 100644 --- a/tests/fluka/T514_QUA_translation.py +++ b/tests/fluka/T514_QUA_translation.py @@ -2,7 +2,17 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import QUA, Region, Zone, FlukaRegistry, AABB, XYP, XZP, Transform, Writer +from pyg4ometry.fluka import ( + QUA, + Region, + Zone, + FlukaRegistry, + AABB, + XYP, + XZP, + Transform, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/fluka/T610_XYP_rototranslation.py b/tests/fluka/T610_XYP_rototranslation.py index 16bfbcae9..57969b55f 100644 --- a/tests/fluka/T610_XYP_rototranslation.py +++ b/tests/fluka/T610_XYP_rototranslation.py @@ -3,7 +3,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import XYP, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + XYP, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) from pyg4ometry.fluka.directive import rotoTranslationFromTra2 import pyg4ometry.misc as _mi diff --git a/tests/fluka/T610_XZP_rototranslation.py b/tests/fluka/T610_XZP_rototranslation.py index 29bc8a44d..aa4d47b6b 100644 --- a/tests/fluka/T610_XZP_rototranslation.py +++ b/tests/fluka/T610_XZP_rototranslation.py @@ -3,7 +3,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import XZP, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + XZP, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) from pyg4ometry.fluka.directive import rotoTranslationFromTra2 import pyg4ometry.misc as _mi diff --git a/tests/fluka/T610_YZP_rototranslation.py b/tests/fluka/T610_YZP_rototranslation.py index 5aef878bf..6621b5602 100644 --- a/tests/fluka/T610_YZP_rototranslation.py +++ b/tests/fluka/T610_YZP_rototranslation.py @@ -3,7 +3,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import YZP, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + YZP, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) from pyg4ometry.fluka.directive import rotoTranslationFromTra2 import pyg4ometry.misc as _mi diff --git a/tests/fluka/T611_PLA_rototranslation.py b/tests/fluka/T611_PLA_rototranslation.py index e738110a4..dad9d5b1a 100644 --- a/tests/fluka/T611_PLA_rototranslation.py +++ b/tests/fluka/T611_PLA_rototranslation.py @@ -3,7 +3,15 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import PLA, Region, Zone, FlukaRegistry, Transform, infinity, Writer +from pyg4ometry.fluka import ( + PLA, + Region, + Zone, + FlukaRegistry, + Transform, + infinity, + Writer, +) from pyg4ometry.fluka.directive import rotoTranslationFromTra2 import pyg4ometry.misc as _mi diff --git a/tests/fluka/T614_QUA_rototranslation.py b/tests/fluka/T614_QUA_rototranslation.py index 2567d7278..be2893324 100644 --- a/tests/fluka/T614_QUA_rototranslation.py +++ b/tests/fluka/T614_QUA_rototranslation.py @@ -3,7 +3,17 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import QUA, Region, Zone, FlukaRegistry, AABB, XYP, XZP, Transform, Writer +from pyg4ometry.fluka import ( + QUA, + Region, + Zone, + FlukaRegistry, + AABB, + XYP, + XZP, + Transform, + Writer, +) from pyg4ometry.fluka.directive import rotoTranslationFromTra2 import pyg4ometry.misc as _mi diff --git a/tests/fluka/T801_filter_redundant_halfspaces.py b/tests/fluka/T801_filter_redundant_halfspaces.py index e880805b5..68b133166 100644 --- a/tests/fluka/T801_filter_redundant_halfspaces.py +++ b/tests/fluka/T801_filter_redundant_halfspaces.py @@ -3,7 +3,17 @@ import pyg4ometry.convert as convert import pyg4ometry.visualisation as vi -from pyg4ometry.fluka import XZP, YZP, XYP, PLA, RPP, Region, Zone, FlukaRegistry, Writer +from pyg4ometry.fluka import ( + XZP, + YZP, + XYP, + PLA, + RPP, + Region, + Zone, + FlukaRegistry, + Writer, +) import pyg4ometry.misc as _mi diff --git a/tests/geant4/T001_Box.py b/tests/geant4/T001_Box.py index 2799f1ca0..db397b068 100644 --- a/tests/geant4/T001_Box.py +++ b/tests/geant4/T001_Box.py @@ -8,7 +8,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T0031_CutTubs_number.py b/tests/geant4/T0031_CutTubs_number.py index 9fc4a895b..47b46abdc 100644 --- a/tests/geant4/T0031_CutTubs_number.py +++ b/tests/geant4/T0031_CutTubs_number.py @@ -10,7 +10,12 @@ def Test( - vis=False, interactive=False, type=normal, outputPath=None, outputFile=None, refFilePath=None + vis=False, + interactive=False, + type=normal, + outputPath=None, + outputFile=None, + refFilePath=None, ): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T0032_CutTubs_string.py b/tests/geant4/T0032_CutTubs_string.py index 3e777a1e7..4d228e2ce 100644 --- a/tests/geant4/T0032_CutTubs_string.py +++ b/tests/geant4/T0032_CutTubs_string.py @@ -5,13 +5,17 @@ import pyg4ometry.visualisation as _vi import pyg4ometry.misc as _mi - normal = 1 flat_ends = 2 def Test( - vis=False, interactive=False, type=normal, outputPath=None, outputFile=None, refFilePath=None + vis=False, + interactive=False, + type=normal, + outputPath=None, + outputFile=None, + refFilePath=None, ): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T0034_CutTubs_DefineTree.py b/tests/geant4/T0034_CutTubs_DefineTree.py index d826990b8..85750aa52 100644 --- a/tests/geant4/T0034_CutTubs_DefineTree.py +++ b/tests/geant4/T0034_CutTubs_DefineTree.py @@ -5,13 +5,17 @@ import pyg4ometry.visualisation as _vi import pyg4ometry.misc as _mi - normal = 1 flat_ends = 2 def Test( - vis=False, interactive=False, type=normal, outputPath=None, outputFile=None, refFilePath=None + vis=False, + interactive=False, + type=normal, + outputPath=None, + outputFile=None, + refFilePath=None, ): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T003_CutTubs.py b/tests/geant4/T003_CutTubs.py index 6ff5e739a..4e415d141 100644 --- a/tests/geant4/T003_CutTubs.py +++ b/tests/geant4/T003_CutTubs.py @@ -5,7 +5,6 @@ import pyg4ometry.visualisation as _vi import pyg4ometry.misc as _mi - normal = 1 flat_ends = 2 diff --git a/tests/geant4/T004_Cons.py b/tests/geant4/T004_Cons.py index e9f6efe2b..d459576f1 100644 --- a/tests/geant4/T004_Cons.py +++ b/tests/geant4/T004_Cons.py @@ -6,7 +6,6 @@ import pyg4ometry.visualisation as _vi import pyg4ometry.misc as _mi - normal = 1 r1min_gt_r1max = 2 r2min_gt_r2max = 3 diff --git a/tests/geant4/T005_Para.py b/tests/geant4/T005_Para.py index cd36b288b..7e21427ff 100644 --- a/tests/geant4/T005_Para.py +++ b/tests/geant4/T005_Para.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T006_Trd.py b/tests/geant4/T006_Trd.py index 99fd8d386..3b1859eb2 100644 --- a/tests/geant4/T006_Trd.py +++ b/tests/geant4/T006_Trd.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T007_Trap.py b/tests/geant4/T007_Trap.py index beb033f21..46e71971c 100644 --- a/tests/geant4/T007_Trap.py +++ b/tests/geant4/T007_Trap.py @@ -7,7 +7,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T012_GenericPolycone.py b/tests/geant4/T012_GenericPolycone.py index ccfc791b5..63d74f6cd 100644 --- a/tests/geant4/T012_GenericPolycone.py +++ b/tests/geant4/T012_GenericPolycone.py @@ -5,7 +5,6 @@ import pyg4ometry.visualisation as _vi import pyg4ometry.misc as _mi - normal = 1 two_planes = 2 diff --git a/tests/geant4/T013_Polyhedra.py b/tests/geant4/T013_Polyhedra.py index 55cb39ed7..99ee7c09a 100644 --- a/tests/geant4/T013_Polyhedra.py +++ b/tests/geant4/T013_Polyhedra.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T014_GenericPolyhedra.py b/tests/geant4/T014_GenericPolyhedra.py index f3ee08288..01b8c95f6 100644 --- a/tests/geant4/T014_GenericPolyhedra.py +++ b/tests/geant4/T014_GenericPolyhedra.py @@ -5,7 +5,6 @@ import pyg4ometry.visualisation as _vi import pyg4ometry.misc as _mi - normal = 1 two_planes = 2 diff --git a/tests/geant4/T019_Hyperboloid.py b/tests/geant4/T019_Hyperboloid.py index dd5d0455b..f57ed5d9a 100644 --- a/tests/geant4/T019_Hyperboloid.py +++ b/tests/geant4/T019_Hyperboloid.py @@ -5,7 +5,6 @@ import pyg4ometry.visualisation as _vi import pyg4ometry.misc as _mi - normal = 1 rmin_eq_zero = 2 rmin_gt_rmax = 3 diff --git a/tests/geant4/T020_Tet.py b/tests/geant4/T020_Tet.py index ac3b547bf..104bae09e 100644 --- a/tests/geant4/T020_Tet.py +++ b/tests/geant4/T020_Tet.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T021_ExtrudedSolid.py b/tests/geant4/T021_ExtrudedSolid.py index 3ab2dec8d..50ccc5550 100644 --- a/tests/geant4/T021_ExtrudedSolid.py +++ b/tests/geant4/T021_ExtrudedSolid.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T022_TwistedBox.py b/tests/geant4/T022_TwistedBox.py index e8572bcf6..308fea5c3 100644 --- a/tests/geant4/T022_TwistedBox.py +++ b/tests/geant4/T022_TwistedBox.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T023_TwistedTrap.py b/tests/geant4/T023_TwistedTrap.py index c7b809e38..92f1e94ad 100644 --- a/tests/geant4/T023_TwistedTrap.py +++ b/tests/geant4/T023_TwistedTrap.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T024_TwistedTrd.py b/tests/geant4/T024_TwistedTrd.py index 6d53d59ae..76ac3e650 100644 --- a/tests/geant4/T024_TwistedTrd.py +++ b/tests/geant4/T024_TwistedTrd.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T025_TwistedTubs.py b/tests/geant4/T025_TwistedTubs.py index f61e70a06..85d89b4b9 100644 --- a/tests/geant4/T025_TwistedTubs.py +++ b/tests/geant4/T025_TwistedTubs.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T026_GenericTrap.py b/tests/geant4/T026_GenericTrap.py index cf4975de8..f42c19b4d 100644 --- a/tests/geant4/T026_GenericTrap.py +++ b/tests/geant4/T026_GenericTrap.py @@ -9,7 +9,13 @@ zero_area_quad = 2 -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T030_Intersection.py b/tests/geant4/T030_Intersection.py index 3d5ac9313..46f1e6a90 100644 --- a/tests/geant4/T030_Intersection.py +++ b/tests/geant4/T030_Intersection.py @@ -6,7 +6,6 @@ import numpy as _np import pyg4ometry.misc as _mi - normal = 1 non_intersecting = 2 diff --git a/tests/geant4/T031_MultiUnion.py b/tests/geant4/T031_MultiUnion.py index 3221ffa84..e72874831 100644 --- a/tests/geant4/T031_MultiUnion.py +++ b/tests/geant4/T031_MultiUnion.py @@ -8,7 +8,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T032_Scaled.py b/tests/geant4/T032_Scaled.py index 3328b38c8..98e2770e6 100644 --- a/tests/geant4/T032_Scaled.py +++ b/tests/geant4/T032_Scaled.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T033_TessellatedSolid.py b/tests/geant4/T033_TessellatedSolid.py index 4613d940d..f16f5f996 100644 --- a/tests/geant4/T033_TessellatedSolid.py +++ b/tests/geant4/T033_TessellatedSolid.py @@ -6,7 +6,13 @@ import pyg4ometry.misc as _mi -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent diff --git a/tests/geant4/T050_Everything.py b/tests/geant4/T050_Everything.py index 103ef01e8..15da2d065 100644 --- a/tests/geant4/T050_Everything.py +++ b/tests/geant4/T050_Everything.py @@ -6,7 +6,13 @@ import pathlib as _pl -def Test(vis=False, interactive=False, writeNISTMaterials=False, outputPath=None, refFilePath=None): +def Test( + vis=False, + interactive=False, + writeNISTMaterials=False, + outputPath=None, + refFilePath=None, +): if not outputPath: outputPath = _pl.Path(__file__).parent