Import Geant4 3.1.0 source tree

source/materials/include/G4Material.hh

@@ -5,8 +5,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4Material.hh,v 1.7 1999/12/16 18:11:09 maire Exp $
-// GEANT4 tag $Name: geant4-03-00 $
+// $Id: G4Material.hh,v 1.10 2001/03/30 14:43:16 maire Exp $
+// GEANT4 tag $Name: geant4-03-01 $
 //
 
 // class description
@@ -14,7 +14,7 @@
 // Materials defined via the G4Material class are used to define the
 // composition of Geant volumes.
 // a Material is always made of Elements. It can be defined directly
-// from scratch (defined by a single element), specifying :
+// from scratch (defined by an implicit, single element), specifying :
 //                                             its name,
 //                                             density,
 //                                             state informations,
@@ -53,6 +53,8 @@
 // 05-10-98, change name: NumDensity -> NbOfAtomsPerVolume
 // 18-11-98, SandiaTable interface modified.
 // 19-07-99, new data member (chemicalFormula) added by V.Ivanchenko
+// 12-03-01, G4bool fImplicitElement (mma)
+// 30-03-01, suppression of the warning message in GetMaterial
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -144,7 +146,7 @@ public:  // with description
                      G4double   fraction);			//fraction of mass
                      
                      
-   ~G4Material();
+   virtual ~G4Material();
                         
     //
     // retrieval methods
@@ -190,6 +192,9 @@ public:  // with description
     // Radiation length:     
     G4double         GetRadlen()          const {return fRadlen;};
     
+    // Nuclear interaction length:     
+    G4double GetNuclearInterLength()      const {return fNuclInterLen;};
+        
     // ionisation parameters:
     G4IonisParamMat* GetIonisation()      const {return fIonisation;};
     
@@ -242,7 +247,10 @@ private:
 
     // Compute Radiation length
     void ComputeRadiationLength();
-
+    
+    // Compute Nuclear interaction length
+    void ComputeNuclearInterLength();
+    
 private:
 
 //
@@ -263,6 +271,7 @@ private:
 
     size_t           fNumberOfElements;     // Number of Elements in the material
     G4ElementVector* theElementVector;      // vector of constituent Elements
+    G4bool           fImplicitElement;      // implicit Element created by this?
     G4double*        fMassFractionVector;   // composition by fractional mass
     G4int*           fAtomsVector;          // composition by atom count
 
@@ -280,7 +289,8 @@ private:
     G4double* VecNbOfAtomsPerVolume;      // vector of nb of atoms per volume
     G4double  TotNbOfAtomsPerVolume;      // total nb of atoms per volume 
     G4double  TotNbOfElectPerVolume;      // total nb of electrons per volume 
-    G4double  fRadlen;                    // Radiation length  
+    G4double  fRadlen;                    // Radiation length
+    G4double  fNuclInterLen;              // Nuclear interaction length  
     
     G4IonisParamMat* fIonisation;          // ionisation parameters
     G4SandiaTable*   fSandiaTable;         // Sandia table         
@@ -298,8 +308,7 @@ G4Material* G4Material::GetMaterial(G4String materialName)
       return theMaterialTable[J];
    }
    
-  G4cerr << "  Warning from GetMaterial(name). The material: " << materialName
-         << "  does not exist in the MaterialTable.  Return NULL pointer \n";
+  // the material does not exist in the table
   return NULL;          
 }