Import Geant4 11.1.2 source tree

source/geometry/solids/CSG/History

@@ -6,6 +6,9 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2023-03-23 Jonas Hahnfeld (geom-csg-V11-00-03)
+- G4UTrap: Fixed constructor for Right Angular Wedge with VecGeom
+
 ## 2022-11-10 Gabriele Cosmo (geom-csg-V11-00-02)
 - Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
 

source/geometry/solids/CSG/src/G4UTrap.cc

@@ -97,11 +97,17 @@ G4UTrap::G4UTrap( const G4String& pName,
   CheckPlanarity(pt);
 }
 
+// Constructor for Right Angular Wedge from STEP; this is different from
+// the UnplacedTrapezoid constructor taking four double's and constructing
+// a Trd1.
 G4UTrap::G4UTrap( const G4String& pName,
                         G4double pZ,
                         G4double pY,
                         G4double pX, G4double pLTX )
-  : Base_t(pName, pZ, pY, pX, pLTX)
+  : Base_t(pName, 0.5*pZ, /*theta=*/0, /*phi=*/0, /*dy1=*/0.5*pY,
+           /*dx1=*/0.5*pX, /*dx2=*/0.5*pLTX, /*Alpha1=*/0.5*(pLTX - pX)/pY,
+           /*dy2=*/0.5*pY, /*dx3=*/0.5*pX, /*dx4=*/0.5*pLTX,
+           /*Alpha2=*/0.5*(pLTX - pX)/pY)
 {
   CheckParameters();
 }

source/geometry/solids/specific/History

@@ -6,6 +6,17 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2023-06-16 Stephan Hageboeck (geom-specific-V11-00-13)
+- Fixed uninitialised value in G4VCSGfaceted::SurfaceNormal().
+
+## 2023-03-20 Gabriele Cosmo (geom-specific-V11-00-12)
+- Fixed more potential uninitialised values in G4PolyconeSide,
+  G4SolidExtentList and G4VTwistSurface.
+
+## 2023-03-13 Gabriele Cosmo
+- Fixed potential uninitialised value for boundary type in
+  G4VTwistSurface::GetBoundaryAtPZ().
+
 ## 2023-01-02 Evgueni Tcherniaev (geom-specific-V11-00-11)
 - G4QuadrangularFacet: fixed warning message.
 

source/geometry/solids/specific/src/G4PolyconeSide.cc

@@ -267,7 +267,7 @@ G4bool G4PolyconeSide::Intersect( const G4ThreeVector& p,
                                         G4ThreeVector& normal,
                                         G4bool& isAllBehind )
 {
-  G4double s1, s2;
+  G4double s1=0., s2=0.;
   G4double normSign = outgoing ? +1 : -1;
   
   isAllBehind = allBehind;

source/geometry/solids/specific/src/G4SolidExtentList.cc

@@ -75,18 +75,18 @@ void G4SolidExtentList::AddSurface( const G4ClippablePolygon& surface )
   //
   // Keep track of four surfaces
   //
-  G4double min, max;
+  G4double smin=.0, smax=0.;
   
-  surface.GetExtent( axis, min, max );
+  surface.GetExtent( axis, smin, smax );
   
-  if (min > maxLimit)
+  if (smin > maxLimit)
   {
     //
     // Nearest surface beyond maximum limit
     //
     if (surface.InFrontOf(minAbove,axis)) minAbove = surface;
   }
-  else if (max < minLimit)
+  else if (smax < minLimit)
   {
     //
     // Nearest surface below minimum limit
@@ -107,7 +107,7 @@ void G4SolidExtentList::AddSurface( const G4ClippablePolygon& surface )
 //
 // Return extent after processing all surfaces
 //
-G4bool G4SolidExtentList::GetExtent( G4double& min, G4double& max ) const
+G4bool G4SolidExtentList::GetExtent( G4double& emin, G4double& emax ) const
 {
   G4double kCarTolerance = G4GeometryTolerance::GetInstance()
                            ->GetSurfaceTolerance();
@@ -129,8 +129,8 @@ G4bool G4SolidExtentList::GetExtent( G4double& min, G4double& max ) const
     //
     // No. We must be entirely within the solid
     //
-    max = maxLimit + kCarTolerance;
-    min = minLimit - kCarTolerance;
+    emax = maxLimit + kCarTolerance;
+    emin = minLimit - kCarTolerance;
     return true;
   }
   
@@ -142,13 +142,13 @@ G4bool G4SolidExtentList::GetExtent( G4double& min, G4double& max ) const
     //
     // Inward facing: max limit must be embedded within solid
     //
-    max = maxLimit + kCarTolerance;
+    emax = maxLimit + kCarTolerance;
   }
   else
   {
     G4double sMin, sMax;
     maxSurface.GetExtent( axis, sMin, sMax );
-    max = ( (sMax > maxLimit) ? maxLimit : sMax ) + kCarTolerance;
+    emax = ( (sMax > maxLimit) ? maxLimit : sMax ) + kCarTolerance;
   }
   
   //
@@ -159,13 +159,13 @@ G4bool G4SolidExtentList::GetExtent( G4double& min, G4double& max ) const
     //
     // Inward facing: max limit must be embedded within solid
     //
-    min = minLimit - kCarTolerance;
+    emin = minLimit - kCarTolerance;
   }
   else
   {
-    G4double sMin, sMax;
+    G4double sMin=0., sMax=0.;
     minSurface.GetExtent( axis, sMin, sMax );
-    min = ( (sMin < minLimit) ? minLimit : sMin ) - kCarTolerance;
+    emin = ( (sMin < minLimit) ? minLimit : sMin ) - kCarTolerance;
   }
   
   return true;

source/geometry/solids/specific/src/G4VCSGfaceted.cc

@@ -229,7 +229,7 @@ G4ThreeVector G4VCSGfaceted::SurfaceNormal( const G4ThreeVector& p ) const
   G4double best = kInfinity;
   do    // Loop checking, 13.08.2015, G.Cosmo
   {
-    G4double distance;
+    G4double distance = kInfinity;
     G4ThreeVector normal = (*face)->Normal( p, &distance );
     if (distance < best)
     {

source/geometry/solids/specific/src/G4VTwistSurface.cc

@@ -715,7 +715,7 @@ G4ThreeVector G4VTwistSurface::GetBoundaryAtPZ(G4int areacode,
 
    G4ThreeVector d;
    G4ThreeVector x0;
-   G4int         boundarytype;
+   G4int         boundarytype = 0;
    G4bool        found = false;
    
    for (G4int i=0; i<4; ++i)