Import Geant4 11.0.2 source tree

source/materials/include/G4DensityEffectData.hh

@@ -61,7 +61,7 @@ public:
   ~G4DensityEffectData();
 
   // return index by Z, -1 if material is not in the table 
-  G4int GetElementIndex(G4int Z, G4State mState) const;
+  G4int GetElementIndex(G4int Z, G4State st = kStateUndefined) const;
 
   // return index by material name, -1 if material is not in the table 
   G4int GetIndex(const G4String& matName) const;

source/materials/include/G4Material.hh

@@ -351,6 +351,11 @@ private:
   G4int fIdxComponent;             // Index of a new component
   G4bool fMassFraction;            // Flag of the method to add components
 
+  // For composites built 
+  std::vector<G4int>* fAtoms; 
+  std::vector<G4double>* fElmFrac; 
+  std::vector<const G4Element*>* fElm;
+
   // For composites built via AddMaterial()
   std::map<G4Material*, G4double> fMatComponents;