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/History
+7 -1
View File
@@ -15,7 +15,13 @@ commit in the repository !
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
May 28, 2019 B.Morgan (geommng-V10-06-04)
November 8, 2020 E.Tcherniaev (geommng-V10-06-06)
- Bug fix in calculation of normal in G4UAdapter::DistanceToOut()
October 28, 2020 Ben Morgan (geommng-V10-06-05)
- Remove include of obsolete CMake module
May 28, 2020 B.Morgan (geommng-V10-06-04)
- When using new CMake build, add location of generated G4GeomConfig.hh
header to public include directories of G4geometrymng module.
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
source/geometry/management/sources.cmake
+3 -5
View File
@@ -125,8 +125,6 @@ geant4_define_module(NAME G4geometrymng
# List any source specific properties here
# For new system, must explicitly add path for generated header
if(GEANT4_USE_NEW_CMAKE)
geant4_module_include_directories(G4geometrymng
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
)
endif()
geant4_module_include_directories(G4geometrymng
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
)
source/geometry/management/src/G4ReflectedSolid.cc
+1 -1
View File
@@ -218,7 +218,7 @@ G4ReflectedSolid::CalculateExtent( const EAxis pAxis,
// Separation of transformations. Calculation of the extent is done
// in a reflection of the global space. In such way, the voxel is
// reflected, but the solid is transformed just by G4AffineTransform.
// It allows to use CalculateExtent() of the solid.
// It allows one to use CalculateExtent() of the solid.
// Reflect voxel limits in Z
//