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

Import Geant4 11.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-12-10 14:46:44 +01:00
committed by Ben Morgan
parent 6399a014b6
commit 80e2389dd8
3932 changed files with 202519 additions and 246221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/navigation/src/G4PartialPhantomParameterisation.cc
+19 -19
View File
@@ -106,7 +106,7 @@ GetMaterialIndex( size_t copyNo ) const
size_t G4PartialPhantomParameterisation::
GetMaterialIndex( size_t nx, size_t ny, size_t nz ) const
{
size_t copyNo = nx + fNoVoxelX*ny + fNoVoxelXY*nz;
size_t copyNo = nx + fNoVoxelsX*ny + fNoVoxelsXY*nz;
return GetMaterialIndex( copyNo );
}
@@ -136,8 +136,8 @@ ComputeVoxelIndices(const G4int copyNo, size_t& nx,
auto ite = fFilledIDs.lower_bound(size_t(copyNo));
G4int dist = std::distance( fFilledIDs.cbegin(), ite );
nz = size_t( dist/fNoVoxelY );
ny = size_t( dist%fNoVoxelY );
nz = size_t( dist/fNoVoxelsY );
ny = size_t( dist%fNoVoxelsY );
G4int ifmin = (*ite).second;
G4int nvoxXprev;
@@ -183,7 +183,7 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
// If it is on the surface side, check the direction: if direction is
// negative place it on the previous voxel (if direction is positive it is
// already in the next voxel...).
// Correct also cases where n = -1 or n = fNoVoxel. It is always traced to be
// Correct also cases where n = -1 or n = fNoVoxels. It is always traced to be
// due to multiple scattering: track is entering a voxel but multiple
// scattering changes the angle towards outside
//
@@ -198,7 +198,7 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
}
else
{
if( nx == G4int(fNoVoxelX) )
if( nx == G4int(fNoVoxelsX) )
{
nx -= 1;
}
@@ -215,7 +215,7 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
}
else
{
if( ny == G4int(fNoVoxelY) )
if( ny == G4int(fNoVoxelsY) )
{
ny -= 1;
}
@@ -232,7 +232,7 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
}
else
{
if( nz == G4int(fNoVoxelZ) )
if( nz == G4int(fNoVoxelsZ) )
{
nz -= 1;
}
@@ -247,9 +247,9 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
nx = 0;
isOK = false;
}
else if( nx >= G4int(fNoVoxelX) )
else if( nx >= G4int(fNoVoxelsX) )
{
nx = fNoVoxelX-1;
nx = fNoVoxelsX-1;
isOK = false;
}
if( ny < 0 )
@@ -257,9 +257,9 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
ny = 0;
isOK = false;
}
else if( ny >= G4int(fNoVoxelY) )
else if( ny >= G4int(fNoVoxelsY) )
{
ny = fNoVoxelY-1;
ny = fNoVoxelsY-1;
isOK = false;
}
if( nz < 0 )
@@ -267,9 +267,9 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
nz = 0;
isOK = false;
}
else if( nz >= G4int(fNoVoxelZ) )
else if( nz >= G4int(fNoVoxelsZ) )
{
nz = fNoVoxelZ-1;
nz = fNoVoxelsZ-1;
isOK = false;
}
if( !isOK )
@@ -289,7 +289,7 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
"GeomNav1002", JustWarning, message);
}
G4int nyz = nz*fNoVoxelY+ny;
G4int nyz = nz*fNoVoxelsY+ny;
auto ite = fFilledIDs.cbegin();
/*
for( ite = fFilledIDs.cbegin(); ite != fFilledIDs.cend(); ++ite )
@@ -318,12 +318,12 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
//------------------------------------------------------------------
void G4PartialPhantomParameterisation::CheckCopyNo( const G4int copyNo ) const
{
if( copyNo < 0 || copyNo >= G4int(fNoVoxel) )
if( copyNo < 0 || copyNo >= G4int(fNoVoxels) )
{
std::ostringstream message;
message << "Copy number is negative or too big!" << G4endl
<< " Copy number: " << copyNo << G4endl
<< " Total number of voxels: " << fNoVoxel;
<< " Total number of voxels: " << fNoVoxels;
G4Exception("G4PartialPhantomParameterisation::CheckCopyNo()",
"GeomNav0002", FatalErrorInArgument, message);
}
@@ -333,7 +333,7 @@ void G4PartialPhantomParameterisation::CheckCopyNo( const G4int copyNo ) const
//------------------------------------------------------------------
void G4PartialPhantomParameterisation::BuildContainerWalls()
{
fContainerWallX = fNoVoxelX * fVoxelHalfX;
fContainerWallY = fNoVoxelY * fVoxelHalfY;
fContainerWallZ = fNoVoxelZ * fVoxelHalfZ;
fContainerWallX = fNoVoxelsX * fVoxelHalfX;
fContainerWallY = fNoVoxelsY * fVoxelHalfY;
fContainerWallZ = fNoVoxelsZ * fVoxelHalfZ;
}
source/geometry/navigation/src/G4PhantomParameterisation.cc
+69 -59
View File
@@ -56,9 +56,9 @@ void G4PhantomParameterisation::
BuildContainerSolid( G4VPhysicalVolume* pMotherPhysical )
{
fContainerSolid = pMotherPhysical->GetLogicalVolume()->GetSolid();
fContainerWallX = fNoVoxelX * fVoxelHalfX;
fContainerWallY = fNoVoxelY * fVoxelHalfY;
fContainerWallZ = fNoVoxelZ * fVoxelHalfZ;
fContainerWallX = fNoVoxelsX * fVoxelHalfX;
fContainerWallY = fNoVoxelsY * fVoxelHalfY;
fContainerWallZ = fNoVoxelsZ * fVoxelHalfZ;
// CheckVoxelsFillContainer();
}
@@ -68,9 +68,9 @@ void G4PhantomParameterisation::
BuildContainerSolid( G4VSolid* pMotherSolid )
{
fContainerSolid = pMotherSolid;
fContainerWallX = fNoVoxelX * fVoxelHalfX;
fContainerWallY = fNoVoxelY * fVoxelHalfY;
fContainerWallZ = fNoVoxelZ * fVoxelHalfZ;
fContainerWallX = fNoVoxelsX * fVoxelHalfX;
fContainerWallY = fNoVoxelsY * fVoxelHalfY;
fContainerWallZ = fNoVoxelsZ * fVoxelHalfZ;
// CheckVoxelsFillContainer();
}
@@ -141,7 +141,7 @@ GetMaterialIndex( size_t copyNo ) const
size_t G4PhantomParameterisation::
GetMaterialIndex( size_t nx, size_t ny, size_t nz ) const
{
size_t copyNo = nx + fNoVoxelX*ny + fNoVoxelXY*nz;
size_t copyNo = nx + fNoVoxelsX*ny + fNoVoxelsXY*nz;
return GetMaterialIndex( copyNo );
}
@@ -165,9 +165,9 @@ ComputeVoxelIndices(const G4int copyNo, size_t& nx,
size_t& ny, size_t& nz ) const
{
CheckCopyNo( copyNo );
nx = size_t(copyNo%fNoVoxelX);
ny = size_t( (copyNo/fNoVoxelX)%fNoVoxelY );
nz = size_t(copyNo/fNoVoxelXY);
nx = size_t(copyNo%fNoVoxelsX);
ny = size_t( (copyNo/fNoVoxelsX)%fNoVoxelsY );
nz = size_t(copyNo/fNoVoxelsXY);
}
@@ -186,31 +186,31 @@ CheckVoxelsFillContainer( G4double contX, G4double contY, G4double contZ ) const
// Any bigger value than kCarTolerance will give an error in GetReplicaNo()
//
if( std::fabs(contX-fNoVoxelX*fVoxelHalfX) >= toleranceForError
|| std::fabs(contY-fNoVoxelY*fVoxelHalfY) >= toleranceForError
|| std::fabs(contZ-fNoVoxelZ*fVoxelHalfZ) >= toleranceForError )
if( std::fabs(contX-fNoVoxelsX*fVoxelHalfX) >= toleranceForError
|| std::fabs(contY-fNoVoxelsY*fVoxelHalfY) >= toleranceForError
|| std::fabs(contZ-fNoVoxelsZ*fVoxelHalfZ) >= toleranceForError )
{
std::ostringstream message;
message << "Voxels do not fully fill the container: "
<< fContainerSolid->GetName() << G4endl
<< " DiffX= " << contX-fNoVoxelX*fVoxelHalfX << G4endl
<< " DiffY= " << contY-fNoVoxelY*fVoxelHalfY << G4endl
<< " DiffZ= " << contZ-fNoVoxelZ*fVoxelHalfZ << G4endl
<< " DiffX= " << contX-fNoVoxelsX*fVoxelHalfX << G4endl
<< " DiffY= " << contY-fNoVoxelsY*fVoxelHalfY << G4endl
<< " DiffZ= " << contZ-fNoVoxelsZ*fVoxelHalfZ << G4endl
<< " Maximum difference is: " << toleranceForError;
G4Exception("G4PhantomParameterisation::CheckVoxelsFillContainer()",
"GeomNav0002", FatalException, message);
}
else if( std::fabs(contX-fNoVoxelX*fVoxelHalfX) >= toleranceForWarning
|| std::fabs(contY-fNoVoxelY*fVoxelHalfY) >= toleranceForWarning
|| std::fabs(contZ-fNoVoxelZ*fVoxelHalfZ) >= toleranceForWarning )
else if( std::fabs(contX-fNoVoxelsX*fVoxelHalfX) >= toleranceForWarning
|| std::fabs(contY-fNoVoxelsY*fVoxelHalfY) >= toleranceForWarning
|| std::fabs(contZ-fNoVoxelsZ*fVoxelHalfZ) >= toleranceForWarning )
{
std::ostringstream message;
message << "Voxels do not fully fill the container: "
<< fContainerSolid->GetName() << G4endl
<< " DiffX= " << contX-fNoVoxelX*fVoxelHalfX << G4endl
<< " DiffY= " << contY-fNoVoxelY*fVoxelHalfY << G4endl
<< " DiffZ= " << contZ-fNoVoxelZ*fVoxelHalfZ << G4endl
<< " DiffX= " << contX-fNoVoxelsX*fVoxelHalfX << G4endl
<< " DiffY= " << contY-fNoVoxelsY*fVoxelHalfY << G4endl
<< " DiffZ= " << contZ-fNoVoxelsZ*fVoxelHalfZ << G4endl
<< " Maximum difference is: " << toleranceForWarning;
G4Exception("G4PhantomParameterisation::CheckVoxelsFillContainer()",
"GeomNav1002", JustWarning, message);
@@ -227,17 +227,22 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
//
if( fContainerSolid->Inside( localPoint ) == kOutside )
{
std::ostringstream message;
message << "Point outside voxels!" << G4endl
<< " localPoint - " << localPoint
<< " - is outside container solid: "
<< fContainerSolid->GetName() << G4endl
<< "DIFFERENCE WITH PHANTOM WALLS X: "
<< std::fabs(localPoint.x()) - fContainerWallX
<< " Y: " << std::fabs(localPoint.y()) - fContainerWallY
<< " Z: " << std::fabs(localPoint.z()) - fContainerWallZ;
G4Exception("G4PhantomParameterisation::GetReplicaNo()", "GeomNav0003",
FatalErrorInArgument, message);
if( std::fabs(localPoint.x()) - fContainerWallX > kCarTolerance
&& std::fabs(localPoint.y()) - fContainerWallY > kCarTolerance
&& std::fabs(localPoint.z()) - fContainerWallZ > kCarTolerance )
{
std::ostringstream message;
message << "Point outside voxels!" << G4endl
<< " localPoint - " << localPoint
<< " - is outside container solid: "
<< fContainerSolid->GetName() << G4endl
<< "DIFFERENCE WITH PHANTOM WALLS X: "
<< std::fabs(localPoint.x()) - fContainerWallX
<< " Y: " << std::fabs(localPoint.y()) - fContainerWallY
<< " Z: " << std::fabs(localPoint.z()) - fContainerWallZ;
G4Exception("G4PhantomParameterisation::GetReplicaNo()", "GeomNav0003",
FatalErrorInArgument, message);
}
}
// Check the voxel numbers corresponding to localPoint
@@ -264,7 +269,7 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
// If it is on the surface side, check the direction: if direction is
// negative place it in the previous voxel (if direction is positive it is
// already in the next voxel).
// Correct also cases where n = -1 or n = fNoVoxel. It is always traced to be
// Correct also cases where n = -1 or n = fNoVoxels. It is always traced to be
// due to multiple scattering: track is entering a voxel but multiple
// scattering changes the angle towards outside
//
@@ -279,7 +284,7 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
}
else
{
if( nx == G4int(fNoVoxelX) )
if( nx == G4int(fNoVoxelsX) )
{
nx -= 1;
}
@@ -296,7 +301,7 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
}
else
{
if( ny == G4int(fNoVoxelY) )
if( ny == G4int(fNoVoxelsY) )
{
ny -= 1;
}
@@ -313,14 +318,14 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
}
else
{
if( nz == G4int(fNoVoxelZ) )
if( nz == G4int(fNoVoxelsZ) )
{
nz -= 1;
}
}
}
G4int copyNo = nx + fNoVoxelX*ny + fNoVoxelXY*nz;
G4int copyNo = nx + fNoVoxelsX*ny + fNoVoxelsXY*nz;
// Check if there are still errors
//
@@ -330,9 +335,9 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
nx = 0;
isOK = false;
}
else if( nx >= G4int(fNoVoxelX) )
else if( nx >= G4int(fNoVoxelsX) )
{
nx = fNoVoxelX-1;
nx = fNoVoxelsX-1;
isOK = false;
}
if( ny < 0 )
@@ -340,9 +345,9 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
ny = 0;
isOK = false;
}
else if( ny >= G4int(fNoVoxelY) )
else if( ny >= G4int(fNoVoxelsY) )
{
ny = fNoVoxelY-1;
ny = fNoVoxelsY-1;
isOK = false;
}
if( nz < 0 )
@@ -350,26 +355,31 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
nz = 0;
isOK = false;
}
else if( nz >= G4int(fNoVoxelZ) )
else if( nz >= G4int(fNoVoxelsZ) )
{
nz = fNoVoxelZ-1;
nz = fNoVoxelsZ-1;
isOK = false;
}
if( !isOK )
{
std::ostringstream message;
message << "Corrected the copy number! It was negative or too big" << G4endl
<< " LocalPoint: " << localPoint << G4endl
<< " LocalDir: " << localDir << G4endl
<< " Voxel container size: " << fContainerWallX
<< " " << fContainerWallY << " " << fContainerWallZ << G4endl
<< " LocalPoint - wall: "
<< localPoint.x()-fContainerWallX << " "
<< localPoint.y()-fContainerWallY << " "
<< localPoint.z()-fContainerWallZ;
G4Exception("G4PhantomParameterisation::GetReplicaNo()",
"GeomNav1002", JustWarning, message);
copyNo = nx + fNoVoxelX*ny + fNoVoxelXY*nz;
if( std::fabs(localPoint.x()-fContainerWallX) > kCarTolerance &&
std::fabs(localPoint.y()-fContainerWallY) > kCarTolerance &&
std::fabs(localPoint.z()-fContainerWallZ) > kCarTolerance ){ // only if difference is big
std::ostringstream message;
message << "Corrected the copy number! It was negative or too big" << G4endl
<< " LocalPoint: " << localPoint << G4endl
<< " LocalDir: " << localDir << G4endl
<< " Voxel container size: " << fContainerWallX
<< " " << fContainerWallY << " " << fContainerWallZ << G4endl
<< " LocalPoint - wall: "
<< localPoint.x()-fContainerWallX << " "
<< localPoint.y()-fContainerWallY << " "
<< localPoint.z()-fContainerWallZ;
G4Exception("G4PhantomParameterisation::GetReplicaNo()",
"GeomNav1002", JustWarning, message);
}
copyNo = nx + fNoVoxelsX*ny + fNoVoxelsXY*nz;
}
return copyNo;
@@ -379,12 +389,12 @@ GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
//------------------------------------------------------------------
void G4PhantomParameterisation::CheckCopyNo( const G4int copyNo ) const
{
if( copyNo < 0 || copyNo >= G4int(fNoVoxel) )
if( copyNo < 0 || copyNo >= G4int(fNoVoxels) )
{
std::ostringstream message;
message << "Copy number is negative or too big!" << G4endl
<< " Copy number: " << copyNo << G4endl
<< " Total number of voxels: " << fNoVoxel;
<< " Total number of voxels: " << fNoVoxels;
G4Exception("G4PhantomParameterisation::CheckCopyNo()",
"GeomNav0002", FatalErrorInArgument, message);
}
source/geometry/navigation/src/G4RegularNavigation.cc
+1 -1
View File
@@ -404,7 +404,7 @@ G4RegularNavigation::LevelLocate( G4NavigationHistory& history,
//
replicaNo = pParam->GetReplicaNo( localPoint, localDir );
if( replicaNo < 0 || replicaNo >= G4int(pParam->GetNoVoxel()) )
if( replicaNo < 0 || replicaNo >= G4int(pParam->GetNoVoxels()) )
{
return false;
}