Import Geant4 5.0.0 source tree
This commit is contained in:
@@ -22,13 +22,14 @@
|
||||
//
|
||||
//
|
||||
// $Id: XrayFluoDetectorConstruction.cc
|
||||
// GEANT4 tag $Name: xray_fluo-V03-02-00
|
||||
// GEANT4 tag $Name: xray_fluo-V04-01-03
|
||||
//
|
||||
// Author: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
|
||||
//
|
||||
// History:
|
||||
// -----------
|
||||
// 28 Nov 2001 Elena Guardincerri Created
|
||||
// 29 Nov 2002 New materials added (Alfonso.mantero@ge.infn.it)
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
|
||||
@@ -71,16 +72,20 @@ XrayFluoDetectorConstruction::XrayFluoDetectorConstruction()
|
||||
NbOfPixelRows = 1;
|
||||
NbOfPixelColumns = 1;
|
||||
NbOfPixels = NbOfPixelRows*NbOfPixelColumns;
|
||||
PixelSizeXY = 0.7 * cm;
|
||||
PixelThickness = 1. * mm;
|
||||
PixelSizeXY = 5 * cm;
|
||||
PixelThickness = 3.5 * mm;
|
||||
ContactSizeXY = 0.005*mm;
|
||||
SampleThickness = 0.25 * mm;
|
||||
SampleThickness = 2.5 * mm;
|
||||
SampleSizeXY = 3. * cm;
|
||||
Dia1Thickness = 1. *mm;
|
||||
Dia3Thickness = 1. *mm;
|
||||
Dia1SizeXY = 3. *cm;
|
||||
Dia3SizeXY = 3. *cm;
|
||||
DiaInnerSize = 1.4 * mm;
|
||||
|
||||
|
||||
DiaInnerSize = 2.99 * cm;
|
||||
|
||||
|
||||
OhmicNegThickness = 0.005*mm;
|
||||
OhmicPosThickness = 0.005*mm;
|
||||
ThetaHPGe = 135. * deg;
|
||||
@@ -102,11 +107,15 @@ XrayFluoDetectorConstruction::XrayFluoDetectorConstruction()
|
||||
// create commands for interactive definition of the apparate
|
||||
|
||||
detectorMessenger = new XrayFluoDetectorMessenger(this);
|
||||
G4cout << "XrayFluoDetectorConstruction created" << G4endl;
|
||||
}
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
XrayFluoDetectorConstruction::~XrayFluoDetectorConstruction()
|
||||
{ delete detectorMessenger;}
|
||||
{
|
||||
delete detectorMessenger;
|
||||
G4cout << "XrayFluoDetectorConstruction deleted" << G4endl;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
@@ -122,14 +131,118 @@ void XrayFluoDetectorConstruction::DefineMaterials()
|
||||
//define elements
|
||||
G4String name, symbol; //a=mass of a mole;
|
||||
G4double a, z, density; //z=mean number of protons;
|
||||
G4int natoms,ncomponents;
|
||||
G4double temperature, pressure;
|
||||
G4double fractionmass;
|
||||
|
||||
// Elements Definitions
|
||||
|
||||
//define Niobium
|
||||
|
||||
a = 92.906*g/mole;
|
||||
G4Element* Nb = new G4Element(name="Niobium" ,symbol="Nb" , z= 41., a);
|
||||
|
||||
//define Zirconium
|
||||
|
||||
a = 91.22*g/mole;
|
||||
G4Element* Zr = new G4Element(name="Zirconium" ,symbol="Zr" , z= 40., a);
|
||||
|
||||
//define Yttrium
|
||||
|
||||
a = 88.905*g/mole;
|
||||
G4Element* Y = new G4Element(name="Yttrium" ,symbol="Y" , z= 39., a);
|
||||
|
||||
//define Stronzium
|
||||
|
||||
a = 87.62*g/mole;
|
||||
G4Element* Sr = new G4Element(name="Stronzium" ,symbol="Sr" , z= 38., a);
|
||||
|
||||
//define Rubidium
|
||||
|
||||
a = 85.47*g/mole;
|
||||
G4Element* Rb = new G4Element(name="Rubidium" ,symbol="Rb" , z= 37., a);
|
||||
|
||||
//define Zinc
|
||||
|
||||
a = 65.37*g/mole;
|
||||
G4Element* Zn = new G4Element(name="Zinc" ,symbol="Zn" , z= 30., a);
|
||||
|
||||
//define Nichel
|
||||
|
||||
a = 58.71*g/mole;
|
||||
G4Element* Ni = new G4Element(name="Nichel" ,symbol="Ni" , z= 28., a);
|
||||
|
||||
//define Scandio
|
||||
|
||||
a = 44.956*g/mole;
|
||||
G4Element* Sc = new G4Element(name="Scandium" ,symbol="Sc" , z= 21., a);
|
||||
|
||||
//define Vanadium
|
||||
|
||||
a = 50.942*g/mole;
|
||||
G4Element* V = new G4Element(name="Vanadium" ,symbol="V" , z= 39., a);
|
||||
|
||||
//define Cromium
|
||||
|
||||
a = 51.996*g/mole;
|
||||
G4Element* Cr = new G4Element(name="Cromium" ,symbol="Cr" , z= 24., a);
|
||||
|
||||
//define Cobalt
|
||||
|
||||
a = 58.933*g/mole;
|
||||
G4Element* Co = new G4Element(name="Cobalt" ,symbol="Co" , z= 27., a);
|
||||
|
||||
//define Copper
|
||||
|
||||
a = 63.54*g/mole;
|
||||
G4Element* elCu = new G4Element(name="Copper" ,symbol="Cu" , z= 29., a);
|
||||
|
||||
//define Barium
|
||||
|
||||
a = 137.34*g/mole;
|
||||
G4Element* Ba = new G4Element(name="Barium" ,symbol="Ba" , z= 56., a);
|
||||
|
||||
//define Cerium
|
||||
|
||||
a = 140.12*g/mole;
|
||||
G4Element* Ce = new G4Element(name="Cerium" ,symbol="Ce" , z= 58., a);
|
||||
|
||||
//define Neodimuim
|
||||
|
||||
a = 144.24*g/mole;
|
||||
G4Element* Nd = new G4Element(name="Neodimuim" ,symbol="Nd" , z= 60., a);
|
||||
|
||||
|
||||
//Define Zolfo
|
||||
|
||||
a = 32.064*g/mole;
|
||||
G4Element* elS = new G4Element(name="Zolfo" ,symbol="S" , z= 16., a);
|
||||
|
||||
|
||||
|
||||
//define carbon
|
||||
|
||||
a = 12.0107*g/mole;
|
||||
G4Element* C = new G4Element(name="Carbon" ,symbol="C" , z= 6., a);
|
||||
|
||||
//define Nitrogen
|
||||
|
||||
a = 14.01*g/mole;
|
||||
G4Element* N = new G4Element(name="Nitrogen",symbol="N" , z= 7., a);
|
||||
|
||||
// define Oxigen
|
||||
a = 15.9994*g/mole;
|
||||
G4Element* O = new G4Element(name="Oxygen" ,symbol="O" , z= 8., a);
|
||||
|
||||
//define Arsenic
|
||||
a = 74.9216 * g/mole;
|
||||
G4Element * As = new G4Element( name="arsenic",symbol="As",z= 33.,a);
|
||||
|
||||
|
||||
//Define Gallium
|
||||
a = 69.72* g/mole;
|
||||
G4Element * Ga = new G4Element(name="gallium",symbol="Ga",z= 31.,a);
|
||||
|
||||
|
||||
//define Iron
|
||||
a = 55.847*g/mole;
|
||||
G4Element* Fe = new G4Element(name="Iron" ,symbol="Fe", z=26., a);
|
||||
//define hydrogen
|
||||
@@ -144,79 +257,232 @@ void XrayFluoDetectorConstruction::DefineMaterials()
|
||||
|
||||
a = 30.97*g/mole;
|
||||
G4Element* P = new G4Element(name="Phosporus",symbol="P", z= 15., a);
|
||||
|
||||
|
||||
// define Titanium
|
||||
a = 47.88*g/mole;
|
||||
G4Element* elTi = new G4Element(name="Titanium",symbol="Ti" , z= 22., a);
|
||||
|
||||
// define Calcium
|
||||
a = 40.078*g/mole;
|
||||
G4Element* Ca = new G4Element(name="Calcium",symbol="Ca" , z= 20., a);
|
||||
|
||||
// define silicon
|
||||
a = 28.0855*g/mole;
|
||||
G4Element* elSi = new G4Element(name="Silicon",symbol="Si" , z= 14., a);
|
||||
|
||||
// define Aluminium
|
||||
a = 26.98154*g/mole;
|
||||
G4Element* elAl = new G4Element(name="Aluminium",symbol="Al" , z= 13., a);
|
||||
|
||||
// Define Magnesium
|
||||
a = 24.305*g/mole;
|
||||
G4Element* Mg = new G4Element(name="Magnesium",symbol="Mg" , z= 12., a);
|
||||
|
||||
// Define Manganese
|
||||
a = 54.938*g/mole;
|
||||
G4Element* Mn = new G4Element(name="Manganese",symbol="Mn" , z= 25., a);
|
||||
|
||||
// Define Sodium
|
||||
a = 22.989*g/mole;
|
||||
G4Element* Na = new G4Element(name="Sodium",symbol="Na" , z= 11., a);
|
||||
|
||||
// Define Potassium
|
||||
a = 39.10*g/mole;
|
||||
G4Element* K = new G4Element(name="Potassium",symbol="K" , z= 19., a);
|
||||
// Define lead
|
||||
|
||||
a=207.19*g/mole;
|
||||
G4Element* elPb = new G4Element(name="Lead",symbol="pb", z=82.,a);
|
||||
|
||||
//define Uranium
|
||||
|
||||
a = 238.02891*g/mole;
|
||||
G4Element* elU = new G4Element(name="Uranium",symbol="U", z=92.,a);
|
||||
|
||||
|
||||
G4cout << "Elementi creati" << G4endl;
|
||||
|
||||
|
||||
|
||||
// Materials Definitions
|
||||
|
||||
// Define dolorite main components
|
||||
|
||||
density = 3*g/cm3;
|
||||
G4Material* diorite = new G4Material(name="Diorite", density, ncomponents=11);
|
||||
diorite->AddElement(Fe, fractionmass=0.1750);
|
||||
diorite->AddElement(elTi, fractionmass=0.0082);
|
||||
diorite->AddElement(Ca, fractionmass=0.0753);
|
||||
diorite->AddElement(elSi, fractionmass=0.2188);
|
||||
diorite->AddElement(elAl, fractionmass=0.0676);
|
||||
diorite->AddElement(Mg, fractionmass=0.0008);
|
||||
diorite->AddElement(O , fractionmass=0.4377);
|
||||
diorite->AddElement(Mn , fractionmass=0.0015);
|
||||
diorite->AddElement(Na , fractionmass=0.0134);
|
||||
diorite->AddElement(K , fractionmass=0.0011);
|
||||
diorite->AddElement(P , fractionmass=0.0006);
|
||||
|
||||
// define traces in dolorite
|
||||
|
||||
density = 3*g/cm3;
|
||||
G4Material* tracesOfDolorite = new G4Material(name="TracesOfDolorite", density, ncomponents=16);
|
||||
tracesOfDolorite->AddElement(Nb, natoms=5);
|
||||
tracesOfDolorite->AddElement(Zr, natoms=91);
|
||||
tracesOfDolorite->AddElement(Y, natoms=29);
|
||||
tracesOfDolorite->AddElement(Sr, natoms=140);
|
||||
tracesOfDolorite->AddElement(Rb, natoms=3);
|
||||
tracesOfDolorite->AddElement(Ga, natoms=20);
|
||||
tracesOfDolorite->AddElement(Zn, natoms=99);
|
||||
tracesOfDolorite->AddElement(Ni, natoms=77);
|
||||
tracesOfDolorite->AddElement(Sc, natoms=32);
|
||||
tracesOfDolorite->AddElement(V, natoms=314);
|
||||
tracesOfDolorite->AddElement(Cr, natoms=130);
|
||||
tracesOfDolorite->AddElement(Co, natoms=56);
|
||||
tracesOfDolorite->AddElement(elCu, natoms=119);
|
||||
tracesOfDolorite->AddElement(Ba, natoms=38);
|
||||
tracesOfDolorite->AddElement(Ce, natoms=15);
|
||||
tracesOfDolorite->AddElement(Nd, natoms=9);
|
||||
|
||||
// define dolorite (full)
|
||||
|
||||
density = 3*g/cm3;
|
||||
dolorite = new G4Material(name="Dolorite", density, ncomponents=2);
|
||||
dolorite->AddMaterial(tracesOfDolorite, fractionmass=0.0027842352);
|
||||
dolorite->AddMaterial(diorite, fractionmass=0.9972157648);
|
||||
|
||||
// define mars1
|
||||
|
||||
density = 3*g/cm3;
|
||||
G4Material* mars1Main = new G4Material(name="Mars1 Main components", density, ncomponents=11);
|
||||
mars1Main->AddElement(Fe, fractionmass=0.100916);
|
||||
mars1Main->AddElement(elTi, fractionmass=0.0186804);
|
||||
mars1Main->AddElement(Ca, fractionmass=0.0404091);
|
||||
mars1Main->AddElement(elSi, fractionmass=0.196378);
|
||||
mars1Main->AddElement(elAl, fractionmass=0.103282);
|
||||
mars1Main->AddElement(Mg, fractionmass=0.0241622);
|
||||
mars1Main->AddElement(Mn , fractionmass=0.00184331);
|
||||
mars1Main->AddElement(Na , fractionmass=0.0177908);
|
||||
mars1Main->AddElement(K , fractionmass=0.00574498);
|
||||
mars1Main->AddElement(P , fractionmass=0.00280169);
|
||||
mars1Main->AddElement(O , fractionmass=0.48799152);
|
||||
|
||||
density = 3*g/cm3;
|
||||
G4Material* tracesOfMars1 = new G4Material(name="TracesOfMars1", density, ncomponents=17);
|
||||
tracesOfMars1->AddElement(Nb, natoms=55);
|
||||
tracesOfMars1->AddElement(Zr, natoms=433);
|
||||
tracesOfMars1->AddElement(Y, natoms=58);
|
||||
tracesOfMars1->AddElement(Sr, natoms=968);
|
||||
tracesOfMars1->AddElement(Rb, natoms=16);
|
||||
tracesOfMars1->AddElement(Ga, natoms=24);
|
||||
tracesOfMars1->AddElement(Zn, natoms=109);
|
||||
tracesOfMars1->AddElement(Ni, natoms=70);
|
||||
tracesOfMars1->AddElement(Sc, natoms=21);
|
||||
tracesOfMars1->AddElement(V, natoms=134);
|
||||
tracesOfMars1->AddElement(Cr, natoms=141);
|
||||
tracesOfMars1->AddElement(Co, natoms=30);
|
||||
tracesOfMars1->AddElement(elCu, natoms=19);
|
||||
tracesOfMars1->AddElement(Ba, natoms=580);
|
||||
tracesOfMars1->AddElement(elPb, natoms=4);
|
||||
tracesOfMars1->AddElement(elS, natoms=444);
|
||||
tracesOfMars1->AddElement(elU, natoms=2);
|
||||
|
||||
|
||||
density = 3*g/cm3;
|
||||
G4Material* mars1 = new G4Material(name="Mars1", density, ncomponents=2);
|
||||
mars1->AddMaterial(tracesOfMars1, fractionmass=0.0044963163);
|
||||
mars1->AddMaterial(mars1Main, fractionmass=0.9955036837);
|
||||
|
||||
//define Neodimuim
|
||||
|
||||
density = 6800*kg/m3;
|
||||
materialNd = new G4Material(name="Neodimuim" ,density , ncomponents=1);
|
||||
materialNd ->AddElement(Nd,natoms=1);
|
||||
|
||||
// Define Magnesium
|
||||
density = 1738*kg/m3;
|
||||
materialMg = new G4Material(name="Magnesium",density , ncomponents=1);
|
||||
materialMg->AddElement(Mg,natoms=1);
|
||||
|
||||
//define iron
|
||||
|
||||
density = 7.86 * g/cm3;
|
||||
|
||||
G4int natoms,ncomponents;
|
||||
G4double temperature, pressure;
|
||||
|
||||
G4Material * FeMaterial = new G4Material(name="Iron",density,ncomponents=1);
|
||||
FeMaterial = new G4Material(name="Iron",density,ncomponents=1);
|
||||
FeMaterial->AddElement(Fe,natoms=1);
|
||||
|
||||
density = 5.32 * g/cm3;
|
||||
G4Material * HPGe = new G4Material(name="HPGe",density,ncomponents=1);
|
||||
HPGe ->AddElement(Ge,natoms=1);
|
||||
|
||||
|
||||
|
||||
//define gallium arsenide
|
||||
|
||||
density = 5.32 * g/cm3;
|
||||
G4Material * GaAs = new G4Material(name ="gallium arsenide",density,ncomponents=2);
|
||||
GaAs->AddElement(Ga,natoms=1);
|
||||
GaAs->AddElement(As,natoms=1);
|
||||
|
||||
|
||||
// define germanium
|
||||
|
||||
density = 5.32 * g/cm3;
|
||||
HPGe = new G4Material(name="HPGe",density,ncomponents=1);
|
||||
HPGe ->AddElement(Ge,natoms=1);
|
||||
|
||||
//define silicon
|
||||
|
||||
density = 2.333*g/cm3;
|
||||
a = 28.0855*g/mole;
|
||||
G4Material* Si = new G4Material(name="Silicon",z=14., a,density);
|
||||
Si = new G4Material(name="Silicon",z=14., a,density);
|
||||
|
||||
//define copper
|
||||
|
||||
density = 8.960*g/cm3;
|
||||
a = 63.55*g/mole;
|
||||
G4Material* Cu = new G4Material(name="Copper" , z=29., a, density);
|
||||
Cu = new G4Material(name="Copper" , z=29., a, density);
|
||||
|
||||
|
||||
|
||||
|
||||
//define carbon
|
||||
|
||||
a = 12.0107*g/mole;
|
||||
G4Element* C = new G4Element(name="Carbon" ,symbol="C" , z= 6., a);
|
||||
|
||||
|
||||
//define scintillator
|
||||
|
||||
density = 1.032*g/cm3;
|
||||
G4Material* Sci = new G4Material(name="Scintillator", density, ncomponents=2);
|
||||
Sci->AddElement(C, natoms=9);
|
||||
Sci->AddElement(H, natoms=10);
|
||||
//define Oxigen
|
||||
density = 1*g/cm3;
|
||||
a=16*g/mole;
|
||||
G4Material* matOx = new G4Material(name="Oxigen", z=8., a, density);
|
||||
|
||||
//define aluminium
|
||||
|
||||
density = 2.700*g/cm3;
|
||||
a = 26.98*g/mole;
|
||||
G4Material* Al = new G4Material(name="Aluminium", z=13., a, density);
|
||||
|
||||
Al = new G4Material(name="Aluminium", z=13., a, density);
|
||||
|
||||
//define titanium
|
||||
density = 4.54 *g/cm3;
|
||||
a = 47.867*g/mole;
|
||||
G4Material* Ti = new G4Material(name="Titanium",z=22.,a,density);
|
||||
|
||||
Ti = new G4Material(name="Titanium",z=22.,a,density);
|
||||
|
||||
|
||||
//define Uranium
|
||||
density = 19050*kg/m3;
|
||||
a = 238.02891*g/mole;
|
||||
G4Material* U = new G4Material(name="Uranium",z=92.,a,density);
|
||||
|
||||
//define Tin
|
||||
density = 7310*kg/m3;
|
||||
a = 118.710*g/mole;
|
||||
Sn = new G4Material(name="Tin",z=50.,a,density);
|
||||
|
||||
//define lead
|
||||
|
||||
density = 11.35*g/cm3;
|
||||
a=207.19*g/mole;
|
||||
G4Material* Pb = new G4Material(name="Lead",z=82.,a,density);
|
||||
|
||||
//define scintillator
|
||||
|
||||
density = 1.032*g/cm3;
|
||||
G4Material* Sci = new G4Material(name="Scintillator", density, ncomponents=2);
|
||||
Sci->AddElement(C, natoms=9);
|
||||
Sci->AddElement(H, natoms=10);
|
||||
|
||||
|
||||
//define air
|
||||
|
||||
a = 14.01*g/mole;
|
||||
G4Element* N = new G4Element(name="Nitrogen",symbol="N" , z= 7., a);
|
||||
|
||||
a = 15.9994*g/mole;
|
||||
G4Element* O = new G4Element(name="Oxygen" ,symbol="O" , z= 8., a);
|
||||
|
||||
G4double fractionmass;
|
||||
|
||||
density = 1.290*mg/cm3;
|
||||
G4Material* Air = new G4Material(name="Air" , density, ncomponents=2);
|
||||
Air->AddElement(N, fractionmass=0.7);
|
||||
@@ -229,32 +495,21 @@ void XrayFluoDetectorConstruction::DefineMaterials()
|
||||
temperature = 2.73*kelvin;
|
||||
G4Material * Vacuum = new G4Material(name="Galactic", z=1., a=1.01*g/mole, density,
|
||||
kStateGas,temperature,pressure);
|
||||
// define Titanium
|
||||
a = 47.88*g/mole;
|
||||
G4Element* elTi = new G4Element(name="Titanium",symbol="Ti" , z= 22., a);
|
||||
// define Calcium
|
||||
a = 40.078*g/mole;
|
||||
G4Element* Ca = new G4Element(name="Calcium",symbol="Ca" , z= 20., a);
|
||||
// define silicon
|
||||
a = 28.0855*g/mole;
|
||||
G4Element* elSi = new G4Element(name="Silicon",symbol="Si" , z= 14., a);
|
||||
|
||||
a = 26.98154*g/mole;
|
||||
G4Element* elAl = new G4Element(name="Aluminium",symbol="Al" , z= 13., a);
|
||||
|
||||
a = 24.305*g/mole;
|
||||
G4Element* Mg = new G4Element(name="Magnesium",symbol="Mg" , z= 12., a);
|
||||
|
||||
|
||||
|
||||
|
||||
//define basalt
|
||||
density = 3.*g/cm3;
|
||||
G4Material* Basalt = new G4Material(name="Basalt", density, ncomponents=7);
|
||||
Basalt->AddElement(Fe, fractionmass=0.1200);
|
||||
Basalt->AddElement(elTi, fractionmass=0.0160);
|
||||
Basalt->AddElement(Ca, fractionmass=0.0750);
|
||||
Basalt->AddElement(elSi, fractionmass=0.2160);
|
||||
Basalt->AddElement(elAl, fractionmass=0.0710);
|
||||
Basalt->AddElement(Mg, fractionmass=0.0590);
|
||||
Basalt->AddElement(O , fractionmass=0.4430);
|
||||
G4Material* basalt = new G4Material(name="Basalt", density, ncomponents=7);
|
||||
basalt->AddElement(Fe, fractionmass=0.1200);
|
||||
basalt->AddElement(elTi, fractionmass=0.0160);
|
||||
basalt->AddElement(Ca, fractionmass=0.0750);
|
||||
basalt->AddElement(elSi, fractionmass=0.2160);
|
||||
basalt->AddElement(elAl, fractionmass=0.0710);
|
||||
basalt->AddElement(Mg, fractionmass=0.0590);
|
||||
basalt->AddElement(O , fractionmass=0.4430);
|
||||
|
||||
// end basalt
|
||||
|
||||
@@ -262,7 +517,7 @@ void XrayFluoDetectorConstruction::DefineMaterials()
|
||||
|
||||
//default materials of the apparate
|
||||
|
||||
sampleMaterial = Basalt;
|
||||
sampleMaterial = mars1;
|
||||
Dia1Material = Pb;
|
||||
Dia3Material = Pb;
|
||||
pixelMaterial = HPGe;
|
||||
@@ -554,6 +809,47 @@ void XrayFluoDetectorConstruction::UpdateGeometry()
|
||||
G4RunManager::GetRunManager()->DefineWorldVolume(ConstructApparate());
|
||||
}
|
||||
|
||||
void XrayFluoDetectorConstruction::SetSampleMaterial(G4String newMaterial)
|
||||
{
|
||||
|
||||
if( newMaterial == "dolorite") {
|
||||
sampleMaterial = dolorite;
|
||||
}
|
||||
|
||||
else if ( newMaterial == "iron") {
|
||||
sampleMaterial = FeMaterial;
|
||||
}
|
||||
|
||||
else if ( newMaterial == "silicon") {
|
||||
sampleMaterial = Si;
|
||||
}
|
||||
|
||||
else if ( newMaterial == "aluminium") {
|
||||
sampleMaterial = Al;
|
||||
}
|
||||
|
||||
else if ( newMaterial == "copper") {
|
||||
sampleMaterial = Cu;
|
||||
}
|
||||
else if ( newMaterial == "germanium") {
|
||||
sampleMaterial = HPGe;
|
||||
}
|
||||
else if ( newMaterial == "magnesium") {
|
||||
sampleMaterial = materialMg;
|
||||
}
|
||||
|
||||
else if ( newMaterial == "neodimium") {
|
||||
sampleMaterial = materialNd;
|
||||
}
|
||||
else if ( newMaterial == "tin") {
|
||||
sampleMaterial = Sn;
|
||||
}
|
||||
else if ( newMaterial == "titanium") {
|
||||
sampleMaterial = Ti;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
|
||||
@@ -562,3 +858,7 @@ void XrayFluoDetectorConstruction::UpdateGeometry()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user