Changeset 986 for trunk/source/materials

Timestamp:

Apr 17, 2009, 10:56:17 AM (17 years ago)

Author:

garnier

Message:

fichiers manquants

Location:

trunk/source/materials

Files:

• History (modified) (2 diffs)
• include/G4AtomicShells.hh (modified) (1 diff)
• include/G4Element.hh (modified) (1 diff)
• include/G4ElementTable.hh (modified) (1 diff)
• include/G4ElementVector.hh (modified) (1 diff)
• include/G4IonisParamElm.hh (modified) (1 diff)
• include/G4IonisParamMat.hh (modified) (1 diff)
• include/G4IronStoppingICRU73.hh (added)
• include/G4Isotope.hh (modified) (1 diff)
• include/G4IsotopeVector.hh (modified) (1 diff)
• include/G4MPVEntry.hh (modified) (1 diff)
• include/G4Material.hh (modified) (1 diff)
• include/G4MaterialPropertiesTable.hh (modified) (1 diff)
• include/G4MaterialPropertyVector.hh (modified) (1 diff)
• include/G4MaterialStoppingICRU73.hh (added)
• include/G4MaterialTable.hh (modified) (1 diff)
• include/G4NistElementBuilder.hh (modified) (1 diff)
• include/G4NistManager.hh (modified) (1 diff)
• include/G4NistMaterialBuilder.hh (modified) (1 diff)
• include/G4NistMessenger.hh (modified) (1 diff)
• include/G4OpticalSurface.hh (modified) (4 diffs)
• include/G4SandiaTable.hh (modified) (1 diff)
• include/G4SimpleMaterialStoppingICRU73.hh (added)
• include/G4StaticSandiaData.hh (modified) (1 diff)
• include/G4SurfaceProperty.hh (modified) (3 diffs)
• src/G4AtomicShells.cc (modified) (1 diff)
• src/G4Element.cc (modified) (1 diff)
• src/G4IonisParamElm.cc (modified) (1 diff)
• src/G4IonisParamMat.cc (modified) (1 diff)
• src/G4IronStoppingICRU73.cc (added)
• src/G4Isotope.cc (modified) (1 diff)
• src/G4MPVEntry.cc (modified) (1 diff)
• src/G4Material.cc (modified) (1 diff)
• src/G4MaterialPropertiesTable.cc (modified) (1 diff)
• src/G4MaterialPropertyVector.cc (modified) (1 diff)
• src/G4MaterialStoppingICRU73.cc (added)
• src/G4NistElementBuilder.cc (modified) (1 diff)
• src/G4NistManager.cc (modified) (1 diff)
• src/G4NistMaterialBuilder.cc (modified) (1 diff)
• src/G4NistMessenger.cc (modified) (1 diff)
• src/G4OpticalSurface.cc (modified) (2 diffs)
• src/G4SandiaTable.cc (modified) (1 diff)
• src/G4SimpleMaterialStoppingICRU73.cc (added)
• src/G4SurfaceProperty.cc (modified) (2 diffs)

trunk/source/materials/History

@@ -1 @@
-$Id: History,v 1.131 2008/11/14 15:14:41 gcosmo Exp $
+$Id: History,v 1.133 2009/02/19 12:19:53 vnivanch Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+19-02-09 V.Ivanchenko (materials-V09-02-00)
+G4MaterialStoppingICRU73 - added 4 forgotten materials from ICRU'73
+G4SimpleMaterialStoppingICRU73 - fixed density of Mo and number of materials.
+
+11-12-08 G.Cosmo (materials-V09-01-20)
+- Added dummy default constructor in G4OpticalSurface and G4SurfaceProperty.
+- Removed debug printout function Overwrite().
 
 14-11-08 G.Cosmo (materials-V09-01-19)

trunk/source/materials/include/G4AtomicShells.hh

@@ -26 +26 @@
 //
 // $Id: G4AtomicShells.hh,v 1.7 2006/10/17 15:15:46 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 
 // class description

trunk/source/materials/include/G4Element.hh

@@ -26 +26 @@
 //
 // $Id: G4Element.hh,v 1.23 2008/11/14 15:14:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 

trunk/source/materials/include/G4ElementTable.hh

@@ -26 +26 @@
 //
 // $Id: G4ElementTable.hh,v 1.6 2006/06/29 19:10:58 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/include/G4ElementVector.hh

@@ -26 +26 @@
 //
 // $Id: G4ElementVector.hh,v 1.6 2006/06/29 19:11:00 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/include/G4IonisParamElm.hh

