v0.9.2

diff --git a/mvd.C b/mvd.C
index 8d1da9f4025777c6610be39ede09636fda92e43f..9c7c26dec702f8771432ae81b15df0089519dca5 100644 (file)
--- a/mvd.C
+++ b/mvd.C
@@ -2,8 +2,8 @@ static const int numStations = 4;
 // all units are in cm
 Float_t quadrantBeamOffset[4] = {0.54, 0.54, 0.82, 1.04};
 Float_t carrierDimensions[4][3] = {{5.0, 5.15, 0.015}, {8.0, 8.0, 0.015}, {11.0, 9.9, 0.0300}, {14.0, 12.75, 0.0300}};
-Float_t stationPosition[4] = {35.0, 65.0, 110.0, 170.0};
-//Float_t stationPosition[4] = {5.0, 10.0, 15.0, 20.0};
+//Float_t stationPosition[4] = {35.0, 65.0, 110.0, 170.0};
+Float_t stationPosition[4] = {5.0, 10.0, 15.0, 20.0};
 Float_t carrierClampOverlap = 1.0;
 Float_t heatsinkWidth[4] = {23.1, 31.1, 34.34, 37.7};
 Float_t heatsinkHeight = 37.7;
@@ -29,14 +29,14 @@ void mvd()
    TCanvas *c3D = new TCanvas("c3D","MVD Layout",1600,1200);
 
    TGeoManager *manager = new TGeoManager("Chamber Layout", "Chamber Layout");
-   TGeoMaterial *mat = new TGeoMaterial("Vacuum", 0.,0.,0.);
-   TGeoMaterial *matAl = new TGeoMaterial("Al", 26.98,13,2.7);
+   TGeoMaterial *mat = new TGeoMaterial("vacuum", 0.,0.,0.);
+   TGeoMaterial *matAl = new TGeoMaterial("aluminium", 26.98,13,2.7);
    TGeoMaterial *matSilicon = new TGeoMaterial("silicon", 0, 0, 0);
-   TGeoMaterial *matGlue = new TGeoMaterial("glue", 0, 0, 0);
-   TGeoMaterial *matDiamond = new TGeoMaterial("diamond", 0, 0, 0);
-   TGeoMaterial *matTPG = new TGeoMaterial("TPG", 0, 0, 0);
-   TGeoMaterial *matFPC = new TGeoMaterial("FPC", 0, 0, 0);
-   TGeoMedium *vac = new TGeoMedium("Vacuum", 0, mat);
+   TGeoMaterial *matGlue = new TGeoMaterial("aluminium", 0, 0, 0);
+   TGeoMaterial *matDiamond = new TGeoMaterial("carbon", 0, 0, 0);
+   TGeoMaterial *matTPG = new TGeoMaterial("carbon", 0, 0, 0);
+   TGeoMaterial *matFPC = new TGeoMaterial("copper", 0, 0, 0);
+   TGeoMedium *vac = new TGeoMedium("vacuumMed", 0, mat);
    TGeoMedium *Al = new TGeoMedium("AlMed", 2, matAl);
    TGeoMedium *silicon = new TGeoMedium("siliconMed", 2, matSilicon);
    TGeoMedium *glue = new TGeoMedium("glueMed", 2, matGlue);