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

Import Geant4 10.6.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-06-28 11:59:04 +02:00
parent 28a70706e0
commit d0f911957d
1056 changed files with 95168 additions and 78160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/management/src/G4GeometryManager.cc
+10 -2
View File
@@ -383,7 +383,11 @@ G4GeometryManager::ReportVoxelStats( std::vector<G4SmartVoxelStat> & stats,
//
// First list: sort by total CPU time
//
std::sort( stats.begin(), stats.end(), G4SmartVoxelStat::ByCpu() );
std::sort( stats.begin(), stats.end(),
[](const G4SmartVoxelStat& a, const G4SmartVoxelStat& b)
{
return a.GetTotalTime() > b.GetTotalTime();
} );
G4int nPrint = nStat > 10 ? 10 : nStat;
@@ -424,7 +428,11 @@ G4GeometryManager::ReportVoxelStats( std::vector<G4SmartVoxelStat> & stats,
//
// Second list: sort by memory use
//
std::sort( stats.begin(), stats.end(), G4SmartVoxelStat::ByMemory() );
std::sort( stats.begin(), stats.end(),
[](const G4SmartVoxelStat& a, const G4SmartVoxelStat& b)
{
return a.GetMemoryUse() > b.GetMemoryUse();
} );
if (nPrint)
{
source/geometry/management/src/G4VPhysicalVolume.cc
+11 -7
View File
@@ -43,7 +43,9 @@ G4PVManager G4VPhysicalVolume::subInstanceManager;
// in the class G4PVData.
//
#define G4MT_rot ((subInstanceManager.offset[instanceID]).frot)
#define G4MT_trans ((subInstanceManager.offset[instanceID]).ftrans)
#define G4MT_tx ((subInstanceManager.offset[instanceID]).tx)
#define G4MT_ty ((subInstanceManager.offset[instanceID]).ty)
#define G4MT_tz ((subInstanceManager.offset[instanceID]).tz)
#define G4MT_pvdata (subInstanceManager.offset[instanceID])
// Constructor: init parameters and register in Store
@@ -64,7 +66,9 @@ G4VPhysicalVolume::G4VPhysicalVolume( G4RotationMatrix *pRot,
// Initialize 'Shadow' data structure - for use by object persistency
pvdata = new G4PVData();
pvdata->frot = pRot;
pvdata->ftrans = G4ThreeVector(tlate);
pvdata->tx = tlate.x();
pvdata->ty = tlate.y();
pvdata->tz = tlate.z();
G4PhysicalVolumeStore::Register(this);
}
@@ -135,14 +139,14 @@ G4int G4VPhysicalVolume::GetMultiplicity() const
return 1;
}
const G4ThreeVector& G4VPhysicalVolume::GetTranslation() const
const G4ThreeVector G4VPhysicalVolume::GetTranslation() const
{
return G4MT_trans;
return G4ThreeVector(G4MT_tx, G4MT_ty, G4MT_tz);
}
void G4VPhysicalVolume::SetTranslation(const G4ThreeVector &vec)
{
G4MT_trans=vec;
G4MT_tx=vec.x(); G4MT_ty=vec.y(); G4MT_tz=vec.z();
}
const G4RotationMatrix* G4VPhysicalVolume::GetRotation() const
@@ -190,7 +194,7 @@ G4RotationMatrix G4VPhysicalVolume::GetObjectRotationValue() const
G4ThreeVector G4VPhysicalVolume::GetObjectTranslation() const
{
return G4MT_trans;
return G4ThreeVector(G4MT_tx, G4MT_ty, G4MT_tz);
}
const G4RotationMatrix* G4VPhysicalVolume::GetFrameRotation() const
@@ -200,7 +204,7 @@ const G4RotationMatrix* G4VPhysicalVolume::GetFrameRotation() const
G4ThreeVector G4VPhysicalVolume::GetFrameTranslation() const
{
return -G4MT_trans;
return -G4ThreeVector(G4MT_tx, G4MT_ty, G4MT_tz);
}
// Only implemented for placed and parameterised volumes.