@@ -26 +26 @@
 //
 // $Id: G4IonisParamElm.hh,v 1.10 2008/06/03 14:30:10 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 

trunk/source/materials/include/G4IonisParamMat.hh

@@ -26 +26 @@
 //
 // $Id: G4IonisParamMat.hh,v 1.12 2008/07/08 10:34:56 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 

trunk/source/materials/include/G4Isotope.hh

@@ -26 +26 @@
 //
 // $Id: G4Isotope.hh,v 1.21 2008/11/14 15:14:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/materials/include/G4IsotopeVector.hh

@@ -26 +26 @@
 //
 // $Id: G4IsotopeVector.hh,v 1.6 2006/06/29 19:11:09 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/include/G4MPVEntry.hh

@@ -26 +26 @@
 //
 // $Id: G4MPVEntry.hh,v 1.7 2008/06/05 23:36:56 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/include/G4Material.hh

@@ -26 +26 @@
 //
 // $Id: G4Material.hh,v 1.27 2008/11/14 15:14:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 

trunk/source/materials/include/G4MaterialPropertiesTable.hh

@@ -26 +26 @@
 //
 // $Id: G4MaterialPropertiesTable.hh,v 1.19 2008/06/05 23:38:03 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/include/G4MaterialPropertyVector.hh

@@ -26 +26 @@
 //
 // $Id: G4MaterialPropertyVector.hh,v 1.11 2008/06/05 23:37:37 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/include/G4MaterialTable.hh

@@ -26 +26 @@
 //
 // $Id: G4MaterialTable.hh,v 1.6 2006/06/29 19:11:19 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/include/G4NistElementBuilder.hh

@@ -25 +25 @@
 //
 // $Id: G4NistElementBuilder.hh,v 1.18 2008/08/07 10:15:16 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 
 #ifndef G4NistElementBuilder_h

trunk/source/materials/include/G4NistManager.hh

@@ -25 +25 @@
 //
 // $Id: G4NistManager.hh,v 1.23 2008/08/07 10:15:16 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/materials/include/G4NistMaterialBuilder.hh

@@ -25 +25 @@
 //
 // $Id: G4NistMaterialBuilder.hh,v 1.13 2008/04/28 08:51:29 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 
 #ifndef G4NistMaterialBuilder_h

trunk/source/materials/include/G4NistMessenger.hh

@@ -26 +26 @@
 //
 // $Id: G4NistMessenger.hh,v 1.4 2007/05/02 10:48:52 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // File name:     G4NistMessenger

