diff --git a/NPSimulation/GASPARD/GaspardTrackerAnnular.cc b/NPSimulation/GASPARD/GaspardTrackerAnnular.cc
index 5a7299b05dedf66ecbd6361df53719ad16b4e204..72f58247ba7af49a436cac6ebc0ce6f0c8edcace 100644
--- a/NPSimulation/GASPARD/GaspardTrackerAnnular.cc
+++ b/NPSimulation/GASPARD/GaspardTrackerAnnular.cc
@@ -111,71 +111,6 @@ void GaspardTrackerAnnular::VolumeMaker(G4int TelescopeNumber ,
Number << NbrTelescopes ;
DetectorNumber = Number.str() ;
- ////////////////////////////////////////////////////////////////
- /////////////////Element Definition ///////////////////////////
- ////////////////////////////////////////////////////////////////
- G4String symbol ;
- G4double density = 0. , a = 0, z = 0 ;
- G4int ncomponents = 0, natoms = 0 ;
-
- G4Element* H = new G4Element("Hydrogen" , symbol = "H" , z = 1 , a = 1.01 * g / mole);
- G4Element* C = new G4Element("Carbon" , symbol = "C" , z = 6 , a = 12.011 * g / mole);
- G4Element* N = new G4Element("Nitrogen" , symbol = "N" , z = 7 , a = 14.01 * g / mole);
- G4Element* O = new G4Element("Oxigen" , symbol = "O" , z = 8 , a = 16.00 * g / mole);
- G4Element* I = new G4Element("Iode" , symbol = "I" , z = 53 , a = 126.9 * g / mole);
- G4Element* Cs = new G4Element("Cesium" , symbol = "Cs" , z = 55 , a = 132.9 * g / mole);
-
- G4Element* Co = new G4Element("Cobalt" , symbol = "Co" , z = 27 , a = 58.933 * g / mole);
- G4Element* Cr = new G4Element("Cromium" , symbol = "Cr" , z = 24 , a = 51.996 * g / mole);
- G4Element* Ni = new G4Element("Nickel" , symbol = "Ni" , z = 28 , a = 58.69 * g / mole);
- G4Element* Fe = new G4Element("Iron" , symbol = "Fe" , z = 26 , a = 55.847 * g / mole);
- G4Element* W = new G4Element("Tungsten" , symbol = "W" , z = 74 , a = 183.5 * g / mole);
-
- ////////////////////////////////////////////////////////////////
- /////////////////Material Definition ///////////////////////////
- ////////////////////////////////////////////////////////////////
- // Si
- a = 28.0855 * g / mole;
- density = 2.321 * g / cm3;
- G4Material* Silicon = new G4Material("Si", z = 14., a, density);
-
- // Al
-// density = 2.702 * g / cm3;
-// a = 26.98 * g / mole;
-// G4Material* Aluminium = new G4Material("Aluminium", z = 13., a, density);
-
- // Iron
-// density = 7.874 * g / cm3;
-// a = 55.847 * g / mole;
-// G4Material* Iron = new G4Material("Iron", z = 26., a, density);
-
- // CsI
- density = 4.51 * g / cm3;
- G4Material* CsI = new G4Material("CsI", density, ncomponents = 2);
- CsI->AddElement(Cs , natoms = 1);
- CsI->AddElement(I , natoms = 1);
-
- // Vacuum
- density = 0.000000001 * mg / cm3;
- G4Material* Vacuum = new G4Material("Vacuum", density, ncomponents = 2);
- Vacuum->AddElement(N, .7);
- Vacuum->AddElement(O, .3);
-
- // Mylar
- density = 1.397 * g / cm3;
- G4Material* Myl = new G4Material("Mylar", density, ncomponents = 3);
- Myl->AddElement(C, natoms = 10);
- Myl->AddElement(H, natoms = 8);
- Myl->AddElement(O, natoms = 4);
-
- // Havar
- G4Material* Harvar = new G4Material("Havar", 8.3*g / cm3, 5);
- Harvar->AddElement(Co , 42);
- Harvar->AddElement(Cr , 20);
- Harvar->AddElement(Ni , 13);
- Harvar->AddElement(Fe , 19);
- Harvar->AddElement(W , 1);
-
////////////////////////////////////////////////////////////////
////////////// Starting Volume Definition //////////////////////
////////////////////////////////////////////////////////////////
@@ -191,7 +126,7 @@ void GaspardTrackerAnnular::VolumeMaker(G4int TelescopeNumber ,
360*deg);
// G4LogicalVolume* logicMM = new G4LogicalVolume(solidMM, Iron, Name, 0, 0, 0);
- G4LogicalVolume* logicMM = new G4LogicalVolume(solidMM, Vacuum, Name, 0, 0, 0);
+ G4LogicalVolume* logicMM = new G4LogicalVolume(solidMM, m_MaterialVacuum, Name, 0, 0, 0);
new G4PVPlacement(G4Transform3D(*MMrot, MMpos), logicMM, Name, world, false, 0);
@@ -208,7 +143,7 @@ void GaspardTrackerAnnular::VolumeMaker(G4int TelescopeNumber ,
0*deg,
360*deg);
- G4LogicalVolume* logicVacBox = new G4LogicalVolume(solidVacBox, Vacuum, "logicVacBox", 0, 0, 0);
+ G4LogicalVolume* logicVacBox = new G4LogicalVolume(solidVacBox, m_MaterialVacuum, "logicVacBox", 0, 0, 0);
G4PVPlacement(0, positionVacBox, logicVacBox, "G" + DetectorNumber + "VacBox", logicMM, false, 0);
@@ -230,7 +165,7 @@ void GaspardTrackerAnnular::VolumeMaker(G4int TelescopeNumber ,
360*deg);
// G4LogicalVolume* logicAluStrip = new G4LogicalVolume(solidAluStrip, Aluminium, "logicAluStrip", 0, 0, 0);
- G4LogicalVolume* logicAluStrip = new G4LogicalVolume(solidAluStrip, Vacuum, "logicAluStrip", 0, 0, 0);
+ G4LogicalVolume* logicAluStrip = new G4LogicalVolume(solidAluStrip, m_MaterialVacuum, "logicAluStrip", 0, 0, 0);
new G4PVPlacement(0, positionAluStripFront, logicAluStrip, "G" + DetectorNumber + "AluStripFront", logicMM, false, 0);
new G4PVPlacement(0, positionAluStripBack, logicAluStrip, "G" + DetectorNumber + "AluStripBack", logicMM, false, 0);
@@ -246,7 +181,7 @@ void GaspardTrackerAnnular::VolumeMaker(G4int TelescopeNumber ,
FirstStageThickness/2,
0*deg,
360*deg);
- G4LogicalVolume* logicSilicon = new G4LogicalVolume(solidSilicon, Silicon, "logicSilicon", 0, 0, 0);
+ G4LogicalVolume* logicSilicon = new G4LogicalVolume(solidSilicon, m_MaterialSilicon, "logicSilicon", 0, 0, 0);
new G4PVPlacement(0, positionSilicon, logicSilicon, Name + "_Silicon", logicMM, false, 0);
@@ -272,7 +207,7 @@ void GaspardTrackerAnnular::VolumeMaker(G4int TelescopeNumber ,
0*deg,
360*deg);
- G4LogicalVolume* logicSecondStage = new G4LogicalVolume(solidSecondStage, Silicon, "logicSecondStage", 0, 0, 0);
+ G4LogicalVolume* logicSecondStage = new G4LogicalVolume(solidSecondStage, m_MaterialSilicon, "logicSecondStage", 0, 0, 0);
new G4PVPlacement(0, positionSecondStage, logicSecondStage, Name + "_SecondStage", logicMM, false, 0);
@@ -298,7 +233,7 @@ void GaspardTrackerAnnular::VolumeMaker(G4int TelescopeNumber ,
0*deg,
360*deg);
- G4LogicalVolume* logicThirdStage = new G4LogicalVolume(solidThirdStage, Silicon, "logicThirdStage", 0, 0, 0);
+ G4LogicalVolume* logicThirdStage = new G4LogicalVolume(solidThirdStage, m_MaterialSilicon, "logicThirdStage", 0, 0, 0);
new G4PVPlacement(0, positionThirdStage, logicThirdStage, Name + "_ThirdStage", logicMM, false, 0);
diff --git a/NPSimulation/GASPARD/GaspardTrackerModule.cc b/NPSimulation/GASPARD/GaspardTrackerModule.cc
index 3a17e5d47752f1a3b1a13ae6c3a60505c46678ae..0907c7508c04604e239e478ddb951d53b67f6ccd 100644
--- a/NPSimulation/GASPARD/GaspardTrackerModule.cc
+++ b/NPSimulation/GASPARD/GaspardTrackerModule.cc
@@ -20,6 +20,7 @@
*****************************************************************************/
#include "GaspardTrackerModule.hh"
+#include "MaterialManager.hh"
#include "RootOutput.h"
@@ -33,6 +34,7 @@ GaspardTrackerModule::GaspardTrackerModule()
InitializeRootOutput();
InitializeIndex();
+ InitializeMaterial();
}
@@ -63,3 +65,11 @@ void GaspardTrackerModule::InitializeIndex()
m_index["Annular"] = 200;
m_index["DummyShape"] = 1000;
}
+
+
+
+void GaspardTrackerModule::InitializeMaterial()
+{
+ m_MaterialSilicon = MaterialManager::getInstance()->GetMaterialFromLibrary("Si");
+ m_MaterialVacuum = MaterialManager::getInstance()->GetMaterialFromLibrary("Vacuum");
+}
diff --git a/NPSimulation/GASPARD/GaspardTrackerModule.hh b/NPSimulation/GASPARD/GaspardTrackerModule.hh
index 72ee7ddd90900afee4e058427e9056717ca7ec2e..60a64ad44bc06c91f3071a235ec7265fc9dc3126 100644
--- a/NPSimulation/GASPARD/GaspardTrackerModule.hh
+++ b/NPSimulation/GASPARD/GaspardTrackerModule.hh
@@ -87,6 +87,17 @@ protected:
// Set to true if you want to see Telescope Frame in your visualisation
bool m_non_sensitive_part_visiualisation;
+protected:
+ ////////////////////////////////////////////////////
+ //////////////////// Material //////////////////////
+ ////////////////////////////////////////////////////
+ // Declare all material used by Gaspard
+ void InitializeMaterial() ;
+ // Si
+ G4Material* m_MaterialSilicon;
+ // Vacuum
+ G4Material* m_MaterialVacuum ;
+
protected:
// First stage Associate Scorer
G4MultiFunctionalDetector* m_FirstStageScorer;
diff --git a/NPSimulation/GASPARD/GaspardTrackerSquare.cc b/NPSimulation/GASPARD/GaspardTrackerSquare.cc
index 90f8f13d4220debd470adf552dcc9a76a3c318ab..f0d560ae56d56447755bacab27d0a27e8fd0969c 100644
--- a/NPSimulation/GASPARD/GaspardTrackerSquare.cc
+++ b/NPSimulation/GASPARD/GaspardTrackerSquare.cc
@@ -159,78 +159,13 @@ void GaspardTrackerSquare::VolumeMaker(G4int TelescopeNumber,
Number << NbrTelescopes ;
DetectorNumber = Number.str() ;
- /////////////////////////////////////////////////////////////////
- /////////////////Element Definition ///////////////////////////
- ////////////////////////////////////////////////////////////////
- G4String symbol ;
- G4double density = 0. , a = 0, z = 0 ;
- G4int ncomponents = 0, natoms = 0 ;
-
- G4Element* H = new G4Element("Hydrogen" , symbol = "H" , z = 1 , a = 1.01 * g / mole);
- G4Element* C = new G4Element("Carbon" , symbol = "C" , z = 6 , a = 12.011 * g / mole);
- G4Element* N = new G4Element("Nitrogen" , symbol = "N" , z = 7 , a = 14.01 * g / mole);
- G4Element* O = new G4Element("Oxigen" , symbol = "O" , z = 8 , a = 16.00 * g / mole);
- G4Element* I = new G4Element("Iode" , symbol = "I" , z = 53 , a = 126.9 * g / mole);
- G4Element* Cs = new G4Element("Cesium" , symbol = "Cs" , z = 55 , a = 132.9 * g / mole);
-
- G4Element* Co = new G4Element("Cobalt" , symbol = "Co" , z = 27 , a = 58.933 * g / mole);
- G4Element* Cr = new G4Element("Cromium" , symbol = "Cr" , z = 24 , a = 51.996 * g / mole);
- G4Element* Ni = new G4Element("Nickel" , symbol = "Ni" , z = 28 , a = 58.69 * g / mole);
- G4Element* Fe = new G4Element("Iron" , symbol = "Fe" , z = 26 , a = 55.847 * g / mole);
- G4Element* W = new G4Element("Tungsten" , symbol = "W" , z = 74 , a = 183.5 * g / mole);
-
- ////////////////////////////////////////////////////////////////
- /////////////////Material Definition ///////////////////////////
- ////////////////////////////////////////////////////////////////
- // Si
- a = 28.0855 * g / mole;
- density = 2.321 * g / cm3;
- G4Material* Silicon = new G4Material("Si", z = 14., a, density);
-
- // Al
- density = 2.702 * g / cm3;
- a = 26.98 * g / mole;
-// G4Material* Aluminium = new G4Material("Aluminium", z = 13., a, density);
-
- // Iron
-// density = 7.874 * g / cm3;
-// a = 55.847 * g / mole;
-// G4Material* Iron = new G4Material("Iron", z = 26., a, density);
-
- // CsI
- density = 4.51 * g / cm3;
- G4Material* CsI = new G4Material("CsI", density, ncomponents = 2);
- CsI->AddElement(Cs , natoms = 1);
- CsI->AddElement(I , natoms = 1);
-
- // Vacuum
- density = 0.000000001 * mg / cm3;
- G4Material* Vacuum = new G4Material("Vacuum", density, ncomponents = 2);
- Vacuum->AddElement(N, .7);
- Vacuum->AddElement(O, .3);
-
- // Mylar
- density = 1.397 * g / cm3;
- G4Material* Myl = new G4Material("Mylar", density, ncomponents = 3);
- Myl->AddElement(C, natoms = 10);
- Myl->AddElement(H, natoms = 8);
- Myl->AddElement(O, natoms = 4);
-
- // Havar
- G4Material* Harvar = new G4Material("Havar", 8.3*g / cm3, 5);
- Harvar->AddElement(Co , 42);
- Harvar->AddElement(Cr , 20);
- Harvar->AddElement(Ni , 13);
- Harvar->AddElement(Fe , 19);
- Harvar->AddElement(W , 1);
-
////////////////////////////////////////////////////////////////
////////////// Starting Volume Definition //////////////////////
////////////////////////////////////////////////////////////////
G4String Name = "GPDSquare" + DetectorNumber;
G4Box* solidGPDSquare = new G4Box(Name, 0.5*FaceFront, 0.5*FaceFront, 0.5*Length);
- G4LogicalVolume* logicGPDSquare = new G4LogicalVolume(solidGPDSquare, Vacuum, Name, 0, 0, 0);
+ G4LogicalVolume* logicGPDSquare = new G4LogicalVolume(solidGPDSquare, m_MaterialVacuum, Name, 0, 0, 0);
new G4PVPlacement(G4Transform3D(*MMrot, MMpos), logicGPDSquare, Name, world, false, 0);
@@ -247,7 +182,7 @@ void GaspardTrackerSquare::VolumeMaker(G4int TelescopeNumber,
/*
G4ThreeVector positionMarkerU = CT*0.98 + MMu*SiliconFace/4;
G4Box* solidMarkerU = new G4Box( "solidMarkerU" , SiliconFace/4 , 1*mm , 1*mm ) ;
- G4LogicalVolume* logicMarkerU = new G4LogicalVolume( solidMarkerU , Vacuum , "logicMarkerU",0,0,0) ;
+ G4LogicalVolume* logicMarkerU = new G4LogicalVolume( solidMarkerU , m_MaterialVacuum , "logicMarkerU",0,0,0) ;
PVPBuffer = new G4PVPlacement(G4Transform3D(*MMrot,positionMarkerU),logicMarkerU,"MarkerU",world,false,0) ;
G4VisAttributes* MarkerUVisAtt= new G4VisAttributes(G4Colour(0.,0.,0.5));//blue
@@ -255,7 +190,7 @@ void GaspardTrackerSquare::VolumeMaker(G4int TelescopeNumber,
G4ThreeVector positionMarkerV = CT*0.98 + MMv*SiliconFace/4;
G4Box* solidMarkerV = new G4Box( "solidMarkerU" , 1*mm , SiliconFace/4 , 1*mm ) ;
- G4LogicalVolume* logicMarkerV = new G4LogicalVolume( solidMarkerV , Vacuum , "logicMarkerV",0,0,0) ;
+ G4LogicalVolume* logicMarkerV = new G4LogicalVolume( solidMarkerV , m_MaterialVacuum , "logicMarkerV",0,0,0) ;
PVPBuffer = new G4PVPlacement(G4Transform3D(*MMrot,positionMarkerV),logicMarkerV,"MarkerV",world,false,0) ;
G4VisAttributes* MarkerVVisAtt= new G4VisAttributes(G4Colour(0.,0.5,0.5));//green
@@ -270,7 +205,7 @@ void GaspardTrackerSquare::VolumeMaker(G4int TelescopeNumber,
G4ThreeVector positionFirstStage = G4ThreeVector(0, 0, FirstStage_PosZ);
G4Box* solidFirstStage = new G4Box("solidFirstStage", 0.5*FirstStageFace, 0.5*FirstStageFace, 0.5*FirstStageThickness);
- G4LogicalVolume* logicFirstStage = new G4LogicalVolume(solidFirstStage, Silicon, "logicFirstStage", 0, 0, 0);
+ G4LogicalVolume* logicFirstStage = new G4LogicalVolume(solidFirstStage, m_MaterialSilicon, "logicFirstStage", 0, 0, 0);
new G4PVPlacement(0, positionFirstStage, logicFirstStage, Name + "_FirstStage", logicGPDSquare, false, 0);
@@ -290,7 +225,7 @@ void GaspardTrackerSquare::VolumeMaker(G4int TelescopeNumber,
G4ThreeVector positionSecondStage = G4ThreeVector(0, 0, SecondStage_PosZ);
G4Box* solidSecondStage = new G4Box("solidSecondStage", 0.5*SecondStageFace, 0.5*SecondStageFace, 0.5*SecondStageThickness);
- G4LogicalVolume* logicSecondStage = new G4LogicalVolume(solidSecondStage, Silicon, "logicSecondStage", 0, 0, 0);
+ G4LogicalVolume* logicSecondStage = new G4LogicalVolume(solidSecondStage, m_MaterialSilicon, "logicSecondStage", 0, 0, 0);
new G4PVPlacement(0, positionSecondStage, logicSecondStage, Name + "_SecondStage", logicGPDSquare, false, 0);
@@ -310,7 +245,7 @@ void GaspardTrackerSquare::VolumeMaker(G4int TelescopeNumber,
G4ThreeVector positionThirdStage = G4ThreeVector(0, 0, ThirdStage_PosZ);
G4Box* solidThirdStage = new G4Box("solidThirdStage", 0.5*ThirdStageFace, 0.5*ThirdStageFace, 0.5*ThirdStageThickness);
- G4LogicalVolume* logicThirdStage = new G4LogicalVolume(solidThirdStage, Silicon, "logicThirdStage", 0, 0, 0);
+ G4LogicalVolume* logicThirdStage = new G4LogicalVolume(solidThirdStage, m_MaterialSilicon, "logicThirdStage", 0, 0, 0);
new G4PVPlacement(0, positionThirdStage, logicThirdStage, Name + "_ThirdStage", logicGPDSquare, false, 0);
diff --git a/NPSimulation/GASPARD/GaspardTrackerTrapezoid.cc b/NPSimulation/GASPARD/GaspardTrackerTrapezoid.cc
index 9a77ce1f178e7edd412855b722151612aa7687b4..b6687096e151aa3d9022c5ba67de527d1c65c33c 100644
--- a/NPSimulation/GASPARD/GaspardTrackerTrapezoid.cc
+++ b/NPSimulation/GASPARD/GaspardTrackerTrapezoid.cc
@@ -156,71 +156,6 @@ void GaspardTrackerTrapezoid::VolumeMaker(G4int TelescopeNumber ,
Number << NbrTelescopes ;
DetectorNumber = Number.str() ;
- ////////////////////////////////////////////////////////////////
- /////////////////Element Definition ///////////////////////////
- ////////////////////////////////////////////////////////////////
- G4String symbol ;
- G4double density = 0. , a = 0, z = 0 ;
- G4int ncomponents = 0, natoms = 0 ;
-
- G4Element* H = new G4Element("Hydrogen" , symbol = "H" , z = 1 , a = 1.01 * g / mole);
- G4Element* C = new G4Element("Carbon" , symbol = "C" , z = 6 , a = 12.011 * g / mole);
- G4Element* N = new G4Element("Nitrogen" , symbol = "N" , z = 7 , a = 14.01 * g / mole);
- G4Element* O = new G4Element("Oxigen" , symbol = "O" , z = 8 , a = 16.00 * g / mole);
- G4Element* I = new G4Element("Iode" , symbol = "I" , z = 53 , a = 126.9 * g / mole);
- G4Element* Cs = new G4Element("Cesium" , symbol = "Cs" , z = 55 , a = 132.9 * g / mole);
-
- G4Element* Co = new G4Element("Cobalt" , symbol = "Co" , z = 27 , a = 58.933 * g / mole);
- G4Element* Cr = new G4Element("Cromium" , symbol = "Cr" , z = 24 , a = 51.996 * g / mole);
- G4Element* Ni = new G4Element("Nickel" , symbol = "Ni" , z = 28 , a = 58.69 * g / mole);
- G4Element* Fe = new G4Element("Iron" , symbol = "Fe" , z = 26 , a = 55.847 * g / mole);
- G4Element* W = new G4Element("Tungsten" , symbol = "W" , z = 74 , a = 183.5 * g / mole);
-
- ////////////////////////////////////////////////////////////////
- /////////////////Material Definition ///////////////////////////
- ////////////////////////////////////////////////////////////////
- // Si
- a = 28.0855 * g / mole;
- density = 2.321 * g / cm3;
- G4Material* Silicon = new G4Material("Si", z = 14., a, density);
-
- // Al
-// density = 2.702 * g / cm3;
-// a = 26.98 * g / mole;
-// G4Material* Aluminium = new G4Material("Aluminium", z = 13., a, density);
-
- // Iron
-// density = 7.874 * g / cm3;
-// a = 55.847 * g / mole;
-// G4Material* Iron = new G4Material("Iron", z = 26., a, density);
-
- // CsI
- density = 4.51 * g / cm3;
- G4Material* CsI = new G4Material("CsI", density, ncomponents = 2);
- CsI->AddElement(Cs , natoms = 1);
- CsI->AddElement(I , natoms = 1);
-
- // Vacuum
- density = 0.000000001 * mg / cm3;
- G4Material* Vacuum = new G4Material("Vacuum", density, ncomponents = 2);
- Vacuum->AddElement(N, .7);
- Vacuum->AddElement(O, .3);
-
- // Mylar
- density = 1.397 * g / cm3;
- G4Material* Myl = new G4Material("Mylar", density, ncomponents = 3);
- Myl->AddElement(C, natoms = 10);
- Myl->AddElement(H, natoms = 8);
- Myl->AddElement(O, natoms = 4);
-
- // Havar
- G4Material* Harvar = new G4Material("Havar", 8.3*g / cm3, 5);
- Harvar->AddElement(Co , 42);
- Harvar->AddElement(Cr , 20);
- Harvar->AddElement(Ni , 13);
- Harvar->AddElement(Fe , 19);
- Harvar->AddElement(W , 1);
-
////////////////////////////////////////////////////////////////
////////////// Starting Volume Definition //////////////////////
////////////////////////////////////////////////////////////////
@@ -231,7 +166,7 @@ void GaspardTrackerTrapezoid::VolumeMaker(G4int TelescopeNumber ,
Length/2, 0*deg, 0*deg,
Height/2, BaseLarge/2, BaseSmall/2, 0*deg,
Height/2, BaseLarge/2, BaseSmall/2, 0*deg);
- G4LogicalVolume* logicGPDTrapezoid = new G4LogicalVolume(solidGPDTrapezoid, Vacuum, Name, 0, 0, 0);
+ G4LogicalVolume* logicGPDTrapezoid = new G4LogicalVolume(solidGPDTrapezoid, m_MaterialVacuum, Name, 0, 0, 0);
new G4PVPlacement(G4Transform3D(*MMrot, MMpos), logicGPDTrapezoid, Name, world, false, 0);
@@ -247,7 +182,7 @@ void GaspardTrackerTrapezoid::VolumeMaker(G4int TelescopeNumber ,
/*
G4ThreeVector positionMarkerU = CT*0.98 + MMu*SiliconFace/4;
G4Box* solidMarkerU = new G4Box( "solidMarkerU" , SiliconFace/4 , 1*mm , 1*mm ) ;
- G4LogicalVolume* logicMarkerU = new G4LogicalVolume( solidMarkerU , Vacuum , "logicMarkerU",0,0,0) ;
+ G4LogicalVolume* logicMarkerU = new G4LogicalVolume( solidMarkerU , m_MaterialVacuum , "logicMarkerU",0,0,0) ;
PVPBuffer = new G4PVPlacement(G4Transform3D(*MMrot,positionMarkerU),logicMarkerU,"MarkerU",world,false,0) ;
G4VisAttributes* MarkerUVisAtt= new G4VisAttributes(G4Colour(0.,0.,0.5));//blue
@@ -255,7 +190,7 @@ void GaspardTrackerTrapezoid::VolumeMaker(G4int TelescopeNumber ,
G4ThreeVector positionMarkerV = CT*0.98 + MMv*SiliconFace/4;
G4Box* solidMarkerV = new G4Box( "solidMarkerU" , 1*mm , SiliconFace/4 , 1*mm ) ;
- G4LogicalVolume* logicMarkerV = new G4LogicalVolume( solidMarkerV , Vacuum , "logicMarkerV",0,0,0) ;
+ G4LogicalVolume* logicMarkerV = new G4LogicalVolume( solidMarkerV , m_MaterialVacuum , "logicMarkerV",0,0,0) ;
PVPBuffer = new G4PVPlacement(G4Transform3D(*MMrot,positionMarkerV),logicMarkerV,"MarkerV",world,false,0) ;
G4VisAttributes* MarkerVVisAtt= new G4VisAttributes(G4Colour(0.,0.5,0.5));//green
@@ -273,7 +208,7 @@ void GaspardTrackerTrapezoid::VolumeMaker(G4int TelescopeNumber ,
FirstStageThickness/2, 0*deg, 0*deg,
FirstStageHeight/2, FirstStageBaseLarge/2, FirstStageBaseSmall/2, 0*deg,
FirstStageHeight/2, FirstStageBaseLarge/2, FirstStageBaseSmall/2, 0*deg);
- G4LogicalVolume* logicFirstStage = new G4LogicalVolume(solidFirstStage, Silicon, "logicFirstStage", 0, 0, 0);
+ G4LogicalVolume* logicFirstStage = new G4LogicalVolume(solidFirstStage, m_MaterialSilicon, "logicFirstStage", 0, 0, 0);
new G4PVPlacement(0,
positionFirstStage,
@@ -302,7 +237,7 @@ void GaspardTrackerTrapezoid::VolumeMaker(G4int TelescopeNumber ,
SecondStageThickness/2, 0*deg, 0*deg,
FirstStageHeight/2, FirstStageBaseLarge/2, FirstStageBaseSmall/2, 0*deg,
FirstStageHeight/2, FirstStageBaseLarge/2, FirstStageBaseSmall/2, 0*deg);
- G4LogicalVolume* logicSecondStage = new G4LogicalVolume(solidSecondStage, Silicon, "logicSecondStage", 0, 0, 0);
+ G4LogicalVolume* logicSecondStage = new G4LogicalVolume(solidSecondStage, m_MaterialSilicon, "logicSecondStage", 0, 0, 0);
new G4PVPlacement(0,
positionSecondStage,
@@ -331,7 +266,7 @@ void GaspardTrackerTrapezoid::VolumeMaker(G4int TelescopeNumber ,
ThirdStageThickness/2, 0*deg, 0*deg,
FirstStageHeight/2, FirstStageBaseLarge/2, FirstStageBaseSmall/2, 0*deg,
FirstStageHeight/2, FirstStageBaseLarge/2, FirstStageBaseSmall/2, 0*deg);
- G4LogicalVolume* logicThirdStage = new G4LogicalVolume(solidThirdStage, Silicon, "logicThirdStage", 0, 0, 0);
+ G4LogicalVolume* logicThirdStage = new G4LogicalVolume(solidThirdStage, m_MaterialSilicon, "logicThirdStage", 0, 0, 0);
new G4PVPlacement(0,
positionThirdStage,