Import Geant4 11.0.2 source tree

source/processes/optical/History

@@ -16,6 +16,12 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+11 Apr 22: D. Sawkey (op-V10-07-08)
+- G4OpBoundaryProcess: fix nullptr dereference. Address bug 2471.
+
+07 Apr 22: D. Sawkey (op-V10-07-07)
+- G4OpWLS2: fix incorrect call to set time profile. Addresses bug 2482.
+
 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.

source/processes/optical/src/G4OpBoundaryProcess.cc

@@ -189,8 +189,12 @@ G4VParticleChange* G4OpBoundaryProcess::PostStepDoIt(const G4Track& aTrack,
     if(verboseLevel > 1)
       BoundaryProcessVerbose();
 
-    G4MaterialPropertyVector* groupvel =
-      fMaterial2->GetMaterialPropertiesTable()->GetProperty(kGROUPVEL);
+    G4MaterialPropertyVector* groupvel = nullptr;
+    G4MaterialPropertiesTable* aMPT = fMaterial2->GetMaterialPropertiesTable();
+    if(aMPT != nullptr)
+    {
+      groupvel = aMPT->GetProperty(kGROUPVEL);
+    }
     if(groupvel != nullptr)
     {
       aParticleChange.ProposeVelocity(
@@ -410,6 +414,7 @@ G4VParticleChange* G4OpBoundaryProcess::PostStepDoIt(const G4Track& aTrack,
         return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
       }
       MPT = fMaterial2->GetMaterialPropertiesTable();
+      rIndexMPV = nullptr;
       if(MPT != nullptr)
       {
         rIndexMPV = MPT->GetProperty(kRINDEX);
@@ -502,8 +507,13 @@ G4VParticleChange* G4OpBoundaryProcess::PostStepDoIt(const G4Track& aTrack,
 
   if(fStatus == FresnelRefraction || fStatus == Transmission)
   {
-    G4MaterialPropertyVector* groupvel =
-      fMaterial2->GetMaterialPropertiesTable()->GetProperty(kGROUPVEL);
+    // not all surface types check that fMaterial2 has an MPT
+    G4MaterialPropertiesTable* aMPT = fMaterial2->GetMaterialPropertiesTable();
+    G4MaterialPropertyVector* groupvel = nullptr;
+    if(aMPT != nullptr)
+    {
+      groupvel = aMPT->GetProperty(kGROUPVEL);
+    }
     if(groupvel != nullptr)
     {
       aParticleChange.ProposeVelocity(

source/processes/optical/src/G4OpWLS2.cc

@@ -336,7 +336,7 @@ void G4OpWLS2::UseTimeProfile(const G4String name)
     G4Exception("G4OpWLS::UseTimeProfile", "em0202", FatalException,
                 "generator does not exist");
   }
-  G4OpticalParameters::Instance()->SetWLSTimeProfile(name);
+  G4OpticalParameters::Instance()->SetWLS2TimeProfile(name);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......