trunk/source/materials/include/G4OpticalSurface.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpticalSurface.hh,v 1.10 2008/07/21 20:54:57 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4OpticalSurface.hh,v 1.11 2008/12/11 10:23:54 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 
@@ -84 +84 @@
 {
 
-public: // Without description
-  
-        //////////////
-        // Operators
-        //////////////
-  
-        G4OpticalSurface(const G4OpticalSurface &right);
-        const G4OpticalSurface & operator=(const G4OpticalSurface &right);
-  
-        G4int operator==(const G4OpticalSurface &right) const;
-        G4int operator!=(const G4OpticalSurface &right) const;
-
 public: // With description
 
         ////////////////////////////////
-        // Constructors and Destructor
+        // Constructor
         ////////////////////////////////
 
@@ -111 +99 @@
 public: // Without description
 
+        //////////////
+        // Constructors and destructor
+        //////////////
+
+        G4OpticalSurface();
         virtual ~G4OpticalSurface();
+        G4OpticalSurface(const G4OpticalSurface &right);
+  
+        //////////////
+        // Operators
+        //////////////
+  
+        const G4OpticalSurface & operator=(const G4OpticalSurface &right);
+  
+        G4int operator==(const G4OpticalSurface &right) const;
+        G4int operator!=(const G4OpticalSurface &right) const;
 
         ////////////
@@ -117 +120 @@
         ////////////
 
-        // public methods
-
 public: // With description
-
-        virtual void Overwrite() {G4cout << "G4OpticalSurface" << G4endl;};
 
         G4OpticalSurfaceFinish GetFinish() const {return theFinish;};

trunk/source/materials/include/G4SandiaTable.hh

@@ -26 +26 @@
 //
 // $Id: G4SandiaTable.hh,v 1.21 2007/10/02 10:13:33 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 
 // class description

trunk/source/materials/include/G4StaticSandiaData.hh

@@ -26 +26 @@
 //
 // $Id: G4StaticSandiaData.hh,v 1.7 2006/06/29 19:12:35 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 

trunk/source/materials/include/G4SurfaceProperty.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4SurfaceProperty.hh,v 1.7 2008/07/21 20:55:16 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4SurfaceProperty.hh,v 1.8 2008/12/11 10:23:54 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 
@@ -102 +102 @@
 public: // Without description
 
+        G4SurfaceProperty();
         virtual ~G4SurfaceProperty();
 
@@ -111 +112 @@
 
 public: // With description
-
-        virtual void Overwrite() {G4cout << "G4SurfaceProperty" << G4endl;};
 
         G4String GetName() const { return theName; };

trunk/source/materials/src/G4AtomicShells.cc

@@ -26 +26 @@
 //
 // $Id: G4AtomicShells.cc,v 1.7 2006/10/17 15:15:46 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....

trunk/source/materials/src/G4Element.cc

@@ -26 +26 @@
 //
 // $Id: G4Element.cc,v 1.31 2008/08/11 11:53:11 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/materials/src/G4IonisParamElm.cc

@@ -26 +26 @@
 //
 // $Id: G4IonisParamElm.cc,v 1.15 2008/06/03 14:30:10 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/materials/src/G4IonisParamMat.cc

@@ -26 +26 @@
 //
 // $Id: G4IonisParamMat.cc,v 1.25 2008/07/08 10:34:56 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/src/G4Isotope.cc

@@ -26 +26 @@
 //
 // $Id: G4Isotope.cc,v 1.22 2008/08/11 11:53:11 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/materials/src/G4MPVEntry.cc

@@ -26 +26 @@
 //
 // $Id: G4MPVEntry.cc,v 1.8 2008/06/05 23:39:18 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/src/G4Material.cc

@@ -26 +26 @@
 //
 // $Id: G4Material.cc,v 1.42 2008/08/13 16:06:42 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/materials/src/G4MaterialPropertiesTable.cc

@@ -26 +26 @@
 //
 // $Id: G4MaterialPropertiesTable.cc,v 1.20 2008/06/05 23:38:34 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/src/G4MaterialPropertyVector.cc

@@ -26 +26 @@
 //
 // $Id: G4MaterialPropertyVector.cc,v 1.16 2008/06/05 23:38:51 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/materials/src/G4NistElementBuilder.cc

@@ -25 +25 @@
 //
 // $Id: G4NistElementBuilder.cc,v 1.22 2008/08/11 11:53:11 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------

trunk/source/materials/src/G4NistManager.cc

@@ -25 +25 @@
 //
 // $Id: G4NistManager.cc,v 1.19 2008/07/23 14:49:31 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -------------------------------------------------------------------

trunk/source/materials/src/G4NistMaterialBuilder.cc

@@ -25 +25 @@
 //
 // $Id: G4NistMaterialBuilder.cc,v 1.19 2008/04/28 08:51:29 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/materials/src/G4NistMessenger.cc

@@ -26 +26 @@
 //
 // $Id: G4NistMessenger.cc,v 1.4 2007/05/02 10:48:52 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/materials/src/G4OpticalSurface.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpticalSurface.cc,v 1.11 2008/07/21 20:55:51 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4OpticalSurface.cc,v 1.12 2008/12/11 10:23:54 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 
@@ -98 +98 @@
 }
 
+G4OpticalSurface::G4OpticalSurface()
+  : G4SurfaceProperty()
+{
+}
+
+G4OpticalSurface::~G4OpticalSurface()
+{
+}
+
 G4OpticalSurface::G4OpticalSurface(const G4OpticalSurface &right)
   : G4SurfaceProperty(right.GetName())
 {
         *this = right;
-}
-
-G4OpticalSurface::~G4OpticalSurface()
-{
-  Overwrite();
 }
 

trunk/source/materials/src/G4SandiaTable.cc

@@ -26 +26 @@
 //
 // $Id: G4SandiaTable.cc,v 1.34 2007/10/02 10:13:33 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....

trunk/source/materials/src/G4SurfaceProperty.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4SurfaceProperty.cc,v 1.4 2008/07/21 20:55:34 gum Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4SurfaceProperty.cc,v 1.5 2008/12/11 10:23:54 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 
@@ -61 +61 @@
 }
 
+//
+// Dummy constructor
+//
+G4SurfaceProperty::G4SurfaceProperty()
+  : theName("Dielectric"), theType(dielectric_metal)
+{
+  theSurfacePropertyTable.push_back(this);
+}
+
 G4SurfaceProperty::~G4SurfaceProperty()
 {
-  Overwrite();
 }