From f2da64612b3c66975ce764c79438d4b4d3f13afa Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 12 Oct 2022 01:49:06 -0500
Subject: [PATCH] fix: 4-argument TGeoTrap needs an atan
The [TGeoTrap class](https://root.cern.ch/doc/master/classTGeoTrap.html#a0e27ff95f2ffa2eb8c320a7778e1f403) (for which an object is created here) has a slightly different calling syntax than what is done internally in [G4Trap](https://apc.u-paris.fr/~franco/g4doxy/html/classG4Trap.html#074ca31710e0a11f9c7b6b13ddd1eabf). We need to take the atan here to get to the angle that TGeoTrap wants.
---
DDCore/src/Shapes.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/DDCore/src/Shapes.cpp b/DDCore/src/Shapes.cpp
index ec2c84b58..c0115d55a 100644
--- a/DDCore/src/Shapes.cpp
+++ b/DDCore/src/Shapes.cpp
@@ -611,21 +611,21 @@ Trap::Trap(const string& nam,
/// Constructor to be used when creating a new anonymous object with attribute initialization
void Trap::make(const string& nam, double pZ, double pY, double pX, double pLTX) {
double fDz = 0.5*pZ;
- double fTthetaCphi = 0;
- double fTthetaSphi = 0;
+ double fTheta = 0;
+ double fPhi = 0;
double fDy1 = 0.5*pY;
double fDx1 = 0.5*pX;
double fDx2 = 0.5*pLTX;
- double fTalpha1 = 0.5*(pLTX - pX)/pY;
+ double fAlpha1 = atan(0.5*(pLTX - pX)/pY);
double fDy2 = fDy1;
double fDx3 = fDx1;
double fDx4 = fDx2;
- double fTalpha2 = fTalpha1;
+ double fAlpha2 = fAlpha1;
_assign(new TGeoTrap(nam.c_str(),
- fDz, fTthetaCphi /* = 0 */, fTthetaSphi /* = 0 */,
- fDy1, fDx1, fDx2, fTalpha1/units::deg,
- fDy2, fDx3, fDx4, fTalpha2/units::deg), "", TRAP_TAG, true);
+ fDz, fTheta /* = 0 */, fPhi /* = 0 */,
+ fDy1, fDx1, fDx2, fAlpha1/units::deg,
+ fDy2, fDx3, fDx4, fAlpha2/units::deg), "", TRAP_TAG, true);
}
/// Set the trap dimensions
--
GitLab