Import Geant4 11.1.2 source tree

source/persistency/gdml/History

@@ -6,6 +6,11 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2023-06-16 I. Hrivnacova (gdml-V11-00-06)
+- Let G4ThreeVectorCompare obey the strict weak ordering requirements;
+  which fixes failures in inserting elements in the std::map with
+  this compare operator used in writing tessellated solid.
+
 ## 2022-11-11 Gabriele Cosmo (gdml-V11-00-05)
 - Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
 

source/persistency/gdml/include/G4GDMLWriteSolids.hh

@@ -78,14 +78,13 @@ class G4GDMLWriteSolids : public G4GDMLWriteMaterials
 
       G4bool operator()(const G4ThreeVector& t1, const G4ThreeVector& t2) const
       {
-        if(t1.x() < t2.x())
-          return true;
+        if(t1.x() < t2.x()) { return true; }
+        if(t1.x() > t2.x()) { return false; }
 
-        if(t1.y() < t2.y())
-          return true;
+        if(t1.y() < t2.y()) { return true; }
+        if(t1.y() > t2.y()) { return false; }
 
-        if(t1.z() < t2.z())
-          return true;
+        if(t1.z() < t2.z()) { return true; }
 
         return false;
       }

source/persistency/gdml/src/G4GDMLWriteSolids.cc

@@ -720,7 +720,14 @@ void G4GDMLWriteSolids::TessellatedWrite(
       }
       else  // Vertex not found
       {
-        vertexMap.insert(std::make_pair(vertex, ref));  // Cache vertex and ...
+        if ( ! vertexMap.insert(std::make_pair(vertex, ref)).second )
+        {
+          G4ExceptionDescription description;
+          description << "Failed to insert [vertex, ref] " << vertex << ", "
+                      << ref << " in map.";
+          G4Exception("G4GDMLWriteSolids::TessellatedWrite", "WriteError",
+                       JustWarning, description);
+        }
         AddPosition(ref, vertex);  // ... add it to define section!
         ++NumVertex;
       }