lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.7.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-12-04 12:30:43 +01:00
parent 67ba86d073
commit dab42d2018
3770 changed files with 226369 additions and 286486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/management/include/G4UAdapter.hh
+5 -12
View File
@@ -366,19 +366,12 @@ DistanceToOut(const G4ThreeVector& pt, const G4ThreeVector& d,
U3Vector v(d.x(), d.y(), d.z());
G4double dist = UnplacedVolume_t::DistanceToOut(p, v, kInfinity);
if(calcNorm) // *norm=n, but only after calcNorm check and if convex volume
if(calcNorm)
{
if (UnplacedVolume_t::IsConvex())
{
U3Vector n, hitpoint = p + dist * v;
UnplacedVolume_t::Normal(hitpoint, n);
*validNorm = true;
norm->set(n.x(), n.y(), n.z());
}
else
{
*validNorm = false;
}
*validNorm = UnplacedVolume_t::IsConvex();
U3Vector n, hitpoint = p + dist * v;
UnplacedVolume_t::Normal(hitpoint, n);
norm->set(n.x(), n.y(), n.z());
}
// Apply Geant4 distance conventions