From: Philipp Klaus Date: Fri, 4 Aug 2017 15:51:36 +0000 (+0200) Subject: v0.9.5 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=d328b98ab20659e35363c90e1500ea4450a0bf55;p=mvd_geometry.git v0.9.5 --- diff --git a/mvd.C b/mvd.C index eeecc68..5a0812d 100644 --- a/mvd.C +++ b/mvd.C @@ -33,15 +33,13 @@ void mvd() TGeoMaterial *matAl = new TGeoMaterial("aluminium", 26.98,13,2.7); TGeoMaterial *matSilicon = new TGeoMaterial("silicon", 0, 0, 0); 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 *matCarbon = 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); - TGeoMedium *diamond = new TGeoMedium("diamondMed", 2, matDiamond); - TGeoMedium *TPG = new TGeoMedium("TPGMed", 2, matTPG); + TGeoMedium *carbon = new TGeoMedium("carbonMed", 2, matCarbon); TGeoMedium *FPC = new TGeoMedium("FPCMed", 2, matFPC); top = manager->MakeBox("Top", vac, 300., 300., 300.); @@ -103,7 +101,7 @@ void mvd() // --- Carrier sprintf(carrier_name, "carrier_S%i", i); Float_t cd[3] = {carrierDimensions[i][0], carrierDimensions[i][1], carrierDimensions[i][2]}; - TGeoVolume *carrier = manager->MakeBox(carrier_name, Al, cd[0]/2, cd[1]/2, cd[2]/2); + TGeoVolume *carrier = manager->MakeBox(carrier_name, carbon, cd[0]/2, cd[1]/2, cd[2]/2); carrier->SetTransparency(0); if (TMath::Sqrt(TMath::Power(cd[0], 2) + TMath::Power(cd[1], 2)) <= 12.6) carrier->SetLineColor(kWhite); else carrier->SetLineColor(kGray+3);