X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliSHIL.cxx;h=031b77e1e542675b2e0bd6118486860fb0c28e3b;hb=3f3549a3de5a77afa5cd27ddb2709083211ae644;hp=4d3ebbd91b45266de47f52f30d870af543083080;hpb=ba380e33d879020d7d588384906d2397a0b818ea;p=u%2Fmrichter%2FAliRoot.git diff --git a/STRUCT/AliSHIL.cxx b/STRUCT/AliSHIL.cxx index 4d3ebbd91b4..031b77e1e54 100644 --- a/STRUCT/AliSHIL.cxx +++ b/STRUCT/AliSHIL.cxx @@ -29,10 +29,13 @@ // // /////////////////////////////////////////////////////////////////////////////// +#include + #include "AliSHIL.h" #include "AliRun.h" #include "AliMagF.h" #include "AliConst.h" +#include "AliLog.h" ClassImp(AliSHIL) @@ -51,9 +54,9 @@ AliSHIL::AliSHIL(const char *name, const char *title) // // Standard constructor for muon shield // - SetMarkerColor(7); - SetMarkerStyle(2); - SetMarkerSize(0.4); + //PH SetMarkerColor(7); + //PH SetMarkerStyle(2); + //PH SetMarkerSize(0.4); } //_____________________________________________________________________________ @@ -70,8 +73,10 @@ void AliSHIL::CreateMaterials() // // Defines materials for the muon shield // - Int_t isxfld = gAlice->Field()->Integ(); - Float_t sxmgmx = gAlice->Field()->Max(); + Int_t isxfld1 = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ(); + Int_t isxfld2 = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->PrecInteg(); + + Float_t sxmgmx = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max(); // Steel Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 }; Float_t zsteel[4] = { 26.,24.,28.,14. }; @@ -88,8 +93,8 @@ void AliSHIL::CreateMaterials() .337021,.013,.044,.014 }; // Ni-Cu-W alloy Float_t aniwcu[3] ={58.6934, 183.84, 63.546}; - Float_t zniwcu[3] ={28., 74., 29}; - Float_t wniwcu[3] ={0.015,0.95,0.035}; + Float_t zniwcu[3] ={28., 74., 29.}; + Float_t wniwcu[3] ={ 0.015, 0.95, 0.035}; // // Insulation powder // Si O Ti Al @@ -145,6 +150,7 @@ void AliSHIL::CreateMaterials() AliMixture(15, "AIR1 ", aAir, zAir, dAir, 4, wAir); AliMixture(35, "AIR2 ", aAir, zAir, dAir, 4, wAir); AliMixture(55, "AIR3 ", aAir, zAir, dAir, 4, wAir); + AliMixture(75, "AIR_MUON ", aAir, zAir, dAir, 4, wAir); // Vacuum AliMixture(16, "VACUUM1 ", aAir, zAir, dAir1, 4, wAir); @@ -188,59 +194,60 @@ void AliSHIL::CreateMaterials() // *************** // Aluminum - AliMedium(9, "ALU_C0 ", 9, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(29, "ALU_C1 ", 29, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(49, "ALU_C2 ", 49, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(9, "ALU_C0 ", 9, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(29, "ALU_C1 ", 29, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(49, "ALU_C2 ", 49, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Iron - AliMedium(10, "FE_C0 ", 10, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(30, "FE_C1 ", 30, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(50, "FE_C2 ", 50, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(10, "FE_C0 ", 10, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(30, "FE_C1 ", 30, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(50, "FE_C2 ", 50, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - // Iron - AliMedium(11, "Cu_C0 ", 11, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(31, "Cu_C1 ", 31, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(51, "Cu_C2 ", 51, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + // Copper + AliMedium(11, "Cu_C0 ", 11, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(31, "Cu_C1 ", 31, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(51, "Cu_C2 ", 51, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Tungsten - AliMedium(12, "W_C0 ", 12, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(32, "W_C1 ", 32, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(52, "W_C2 ", 52, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(12, "W_C0 ", 12, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(32, "W_C1 ", 32, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(52, "W_C2 ", 52, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Lead - AliMedium(13, "PB_C0 ", 13, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(33, "PB_C1 ", 33, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(53, "PB_C2 ", 53, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(13, "PB_C0 ", 13, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(33, "PB_C1 ", 33, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(53, "PB_C2 ", 53, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Insulation Powder - AliMedium(14, "INS_C0 ", 14, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(34, "INS_C1 ", 34, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(54, "INS_C2 ", 54, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(14, "INS_C0 ", 14, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(34, "INS_C1 ", 34, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(54, "INS_C2 ", 54, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Air - AliMedium(15, "AIR_C0 ", 15, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(35, "AIR_C1 ", 35, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(55, "AIR_C2 ", 55, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(15, "AIR_C0 ", 15, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(35, "AIR_C1 ", 35, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(55, "AIR_C2 ", 55, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(75, "AIR_MUON ", 75, 0, isxfld2, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Vacuum - AliMedium(16, "VA_C0 ", 16, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(36, "VA_C1 ", 36, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(56, "VA_C2 ", 56, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(16, "VA_C0 ", 16, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(36, "VA_C1 ", 36, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(56, "VA_C2 ", 56, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Steel - AliMedium(19, "ST_C0 ", 19, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(39, "ST_C1 ", 39, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(59, "ST_C3 ", 59, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(19, "ST_C0 ", 19, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(39, "ST_C1 ", 39, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(59, "ST_C3 ", 59, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Lead/Tungsten - AliMedium(20, "PB/W0 ", 20, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(40, "PB/W1 ", 40, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(60, "PB/W3 ", 60, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(20, "PB/W0 ", 20, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(40, "PB/W1 ", 40, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(60, "PB/W3 ", 60, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Ni/Tungsten - AliMedium(21, "Ni/W0 ", 21, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(41, "Ni/W1 ", 41, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(61, "Ni/W3 ", 61, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(21, "Ni/W0 ", 21, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(41, "Ni/W1 ", 41, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(61, "Ni/W3 ", 61, 0, isxfld1, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); // Concrete AliMedium(17, "CC_C0 ", 17, 0, 0, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin); @@ -263,7 +270,7 @@ void AliSHIL::Init() // Int_t i; // - if(fDebug) { + if(AliLog::GetGlobalDebugLevel()>0) { printf("\n%s: ",ClassName()); for(i=0;i<35;i++) printf("*"); printf(" SHIL_INIT ");