Import Geant4 11.1.1 source tree
This commit is contained in:
@@ -6,6 +6,10 @@ It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
## 2022-12-20 Ivana Hrivnacova (geom-bool-V11-00-08)
|
||||
- Fixed hang-out in G4MultiUnion, caused by oveflow of 'size-1' when 'size' value is zero
|
||||
after changing G4int type to size_t
|
||||
|
||||
## 2022-11-10 Gabriele Cosmo (geom-bool-V11-00-07)
|
||||
- Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
|
||||
|
||||
|
||||
@@ -480,6 +480,12 @@ EInside G4MultiUnion::InsideWithExclusion(const G4ThreeVector& aPoint,
|
||||
// located around will correspond to kInside (cf. G4UnionSolid)
|
||||
|
||||
std::size_t size = surfaces.size();
|
||||
|
||||
if (size == 0)
|
||||
{
|
||||
return EInside::kOutside;
|
||||
}
|
||||
|
||||
for (std::size_t i = 0; i < size - 1; ++i)
|
||||
{
|
||||
G4MultiUnionSurface& left = surfaces[i];
|
||||
@@ -494,9 +500,7 @@ EInside G4MultiUnion::InsideWithExclusion(const G4ThreeVector& aPoint,
|
||||
}
|
||||
}
|
||||
|
||||
location = size ? EInside::kSurface : EInside::kOutside;
|
||||
|
||||
return location;
|
||||
return EInside::kSurface;
|
||||
}
|
||||
|
||||
//______________________________________________________________________________
|
||||
|
||||
@@ -6,6 +6,9 @@ It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
## 2023-01-02 Evgueni Tcherniaev (geom-specific-V11-00-11)
|
||||
- G4QuadrangularFacet: fixed warning message.
|
||||
|
||||
## 2022-11-10 Gabriele Cosmo (geom-specific-V11-00-10)
|
||||
- Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
|
||||
|
||||
|
||||
@@ -131,10 +131,11 @@ G4QuadrangularFacet::G4QuadrangularFacet (const G4ThreeVector& vt0,
|
||||
<< "P1 = " << GetVertex(1) << G4endl
|
||||
<< "P2 = " << GetVertex(2) << G4endl
|
||||
<< "P3 = " << GetVertex(3) << G4endl
|
||||
<< "Height in P0-P1-P2 = " << h1 << G4endl
|
||||
<< "Height in P1-P2-P3 = " << h2 << G4endl
|
||||
<< "Height in P2-P3-P4 = " << h3 << G4endl
|
||||
<< "Height in P4-P0-P1 = " << h4;
|
||||
<< "Smallest heights:" << G4endl
|
||||
<< " in triangle P0-P1-P2 = " << h1 << G4endl
|
||||
<< " in triangle P1-P2-P3 = " << h2 << G4endl
|
||||
<< " in triangle P2-P3-P0 = " << h3 << G4endl
|
||||
<< " in triangle P3-P0-P1 = " << h4;
|
||||
G4Exception("G4QuadrangularFacet::G4QuadrangularFacet()",
|
||||
"GeomSolids1001", JustWarning, message);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user