Changeset 1230 for trunk/examples/extended/electromagnetic/TestEm3/src/DetectorConstruction.cc

Timestamp:

Jan 8, 2010, 3:02:48 PM (14 years ago)

Author:

garnier

Message:

update to geant4.9.3

File:

• trunk/examples/extended/electromagnetic/TestEm3/src/DetectorConstruction.cc (modified) (6 diffs)

trunk/examples/extended/electromagnetic/TestEm3/src/DetectorConstruction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: DetectorConstruction.cc,v 1.20 2007/03/19 20:10:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: DetectorConstruction.cc,v 1.23 2009/03/04 18:49:17 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -105 +105 @@
   G4Element* H  = manager->FindOrBuildElement(1);
   G4Element* C  = manager->FindOrBuildElement(6);
+  G4Element* N  = manager->FindOrBuildElement(7);
   G4Element* O  = manager->FindOrBuildElement(8);
   G4Element* Si = manager->FindOrBuildElement(14);
@@ -164 +165 @@
   Sci->AddElement(C, natoms=9);
   Sci->AddElement(H, natoms=10);
+  
+  Sci->GetIonisation()->SetBirksConstant(0.126*mm/MeV);
 
   G4Material* Lct =
@@ -199 +202 @@
   BGO->AddElement(Bi, natoms= 4);
 
+  //SiNx
+  density= 3.1 *g/cm3;
+  G4Material* SiNx= new G4Material("SiNx", density, ncomponents=3);
+  SiNx-> AddElement(Si, 300);
+  SiNx-> AddElement(N, 310);
+  SiNx-> AddElement(H, 6);
+
   //
   // define gaseous materials using G4 NIST database 
@@ -205 +215 @@
   
   G4Material* Air = manager->FindOrBuildMaterial("G4_AIR");
-  manager->ConstructNewGasMaterial("Air20","G4_AIR",293.*kelvin, 1.*atmosphere);
+  manager->ConstructNewGasMaterial("Air20","G4_AIR",293.*kelvin,1.*atmosphere);
 
   G4Material* lAr = manager->FindOrBuildMaterial("G4_lAr");
@@ -242 +252 @@
                   kStateGas, temperature= 273*kelvin, pressure= 1*atmosphere);
   steam->AddMaterial(H2O, fractionmass=1.);
-
+  
+  new G4Material("ArgonGas", z=18, a=39.948*g/mole, density= 1.782*mg/cm3,
+                 kStateGas, 273.15*kelvin, 1*atmosphere);
   //
   // examples of vacuum