Import Geant4 11.1.1 source tree

source/materials/History

@@ -6,6 +6,9 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2022-12-09 Vladimir Ivanchenko (materials-V11-00-20)
+- G4Material - allowed recursive search for based material (fix problem #2520)
+
 ## 2022-11-16 Gabriele Cosmo (materials-V11-00-19)
 - Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
 

source/materials/src/G4Material.cc

@@ -204,6 +204,15 @@ G4Material::G4Material(const G4String& name, G4double density,
   fPressure = pressure;
 
   fBaseMaterial = bmat;
+  auto ptr = bmat;
+  if(nullptr != ptr) {
+    while(1) {
+      ptr = ptr->GetBaseMaterial();
+      if(nullptr == ptr) { break; }
+      else { fBaseMaterial = ptr; }
+    }
+  }
+
   fChemicalFormula = fBaseMaterial->GetChemicalFormula();
   fMassOfMolecule  = fBaseMaterial->GetMassOfMolecule();