From: fca Date: Thu, 27 Apr 2000 09:29:53 +0000 (+0000) Subject: Reverting to version 1.6.2 X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=d811c12bd06daf7ba2e43507a2a8a529a7a9a499;p=u%2Fmrichter%2FAliRoot.git Reverting to version 1.6.2 --- diff --git a/STRUCT/AliDIPOv2.cxx b/STRUCT/AliDIPOv2.cxx index 1e7fbebeed5..c1dbd87890f 100644 --- a/STRUCT/AliDIPOv2.cxx +++ b/STRUCT/AliDIPOv2.cxx @@ -15,8 +15,8 @@ /* $Log$ -Revision 1.7.2.2 2000/04/26 11:30:34 morsch -Revised version with detailed geometry from G. Chabratova +Revision 1.6.2.1 1999/12/03 16:38:51 fca +Correct overlap in magnet Revision 1.6 1999/09/29 09:24:30 fca Introduction of the Copyright and cvs Log @@ -29,7 +29,7 @@ Introduction of the Copyright and cvs Log // // //Begin_Html /* - +
@@ -50,10 +50,10 @@ Introduction of the Copyright and cvs Log ClassImp(AliDIPOv2) //_____________________________________________________________________________ -AliDIPOv2::AliDIPOv2() +AliDIPOv2::AliDIPOv2() { // - // Last design of magnetic dipole version 2 + // Default constructor for magnetic dipole version 2 // } @@ -75,398 +75,270 @@ void AliDIPOv2::CreateGeometry() // Creation of the geometry of the magnetic DIPOLE version 2 // //Begin_Html + /* + + */ + //End_Html + //Begin_Html + /* + + */ //End_Html - AliMC* gMC = AliMC::GetMC(); - - Float_t cpar[5], tpar[3], ypar[12]; + Float_t cpar[5], tpar[3], ypar[4]; Float_t dz, dx, dy; Int_t idrotm[1899]; Float_t acc_max, the1, phi1, the2, phi2, the3, phi3; - - Int_t *idtmed = fIdtmed->GetArray()-1799; + Int_t *idtmed = fIdtmed->GetArray()-1799; + + //abs_d = 90.; // DEFINES DRIFT LENGTH + //z_nose = 102.; + //z_cone = 285.; + //theta1 = 24.; // 1. angle defining the front absorber + //theta2 = 5.; // 2. angle defining the front absorbe acc_max = 9.; // ANGLE POLAIRE MAXIMUM + //acc_min = 2.; // ANGLE POLAIRE MINIMUM DE DETECTION + //abs_l = 503.; + //d_steel = 1.; // THICKNESS OF STEEL SUPPORT + //d_poly = 7.5; + //d_pb = 2.5; + //abs_cc = 315.; // DEFINES LENGTH OF CARBON + //abs_c = 358.; + //abs_s = 150.; // DEFINES W-SHIELD LENGTH + //abs_n = 80.; // START OF NOSE + //r_abs = 4.; + //r_pb = .1; + //epsilon = .01; + //theta_r = 3.; + //d_rear = 35.; + //theta_open = .75; + + //z_l3 = 700.; + //zmag_in = 725.; + //zmag_out = 1225.; + //zfil_in = 1471.; + //zfil_out = 1591.; + //zcon_in = 1900.; + //zcon_out = 2e3; + //zcone_e = 859.0875; + //spec_l = 1800.; + //zplug_in = 1780.; + //zplug_out = 1900.; + + // Chamber position + // CZ1=515.5 + //cz1 = 511.; + //cz2 = 686.; + //cz3 = 971.; + //cz4 = 1245.; + //cz5 = 1445.; + //cz6 = 1610.; + //cz7 = 1710.; + // DIPOLE MAGNET - - tpar[0] = 243.55; // 248.5 - tpar[1] = 130.88762; - tpar[2] = 527.34; //440.; - tpar[3] = 211.2; - tpar[4] = 527.34; // 440.; - - gMC->Gsvolu("DDIP", "CONE", idtmed[1815], tpar, 5); + + tpar[0] = 300.; + tpar[1] = 415.; + tpar[2] = 250.; + gMC->Gsvolu("DDIP", "BOX ", idtmed[1814], tpar, 3); + // COILS + // air - m.f. - cpar[0] = 207.; - cpar[1] = 274.; - cpar[2] = 37.65; - cpar[3] = 119.; - cpar[4] = 241. ; - // coil - high cuts - gMC->Gsvolu("DC1 ", "TUBS", idtmed[1854], cpar, 5); - cpar[3] = -61.; - cpar[4] = 61.; - gMC->Gsvolu("DC2 ", "TUBS", idtmed[1854], cpar, 5); - - // coil - low cuts cuts - cpar[0] = 207.; -// cpar[1] = cpar[0] + 10.; - cpar[1] = 217; - cpar[3] = 119.; - cpar[4] = 241.; - - gMC->Gsvolu("DC3 ", "TUBS", idtmed[1814], cpar, 5); - cpar[0] = 207.; - cpar[1] = 217; - cpar[3] = -61.; - cpar[4] = 61.; - gMC->Gsvolu("DC4 ", "TUBS", idtmed[1814], cpar, 5); - + cpar[0] = 210.; + cpar[1] = 263.; + cpar[2] = 83.2/2.; + cpar[3] = 120.; + cpar[4] = 240.; + gMC->Gsvolu("DC1 ", "TUBS", idtmed[1813], cpar, 5); + cpar[3] = -60.; + cpar[4] = 60.; + gMC->Gsvolu("DC2 ", "TUBS", idtmed[1813], cpar, 5); + // ... define regions for higher cuts + cpar[0] += 10.; + cpar[1] += -10.; + cpar[2] += -10.; + cpar[3] = 120.; + cpar[4] = 240.; + gMC->Gsvolu("DC3 ", "TUBS", idtmed[1833], cpar, 5); gMC->Gspos("DC3 ", 1, "DC1 ", 0., 0., 0., 0, "ONLY"); + cpar[3] = -60.; + cpar[4] = 60.; + gMC->Gsvolu("DC4 ", "TUBS", idtmed[1833], cpar, 5); gMC->Gspos("DC4 ", 1, "DC2 ", 0., 0., 0., 0, "ONLY"); - -// dz = 37.65 - 243.55 - dz = -205.9-2.45; - dx = 5.; - gMC->Gspos("DC1 ", 1, "DDIP", dx, 0., dz, 0, "ONLY"); - gMC->Gspos("DC1 ", 2, "DDIP", dx, 0., -dz, 0, "ONLY"); - gMC->Gspos("DC2 ", 1, "DDIP", -dx, 0., dz, 0, "ONLY"); - gMC->Gspos("DC2 ", 2, "DDIP", -dx, 0., -dz, 0, "ONLY"); + // ... + dz = 83.2/2. - 250.; + gMC->Gspos("DC1 ", 1, "DDIP", 0., 0., dz, 0, "ONLY"); + gMC->Gspos("DC1 ", 2, "DDIP", 0., 0., -dz, 0, "ONLY"); + gMC->Gspos("DC2 ", 1, "DDIP", 0., 0., dz, 0, "ONLY"); + gMC->Gspos("DC2 ", 2, "DDIP", 0., 0., -dz, 0, "ONLY"); the1 = 180.; phi1 = 0.; the2 = 90.; - phi2 = 151.; + phi2 = 150.; the3 = 90.; - phi3 = 61.; + phi3 = 60.; AliMatrix(idrotm[1800], the1, phi1, the2, phi2, the3, phi3); - phi2 = 29.; //90-61 + phi2 = 30.; the3 = -90.; - phi3 = -61.; + phi3 = -60.; AliMatrix(idrotm[1801], the1, phi1, the2, phi2, the3, phi3); the1 = 0.; phi1 = 0.; the2 = 90.; - phi2 = 151.; + phi2 = 150.; the3 = 90.; - phi3 = 61.; + phi3 = 60.; AliMatrix(idrotm[1802], the1, phi1, the2, phi2, the3, phi3); - phi2 = 29.; + phi2 = 30.; the3 = -90.; - phi3 = -61.; + phi3 = -60.; AliMatrix(idrotm[1803], the1, phi1, the2, phi2, the3, phi3); - cpar[0] = 25.; - cpar[1] = 100.3; //25+75.3 - cpar[2] = 33.5; + cpar[1] = 108.2; + cpar[2] = 26.5; cpar[3] = 270.; cpar[4] = 360.; -//* coil high cuts - gMC->Gsvolu("DC11", "TUBS", idtmed[1854], cpar, 5); - - dx = TMath::Sin(30.5*kDegrad) * -(207.+33.5)+5./TMath::Sin(30.5*kDegrad) ; - dy = TMath::Cos(30.5*kDegrad) * -(207.+33.5); - dz = cpar[1] - 243.55-2.45; + gMC->Gsvolu("DC11", "TUBS", idtmed[1813], cpar, 5); + // ... higher cuts + cpar[0] += 10.; + cpar[1] += -10.; + cpar[2] += -10.; + gMC->Gsvolu("DC21", "TUBS", idtmed[1833], cpar, 5); + gMC->Gspos("DC21", 1, "DC11", 0., 0., 0., 0, "ONLY"); + // ... + dx = TMath::Sin(30*kDegrad) * -236.5; + dy = TMath::Cos(30*kDegrad) * -236.5; + dz = cpar[1] + 10. - 250.; gMC->Gspos("DC11", 1, "DDIP", dx, dy, dz, idrotm[1800], "ONLY"); gMC->Gspos("DC11", 2, "DDIP", dx, dy, -dz, idrotm[1802], "ONLY"); gMC->Gspos("DC11", 3, "DDIP", -dx, dy, dz, idrotm[1801], "ONLY"); gMC->Gspos("DC11", 4, "DDIP", -dx, dy, -dz, idrotm[1803], "ONLY"); - - - -//* ... higher cuts cpar[0] = 25.; - cpar[1] = 100.3; //25+75.3 - cpar[2] = 33.5; + cpar[1] = 25.+83.2; + cpar[2] = 53./2.; cpar[3] = 0.; cpar[4] = 90.; -//* coil high cuts - gMC->Gsvolu("DC12", "TUBS", idtmed[1854], cpar, 5); - - dx = TMath::Sin(30.5*kDegrad) * -(207.+33.5)+5./TMath::Sin(30.5*kDegrad) ; - dy = TMath::Cos(30.5*kDegrad) *(207.+33.5); - dz = cpar[1] - 243.55-2.45; + gMC->Gsvolu("DC12", "TUBS", idtmed[1813], cpar, 5); + // ... higher cuts + cpar[0] += 10.; + cpar[1] += -10.; + cpar[2] += -10.; + gMC->Gsvolu("DC22", "TUBS", idtmed[1833], cpar, 5); + gMC->Gspos("DC22", 1, "DC12", 0., 0., 0., 0, "ONLY"); + // ... + dx = TMath::Sin(30*kDegrad) * -236.5; + dy = TMath::Cos(30*kDegrad) * 236.5; + dz = cpar[1] + 10. - 250.; gMC->Gspos("DC12", 1, "DDIP", dx, dy, dz, idrotm[1801], "ONLY"); gMC->Gspos("DC12", 2, "DDIP", dx, dy, -dz, idrotm[1803], "ONLY"); gMC->Gspos("DC12", 3, "DDIP", -dx, dy, dz, idrotm[1800], "ONLY"); gMC->Gspos("DC12", 4, "DDIP", -dx, dy, -dz, idrotm[1802], "ONLY"); - the1 = 90.; - phi1 = 61.; + phi1 = 60.; the2 = 90.; - phi2 = 151.; + phi2 = 150.; the3 = 0.; phi3 = 0.; AliMatrix(idrotm[1804], the1, phi1, the2, phi2, the3, phi3); the1 = 90.; - phi1 = -61.; + phi1 = 120.; the2 = 90.; - phi2 = -151.; + phi2 = 210.; + the3 = 0.; + phi3 = 0.; AliMatrix(idrotm[1805], the1, phi1, the2, phi2, the3, phi3); - the1 = 90.; - phi1 = 119.; //180 -61 - the2 = 90.; - phi2 = 209.; //270-61 - AliMatrix(idrotm[1806], the1, phi1, the2, phi2, the3, phi3); - the1 = 90.; - phi1 = -119.; - the2 = 90.; - phi2 = -209.; - AliMatrix(idrotm[1807], the1, phi1, the2, phi2, the3, phi3); - -//* coil - high cuts - - tpar[0] = 37.65; - tpar[1] = 33.5; - tpar[2] = 143.25; - gMC->Gsvolu("DL1 ", "BOX ", idtmed[1854], tpar, 3); - -// coil - low cuts - - tpar[0] = 5.; - dx = 37.65 - 5.; - gMC->Gsvolu("DL2 ", "BOX ", idtmed[1814], tpar, 3); - gMC->Gspos("DL2 ", 1, "DL1 ", dx, 0., 0., 0, "ONLY"); - - dx =-53.62; - dy =-241.26819; - dz = -2.45; + tpar[0] = 53./2.; + tpar[1] = 83.2/2.; + tpar[2] = 283.6/2.; + gMC->Gsvolu("DL1 ", "BOX ", idtmed[1813], tpar, 3); + // ... higher cuts + tpar[0] -= 10.; + tpar[1] -= 10.; + gMC->Gsvolu("DL2 ", "BOX ", idtmed[1833], tpar, 3); + gMC->Gspos("DL2 ", 1, "DL1 ", 0., 0., 0., 0, "ONLY"); + // ... + dx = -60.5; + dy = -238.; + dz = 0.; gMC->Gspos("DL1 ", 1, "DDIP", dx, dy, dz, idrotm[1804], "ONLY"); gMC->Gspos("DL1 ", 2, "DDIP", dx, -dy, dz, idrotm[1805], "ONLY"); - gMC->Gspos("DL1 ", 3, "DDIP",-dx, dy, dz, idrotm[1806], "ONLY"); - gMC->Gspos("DL1 ", 4, "DDIP",-dx, -dy, dz, idrotm[1807], "ONLY"); - - // Conductors - - // high cuts - - //Steel outer face planes - - cpar[0] = 207.-18.6; - cpar[1] = 274.+18.6; - cpar[2] = 1.; - cpar[3] = -50.; - cpar[4] = 50.; - - gMC->Gsvolu("DCO1", "TUBS", idtmed[1819], cpar, 5); - dx = -5.; - dz = 168.25-1.5-1.; - gMC->Gspos("DCO1", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - dz = 243.55+4.5+1.5+1.; - gMC->Gspos("DCO1", 2, "DDIP", dx, 0, dz, 0, "ONLY"); - - // Resin face planes - - cpar[0] = 207.; - cpar[1] = 274.; - cpar[2] = .75; - cpar[3] = -50.; - cpar[4] = 50.; - - gMC->Gsvolu("DCO2", "TUBS", idtmed[1813], cpar, 5); - dx = -5; - dz = 168.25-0.75; - gMC->Gspos("DCO2", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - dz = 243.55+4.5+0.75; - gMC->Gspos("DCO2", 2, "DDIP", dx, 0, dz, 0, "ONLY"); - - // G10 face plane - - cpar[0] = 207.; - cpar[1] = 274.; - cpar[2] = 2.25; - cpar[3] = -50.; - cpar[4] = 50.; - - gMC->Gsvolu("DCO3", "TUBS", idtmed[1811], cpar, 5); - - dx = -5; - dz = 243.55+2.25; - gMC->Gspos("DCO3", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - - //Steel supported planes - - cpar[0] = 274.+1.5+2.; - cpar[1] = 274.+18.6; - cpar[2] = 1.; - cpar[3] = -50.; - cpar[4] = 50.; - - gMC->Gsvolu("DCO4", "TUBS", idtmed[1819], cpar, 5); - - dx = -5; - dz = 168.25+1.; - gMC->Gspos("DCO4", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - - cpar[0] = 207.- 18.6; - cpar[1] = 207.- 2.- 1.5; - cpar[2] = 1.; - cpar[3] = -50.; - cpar[4] = 50.; - - gMC->Gsvolu("DCO5", "TUBS", idtmed[1819], cpar, 5); - - dx = -5; - dz = 168.25+1.; - gMC->Gspos("DCO5", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - - // Sides steel planes - - cpar[0] = 207. - 1.5 -2.; - cpar[1] = 207. - 1.5 ; - cpar[2] = ((243.55+4.5+1.5)-168.25)/2; - cpar[3] = -50.; - cpar[4] = 50.; - - gMC->Gsvolu("DCO6", "TUBS", idtmed[1819], cpar, 5); - - cpar[0] = 274. + 1.5; - cpar[1] = 274. + 1.5 +2.; - - gMC->Gsvolu("DCO7", "TUBS", idtmed[1819], cpar, 5); - - dx=-5.; - dz = ((243.55+4.5+1.5)+168.25)/2; - gMC->Gspos("DCO6", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - gMC->Gspos("DCO7", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - - // Top and bottom resin planes - - cpar[0] = 207. - 1.5 ; - cpar[1] = 207. ; - cpar[2] = ((243.55+4.5+1.5)-168.25)/2; - cpar[3] = -50.; - cpar[4] = 50.; - - gMC->Gsvolu("DCO8", "TUBS", idtmed[1813], cpar, 5); - - cpar[0] = 274.; - cpar[1] = 274. + 1.5; - - gMC->Gsvolu("DCO9", "TUBS", idtmed[1813], cpar, 5); - - - dx=-5.; - dz = ((243.55+4.5+1.5)+168.25)/2; - gMC->Gspos("DCO8", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - gMC->Gspos("DCO9", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - - // Aluminum cabels - - cpar[0] = 274. + 1.5 +2.; - cpar[1] = 274. + 1.5 +2. + 80.; - cpar[2] = 5.05/2; - cpar[3] = -24.; - cpar[4] = 24.; - - gMC->Gsvolu("DCOA", "TUBS", idtmed[1812], cpar, 5); - - // dx = 274. + 1.5 +2. +40.; - // dx = 5. + 1.5 +2. +40.; - // dx = 5. + 1.5 +2.; - dx=-5.; - dz = 168.25 + 5.05 + 5.05/2; - gMC->Gspos("DCOA", 1, "DDIP", dx, 0, dz, 0, "ONLY"); - - dz = 243.55 - 5.05/2; - gMC->Gspos("DCOA", 2, "DDIP", dx, 0, dz, 0, "ONLY"); - + gMC->Gspos("DL1 ", 3, "DDIP",-dx, dy, dz, idrotm[1805], "ONLY"); + gMC->Gspos("DL1 ", 4, "DDIP",-dx, -dy, dz, idrotm[1804], "ONLY"); + // YOKE - -// Top and bottom blocks - ypar[0] = 298.1 ; - ypar[1] = 69.5; - ypar[2] = 155.75; - -// iron- high cuts - gMC->Gsvolu("DY1 ", "BOX ", idtmed[1859], ypar, 3); - ypar[0] = 144.+10. ; - ypar[1] = 193.3+10.; + + ypar[1] = 275.8; ypar[2] = 5.; - ypar[3] = 155.75; - dy = -69.5 + 5.; -// iron- low cuts - gMC->Gsvolu("DY11", "TRD1", idtmed[1819], ypar, 4); - gMC->Gspos("DY11", 1, "DY1 ", 0., dy, 0., 0, "ONLY"); - - dy = 365.5; - dz = 4.95; - gMC->Gspos("DY1 ", 1, "DDIP", 0., dy, -dz, 0, "ONLY"); - - the1 = 270.; + ypar[3] = 156.8; + ypar[0] = ypar[1] - ypar[3] * 2. * TMath::Tan(acc_max * kDegrad); + gMC->Gsvolu("DY1 ", "TRD1", idtmed[1809], ypar, 4); + // iron - + dy = 283.5; + dy = 279; + gMC->Gspos("DY1 ", 1, "DDIP", 0., dy, 0., 0, "ONLY"); + gMC->Gspos("DY1 ", 2, "DDIP", 0., -dy, 0., 0, "ONLY"); + ypar[2] = 60.; + gMC->Gsvolu("DY2 ", "TRD1", idtmed[1829], ypar, 4); + // iron - + dy = ypar[2] + 284.; + gMC->Gspos("DY2 ", 1, "DDIP", 0., dy, 0., 0, "ONLY"); + gMC->Gspos("DY2 ", 2, "DDIP", 0., -dy, 0., 0, "ONLY"); + the1 = 99.; phi1 = 0.; - the2 = 270.; + the2 = 90.; phi2 = 90.; - the3 = 0.; + the3 = 9.; phi3 = 0.; - AliMatrix(idrotm[1808], the1, phi1, the2, phi2, the3, phi3); - gMC->Gspos("DY1 ", 2, "DDIP", 0., -dy, -dz, idrotm[1808] , "ONLY"); - -// side walls - // ypar[0] = 579./2. ; - ypar[0] = 296. ; - ypar[1] = 0.; - ypar[2] = 0.; - ypar[3] = 155.75; - ypar[4] = 47.9 ; - ypar[5] = 72.55; - ypar[6] = 4.3058039629 ; - // z+ - ypar[7] = 155.75; - ypar[8] = 47.9 ; - ypar[9] = 72.55; - ypar[10] = 4.3058039629 ; - -// iron - high cuts - - gMC->Gsvolu("DY2 ", "TRAP", idtmed[1859], ypar,11); - - ypar[4] = 47.9 -5.; - ypar[5] = 72.55 -5.; - - ypar[8] = 47.9 -5.; - ypar[9] = 72.55 -5.; - - -// iron - low cuts - - gMC->Gsvolu("DY22", "TRAP", idtmed[1819], ypar,11); - - dy = 0.; - dx = -5.; - - gMC->Gspos("DY22", 1, "DY2 ", dx, dy, 0., 0, "ONLY"); - - the1 = 90.; - phi1 = 180.; - the2 = 180.; - phi2 = 180.; - the3 = 90.; - phi3 = 90.; - AliMatrix(idrotm[1809], the1, phi1, the2, phi2, the3, phi3); - - the1 = 90.; + AliMatrix(idrotm[1806], the1, phi1, the2, phi2, the3, phi3); + the1 = 261.; phi1 = 0.; - the2 = 180.; - phi2 = 0.; - the3 = 90. ; - phi3 = 90.; - AliMatrix(idrotm[1810], the1, phi1, the2, phi2, the3, phi3); - - dx = 228.875; - dz = - 4.95; - gMC->Gspos("DY2 ", 1, "DDIP", dx, 0.0, dz, idrotm[1809], "ONLY"); - gMC->Gspos("DY2 ", 2, "DDIP", -dx, 0.0, dz, idrotm[1810], "ONLY"); - - dz=975.; - gMC->Gspos("DDIP", 1, "ALIC", 0., 0., dz, 0, "ONLY"); - + the3 = 171.; + AliMatrix(idrotm[1807], the1, phi1, the2, phi2, the3, phi3); + tpar[0] = 60.; + tpar[1] = 283.; + tpar[2] = 156.8; + gMC->Gsvolu("DYL ", "BOX ", idtmed[1814], tpar, 3); + tpar[0] = 5.; + tpar[1] = 73.; + gMC->Gsvolu("DY3 ", "BOX ", idtmed[1809], tpar, 3); + dx = tpar[0] - 60.; + dy = tpar[1] + 137.; + gMC->Gspos("DY3 ", 1, "DYL ", dx, dy, 0., 0, "ONLY"); + gMC->Gspos("DY3 ", 2, "DYL ", dx, -dy, 0., 0, "ONLY"); + tpar[0] = 55.; + gMC->Gsvolu("DY4 ", "BOX ", idtmed[1829], tpar, 3); + dx = dx + 5. + tpar[0]; + gMC->Gspos("DY4 ", 1, "DYL ", dx, dy, 0., 0, "ONLY"); + gMC->Gspos("DY4 ", 2, "DYL ", dx, -dy, 0., 0, "ONLY"); + tpar[0] = 37.7; + tpar[1] = 137.; + gMC->Gsvolu("DY5 ", "BOX ", idtmed[1829], tpar, 3); + dx = 60. - tpar[0]; + gMC->Gspos("DY5 ", 1, "DYL ", dx, 0., 0., 0, "ONLY"); + tpar[0] = 5.; + gMC->Gsvolu("DY6 ", "BOX ", idtmed[1809], tpar, 3); + dx = dx - 37.7 - tpar[0]; + gMC->Gspos("DY6 ", 1, "DYL ", dx, 0., 0., 0, "ONLY"); + tpar[0] = 17.3; + tpar[1] = 5.; + gMC->Gsvolu("DY7 ", "BOX ", idtmed[1809], tpar, 3); + dx = tpar[0] - 60.; + dy = tpar[1] + 127.; + gMC->Gspos("DY7 ", 1, "DYL ", dx, dy, 0., 0, "ONLY"); + gMC->Gspos("DY7 ", 2, "DYL ", dx, -dy, 0., 0, "ONLY"); + + dx = ypar[0] + ypar[3] * TMath::Tan(acc_max * kDegrad) - 60.; + gMC->Gspos("DYL ", 1, "DDIP", dx, 0., 0., idrotm[1806], "ONLY"); + gMC->Gspos("DYL ", 2, "DDIP",-dx, 0., 0., idrotm[1807], "ONLY"); + gMC->Gspos("DDIP", 1, "ALIC", 0., 0., 725.+250., 0, "MANY"); gMC->Gsatt("DDIP", "SEEN", 0); -// gMC->Gsatt("DC21", "SEEN", 0); -// gMC->Gsatt("DC22", "SEEN", 0); -// gMC->Gsatt("DC3 ", "SEEN", 0); -// gMC->Gsatt("DC4 ", "SEEN", 0); + gMC->Gsatt("DC21", "SEEN", 0); + gMC->Gsatt("DC22", "SEEN", 0); + gMC->Gsatt("DC3 ", "SEEN", 0); + gMC->Gsatt("DC4 ", "SEEN", 0); } //_____________________________________________________________________________ @@ -476,8 +348,6 @@ void AliDIPOv2::DrawModule() // Draw a shaded view of the muon absorber // - AliMC* gMC = AliMC::GetMC(); - // Set everything unseen gMC->Gsatt("*", "seen", -1); // @@ -500,10 +370,10 @@ void AliDIPOv2::DrawModule() gMC->Gsatt("DY2 ","seen",1); gMC->Gsatt("DYL ","seen",1); gMC->Gsatt("DY3 ","seen",1); - // gMC->Gsatt("DY4 ","seen",1); - // gMC->Gsatt("DY5 ","seen",1); - // gMC->Gsatt("DY6 ","seen",1); -// gMC->Gsatt("DY7 ","seen",1); + gMC->Gsatt("DY4 ","seen",1); + gMC->Gsatt("DY5 ","seen",1); + gMC->Gsatt("DY6 ","seen",1); + gMC->Gsatt("DY7 ","seen",1); // gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); @@ -529,23 +399,9 @@ void AliDIPOv2::CreateMaterials() Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 }; Float_t zsteel[4] = { 26.,24.,28.,14. }; Float_t wsteel[4] = { .715,.18,.1,.005 }; - Float_t acoil[3] = { 26.98,1.01,16. }; Float_t zcoil[3] = { 13.,1.,8. }; Float_t wcoil[3] = { .66,.226,.114 }; - - Float_t aresi[3] = { 1.01,12.011,16.}; - Float_t zresi[3] = { 1.,6.,8. }; - Float_t wresi[3] = { .0644,.7655,.1701 }; - - Float_t aG10[5] = { 1.01,12.011,16.,28.085 ,79.904 }; - Float_t zG10[5] = { 1.,6.,8.,14.,35. }; - Float_t wG10[5] = { .02089,.22338,.28493,.41342,.05738 }; - - Float_t aAlCon[2] = { 14.61, 26.98}; - Float_t zAlCon[2] = { 7.3, 13.}; - Float_t wAlCon[2] = { .0004,.9996}; - Float_t epsil, stmin, deemax, tmaxfd, stemax; @@ -579,22 +435,7 @@ void AliDIPOv2::CreateMaterials() AliMixture(14, "Al$", acoil, zcoil, 2.122, 3, wcoil); AliMixture(34, "Al$", acoil, zcoil, 2.122, 3, wcoil); AliMixture(54, "Al$", acoil, zcoil, 2.122, 3, wcoil); - - //RESIN - AliMixture(13, "RESIN$", aresi, zresi, 1.05, 3, wresi); - AliMixture(33, "RESIN$", aresi, zresi, 1.05, 3, wresi); - AliMixture(53, "RESIN$", aresi, zresi, 1.05, 3, wresi); - - //G10 - AliMixture(11, "G10$", aG10, zG10, 1.7, 5, wG10); - AliMixture(31, "G10$", aG10, zG10, 1.7, 5, wG10); - AliMixture(51, "G10$", aG10, zG10, 1.7, 5, wG10); - - //Aluminium Conductor - AliMixture(12, "AlCond$", aAlCon, zAlCon, 1.3506, 2, wAlCon); - AliMixture(32, "AlCond$", aAlCon, zAlCon, 1.3506, 2, wAlCon); - AliMixture(52, "AlCond$", aAlCon, zAlCon, 1.3506, 2, wAlCon); - + // **************** // Defines tracking media parameters. // Les valeurs sont commentees pour laisser le defaut @@ -607,53 +448,33 @@ void AliDIPOv2::CreateMaterials() // *************** // Aluminum - AliMedium(1809, "ALU_C0 ", 9, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1829, "ALU_C1 ", 29, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1849, "ALU_C2 ", 49, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); + 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); // Iron - AliMedium(1810, "FE_C0 ", 10, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1830, "FE_C1 ", 30, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1850, "FE_C2 ", 50, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); + 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); // Air - AliMedium(1815, "AIR_C0 ", 15, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1835, "AIR_C1 ", 35, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1855, "AIR_C2 ", 55, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); + 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); // Vacuum - AliMedium(1816, "VA_C0 ", 16, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1836, "VA_C1 ", 36, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1856, "VA_C2 ", 56, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); + 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); // Steel - AliMedium(1819, "ST_C0 ", 19, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1839, "ST_C1 ", 39, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1859, "ST_C3 ", 59, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); + 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); // Coil - AliMedium(1814, "Coil_C1 ", 14, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1834, "Coil_C2 ", 34, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1854, "Coil_C3 ", 54, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - - // Resin - AliMedium(1813, "RESIN_C0 ", 13, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1833, "RESIN_C1 ", 33, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1853, "RESIN_C2 ", 53, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - - // G10 - AliMedium(1811, "G10_C0 ", 11, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1831, "G10_C1 ", 31, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1851, "G10_C2 ", 51, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - - //Aluminium Conductor - AliMedium(1812, "AlCond_C0 ", 12, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1832, "AlCond_C1 ", 32, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(1852, "AlCond_C2 ", 52, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(14, "Coil_C1 ", 14, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(34, "Coil_C2 ", 34, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(54, "Coil_C3 ", 54, 0, ISXFLD, SXMGMX, tmaxfd, stemax, deemax, epsil, stmin); } - - - - -