Import Geant4 11.3.0 source tree

source/geometry/navigation/History

@@ -6,6 +6,11 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2024-11-22 Gabriele Cosmo (geomnav-V11-02-03)
+- In G4MultiLevelLocator::EstimateIntersectionPoint(), moved repeated assertion
+  on invalid intersection within G4DEBUG_FIELD, to avoid excess of warning
+  printouts in rare cases of failed convergence, as reported by CMS.
+
 ## 2024-05-15 Ivana Hrivnacova (geomnav-V11-02-02)
 - Let G4TransportationManager notify G4FieldManager about the global
   field via newly added G4FieldManager::SetGlobalFieldManager().

source/geometry/navigation/src/G4MultiLevelLocator.cc

@@ -281,7 +281,7 @@ G4bool G4MultiLevelLocator::EstimateIntersectionPoint(
           G4LocatorChangeLogger::ReportEndChanges(G4cerr, endChangeA, endChangeB);
         }
       }
-#endif    
+
       if( !validIntersectP )
       {
         G4ExceptionDescription errmsg;
@@ -294,7 +294,8 @@ G4bool G4MultiLevelLocator::EstimateIntersectionPoint(
         G4Exception("G4MultiLevelLocator::EstimateIntersectionPoint", "GeomNav0004",
                     JustWarning, errmsg);
       }
-      
+#endif    
+
       // F = a point on true AB path close to point E 
       // (the closest if possible)
       //