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

Import Geant4 5.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:28:22 +02:00
parent fbd4999cf7
commit 4aea781e80
5454 changed files with 223141 additions and 67347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/verification/src/G4GeomTestErrorList.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GeomTestErrorList.cc,v 1.1 2001/10/17 12:59:57 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
// GEANT 4 class source file
source/geometry/verification/src/G4GeomTestOverlapList.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GeomTestOverlapList.cc,v 1.1 2001/10/17 12:59:58 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
// GEANT 4 class source file
source/geometry/verification/src/G4GeomTestOvershootList.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GeomTestOvershootList.cc,v 1.1 2001/10/17 12:59:58 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
// GEANT 4 class source file
source/geometry/verification/src/G4GeomTestPoint.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GeomTestPoint.cc,v 1.1 2001/10/17 12:59:58 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
// GEANT 4 class source file
source/geometry/verification/src/G4GeomTestSegment.cc
+6 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4GeomTestSegment.cc,v 1.1 2001/10/17 12:59:59 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4GeomTestSegment.cc,v 1.2 2003/06/16 16:54:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
// GEANT 4 class source file
@@ -106,14 +106,14 @@ void G4GeomTestSegment::PatchInconsistencies( G4GeomTestLogger *logger )
//
// Sort
//
G4std::sort( points.begin(), points.end() );
std::sort( points.begin(), points.end() );
//
// Loop over entering/leaving pairs
//
G4std::vector<G4GeomTestPoint>::iterator curr = points.begin();
std::vector<G4GeomTestPoint>::iterator curr = points.begin();
do {
G4std::vector<G4GeomTestPoint>::iterator next = curr + 1;
std::vector<G4GeomTestPoint>::iterator next = curr + 1;
//
// Is the next point close by?
@@ -164,7 +164,7 @@ void G4GeomTestSegment::PatchInconsistencies( G4GeomTestLogger *logger )
// Test solid just after last point
//
if (curr != points.begin()) {
G4std::vector<G4GeomTestPoint>::iterator prev = curr - 1;
std::vector<G4GeomTestPoint>::iterator prev = curr - 1;
s = prev->GetDistance();
p = p0 + s*v;
source/geometry/verification/src/G4GeomTestStreamLogger.cc
+16 -16
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4GeomTestStreamLogger.cc,v 1.5 2002/04/19 08:23:37 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4GeomTestStreamLogger.cc,v 1.6 2003/06/16 16:54:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
// GEANT 4 class source file
@@ -34,7 +34,7 @@
#include "G4GeomTestStreamLogger.hh"
#include "G4VSolid.hh"
#include "G4VPhysicalVolume.hh"
#include "g4std/iomanip"
#include <iomanip>
#include "G4GeomTestOverlapList.hh"
#include "G4GeomTestOvershootList.hh"
@@ -42,7 +42,7 @@
//
// Constructor and destructor
//
G4GeomTestStreamLogger::G4GeomTestStreamLogger( G4std::ostream &o,
G4GeomTestStreamLogger::G4GeomTestStreamLogger( std::ostream &o,
G4int theMaxPointsPerError )
: out(o), maxPointsPerError(theMaxPointsPerError)
{;}
@@ -55,15 +55,15 @@ G4GeomTestStreamLogger::~G4GeomTestStreamLogger()
//
// Utility class for printing a 3 vector position
//
void G4GeomTestStreamLogger::PrintPos::Print( G4std::ostream &o ) const
void G4GeomTestStreamLogger::PrintPos::Print( std::ostream &o ) const
{
o << G4std::setprecision(6) << G4std::setw(14) << p.x()/cm;
o << G4std::setprecision(6) << G4std::setw(14) << p.y()/cm;
o << G4std::setprecision(6) << G4std::setw(14) << p.z()/cm;
o << std::setprecision(6) << std::setw(14) << p.x()/cm;
o << std::setprecision(6) << std::setw(14) << p.y()/cm;
o << std::setprecision(6) << std::setw(14) << p.z()/cm;
if (unit) o << " cm";
}
G4std::ostream &operator<<( G4std::ostream &o,
std::ostream &operator<<( std::ostream &o,
const G4GeomTestStreamLogger::PrintPos &p )
{
p.Print(o);
@@ -76,12 +76,12 @@ G4std::ostream &operator<<( G4std::ostream &o,
// Utility class for printing a volume's name and copy number
//
void
G4GeomTestStreamLogger::VolumeNameAndCopy::Print( G4std::ostream &o ) const
G4GeomTestStreamLogger::VolumeNameAndCopy::Print( std::ostream &o ) const
{
o << volume->GetName() << "[" << volume->GetCopyNo() << "]";
}
G4std::ostream &operator<<( G4std::ostream &o,
std::ostream &operator<<( std::ostream &o,
const G4GeomTestStreamLogger::VolumeNameAndCopy &p )
{
p.Print(o);
@@ -99,7 +99,7 @@ void G4GeomTestStreamLogger::SolidProblem( const G4VSolid *solid,
out << "GeomTest Error: SolidProblem\n"
<< " " << message << "\n"
<< " Solid name = " << solid->GetName() << "\n"
<< " Local position = " << PrintPos(point) << G4std::endl;
<< " Local position = " << PrintPos(point) << std::endl;
}
@@ -108,7 +108,7 @@ void G4GeomTestStreamLogger::SolidProblem( const G4VSolid *solid,
//
void G4GeomTestStreamLogger::NoProblem( const G4String &message )
{
out << message << G4std::endl;
out << message << std::endl;
}
@@ -177,7 +177,7 @@ G4GeomTestStreamLogger::OverlappingDaughters(const G4GeomTestOverlapList *list)
PrintSegmentListElement( s1, s2 );
}
out << G4std::endl;
out << std::endl;
}
@@ -237,7 +237,7 @@ OvershootingDaughter( const G4GeomTestOvershootList *list )
PrintSegmentListElement( s1, s2 );
}
out << G4std::endl;
out << std::endl;
}
@@ -266,7 +266,7 @@ void G4GeomTestStreamLogger::PrintSegmentListHeader()
void G4GeomTestStreamLogger::PrintSegmentListElement( const G4ThreeVector &s1,
const G4ThreeVector &s2 )
{
out << " " << G4std::setprecision(6) << G4std::setw(14)
out << " " << std::setprecision(6) << std::setw(14)
<< (s1-s2).mag()/cm
<< " " << PrintPos(s1,false) << " " << PrintPos(s2,false) << "\n";
}
source/geometry/verification/src/G4GeomTestVolPoint.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GeomTestVolPoint.cc,v 1.1 2001/10/17 13:00:00 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
// GEANT 4 class source file
source/geometry/verification/src/G4GeomTestVolume.cc
+207 -59
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4GeomTestVolume.cc,v 1.5 2002/07/30 07:26:34 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4GeomTestVolume.cc,v 1.7 2003/06/16 16:54:40 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
// GEANT 4 class source file
@@ -41,10 +41,10 @@
#include "G4LogicalVolume.hh"
#include "G4VSolid.hh"
#include "g4std/vector"
#include "g4std/set"
#include "g4std/algorithm"
#include "g4std/iomanip"
#include <vector>
#include <set>
#include <algorithm>
#include <iomanip>
//
// Constructor
@@ -58,7 +58,6 @@ G4GeomTestVolume::G4GeomTestVolume( const G4VPhysicalVolume *theTarget,
extent(theTarget->GetLogicalVolume()->GetSolid()->GetExtent())
{;}
//
// Destructor
//
@@ -90,7 +89,6 @@ void G4GeomTestVolume::TestCartGridXYZ( G4int nx, G4int ny, G4int nz )
TestCartGridZ( nx, ny );
}
//
// TestCartGridX
//
@@ -100,7 +98,6 @@ void G4GeomTestVolume::TestCartGridX( G4int ny, G4int nz )
G4ThreeVector(1,0,0), ny, nz );
}
//
// TestCartGridY
//
@@ -110,7 +107,6 @@ void G4GeomTestVolume::TestCartGridY( G4int nz, G4int nx )
G4ThreeVector(0,1,0), nz, nx );
}
//
// TestCartGridZ
//
@@ -120,16 +116,26 @@ void G4GeomTestVolume::TestCartGridZ( G4int nx, G4int ny )
G4ThreeVector(0,0,1), nx, ny );
}
//
// TestRecursiveCartGrid
//
void G4GeomTestVolume::TestRecursiveCartGrid( G4int nx, G4int ny, G4int nz )
void G4GeomTestVolume::TestRecursiveCartGrid( G4int nx, G4int ny, G4int nz,
G4int slevel, G4int depth )
{
// If reached requested level of depth (i.e. set to 0), exit.
// If not depth specified (i.e. set to -1), visit the whole tree.
// If requested initial level of depth is not zero, visit from beginning
//
// As long as we aren't a replica, test ourselves
if (depth == 0) return;
if (depth != -1) depth--;
if (slevel != 0) slevel--;
//
if (!target->IsReplicated()) {
// As long as we aren't a replica and we reached the requested
// initial level of depth, test ourselves
//
if ( (!target->IsReplicated()) && (slevel==0) )
{
TestCartGridXYZ( nx, ny, nz );
ReportErrors();
}
@@ -137,12 +143,13 @@ void G4GeomTestVolume::TestRecursiveCartGrid( G4int nx, G4int ny, G4int nz )
//
// Loop over unique daughters
//
G4std::set<const G4LogicalVolume *> tested;
std::set<const G4LogicalVolume *> tested;
const G4LogicalVolume *logical = target->GetLogicalVolume();
G4int nDaughter = logical->GetNoDaughters();
G4int iDaughter;
for( iDaughter=0; iDaughter<nDaughter; ++iDaughter) {
for( iDaughter=0; iDaughter<nDaughter; ++iDaughter )
{
const G4VPhysicalVolume *daughter =
logical->GetDaughter(iDaughter);
const G4LogicalVolume *daughterLogical =
@@ -156,7 +163,7 @@ void G4GeomTestVolume::TestRecursiveCartGrid( G4int nx, G4int ny, G4int nz )
//
// Tested already?
//
G4std::pair<G4std::set<const G4LogicalVolume *>::iterator,G4bool>
std::pair<std::set<const G4LogicalVolume *>::iterator,G4bool>
there = tested.insert(daughterLogical);
if (!there.second) continue;
@@ -164,10 +171,73 @@ void G4GeomTestVolume::TestRecursiveCartGrid( G4int nx, G4int ny, G4int nz )
// Recurse
//
G4GeomTestVolume vTest( daughter, logger, tolerance );
vTest.TestRecursiveCartGrid(nx,ny,nz);
vTest.TestRecursiveCartGrid( nx,ny,nz,slevel,depth );
}
}
//
// TestRecursiveCylinder
//
void
G4GeomTestVolume::TestRecursiveCylinder( G4int nPhi, G4int nZ, G4int nRho,
G4double fracZ, G4double fracRho,
G4bool usePhi,
G4int slevel, G4int depth )
{
// If reached requested level of depth (i.e. set to 0), exit.
// If not depth specified (i.e. set to -1), visit the whole tree.
// If requested initial level of depth is not zero, visit from beginning
//
if (depth == 0) return;
if (depth != -1) depth--;
if (slevel != 0) slevel--;
//
// As long as we aren't a replica and we reached the requested
// initial level of depth, test ourselves
//
if ( (!target->IsReplicated()) && (slevel==0) )
{
TestCylinder( nPhi, nZ, nRho, fracZ, fracRho, usePhi );
ReportErrors();
}
//
// Loop over unique daughters
//
std::set<const G4LogicalVolume *> tested;
const G4LogicalVolume *logical = target->GetLogicalVolume();
G4int nDaughter = logical->GetNoDaughters();
G4int iDaughter;
for( iDaughter=0; iDaughter<nDaughter; ++iDaughter )
{
const G4VPhysicalVolume *daughter =
logical->GetDaughter(iDaughter);
const G4LogicalVolume *daughterLogical =
daughter->GetLogicalVolume();
//
// Skip empty daughters
//
if (daughterLogical->GetNoDaughters() == 0) continue;
//
// Tested already?
//
std::pair<std::set<const G4LogicalVolume *>::iterator,G4bool>
there = tested.insert(daughterLogical);
if (!there.second) continue;
//
// Recurse
//
G4GeomTestVolume vTest( daughter, logger, tolerance );
vTest.TestRecursiveCylinder( nPhi, nZ, nRho,
fracZ, fracRho, usePhi,
slevel, depth );
}
}
//
// TestCylinder
@@ -179,8 +249,8 @@ void G4GeomTestVolume::TestCylinder( G4int nPhi, G4int nZ, G4int nRho,
//
// Get size of our volume
//
G4double xMax = G4std::max(extent.GetXmax(),-extent.GetXmin());
G4double yMax = G4std::max(extent.GetYmax(),-extent.GetYmin());
G4double xMax = std::max(extent.GetXmax(),-extent.GetXmin());
G4double yMax = std::max(extent.GetYmax(),-extent.GetYmin());
G4double rhoMax = sqrt(xMax*xMax + yMax*yMax);
G4double zMax = extent.GetZmax();
@@ -196,7 +266,8 @@ void G4GeomTestVolume::TestCylinder( G4int nPhi, G4int nZ, G4int nRho,
G4double phi = 0;
G4int iPhi = nPhi;
if ((iPhi&1) == 0) iPhi++; // Also use odd number phi slices
do {
do
{
G4double cosPhi = cos(phi);
G4double sinPhi = sin(phi);
@@ -205,13 +276,15 @@ void G4GeomTestVolume::TestCylinder( G4int nPhi, G4int nZ, G4int nRho,
//
G4double rho = rhoMax;
G4int iRho = nRho;
do {
do
{
G4ThreeVector p(rho*cosPhi,rho*sinPhi,0);
static G4ThreeVector v(0,0,1);
TestOneLine( p, v );
if (usePhi) {
if (usePhi)
{
//
// Loop over z
//
@@ -219,7 +292,8 @@ void G4GeomTestVolume::TestCylinder( G4int nPhi, G4int nZ, G4int nRho,
G4double zScale = 1.0;
G4int iZ=nZ;
do {
do
{
p.setZ( z0 + zScale*zHalfLength );
TestOneLine(p,v);
p.setZ( z0 - zScale*zHalfLength );
@@ -236,7 +310,8 @@ void G4GeomTestVolume::TestCylinder( G4int nPhi, G4int nZ, G4int nRho,
G4double zScale = 1.0;
G4int iZ=nZ;
do {
do
{
p.setZ( z0 + zScale*zHalfLength );
TestOneLine(p,v);
@@ -249,8 +324,6 @@ void G4GeomTestVolume::TestCylinder( G4int nPhi, G4int nZ, G4int nRho,
} while( phi += deltaPhi, --iPhi );
}
//
// TestCartGrid
//
@@ -282,10 +355,12 @@ void G4GeomTestVolume::TestCartGrid( const G4ThreeVector &theG1,
G4int i1, i2;
for(i1=0;i1<=n1;++i1) {
for(i1=0;i1<=n1;++i1)
{
G4ThreeVector p1 = (gMin1 + G4double(i1)*delta1)*g1;
for(i2=0;i2<=n2;++i2) {
for(i2=0;i2<=n2;++i2)
{
G4ThreeVector p2 = (gMin2 + G4double(i2)*delta2)*g2;
TestOneLine( p1+p2, v );
@@ -293,7 +368,66 @@ void G4GeomTestVolume::TestCartGrid( const G4ThreeVector &theG1,
}
}
//
// TestRecursiveLine
//
void
G4GeomTestVolume::TestRecursiveLine( const G4ThreeVector& p,
const G4ThreeVector& v,
G4int slevel, G4int depth )
{
// If reached requested level of depth (i.e. set to 0), exit.
// If not depth specified (i.e. set to -1), visit the whole tree.
// If requested initial level of depth is not zero, visit from beginning
//
if (depth == 0) return;
if (depth != -1) depth--;
if (slevel != 0) slevel--;
//
// As long as we aren't a replica and we reached the requested
// initial level of depth, test ourselves
//
if ( (!target->IsReplicated()) && (slevel==0) )
{
TestOneLine( p, v );
ReportErrors();
}
//
// Loop over unique daughters
//
std::set<const G4LogicalVolume *> tested;
const G4LogicalVolume *logical = target->GetLogicalVolume();
G4int nDaughter = logical->GetNoDaughters();
G4int iDaughter;
for( iDaughter=0; iDaughter<nDaughter; ++iDaughter )
{
const G4VPhysicalVolume *daughter =
logical->GetDaughter(iDaughter);
const G4LogicalVolume *daughterLogical =
daughter->GetLogicalVolume();
//
// Skip empty daughters
//
if (daughterLogical->GetNoDaughters() == 0) continue;
//
// Tested already?
//
std::pair<std::set<const G4LogicalVolume *>::iterator,G4bool>
there = tested.insert(daughterLogical);
if (!there.second) continue;
//
// Recurse
//
G4GeomTestVolume vTest( daughter, logger, tolerance );
vTest.TestRecursiveLine( p, v, slevel, depth );
}
}
//
// TestOneLine
@@ -306,7 +440,7 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
//
// Keep track of intersection points
//
G4std::vector<G4GeomTestVolPoint> points;
std::vector<G4GeomTestVolPoint> points;
//
// Calculate intersections with the mother volume
@@ -319,7 +453,8 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
//
G4int n = targetSegment.GetNumberPoints();
G4int i;
for(i=0;i<n;++i) {
for(i=0;i<n;++i)
{
points.push_back( G4GeomTestVolPoint( targetSegment.GetPoint(i), -1 ) );
}
@@ -329,7 +464,8 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
const G4LogicalVolume *logical = target->GetLogicalVolume();
G4int nDaughter = logical->GetNoDaughters();
G4int iDaughter;
for( iDaughter=0; iDaughter<nDaughter; ++iDaughter) {
for( iDaughter=0; iDaughter<nDaughter; ++iDaughter)
{
const G4VPhysicalVolume *daughter =
logical->GetDaughter(iDaughter);
@@ -342,7 +478,8 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
G4ThreeVector pLocal = translation + p;
G4ThreeVector vLocal = v;
if (rotation) {
if (rotation)
{
pLocal = (*rotation)*pLocal;
vLocal = (*rotation)*vLocal;
}
@@ -359,7 +496,8 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
//
G4int n = daughterSegment.GetNumberPoints();
G4int i;
for(i=0;i<n;++i) {
for(i=0;i<n;++i)
{
points.push_back( G4GeomTestVolPoint( daughterSegment.GetPoint(i),
iDaughter, translation, rotation ) );
}
@@ -368,7 +506,7 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
//
// Now sort the list of intersection points
//
G4std::sort( points.begin(), points.end() );
std::sort( points.begin(), points.end() );
//
// Search for problems:
@@ -387,9 +525,10 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
//
// Set true if this point has been analyzed
//
G4std::vector<G4bool> checked( n, false );
std::vector<G4bool> checked( n, false );
for(i=0;i<n;++i) {
for(i=0;i<n;++i)
{
if (checked[i]) continue;
G4int iDaug = points[i].GetDaughterIndex();
@@ -400,10 +539,12 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
//
G4double iS = points[i].GetDistance();
G4int j = i;
while(++j<n) {
while(++j<n)
{
if (iDaug == points[j].GetDaughterIndex()) break;
}
if (j>=n) {
if (j>=n)
{
//
// Unmatched? This shouldn't happen
//
@@ -422,7 +563,8 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
// Otherwise, we could have a problem
//
G4int k = i;
while(++k<j) {
while(++k<j)
{
if (checked[k]) continue;
G4bool kEntering = points[k].Entering();
@@ -433,7 +575,8 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
// Problem found: catagorize
//
G4int kDaug = points[k].GetDaughterIndex();
if (kDaug < 0) {
if (kDaug < 0)
{
//
// Ignore small overshoots if they are within tolerance
//
@@ -443,12 +586,13 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
//
// We appear to extend outside the mother volume
//
G4std::map<G4long,G4GeomTestOvershootList>::iterator overshoot =
std::map<G4long,G4GeomTestOvershootList>::iterator overshoot =
overshoots.find(iDaug);
if (overshoot == overshoots.end()) {
G4std::pair<G4std::map<G4long,G4GeomTestOvershootList>::iterator,G4bool>
if (overshoot == overshoots.end())
{
std::pair<std::map<G4long,G4GeomTestOvershootList>::iterator,G4bool>
result =
overshoots.insert( G4std::pair<const G4long,G4GeomTestOvershootList>
overshoots.insert( std::pair<const G4long,G4GeomTestOvershootList>
(iDaug,G4GeomTestOvershootList(target,iDaug)) );
assert(result.second);
overshoot = result.first;
@@ -461,7 +605,8 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
(*overshoot).second.AddError( points[k].GetPosition(),
points[j].GetPosition() );
}
else {
else
{
//
// Ignore small overlaps if they are within tolerance
//
@@ -474,12 +619,13 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
G4long key = iDaug < kDaug ?
(iDaug*nDaughter + kDaug) : (kDaug*nDaughter + iDaug);
G4std::map<G4long,G4GeomTestOverlapList>::iterator overlap =
std::map<G4long,G4GeomTestOverlapList>::iterator overlap =
overlaps.find(key);
if (overlap == overlaps.end()) {
G4std::pair<G4std::map<G4long,G4GeomTestOverlapList>::iterator,G4bool>
if (overlap == overlaps.end())
{
std::pair<std::map<G4long,G4GeomTestOverlapList>::iterator,G4bool>
result =
overlaps.insert( G4std::pair<const G4long,G4GeomTestOverlapList>
overlaps.insert( std::pair<const G4long,G4GeomTestOverlapList>
(key,G4GeomTestOverlapList(target,iDaug,kDaug)) );
assert(result.second);
overlap = result.first;
@@ -494,7 +640,6 @@ void G4GeomTestVolume::TestOneLine( const G4ThreeVector &p,
}
}
}
}
//
@@ -507,10 +652,12 @@ void G4GeomTestVolume::ReportErrors()
//
if (overshoots.empty())
logger->NoProblem("GeomTest: no daughter volume extending outside mother detected.");
else {
G4std::map<G4long,G4GeomTestOvershootList>::iterator overshoot =
else
{
std::map<G4long,G4GeomTestOvershootList>::iterator overshoot =
overshoots.begin();
while( overshoot != overshoots.end() ) {
while( overshoot != overshoots.end() )
{
logger->OvershootingDaughter( &(*overshoot).second );
++overshoot;
}
@@ -521,17 +668,18 @@ void G4GeomTestVolume::ReportErrors()
//
if (overlaps.empty())
logger->NoProblem("GeomTest: no overlapping daughters detected.");
else {
G4std::map<G4long,G4GeomTestOverlapList>::iterator overlap =
else
{
std::map<G4long,G4GeomTestOverlapList>::iterator overlap =
overlaps.begin();
while( overlap != overlaps.end() ) {
while( overlap != overlaps.end() )
{
logger->OverlappingDaughters( &(*overlap).second );
++overlap;
}
}
}
//
// ClearErrors
//