From 8ac99cfebfb4aefa85c20c99321ea5053e702c58 Mon Sep 17 00:00:00 2001 From: Stewart Boogert Date: Tue, 6 Aug 2024 20:45:21 +0100 Subject: [PATCH 1/2] Chord fix for conversion --- src/pyg4ometry/convert/geant42Fluka.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pyg4ometry/convert/geant42Fluka.py b/src/pyg4ometry/convert/geant42Fluka.py index 5df21c674..03ca9bf38 100644 --- a/src/pyg4ometry/convert/geant42Fluka.py +++ b/src/pyg4ometry/convert/geant42Fluka.py @@ -2110,8 +2110,9 @@ def geant4Torus2Fluka( ny0 = d * _np.sin(i * dPhi + pSPhi + _np.pi / 2.0) nz0 = 0 - x1 = pRtor * _np.cos((i + 0.5) * dPhi + pSPhi) - y1 = pRtor * _np.sin((i + 0.5) * dPhi + pSPhi) + # _np.cos(dPhi/2) factor is due chord vs point on perimeter + x1 = pRtor * _np.cos(dPhi / 2) * _np.cos((i + 0.5) * dPhi + pSPhi) + y1 = pRtor * _np.cos(dPhi / 2) * _np.sin((i + 0.5) * dPhi + pSPhi) z1 = 0 nx1 = d * _np.cos((i + 0.5) * dPhi + pSPhi + _np.pi / 2.0) From 4129a445e2b17ee0e038ce39edd041b5daad6e15 Mon Sep 17 00:00:00 2001 From: Stewart Boogert Date: Tue, 6 Aug 2024 20:56:43 +0100 Subject: [PATCH 2/2] Chord fix for conversion (tests update) --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index c9a56d618..7ecdab90c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -35,5 +35,5 @@ def pytest_sessionfinish(session, exitstatus): @pytest.fixture(scope="session") def testdata(): g4data = G4EdgeTestData() - g4data.checkout("ec37079") + g4data.checkout("2c25b5c") return g4data