Import Geant4 10.5.1 source tree
This commit is contained in:
@@ -16,6 +16,11 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
March 1st, 2019 G.Cosmo - geomvol-V10-04-06
|
||||
- Correction in G4AssemblyVolume destructor to avoid deletion of internal
|
||||
physical volumes, as cleanup is taken care by G4PhysicalVolumeStore.
|
||||
Addressing problem report #2140.
|
||||
|
||||
October 9th, 2018 G.Cosmo - geomvol-V10-04-05, 04
|
||||
- Added G4AssemblyStore singleton class for assembly structures bookeeping,
|
||||
to address the specific use-case of allowing identification of assembly
|
||||
|
||||
@@ -260,7 +260,7 @@ _Tp* G4EnhancedVecAllocator<_Tp>::allocate(size_t _Count)
|
||||
// ************************************************************
|
||||
//
|
||||
template<typename _T1, typename _T2>
|
||||
inline bool operator==(const G4EnhancedVecAllocator<_T1>&,
|
||||
inline G4bool operator==(const G4EnhancedVecAllocator<_T1>&,
|
||||
const G4EnhancedVecAllocator<_T2>&)
|
||||
{ return true; }
|
||||
|
||||
@@ -269,7 +269,7 @@ inline bool operator==(const G4EnhancedVecAllocator<_T1>&,
|
||||
// ************************************************************
|
||||
//
|
||||
template<typename _T1, typename _T2>
|
||||
inline bool operator!=(const G4EnhancedVecAllocator<_T1>&,
|
||||
inline G4bool operator!=(const G4EnhancedVecAllocator<_T1>&,
|
||||
const G4EnhancedVecAllocator<_T2>&)
|
||||
{ return false; }
|
||||
|
||||
|
||||
@@ -81,8 +81,8 @@ class G4LogicalBorderSurface : public G4LogicalSurface
|
||||
static void DumpInfo();
|
||||
// To handle the table of surfaces.
|
||||
|
||||
G4int operator==( const G4LogicalBorderSurface &right ) const;
|
||||
G4int operator!=( const G4LogicalBorderSurface &right ) const;
|
||||
G4bool operator==( const G4LogicalBorderSurface &right ) const;
|
||||
G4bool operator!=( const G4LogicalBorderSurface &right ) const;
|
||||
// Operators.
|
||||
|
||||
private:
|
||||
|
||||
@@ -72,8 +72,8 @@ class G4LogicalSkinSurface : public G4LogicalSurface
|
||||
static void DumpInfo(); // const
|
||||
// To handle with the table of surfaces.
|
||||
|
||||
G4int operator==(const G4LogicalSkinSurface &right) const;
|
||||
G4int operator!=(const G4LogicalSkinSurface &right) const;
|
||||
G4bool operator==(const G4LogicalSkinSurface &right) const;
|
||||
G4bool operator!=(const G4LogicalSkinSurface &right) const;
|
||||
// Operators.
|
||||
|
||||
private:
|
||||
|
||||
@@ -101,7 +101,7 @@ G4AssemblyVolume::~G4AssemblyVolume()
|
||||
unsigned int howmany = fTriplets.size();
|
||||
if( howmany != 0 )
|
||||
{
|
||||
for( unsigned int i = 0; i < howmany; i++ )
|
||||
for( unsigned int i = 0; i < howmany; ++i )
|
||||
{
|
||||
G4RotationMatrix* pRotToClean = fTriplets[i].GetRotation();
|
||||
if( pRotToClean != 0 )
|
||||
@@ -112,14 +112,9 @@ G4AssemblyVolume::~G4AssemblyVolume()
|
||||
}
|
||||
fTriplets.clear();
|
||||
|
||||
howmany = fPVStore.size();
|
||||
if( howmany != 0 )
|
||||
{
|
||||
for( unsigned int j = 0; j < howmany; j++ )
|
||||
{
|
||||
delete fPVStore[j];
|
||||
}
|
||||
}
|
||||
// No need to delete physical volumes, as these are deleted
|
||||
// by physical-volumes store.
|
||||
//
|
||||
fPVStore.clear();
|
||||
InstanceCountMinus();
|
||||
G4AssemblyStore::GetInstance()->DeRegister(this);
|
||||
|
||||
@@ -102,13 +102,13 @@ G4LogicalBorderSurface::operator=(const G4LogicalBorderSurface &right)
|
||||
return *this;
|
||||
}
|
||||
|
||||
G4int
|
||||
G4bool
|
||||
G4LogicalBorderSurface::operator==(const G4LogicalBorderSurface &right) const
|
||||
{
|
||||
return (this == (G4LogicalBorderSurface *) &right);
|
||||
}
|
||||
|
||||
G4int
|
||||
G4bool
|
||||
G4LogicalBorderSurface::operator!=(const G4LogicalBorderSurface &right) const
|
||||
{
|
||||
return (this != (G4LogicalBorderSurface *) &right);
|
||||
|
||||
@@ -96,13 +96,13 @@ G4LogicalSkinSurface::operator=(const G4LogicalSkinSurface& right)
|
||||
return *this;
|
||||
}
|
||||
|
||||
G4int
|
||||
G4bool
|
||||
G4LogicalSkinSurface::operator==(const G4LogicalSkinSurface& right) const
|
||||
{
|
||||
return (this == (G4LogicalSkinSurface *) &right);
|
||||
}
|
||||
|
||||
G4int
|
||||
G4bool
|
||||
G4LogicalSkinSurface::operator!=(const G4LogicalSkinSurface& right) const
|
||||
{
|
||||
return (this != (G4LogicalSkinSurface *) &right);
|
||||
|
||||
Reference in New Issue
Block a user