Import Geant4 11.0.1 source tree

source/processes/optical/History

@@ -16,6 +16,10 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+10 Jan 22: D. Sawkey (op-V10-07-06)
+- Remove G4lrint/G4lint to calculate angle bin for Davis/LBNL LUT. Fixes crash
+  when angle = 0. Addresses issue 116.
+
 21 Oct 21: D. Sawkey (op-V10-07-05)
 - G4OpBoundaryProcess - rename variables: class start with f; lowercase
   - make comparison to nullptr explicit

source/processes/optical/src/G4OpBoundaryProcess.cc

@@ -801,7 +801,7 @@ void G4OpBoundaryProcess::DielectricLUT()
       // Calculate Angle between Normal and Photon Momentum
       G4double anglePhotonToNormal = fOldMomentum.angle(-fGlobalNormal);
       // Round to closest integer: LBNL model array has 91 values
-      G4int angleIncident = G4lrint(anglePhotonToNormal / CLHEP::deg);
+      G4int angleIncident = std::lrint(anglePhotonToNormal / CLHEP::deg);
 
       // Take random angles THETA and PHI,
       // and see if below Probability - if not - Redo
@@ -857,7 +857,9 @@ void G4OpBoundaryProcess::DielectricLUTDAVIS()
     anglePhotonToNormal = fOldMomentum.angle(-fGlobalNormal);
 
     // Davis model has 90 reflection bins: round down
-    angleIncident     = G4lint(anglePhotonToNormal / CLHEP::deg);
+    // don't allow angleIncident to be 90 for anglePhotonToNormal close to 90
+    angleIncident = std::min(static_cast<G4int>(
+      std::floor(anglePhotonToNormal / CLHEP::deg)), 89);
     reflectivityValue = fOpticalSurface->GetReflectivityLUTValue(angleIncident);
 
     if(rand > reflectivityValue)