Import Geant4 11.1.0 source tree
This commit is contained in:
@@ -114,7 +114,7 @@ class G4ParameterisedNavigation : public G4VoxelNavigation
|
||||
EAxis fVoxelAxis = kUndefined;
|
||||
G4int fVoxelNoSlices = 0;
|
||||
G4double fVoxelSliceWidth = 0.0;
|
||||
size_t fVoxelNodeNo = 0;
|
||||
std::size_t fVoxelNodeNo = 0;
|
||||
G4SmartVoxelHeader* fVoxelHeader = nullptr;
|
||||
};
|
||||
|
||||
|
||||
@@ -69,11 +69,11 @@ class G4PartialPhantomParameterisation : public G4PhantomParameterisation
|
||||
|
||||
G4ThreeVector GetTranslation(const G4int copyNo ) const;
|
||||
|
||||
size_t GetMaterialIndex( size_t nx, size_t ny, size_t nz) const;
|
||||
size_t GetMaterialIndex( size_t copyNo) const;
|
||||
std::size_t GetMaterialIndex( std::size_t nx, std::size_t ny, std::size_t nz) const;
|
||||
std::size_t GetMaterialIndex( std::size_t copyNo) const;
|
||||
|
||||
G4Material* GetMaterial( size_t nx, size_t ny, size_t nz) const;
|
||||
G4Material* GetMaterial( size_t copyNo ) const;
|
||||
G4Material* GetMaterial( std::size_t nx, std::size_t ny, std::size_t nz) const;
|
||||
G4Material* GetMaterial( std::size_t copyNo ) const;
|
||||
|
||||
void SetFilledIDs( std::multimap<G4int,G4int> fid )
|
||||
{
|
||||
@@ -89,11 +89,11 @@ class G4PartialPhantomParameterisation : public G4PhantomParameterisation
|
||||
|
||||
private:
|
||||
|
||||
void ComputeVoxelIndices(const G4int copyNo, size_t& nx,
|
||||
size_t& ny, size_t& nz ) const;
|
||||
void ComputeVoxelIndices(const G4int copyNo, std::size_t& nx,
|
||||
std::size_t& ny, std::size_t& nz ) const;
|
||||
// Convert the copyNo to voxel numbers in x, y and z.
|
||||
|
||||
void CheckCopyNo( const G4int copyNo ) const;
|
||||
void CheckCopyNo( const G4long copyNo ) const;
|
||||
// Check that the copy number is within limits.
|
||||
|
||||
private:
|
||||
|
||||
@@ -67,7 +67,7 @@ class G4Polyhedra;
|
||||
|
||||
class G4PhantomParameterisation : public G4VPVParameterisation
|
||||
{
|
||||
public: // with description
|
||||
public:
|
||||
|
||||
G4PhantomParameterisation();
|
||||
~G4PhantomParameterisation();
|
||||
@@ -122,21 +122,21 @@ class G4PhantomParameterisation : public G4VPVParameterisation
|
||||
|
||||
inline void SetMaterials(std::vector<G4Material*>& mates );
|
||||
|
||||
inline void SetMaterialIndices( size_t* matInd );
|
||||
inline void SetMaterialIndices( std::size_t* matInd );
|
||||
|
||||
void SetVoxelDimensions( G4double halfx, G4double halfy, G4double halfz );
|
||||
void SetNoVoxels( size_t nx, size_t ny, size_t nz );
|
||||
void SetNoVoxels( std::size_t nx, std::size_t ny, std::size_t nz );
|
||||
|
||||
inline G4double GetVoxelHalfX() const;
|
||||
inline G4double GetVoxelHalfY() const;
|
||||
inline G4double GetVoxelHalfZ() const;
|
||||
inline size_t GetNoVoxelsX() const;
|
||||
inline size_t GetNoVoxelsY() const;
|
||||
inline size_t GetNoVoxelsZ() const;
|
||||
inline size_t GetNoVoxels() const;
|
||||
inline std::size_t GetNoVoxelsX() const;
|
||||
inline std::size_t GetNoVoxelsY() const;
|
||||
inline std::size_t GetNoVoxelsZ() const;
|
||||
inline std::size_t GetNoVoxels() const;
|
||||
|
||||
inline std::vector<G4Material*> GetMaterials() const;
|
||||
inline size_t* GetMaterialIndices() const;
|
||||
inline std::size_t* GetMaterialIndices() const;
|
||||
inline G4VSolid* GetContainerSolid() const;
|
||||
|
||||
G4ThreeVector GetTranslation(const G4int copyNo ) const;
|
||||
@@ -144,11 +144,11 @@ class G4PhantomParameterisation : public G4VPVParameterisation
|
||||
G4bool SkipEqualMaterials() const;
|
||||
void SetSkipEqualMaterials( G4bool skip );
|
||||
|
||||
size_t GetMaterialIndex( size_t nx, size_t ny, size_t nz) const;
|
||||
size_t GetMaterialIndex( size_t copyNo) const;
|
||||
std::size_t GetMaterialIndex( std::size_t nx, std::size_t ny, std::size_t nz) const;
|
||||
std::size_t GetMaterialIndex( std::size_t copyNo) const;
|
||||
|
||||
G4Material* GetMaterial( size_t nx, size_t ny, size_t nz) const;
|
||||
G4Material* GetMaterial( size_t copyNo ) const;
|
||||
G4Material* GetMaterial( std::size_t nx, std::size_t ny, std::size_t nz) const;
|
||||
G4Material* GetMaterial( std::size_t copyNo ) const;
|
||||
|
||||
void CheckVoxelsFillContainer( G4double contX, G4double contY,
|
||||
G4double contZ ) const;
|
||||
@@ -156,27 +156,27 @@ class G4PhantomParameterisation : public G4VPVParameterisation
|
||||
|
||||
private:
|
||||
|
||||
void ComputeVoxelIndices(const G4int copyNo, size_t& nx,
|
||||
size_t& ny, size_t& nz ) const;
|
||||
void ComputeVoxelIndices(const G4int copyNo, std::size_t& nx,
|
||||
std::size_t& ny, std::size_t& nz ) const;
|
||||
// Convert the copyNo to voxel numbers in x, y and z.
|
||||
|
||||
void CheckCopyNo( const G4int copyNo ) const;
|
||||
void CheckCopyNo( const G4long copyNo ) const;
|
||||
// Check that the copy number is within limits.
|
||||
|
||||
protected:
|
||||
|
||||
G4double fVoxelHalfX = 0.0, fVoxelHalfY = 0.0, fVoxelHalfZ = 0.0;
|
||||
// Half dimension of voxels (assume they are boxes).
|
||||
size_t fNoVoxelsX = 0, fNoVoxelsY = 0, fNoVoxelsZ = 0;
|
||||
std::size_t fNoVoxelsX = 0, fNoVoxelsY = 0, fNoVoxelsZ = 0;
|
||||
// Number of voxel in x, y and z dimensions.
|
||||
size_t fNoVoxelsXY = 0;
|
||||
std::size_t fNoVoxelsXY = 0;
|
||||
// Number of voxels in x times number of voxels in y (for speed-up).
|
||||
size_t fNoVoxels = 0;
|
||||
std::size_t fNoVoxels = 0;
|
||||
// Total number of voxels (for speed-up).
|
||||
|
||||
std::vector<G4Material*> fMaterials;
|
||||
// List of materials of the voxels.
|
||||
size_t* fMaterialIndices = nullptr;
|
||||
std::size_t* fMaterialIndices = nullptr;
|
||||
// Index in fMaterials that correspond to each voxel.
|
||||
|
||||
G4VSolid* fContainerSolid = nullptr;
|
||||
|
||||
@@ -38,7 +38,9 @@ SetVoxelDimensions( G4double halfx, G4double halfy, G4double halfz )
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
inline
|
||||
void G4PhantomParameterisation::SetNoVoxels( size_t nx, size_t ny, size_t nz )
|
||||
void G4PhantomParameterisation::SetNoVoxels( std::size_t nx,
|
||||
std::size_t ny,
|
||||
std::size_t nz )
|
||||
{
|
||||
fNoVoxelsX = nx;
|
||||
fNoVoxelsY = ny;
|
||||
@@ -56,7 +58,7 @@ void G4PhantomParameterisation::SetMaterials( std::vector<G4Material*>& mates )
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
inline
|
||||
void G4PhantomParameterisation::SetMaterialIndices( size_t* matInd )
|
||||
void G4PhantomParameterisation::SetMaterialIndices( std::size_t* matInd )
|
||||
{
|
||||
fMaterialIndices = matInd;
|
||||
}
|
||||
@@ -84,28 +86,28 @@ G4double G4PhantomParameterisation::GetVoxelHalfZ() const
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
inline
|
||||
size_t G4PhantomParameterisation::GetNoVoxelsX() const
|
||||
std::size_t G4PhantomParameterisation::GetNoVoxelsX() const
|
||||
{
|
||||
return fNoVoxelsX;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
inline
|
||||
size_t G4PhantomParameterisation::GetNoVoxelsY() const
|
||||
std::size_t G4PhantomParameterisation::GetNoVoxelsY() const
|
||||
{
|
||||
return fNoVoxelsY;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
inline
|
||||
size_t G4PhantomParameterisation::GetNoVoxelsZ() const
|
||||
std::size_t G4PhantomParameterisation::GetNoVoxelsZ() const
|
||||
{
|
||||
return fNoVoxelsZ;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
inline
|
||||
size_t G4PhantomParameterisation::GetNoVoxels() const
|
||||
std::size_t G4PhantomParameterisation::GetNoVoxels() const
|
||||
{
|
||||
return fNoVoxels;
|
||||
}
|
||||
@@ -119,7 +121,7 @@ std::vector<G4Material*> G4PhantomParameterisation::GetMaterials() const
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
inline
|
||||
size_t* G4PhantomParameterisation::GetMaterialIndices() const
|
||||
std::size_t* G4PhantomParameterisation::GetMaterialIndices() const
|
||||
{
|
||||
return fMaterialIndices;
|
||||
}
|
||||
|
||||
@@ -73,11 +73,11 @@ class G4TransportationManager
|
||||
// Set the world volume for tracking
|
||||
// This method is to be invoked by G4RunManagerKernel.
|
||||
|
||||
inline size_t GetNoActiveNavigators() const;
|
||||
inline std::size_t GetNoActiveNavigators() const;
|
||||
inline std::vector<G4Navigator*>::iterator GetActiveNavigatorsIterator();
|
||||
// Return an iterator to the list of active navigators
|
||||
|
||||
inline size_t GetNoWorlds() const;
|
||||
inline std::size_t GetNoWorlds() const;
|
||||
inline std::vector<G4VPhysicalVolume*>::iterator GetWorldsIterator();
|
||||
// Return an iterator to the list of registered worlds
|
||||
|
||||
|
||||
Reference in New Issue
Block a user