X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=ZDC%2FAliZDCv3.cxx;h=9bbf91622e8115e1c727cecce9b71173dc24e9bd;hp=c23adccadf6f21d2a00703ab6290361e11fa46b7;hb=ec6e635345a030dc256a85bfb212137830296ae7;hpb=09930289d6649bb7489cc35498db3453783f6043 diff --git a/ZDC/AliZDCv3.cxx b/ZDC/AliZDCv3.cxx index c23adccadf6..9bbf91622e8 100644 --- a/ZDC/AliZDCv3.cxx +++ b/ZDC/AliZDCv3.cxx @@ -17,7 +17,7 @@ /////////////////////////////////////////////////////////////////////// // // // AliZDCv3 --- new ZDC geometry // -// with the both ZDC set geometry implemented // +// with both ZDC arms geometry implemented // // // /////////////////////////////////////////////////////////////////////// @@ -25,21 +25,22 @@ #include "stdio.h" // --- ROOT system -#include #include -#include #include #include #include #include #include #include +#include #include #include +#include #include #include // --- AliRoot classes +#include "AliLog.h" #include "AliConst.h" #include "AliMagF.h" #include "AliRun.h" @@ -64,6 +65,8 @@ AliZDCv3::AliZDCv3() : fMedSensGR(0), fMedSensPI(0), fMedSensTDI(0), + fMedSensVColl(0), + fMedSensLumi(0), fNalfan(0), fNalfap(0), fNben(0), @@ -71,21 +74,35 @@ AliZDCv3::AliZDCv3() : fZEMLength(0), fpLostITC(0), fpLostD1C(0), + fpcVCollC(0), fpDetectedC(0), fnDetectedC(0), - fnLumiC(0), fpLostITA(0), fpLostD1A(0), fpLostTDI(0), + fpcVCollA(0), fpDetectedA(0), fnDetectedA(0), - fnLumiA(0), - fnTrou(0) + fVCollSideCAperture(7./2.), + fVCollSideCApertureNeg(7./2.), + fVCollSideCCentreY(0.), + fVCollSideAAperture(7./2.), + fVCollSideAApertureNeg(7./2.), + fVCollSideACentreY(0.), + fTCDDAperturePos(2.0), + fTCDDApertureNeg(2.2), + fTDIAperturePos(5.5), + fTDIApertureNeg(5.5), + fLumiLength(15.) { // // Default constructor for Zero Degree Calorimeter // - + for(Int_t i=0; i<3; i++){ + fDimZN[i] = fDimZP[i] = 0.; + fPosZNC[i] = fPosZNA[i] = fPosZPC[i]= fPosZPA[i] = fPosZEM[i] = 0.; + fFibZN[i] = fFibZP[i] = 0.; + } } //_____________________________________________________________________________ @@ -99,6 +116,8 @@ AliZDCv3::AliZDCv3(const char *name, const char *title) : fMedSensGR(0), fMedSensPI(0), fMedSensTDI(0), + fMedSensVColl(0), + fMedSensLumi(0), fNalfan(90), fNalfap(90), fNben(18), @@ -106,16 +125,26 @@ AliZDCv3::AliZDCv3(const char *name, const char *title) : fZEMLength(0), fpLostITC(0), fpLostD1C(0), + fpcVCollC(0), fpDetectedC(0), fnDetectedC(0), - fnLumiC(0), fpLostITA(0), fpLostD1A(0), fpLostTDI(0), + fpcVCollA(0), fpDetectedA(0), - fnDetectedA(0), - fnLumiA(0), - fnTrou(0) + fnDetectedA(0), + fVCollSideCAperture(7./2.), + fVCollSideCApertureNeg(7./2.), + fVCollSideCCentreY(0.), + fVCollSideAAperture(7./2.), + fVCollSideAApertureNeg(7./2.), + fVCollSideACentreY(0.), + fTCDDAperturePos(2.0), + fTCDDApertureNeg(2.2), + fTDIAperturePos(5.5), + fTDIApertureNeg(5.5), + fLumiLength(15.) { // // Standard constructor for Zero Degree Calorimeter @@ -150,6 +179,7 @@ AliZDCv3::AliZDCv3(const char *name, const char *title) : } // // Parameters for hadronic calorimeters geometry + // Positions updated after post-installation measurements fDimZN[0] = 3.52; fDimZN[1] = 3.52; fDimZN[2] = 50.; @@ -157,17 +187,17 @@ AliZDCv3::AliZDCv3(const char *name, const char *title) : fDimZP[1] = 6.; fDimZP[2] = 75.; fPosZNC[0] = 0.; - fPosZNC[1] = 1.2; - fPosZNC[2] = -11600.; - fPosZPC[0] = 23.9; + fPosZNC[1] = 0.; + fPosZNC[2] = -11397.3; + fPosZPC[0] = 24.35; fPosZPC[1] = 0.; - fPosZPC[2] = -11600.; + fPosZPC[2] = -11389.3; fPosZNA[0] = 0.; - fPosZNA[1] = 1.2; - fPosZNA[2] = 11620.; - fPosZPA[0] = 24.; + fPosZNA[1] = 0.; + fPosZNA[2] = 11395.8; + fPosZPA[0] = 24.35; fPosZPA[1] = 0.; - fPosZPA[2] = 11620.; + fPosZPA[2] = 11387.8; fFibZN[0] = 0.; fFibZN[1] = 0.01825; fFibZN[2] = 50.; @@ -206,9 +236,14 @@ void AliZDCv3::CreateBeamLine() // Create the beam line elements // - Float_t zc, zq, zd1, zd2, zql, zd2l; - Float_t conpar[9], tubpar[3], tubspar[5], boxpar[3]; - Int_t im1, im2; + Double_t zd1, zd2, zCorrDip, zInnTrip, zD1, zD2; + Double_t conpar[9], tubpar[3], tubspar[5], boxpar[3]; + + //-- rotation matrices for the legs + Int_t irotpipe1, irotpipe2; + TVirtualMC::GetMC()->Matrix(irotpipe1,90.-1.0027,0.,90.,90.,1.0027,180.); + TVirtualMC::GetMC()->Matrix(irotpipe2,90.+1.0027,0.,90.,90.,1.0027,0.); + // Int_t *idtmed = fIdtmed->GetArray(); @@ -231,267 +266,427 @@ void AliZDCv3::CreateBeamLine() conpar[6] = -zd1; conpar[7] = 0.; conpar[8] = 55.; - gMC->Gsvolu("ZDCC", "PCON", idtmed[10], conpar, 9); - gMC->Gspos("ZDCC", 1, "ALIC", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("ZDCC", "PCON", idtmed[10], conpar, 9); + TVirtualMC::GetMC()->Gspos("ZDCC", 1, "ALIC", 0., 0., 0., 0, "ONLY"); - // -- FIRST SECTION OF THE BEAM PIPE (from compensator dipole to - // the beginning of D1) + // -- BEAM PIPE from compensator dipole to the beginning of D1) tubpar[0] = 6.3/2.; tubpar[1] = 6.7/2.; // From beginning of ZDC volumes to beginning of D1 tubpar[2] = (5838.3-zd1)/2.; - gMC->Gsvolu("QT01", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT01", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QT01", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT01", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT01 TUBE pipe from z = %f to z= %f (D1 beg.)\n",-zd1,-2*tubpar[2]-zd1); + //printf(" QT01 TUBE pipe from z = %1.2f to z= %1.2f (D1 beg.)\n",-zd1,-2*tubpar[2]-zd1); - //-- SECOND SECTION OF THE BEAM PIPE (from the end of D1 to the - // beginning of D2) - - //-- FROM MAGNETIC BEGINNING OF D1 TO MAGNETIC END OF D1 + 13.5 cm - //-- Cylindrical pipe (r = 3.47) + conical flare + //-- BEAM PIPE from the end of D1 to the beginning of D2) + //-- FROM MAGNETIC BEGINNING OF D1 TO MAGNETIC END OF D1 + //-- Cylindrical pipe (r = 3.47) + conical flare // -> Beginning of D1 zd1 += 2.*tubpar[2]; - tubpar[0] = 3.47; - tubpar[1] = 3.47+0.2; - tubpar[2] = 958.5/2.; - gMC->Gsvolu("QT02", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT02", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + tubpar[0] = 6.94/2.; + tubpar[1] = 7.34/2.; + tubpar[2] = (6909.8-zd1)/2.; + TVirtualMC::GetMC()->Gsvolu("QT02", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT02", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT02 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); + //printf(" QT02 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); zd1 += 2.*tubpar[2]; - conpar[0] = 25./2.; - conpar[1] = 10./2.; - conpar[2] = 10.4/2.; - conpar[3] = 6.44/2.; - conpar[4] = 6.84/2.; - gMC->Gsvolu("QC01", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QC01", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); + tubpar[0] = 9./2.; + tubpar[1] = 9.6/2.; + tubpar[2] = (7022.8-zd1)/2.; + TVirtualMC::GetMC()->Gsvolu("QT03", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT03", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QC01 CONE pipe from z = %f to z= %f\n",-zd1,-2*conpar[0]-zd1); + //printf(" QT03 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); - zd1 += 2.*conpar[0]; + zd1 += 2.*tubpar[2]; - tubpar[0] = 10./2.; - tubpar[1] = 10.4/2.; - tubpar[2] = 50./2.; - gMC->Gsvolu("QT03", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT03", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + conpar[0] = 39.2/2.; + conpar[1] = 18./2.; + conpar[2] = 18.6/2.; + conpar[3] = 9./2.; + conpar[4] = 9.6/2.; + TVirtualMC::GetMC()->Gsvolu("QC01", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC01", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT03 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); + //printf(" QC01 CONE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-zd1); - zd1 += tubpar[2]*2.; + zd1 += conpar[0] * 2.; - tubpar[0] = 10./2.; - tubpar[1] = 10.4/2.; - tubpar[2] = 10./2.; - gMC->Gsvolu("QT04", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT04", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // ****************************************************** + // N.B.-> according to last vacuum layout + // private communication by D. Macina, mail 27/1/2009 + // ****************************************************** + // 2nd section of VCTCQ+VAMTF+TCTVB+VAMTF+TCLIA+VAMTF+1st part of VCTCP + Float_t totLength1 = 160.8 + 78. + 148. + 78. + 148. + 78. + 9.3; + // + tubpar[0] = 18.6/2.; + tubpar[1] = 7.6/2.; + tubpar[2] = totLength1/2.; +// TVirtualMC::GetMC()->Gsvolu("QE01", "ELTU", idtmed[7], tubpar, 3); + // temporary replace with a scaled tube (AG) + TGeoTube *tubeQE01 = new TGeoTube(0.,tubpar[0],tubpar[2]); + TGeoScale *scaleQE01 = new TGeoScale(1., tubpar[1]/tubpar[0], 1.); + TGeoScaledShape *sshapeQE01 = new TGeoScaledShape(tubeQE01, scaleQE01); + new TGeoVolume("QE01", sshapeQE01, gGeoManager->GetMedium(idtmed[7])); + + tubpar[0] = 18.0/2.; + tubpar[1] = 7.0/2.; + tubpar[2] = totLength1/2.; +// TVirtualMC::GetMC()->Gsvolu("QE02", "ELTU", idtmed[10], tubpar, 3); + // temporary replace with a scaled tube (AG) + TGeoTube *tubeQE02 = new TGeoTube(0.,tubpar[0],tubpar[2]); + TGeoScale *scaleQE02 = new TGeoScale(1., tubpar[1]/tubpar[0], 1.); + TGeoScaledShape *sshapeQE02 = new TGeoScaledShape(tubeQE02, scaleQE02); + new TGeoVolume("QE02", sshapeQE02, gGeoManager->GetMedium(idtmed[10])); + + TVirtualMC::GetMC()->Gspos("QE01", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QE02", 1, "QE01", 0., 0., 0., 0, "ONLY"); // Ch.debug - //printf("\n QT04 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); + //printf(" QE01 ELTU from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); + + // Vertical collimator jaws (defined ONLY if fVCollAperture<3.5!) + if(fVCollSideCAperture<3.5){ + boxpar[0] = 5.4/2.; + boxpar[1] = (3.5-fVCollSideCAperture-fVCollSideCCentreY-0.7)/2.; + if(boxpar[1]<0.) boxpar[1]=0.; + boxpar[2] = 124.4/2.; + printf(" AliZDCv3 -> sideC VCollimator jaws: apertures +%1.2f/-%1.2f center %1.2f [cm]\n", + fVCollSideCAperture, fVCollSideCApertureNeg,fVCollSideCCentreY); + TVirtualMC::GetMC()->Gsvolu("QCVC" , "BOX ", idtmed[13], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QCVC", 1, "QE02", -boxpar[0], fVCollSideCAperture+fVCollSideCCentreY+boxpar[1], -totLength1/2.+160.8+78.+148./2., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QCVC", 2, "QE02", -boxpar[0], -fVCollSideCApertureNeg+fVCollSideCCentreY-boxpar[1], -totLength1/2.+160.8+78.+148./2., 0, "ONLY"); + } zd1 += tubpar[2] * 2.; - tubpar[0] = 10./2.; - tubpar[1] = 10.4/2.; - tubpar[2] = 3.16/2.; - gMC->Gsvolu("QT05", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT05", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // 2nd part of VCTCP + conpar[0] = 31.5/2.; + conpar[1] = 21.27/2.; + conpar[2] = 21.87/2.; + conpar[3] = 18.0/2.; + conpar[4] = 18.6/2.; + TVirtualMC::GetMC()->Gsvolu("QC02", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC02", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT05 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); - - zd1 += tubpar[2] * 2.; + //printf(" QC02 CONE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-zd1); - tubpar[0] = 10.0/2.; - tubpar[1] = 10.4/2; - tubpar[2] = 190./2.; - gMC->Gsvolu("QT06", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT06", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + zd1 += conpar[0] * 2.; + + // 3rd section of VCTCP+VCDWC+VMLGB + Float_t totLenght2 = 9.2 + 530.5+40.; + tubpar[0] = 21.2/2.; + tubpar[1] = 21.9/2.; + tubpar[2] = totLenght2/2.; + TVirtualMC::GetMC()->Gsvolu("QT04", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT04", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT06 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); + //printf(" QT04 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); zd1 += tubpar[2] * 2.; - conpar[0] = 30./2.; - conpar[1] = 20.6/2.; - conpar[2] = 21./2.; - conpar[3] = 10./2.; - conpar[4] = 10.4/2.; - gMC->Gsvolu("QC02", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QC02", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); + // First part of VCTCD + // skewed transition cone from ID=212.7 mm to ID=797 mm + conpar[0] = 121./2.; + conpar[1] = 79.7/2.; + conpar[2] = 81.3/2.; + conpar[3] = 21.27/2.; + conpar[4] = 21.87/2.; + TVirtualMC::GetMC()->Gsvolu("QC03", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC03", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QC02 CONE pipe from z = %f to z= %f\n",-zd1,-2*conpar[0]-zd1); + //printf(" QC03 CONE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-zd1); - zd1 += conpar[0] * 2.; + zd1 += 2.*conpar[0]; - tubpar[0] = 20.6/2.; - tubpar[1] = 21./2.; - tubpar[2] = 450./2.; - gMC->Gsvolu("QT07", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT07", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // VCDGB + 1st part of VCTCH + tubpar[0] = 79.7/2.; + tubpar[1] = 81.3/2.; + tubpar[2] = (5*475.2+97.)/2.; + TVirtualMC::GetMC()->Gsvolu("QT05", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT05", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT07 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); + //printf(" QT05 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); - zd1 += tubpar[2] * 2.; + zd1 += 2.*tubpar[2]; + + // 2nd part of VCTCH + // Transition from ID=797 mm to ID=196 mm: + // in order to simulate the thin window opened in the transition cone + // we divide the transition cone in three cones: + // (1) 8 mm thick (2) 3 mm thick (3) the third 8 mm thick - conpar[0] = 13.6/2.; - conpar[1] = 25.4/2.; - conpar[2] = 25.8/2.; - conpar[3] = 20.6/2.; - conpar[4] = 21./2.; - gMC->Gsvolu("QC03", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QC03", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); + // (1) 8 mm thick + conpar[0] = 9.09/2.; // 15 degree + conpar[1] = 74.82868/2.; + conpar[2] = 76.42868/2.; // thickness 8 mm + conpar[3] = 79.7/2.; + conpar[4] = 81.3/2.; // thickness 8 mm + TVirtualMC::GetMC()->Gsvolu("QC04", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC04", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QC03 CONE pipe from z = %f to z= %f\n",-zd1,-2*conpar[0]-zd1); - - zd1 += conpar[0] * 2.; - - tubpar[0] = 25.4/2.; - tubpar[1] = 25.8/2.; - tubpar[2] = 205.8/2.; - gMC->Gsvolu("QT08", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT08", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + //printf(" QC04 CONE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-zd1); + + zd1 += 2.*conpar[0]; + + // (2) 3 mm thick + conpar[0] = 96.2/2.; // 15 degree + conpar[1] = 23.19588/2.; + conpar[2] = 23.79588/2.; // thickness 3 mm + conpar[3] = 74.82868/2.; + conpar[4] = 75.42868/2.; // thickness 3 mm + TVirtualMC::GetMC()->Gsvolu("QC05", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC05", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT08 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); - - zd1 += tubpar[2] * 2.; + //printf(" QC05 CONE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-zd1); + + zd1 += 2.*conpar[0]; - tubpar[0] = 50./2.; - tubpar[1] = 50.4/2.; - // QT09 is 10 cm longer to accomodate TDI - tubpar[2] = 515.4/2.; - gMC->Gsvolu("QT09", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT09", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // (3) 8 mm thick + conpar[0] = 6.71/2.; // 15 degree + conpar[1] = 19.6/2.; + conpar[2] = 21.2/2.;// thickness 8 mm + conpar[3] = 23.19588/2.; + conpar[4] = 24.79588/2.;// thickness 8 mm + TVirtualMC::GetMC()->Gsvolu("QC06", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC06", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT09 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); - - zd1 += tubpar[2] * 2.; + //printf(" QC06 CONE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-zd1); + + zd1 += 2.*conpar[0]; - tubpar[0] = 50./2.; - tubpar[1] = 50.4/2.; - // QT10 is 10 cm shorter - tubpar[2] = 690./2.; - gMC->Gsvolu("QT10", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT10", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // VMZAR (5 volumes) + tubpar[0] = 20.2/2.; + tubpar[1] = 20.6/2.; + tubpar[2] = 2.15/2.; + TVirtualMC::GetMC()->Gsvolu("QT06", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT06", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT10 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); - - zd1 += tubpar[2] * 2.; + //printf(" QT06 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); + + zd1 += 2.*tubpar[2]; - tubpar[0] = 50./2.; - tubpar[1] = 50.4/2.; - tubpar[2] = 778.5/2.; - gMC->Gsvolu("QT11", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT11", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + conpar[0] = 6.9/2.; + conpar[1] = 23.9/2.; + conpar[2] = 24.3/2.; + conpar[3] = 20.2/2.; + conpar[4] = 20.6/2.; + TVirtualMC::GetMC()->Gsvolu("QC07", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC07", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT11 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); - - zd1 += tubpar[2] * 2.; + //printf(" QC07 CONE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-zd1); + + zd1 += 2.*conpar[0]; + + tubpar[0] = 23.9/2.; + tubpar[1] = 25.5/2.; + tubpar[2] = 17.0/2.; + TVirtualMC::GetMC()->Gsvolu("QT07", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT07", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // Ch.debug + //printf(" QT07 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); + + zd1 += 2.*tubpar[2]; - conpar[0] = 14.18/2.; - conpar[1] = 55./2.; - conpar[2] = 55.4/2.; - conpar[3] = 50./2.; - conpar[4] = 50.4/2.; - gMC->Gsvolu("QC04", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QC04", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); + conpar[0] = 6.9/2.; + conpar[1] = 20.2/2.; + conpar[2] = 20.6/2.; + conpar[3] = 23.9/2.; + conpar[4] = 24.3/2.; + TVirtualMC::GetMC()->Gsvolu("QC08", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC08", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QC04 CONE pipe from z = %f to z= %f\n",-zd1,-2*conpar[0]-zd1); + //printf(" QC08 CONE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-zd1); + + zd1 += 2.*conpar[0]; - zd1 += conpar[0] * 2.; + tubpar[0] = 20.2/2.; + tubpar[1] = 20.6/2.; + tubpar[2] = 2.15/2.; + TVirtualMC::GetMC()->Gsvolu("QT08", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT08", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // Ch.debug + //printf(" QT08 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); + + zd1 += 2.*tubpar[2]; - tubpar[0] = 55./2.; - tubpar[1] = 55.4/2.; - tubpar[2] = 730./2.; - gMC->Gsvolu("QT12", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT12", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // Flange (ID=196 mm)(last part of VMZAR and first part of VCTYB) + tubpar[0] = 19.6/2.; + tubpar[1] = 25.3/2.; + tubpar[2] = 4.9/2.; + TVirtualMC::GetMC()->Gsvolu("QT09", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT09", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // Ch.debug + //printf(" QT09 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); + + zd1 += 2.*tubpar[2]; // Ch.debug - //printf("\n QT12 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); + //printf(" Beginning of VCTYB volume @ z = %1.2f \n",-zd1); - zd1 += tubpar[2] * 2.; + // simulation of the trousers (VCTYB) + tubpar[0] = 19.6/2.; + tubpar[1] = 20.0/2.; + tubpar[2] = 3.9/2.; + TVirtualMC::GetMC()->Gsvolu("QT10", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT10", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // Ch.debug + //printf(" QT10 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); + + zd1 += 2.*tubpar[2]; + + // transition cone from ID=196. to ID=216.6 + conpar[0] = 32.55/2.; + conpar[1] = 21.66/2.; + conpar[2] = 22.06/2.; + conpar[3] = 19.6/2.; + conpar[4] = 20.0/2.; + TVirtualMC::GetMC()->Gsvolu("QC09", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC09", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); + // Ch.debug + //printf(" QC09 CONE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-zd1); + + zd1 += 2.*conpar[0]; - conpar[0] = 36.86/2.; - conpar[1] = 68./2.; - conpar[2] = 68.4/2.; - conpar[3] = 55./2.; - conpar[4] = 55.4/2.; - gMC->Gsvolu("QC05", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QC05", 1, "ZDCC", 0., 0., -conpar[0]-zd1, 0, "ONLY"); + // tube + tubpar[0] = 21.66/2.; + tubpar[1] = 22.06/2.; + tubpar[2] = 28.6/2.; + TVirtualMC::GetMC()->Gsvolu("QT11", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT11", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QC05 CONE pipe from z = %f to z= %f\n",-zd1,-2*conpar[0]-zd1); + //printf(" QT11 TUBE pipe from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); + + zd1 += 2.*tubpar[2]; + // Ch.debug + //printf(" Beginning of recombination chamber @ z = %f \n",-zd1); + + // -------------------------------------------------------- + // RECOMBINATION CHAMBER IMPLEMENTED USING TGeo CLASSES!!!! + // author: Chiara (August 2008) + // -------------------------------------------------------- + // TRANSFORMATION MATRICES + // Combi transformation: + Double_t dx = -3.970000; + Double_t dy = 0.000000; + Double_t dz = 0.0; + // Rotation: + Double_t thx = 84.989100; Double_t phx = 180.000000; + Double_t thy = 90.000000; Double_t phy = 90.000000; + Double_t thz = 185.010900; Double_t phz = 0.000000; + TGeoRotation *rotMatrix1c = new TGeoRotation("c",thx,phx,thy,phy,thz,phz); + // Combi transformation: + dx = -3.970000; + dy = 0.000000; + dz = 0.0; + TGeoCombiTrans *rotMatrix2c = new TGeoCombiTrans("ZDCC_c1", dx,dy,dz,rotMatrix1c); + rotMatrix2c->RegisterYourself(); + // Combi transformation: + dx = 3.970000; + dy = 0.000000; + dz = 0.0; + // Rotation: + thx = 95.010900; phx = 180.000000; + thy = 90.000000; phy = 90.000000; + thz = 180.-5.010900; phz = 0.000000; + TGeoRotation *rotMatrix3c = new TGeoRotation("",thx,phx,thy,phy,thz,phz); + TGeoCombiTrans *rotMatrix4c = new TGeoCombiTrans("ZDCC_c2", dx,dy,dz,rotMatrix3c); + rotMatrix4c->RegisterYourself(); + + // VOLUMES DEFINITION + // Volume: ZDCC + TGeoVolume *pZDCC = gGeoManager->GetVolume("ZDCC"); - zd1 += conpar[0] * 2.; + conpar[0] = (90.1-0.95-0.26-0.0085)/2.; + conpar[1] = 0.0/2.; + conpar[2] = 21.6/2.; + conpar[3] = 0.0/2.; + conpar[4] = 5.8/2.; + new TGeoCone("QCLext", conpar[0],conpar[1],conpar[2],conpar[3],conpar[4]); - tubpar[0] = 68./2.; - tubpar[1] = 68.4/2.; - tubpar[2] = 927.3/2.; - gMC->Gsvolu("QT13", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QT13", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); - // Ch.debug - //printf("\n QT13 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); + conpar[0] = (90.1-0.95-0.26-0.0085)/2.; + conpar[1] = 0.0/2.; + conpar[2] = 21.2/2.; + conpar[3] = 0.0/2.; + conpar[4] = 5.4/2.; + new TGeoCone("QCLint", conpar[0],conpar[1],conpar[2],conpar[3],conpar[4]); + + // Outer trousers + TGeoCompositeShape *pOutTrousersC = new TGeoCompositeShape("outTrousersC", "QCLext:ZDCC_c1+QCLext:ZDCC_c2"); - zd1 += tubpar[2] * 2.; + // Volume: QCLext + TGeoMedium *medZDCFe = gGeoManager->GetMedium("ZDC_ZIRONT"); + TGeoVolume *pQCLext = new TGeoVolume("QCLext",pOutTrousersC, medZDCFe); + pQCLext->SetLineColor(kGreen); + pQCLext->SetVisLeaves(kTRUE); + // + TGeoTranslation *tr1c = new TGeoTranslation(0., 0., (Double_t) -conpar[0]-0.95-zd1); + //printf(" Recombination chamber from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-0.95-zd1); + // + pZDCC->AddNode(pQCLext, 1, tr1c); + // Inner trousers + TGeoCompositeShape *pIntTrousersC = new TGeoCompositeShape("intTrousersC", "QCLint:ZDCC_c1+QCLint:ZDCC_c2"); + // Volume: QCLint + TGeoMedium *medZDCvoid = gGeoManager->GetMedium("ZDC_ZVOID"); + TGeoVolume *pQCLint = new TGeoVolume("QCLint",pIntTrousersC, medZDCvoid); + pQCLint->SetLineColor(kTeal); + pQCLint->SetVisLeaves(kTRUE); + pQCLext->AddNode(pQCLint, 1); + + zd1 += 90.1; + Double_t offset = 0.5; + zd1 = zd1+offset; - tubpar[0] = 0./2.; - tubpar[1] = 68.4/2.; - tubpar[2] = 0.2/2.; - gMC->Gsvolu("QT14", "TUBE", idtmed[8], tubpar, 3); - gMC->Gspos("QT14", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + // second section : 2 tubes (ID = 54. OD = 58.) + tubpar[0] = 5.4/2.; + tubpar[1] = 5.8/2.; + tubpar[2] = 40.0/2.; + TVirtualMC::GetMC()->Gsvolu("QT12", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT12", 1, "ZDCC", -15.8/2., 0., -tubpar[2]-zd1, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QT12", 2, "ZDCC", 15.8/2., 0., -tubpar[2]-zd1, 0, "ONLY"); // Ch.debug - //printf("\n QT14 TUBE pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); + //printf(" QT12 TUBE from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); - zd1 += tubpar[2] * 2.; + zd1 += 2.*tubpar[2]; - tubpar[0] = 0./2.; - tubpar[1] = 6.4/2.; - tubpar[2] = 0.2/2.; - gMC->Gsvolu("QT15", "TUBE", idtmed[11], tubpar, 3); - //-- Position QT15 inside QT14 - gMC->Gspos("QT15", 1, "QT14", -7.7, 0., 0., 0, "ONLY"); - - gMC->Gsvolu("QT16", "TUBE", idtmed[11], tubpar, 3); - //-- Position QT16 inside QT14 - gMC->Gspos("QT16", 1, "QT14", 7.7, 0., 0., 0, "ONLY"); - - - //-- BEAM PIPE BETWEEN END OF CONICAL PIPE AND BEGINNING OF D2 - - tubpar[0] = 6.4/2.; - tubpar[1] = 6.8/2.; - tubpar[2] = 680.8/2.; - gMC->Gsvolu("QT17", "TUBE", idtmed[7], tubpar, 3); - - tubpar[0] = 6.4/2.; - tubpar[1] = 6.8/2.; - tubpar[2] = 680.8/2.; - gMC->Gsvolu("QT18", "TUBE", idtmed[7], tubpar, 3); - - // -- ROTATE PIPES - Float_t angle = 0.143*kDegrad; // Rotation angle - - //AliMatrix(im1, 90.+0.143, 0., 90., 90., 0.143, 0.); // x<0 - gMC->Matrix(im1, 90.+0.143, 0., 90., 90., 0.143, 0.); // x<0 - gMC->Gspos("QT17", 1, "ZDCC", TMath::Sin(angle) * 680.8/ 2. - 9.4, - 0., -tubpar[2]-zd1, im1, "ONLY"); - //printf("\n QT17-18 pipe from z = %f to z= %f\n",-zd1,-2*tubpar[2]-zd1); - - //AliMatrix(im2, 90.-0.143, 0., 90., 90., 0.143, 180.); // x>0 (ZP) - gMC->Matrix(im2, 90.-0.143, 0., 90., 90., 0.143, 180.); // x>0 (ZP) - gMC->Gspos("QT18", 1, "ZDCC", 9.7 - TMath::Sin(angle) * 680.8 / 2., - 0., -tubpar[2]-zd1, im2, "ONLY"); + // transition x2zdc to recombination chamber : skewed cone + conpar[0] = (10.-0.2-offset)/2.; + conpar[1] = 6.3/2.; + conpar[2] = 7.0/2.; + conpar[3] = 5.4/2.; + conpar[4] = 5.8/2.; + TVirtualMC::GetMC()->Gsvolu("QC10", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QC10", 1, "ZDCC", -7.9-0.175, 0., -conpar[0]-0.1-zd1, irotpipe1, "ONLY"); + TVirtualMC::GetMC()->Gspos("QC10", 2, "ZDCC", 7.9+0.175, 0., -conpar[0]-0.1-zd1, irotpipe2, "ONLY"); + //printf(" QC10 CONE from z = %1.2f to z= %1.2f\n",-zd1,-2*conpar[0]-0.2-zd1); + + zd1 += 2.*conpar[0]+0.2; + + // 2 tubes (ID = 63 mm OD=70 mm) + tubpar[0] = 6.3/2.; + tubpar[1] = 7.0/2.; + tubpar[2] = 639.8/2.; + TVirtualMC::GetMC()->Gsvolu("QT13", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QT13", 1, "ZDCC", -16.5/2., 0., -tubpar[2]-zd1, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QT13", 2, "ZDCC", 16.5/2., 0., -tubpar[2]-zd1, 0, "ONLY"); + //printf(" QT13 TUBE from z = %1.2f to z= %1.2f\n",-zd1,-2*tubpar[2]-zd1); + + zd1 += 2.*tubpar[2]; + //printf(" END OF SIDE C BEAM PIPE DEFINITION @ z = %f\n",-zd1); + // -- Luminometer (Cu box) in front of ZN - side C boxpar[0] = 8.0/2.; boxpar[1] = 8.0/2.; - boxpar[2] = 15./2.; - gMC->Gsvolu("QLUC", "BOX ", idtmed[6], boxpar, 3); - gMC->Gspos("QLUC", 1, "ZDCC", 0., 0., fPosZNC[2]+66.+boxpar[2], 0, "ONLY"); - //printf("\n QLUC LUMINOMETER from z = %f to z= %f\n", fPosZNC[2]+66., fPosZNC[2]+66.+2*boxpar[2]); + boxpar[2] = fLumiLength/2.; + TVirtualMC::GetMC()->Gsvolu("QLUC", "BOX ", idtmed[9], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QLUC", 1, "ZDCC", 0., 0., fPosZNC[2]+66.+boxpar[2], 0, "ONLY"); + //printf(" QLUC LUMINOMETER from z = %1.2f to z= %1.2f\n", fPosZNC[2]+66., fPosZNC[2]+66.+2*boxpar[2]); // -- END OF BEAM PIPE VOLUME DEFINITION FOR SIDE C (RB26 SIDE) // ---------------------------------------------------------------- @@ -503,18 +698,13 @@ void AliZDCv3::CreateBeamLine() /////////////////////////////////////////////////////////////// // Rotation Matrices definition - Int_t irotpipe2, irotpipe1; - //Int_t irotpipe5, irotpipe6 - Int_t irotpipe7, irotpipe8; - //-- rotation matrices for the tilted tube before and after the TDI - gMC->Matrix(irotpipe2,90.+6.3025,0.,90.,90.,6.3025,0.); + Int_t irotpipe3, irotpipe4, irotpipe5; //-- rotation matrices for the tilted cone after the TDI to recenter vacuum chamber - gMC->Matrix(irotpipe1,90.-2.2918,0.,90.,90.,2.2918,180.); - //-- rotation matrices for the legs - /*gMC->Matrix(irotpipe5,90.-5.0109,0.,90.,90.,5.0109,180.); - gMC->Matrix(irotpipe6,90.+5.0109,0.,90.,90.,5.0109,0.);*/ - gMC->Matrix(irotpipe7,90.-1.0027,0.,90.,90.,1.0027,180.); - gMC->Matrix(irotpipe8,90.+1.0027,0.,90.,90.,1.0027,0.); + TVirtualMC::GetMC()->Matrix(irotpipe3,90.-1.8934,0.,90.,90.,1.8934,180.); + //-- rotation matrices for the tilted tube before and after the TDI + TVirtualMC::GetMC()->Matrix(irotpipe4,90.-3.8,0.,90.,90.,3.8,180.); + //-- rotation matrix for the tilted cone after the TDI + TVirtualMC::GetMC()->Matrix(irotpipe5,90.+9.8,0.,90.,90.,9.8,0.); // -- Mother of the ZDCs (Vacuum PCON) zd2 = 1910.22;// zd2 initial value @@ -528,17 +718,21 @@ void AliZDCv3::CreateBeamLine() conpar[6] = 13500.; conpar[7] = 0.; conpar[8] = 55.; - gMC->Gsvolu("ZDCA", "PCON", idtmed[10], conpar, 9); - gMC->Gspos("ZDCA", 1, "ALIC", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("ZDCA", "PCON", idtmed[10], conpar, 9); + TVirtualMC::GetMC()->Gspos("ZDCA", 1, "ALIC", 0., 0., 0., 0, "ONLY"); + + // To avoid overlaps 1 micron are left between certain volumes! + Double_t dxNoOverlap = 0.0; + //zd2 += dxNoOverlap; // BEAM PIPE from 19.10 m to inner triplet beginning (22.965 m) tubpar[0] = 6.0/2.; tubpar[1] = 6.4/2.; - tubpar[2] = (386.5 - 0.22)/2.; - gMC->Gsvolu("QA01", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA01", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + tubpar[2] = 386.28/2. - dxNoOverlap; + TVirtualMC::GetMC()->Gsvolu("QA01", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA01", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf("\n QA01 TUBE from z = %f to z= %f (Inner triplet beg.)\n",zd2,2*tubpar[2]+zd2); + //printf(" QA01 TUBE centred in %f from z = %1.2f to z= %1.2f (IT begin)\n",tubpar[2]+zd2,zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -546,11 +740,11 @@ void AliZDCv3::CreateBeamLine() // beginning of D1) tubpar[0] = 6.3/2.; tubpar[1] = 6.7/2.; - tubpar[2] = 3541.8/2.; - gMC->Gsvolu("QA02", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA02", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + tubpar[2] = 3541.8/2. - dxNoOverlap; + TVirtualMC::GetMC()->Gsvolu("QA02", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA02", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf("\n QA02 TUBE from z = %f to z= %f (D1 beg.)\n",zd2,2*tubpar[2]+zd2); + //printf(" QA02 TUBE from z = %1.2f to z= %1.2f (D1 begin)\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -563,16 +757,14 @@ void AliZDCv3::CreateBeamLine() // 1) 80.1 cm still with ID = 6.75 radial beam screen // 2) 2.5 cm conical section from ID = 6.75 to ID = 8.0 cm // 3) 43.9 cm straight section (tube) with ID = 8.0 cm - // - //printf("\n Beginning of D1 at z= %f\n",zd2); tubpar[0] = 6.75/2.; tubpar[1] = 7.15/2.; tubpar[2] = (945.0+80.1)/2.; - gMC->Gsvolu("QA03", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA03", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QA03", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA03", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf("\n QA03 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" QA03 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -582,52 +774,19 @@ void AliZDCv3::CreateBeamLine() conpar[2] = 7.15/2.; conpar[3] = 8.0/2.; conpar[4] = 8.4/2.; - gMC->Gsvolu("QA04", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QA04", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" QA04 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + TVirtualMC::GetMC()->Gsvolu("QA04", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA04", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + //printf(" QA04 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; tubpar[0] = 8.0/2.; tubpar[1] = 8.4/2.; - tubpar[2] = 43.9/2.; - gMC->Gsvolu("QA05", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA05", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + tubpar[2] = (43.9+20.+28.5+28.5)/2.; + TVirtualMC::GetMC()->Gsvolu("QA05", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA05", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf("\n QA05 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; - - // Bellow (ID=80 mm) - length = 0.2 m - VMAA - tubpar[0] = 8.0/2.; - tubpar[1] = 8.4/2.; - tubpar[2] = 20./2.; - gMC->Gsvolu("QA06", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA06", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA06 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; - - // Beam Position Monitor (ID=80 mm) Cu - BPMSX - tubpar[0] = 8.0/2.; - tubpar[1] = 8.4/2.; - tubpar[2] = 28.5/2.; - gMC->Gsvolu("QA07", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA07", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA07 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; - - // First section of VAEHI (tube ID=80mm) - tubpar[0] = 8.0/2.; - tubpar[1] = 8.4/2.; - tubpar[2] = 28.5/2.; - gMC->Gsvolu("QAV1", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QAV1", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QAV1 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" QA05 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -637,9 +796,9 @@ void AliZDCv3::CreateBeamLine() conpar[2] = 8.4/2.; conpar[3] = 9.8/2.; conpar[4] = 10.2/2.; - gMC->Gsvolu("QAV2", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QAV2", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" QAV2 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + TVirtualMC::GetMC()->Gsvolu("QAV1", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QAV1", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + //printf(" QAV1 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; @@ -649,9 +808,9 @@ void AliZDCv3::CreateBeamLine() conpar[2] = 10.2/2.; conpar[3] = 9.0/2.; conpar[4] = 9.4/2.; - gMC->Gsvolu("QAV3", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QAV3", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" QAV3 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + TVirtualMC::GetMC()->Gsvolu("QAV2", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QAV2", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + //printf(" QAV2 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; @@ -659,10 +818,10 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 9.0/2.; tubpar[1] = 9.4/2.; tubpar[2] = 31.0/2.; - gMC->Gsvolu("QAV4", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QAV4", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QAV3", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QAV3", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" QAV4 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" QAV3 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -674,9 +833,9 @@ void AliZDCv3::CreateBeamLine() conpar[2] = 13.0/2.; conpar[3] = 9.6/2.; conpar[4] = 13.0/2.; - gMC->Gsvolu("Q01T", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("Q01T", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" Q01T CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + TVirtualMC::GetMC()->Gsvolu("Q01T", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("Q01T", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + //printf(" Q01T CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; @@ -684,10 +843,10 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 9.6/2.; tubpar[1] = 10.0/2.; tubpar[2] = 1.0/2.; - gMC->Gsvolu("Q02T", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("Q02T", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("Q02T", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("Q02T", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" Q02T TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" Q02T TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -697,9 +856,9 @@ void AliZDCv3::CreateBeamLine() conpar[2] = 10.0/2.; conpar[3] = 13.8/2.; conpar[4] = 14.2/2.; - gMC->Gsvolu("Q03T", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("Q03T", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" Q03T CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + TVirtualMC::GetMC()->Gsvolu("Q03T", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("Q03T", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + //printf(" Q03T CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; @@ -707,10 +866,10 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 13.8/2.; tubpar[1] = 14.2/2.; tubpar[2] = 38.6/2.; - gMC->Gsvolu("Q04T", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("Q04T", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("Q04T", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("Q04T", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" Q04T TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" Q04T TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -718,10 +877,10 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 21.0/2.; tubpar[1] = 21.4/2.; tubpar[2] = 100.12/2.; - gMC->Gsvolu("Q05T", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("Q05T", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("Q05T", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("Q05T", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" Q05T TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" Q05T TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -729,10 +888,10 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 13.8/2.; tubpar[1] = 14.2/2.; tubpar[2] = 38.6/2.; - gMC->Gsvolu("Q06T", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("Q06T", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("Q06T", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("Q06T", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" Q06T TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" Q06T TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -742,164 +901,159 @@ void AliZDCv3::CreateBeamLine() conpar[2] = 14.2/2.; conpar[3] = 18.0/2.; conpar[4] = 18.4/2.; - gMC->Gsvolu("Q07T", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("Q07T", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" Q07T CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + TVirtualMC::GetMC()->Gsvolu("Q07T", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("Q07T", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + //printf(" Q07T CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; // Upper section : one single phi segment of a tube // 5 parameters for tubs: inner radius = 0., - // outer radius = 7.5 cm, half length = 50 cm + // outer radius = 7. cm, half length = 50 cm // phi1 = 0., phi2 = 180. tubspar[0] = 0.0/2.; - tubspar[1] = 15.0/2.; + tubspar[1] = 14.0/2.; tubspar[2] = 100.0/2.; tubspar[3] = 0.; tubspar[4] = 180.; - gMC->Gsvolu("Q08T", "TUBS", idtmed[7], tubspar, 5); + TVirtualMC::GetMC()->Gsvolu("Q08T", "TUBS", idtmed[7], tubspar, 5); // Ch.debug - //printf("\n upper part : one single phi segment of a tube (Q08T)\n"); + //printf(" upper part : one single phi segment of a tube (Q08T)\n"); // rectangular beam pipe inside TCDD upper section (Vacuum) boxpar[0] = 7.0/2.; - boxpar[1] = 2.5/2.; + boxpar[1] = 2.2/2.; boxpar[2] = 100./2.; - gMC->Gsvolu("Q09T", "BOX ", idtmed[10], boxpar, 3); + TVirtualMC::GetMC()->Gsvolu("Q09T", "BOX ", idtmed[10], boxpar, 3); // positioning vacuum box in the upper section of TCDD - gMC->Gspos("Q09T", 1, "Q08T", 0., 1.25, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("Q09T", 1, "Q08T", 0., 1.1, 0., 0, "ONLY"); // lower section : one single phi segment of a tube tubspar[0] = 0.0/2.; - tubspar[1] = 15.0/2.; + tubspar[1] = 14.0/2.; tubspar[2] = 100.0/2.; tubspar[3] = 180.; tubspar[4] = 360.; - gMC->Gsvolu("Q10T", "TUBS", idtmed[7], tubspar, 5); + TVirtualMC::GetMC()->Gsvolu("Q10T", "TUBS", idtmed[7], tubspar, 5); // rectangular beam pipe inside TCDD lower section (Vacuum) boxpar[0] = 7.0/2.; - boxpar[1] = 2.5/2.; + boxpar[1] = 2.2/2.; boxpar[2] = 100./2.; - gMC->Gsvolu("Q11T", "BOX ", idtmed[10], boxpar, 3); + TVirtualMC::GetMC()->Gsvolu("Q11T", "BOX ", idtmed[10], boxpar, 3); // positioning vacuum box in the lower section of TCDD - gMC->Gspos("Q11T", 1, "Q10T", 0., -1.25, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("Q11T", 1, "Q10T", 0., -1.1, 0., 0, "ONLY"); - // positioning TCDD elements in ZDC2, (inside TCDD volume) - gMC->Gspos("Q08T", 1, "ZDCA", 0., 2.5, -100+zd2, 0, "ONLY"); - gMC->Gspos("Q10T", 1, "ZDCA", 0., -2.5, -100+zd2, 0, "ONLY"); + // positioning TCDD elements in ZDCA, (inside TCDD volume) + TVirtualMC::GetMC()->Gspos("Q08T", 1, "ZDCA", 0., fTCDDAperturePos, -100.+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("Q10T", 1, "ZDCA", 0., -fTCDDApertureNeg, -100.+zd2, 0, "ONLY"); + printf(" AliZDCv3 -> TCDD apertures +%1.2f/-%1.2f cm\n", + fTCDDAperturePos, fTCDDApertureNeg); // RF screen boxpar[0] = 0.2/2.; - boxpar[1] = 5.0/2.; + boxpar[1] = 4.0/2.; boxpar[2] = 100./2.; - gMC->Gsvolu("Q12T", "BOX ", idtmed[7], boxpar, 3); + TVirtualMC::GetMC()->Gsvolu("Q12T", "BOX ", idtmed[7], boxpar, 3); // positioning RF screen at both sides of TCDD - gMC->Gspos("Q12T", 1, "ZDCA", tubspar[1]+boxpar[0], 0., -100+zd2, 0, "ONLY"); - gMC->Gspos("Q12T", 2, "ZDCA", -tubspar[1]-boxpar[0], 0., -100+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("Q12T", 1, "ZDCA", tubspar[1]+boxpar[0], 0., -100.+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("Q12T", 2, "ZDCA", -tubspar[1]-boxpar[0], 0., -100.+zd2, 0, "ONLY"); //---------------------------- TCDD end --------------------------------------- - // Bellow (ID=80 mm) - length = 0.3 m - VMAAB - tubpar[0] = 8.0/2.; - tubpar[1] = 8.4/2.; - tubpar[2] = 30.0/2.; - gMC->Gsvolu("QA08", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA08", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA08 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; + // The following elliptical tube 180 mm x 70 mm + // (obtained positioning the void QA09 in QA08) + // represents VMTSA (780 mm) + space reserved to the TCTVB (1480 mm)+ + // VMTSA (780 mm) + first part of VCTCP (93 mm) + + tubpar[0] = 18.4/2.; + tubpar[1] = 7.4/2.; + tubpar[2] = 313.3/2.; +// TVirtualMC::GetMC()->Gsvolu("QA06", "ELTU", idtmed[7], tubpar, 3); + // temporary replace with a scaled tube (AG) + TGeoTube *tubeQA06 = new TGeoTube(0.,tubpar[0],tubpar[2]); + TGeoScale *scaleQA06 = new TGeoScale(1., tubpar[1]/tubpar[0], 1.); + TGeoScaledShape *sshapeQA06 = new TGeoScaledShape(tubeQA06, scaleQA06); + new TGeoVolume("QA06", sshapeQA06, gGeoManager->GetMedium(idtmed[7])); + //printf(" QA06 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); + + tubpar[0] = 18.0/2.; + tubpar[1] = 7.0/2.; + tubpar[2] = 313.3/2.; +// TVirtualMC::GetMC()->Gsvolu("QA07", "ELTU", idtmed[10], tubpar, 3); + // temporary replace with a scaled tube (AG) + TGeoTube *tubeQA07 = new TGeoTube(0.,tubpar[0],tubpar[2]); + TGeoScale *scaleQA07 = new TGeoScale(1., tubpar[1]/tubpar[0], 1.); + TGeoScaledShape *sshapeQA07 = new TGeoScaledShape(tubeQA07, scaleQA07); + new TGeoVolume("QA07", sshapeQA07, gGeoManager->GetMedium(idtmed[10])); + //printf(" QA07 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); + TVirtualMC::GetMC()->Gspos("QA06", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QA07", 1, "QA06", 0., 0., 0., 0, "ONLY"); + + // Vertical collimator jaws (defined ONLY if fVCollAperture<3.5!) + if(fVCollSideAAperture<3.5){ + boxpar[0] = 5.4/2.; + boxpar[1] = (3.5-fVCollSideAAperture-fVCollSideACentreY-0.7)/2.; + if(boxpar[1]<0.) boxpar[1]=0.; + boxpar[2] = 124.4/2.; + TVirtualMC::GetMC()->Gsvolu("QCVA" , "BOX ", idtmed[13], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QCVA", 1, "QA07", -boxpar[0], fVCollSideAAperture+fVCollSideACentreY+boxpar[1], -313.3/2.+78.+148./2., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QCVA", 2, "QA07", -boxpar[0], -fVCollSideAApertureNeg+fVCollSideACentreY-boxpar[1], -313.3/2.+78.+148./2., 0, "ONLY"); + printf(" AliZDCv3 -> sideA VCollimator jaws: apertures +%1.2f/-%1.2f center %1.2f [cm]\n", + fVCollSideAAperture, fVCollSideAApertureNeg,fVCollSideACentreY); + } - // Flange (ID=80 mm) Cu (first section of VCTCE) - tubpar[0] = 8.0/2.; - tubpar[1] = 8.4/2.; - tubpar[2] = 2.0/2.; - gMC->Gsvolu("QA09", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA09", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA09 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - zd2 += 2.*tubpar[2]; - - // transition cone from ID=80 to ID=212 (second section of VCTCE) - conpar[0] = 25.0/2.; - conpar[1] = 8.0/2.; - conpar[2] = 8.4/2.; - conpar[3] = 21.2/2.; - conpar[4] = 21.8/2.; - gMC->Gsvolu("QA10", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QA10", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" QA10 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + + // VCTCP second part: transition cone from ID=180 to ID=212.7 + conpar[0] = 31.5/2.; + conpar[1] = 18.0/2.; + conpar[2] = 18.6/2.; + conpar[3] = 21.27/2.; + conpar[4] = 21.87/2.; + TVirtualMC::GetMC()->Gsvolu("QA08", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA08", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + // Ch.debug + //printf(" QA08 CONE from z = %Third part of VCTCR: tube (ID=196 mm) f to z = %f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; - // tube (ID=212 mm) Cu (third section of VCTCE) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = 403.54/2.; - gMC->Gsvolu("QA11", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA11", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA11 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; - - // bellow (ID=212 mm) (VMBGA) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = 40.0/2.; - gMC->Gsvolu("QA12", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA12", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA12 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + // Tube ID 212.7 mm + // Represents VCTCP third part (92 mm) + VCDWB (765 mm) + VMBGA (400 mm) + + // VCDWE (300 mm) + VMBGA (400 mm) + tubpar[0] = 21.27/2.; + tubpar[1] = 21.87/2.; + tubpar[2] = 195.7/2.; + TVirtualMC::GetMC()->Gsvolu("QA09", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA09", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + //printf(" QA09 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; - - // TDI valve assembly (ID=212 mm) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = 30.0/2.; - gMC->Gsvolu("QA13", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA13", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA13 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - zd2 += 2.*tubpar[2]; - - // bellow (ID=212 mm) (VMBGA) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = 40.0/2.; - gMC->Gsvolu("QA14", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA14", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA14 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; - - // skewed transition piece (ID=212 mm) (before TDI) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = (20.0-2.41)/2.; - gMC->Gsvolu("QA15", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA15", 1, "ZDCA", 1.10446, 0., tubpar[2]+2.41/2.+zd2, irotpipe2, "ONLY"); - // Ch.debug - //printf(" QA15 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+2.41+zd2); + // skewed transition piece (ID=212.7 mm to 332 mm) (before TDI) + conpar[0] = (50.0-0.73-1.13)/2.; + conpar[1] = 21.27/2.; + conpar[2] = 21.87/2.; + conpar[3] = 33.2/2.; + conpar[4] = 33.8/2.; + TVirtualMC::GetMC()->Gsvolu("QA10", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA10", 1, "ZDCA", -1.66, 0., conpar[0]+0.73+zd2, irotpipe4, "ONLY"); + // Ch.debug + //printf(" QA10 skewed CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+0.73+1.13+zd2); - zd2 += 2.*tubpar[2]+2.41; + zd2 += 2.*conpar[0]+0.73+1.13; // Vacuum chamber containing TDI tubpar[0] = 0.; tubpar[1] = 54.6/2.; tubpar[2] = 540.0/2.; - gMC->Gsvolu("Q13TM", "TUBE", idtmed[10], tubpar, 3); - gMC->Gspos("Q13TM", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("Q13TM", "TUBE", idtmed[10], tubpar, 3); + TVirtualMC::GetMC()->Gspos("Q13TM", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); tubpar[0] = 54.0/2.; tubpar[1] = 54.6/2.; tubpar[2] = 540.0/2.; - gMC->Gsvolu("Q13T", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("Q13T", 1, "Q13TM", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("Q13T", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("Q13T", 1, "Q13TM", 0., 0., 0., 0, "ONLY"); // Ch.debug - //printf(" Q13T TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" Q13T TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -907,201 +1061,166 @@ void AliZDCv3::CreateBeamLine() boxpar[0] = 11.0/2.; boxpar[1] = 9.0/2.; boxpar[2] = 540.0/2.; - gMC->Gsvolu("QTD1", "BOX ", idtmed[7], boxpar, 3); - gMC->Gspos("QTD1", 1, "Q13TM", -3.8, 10.5, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QTD1", "BOX ", idtmed[7], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QTD1", 1, "Q13TM", -3.8, boxpar[1]+fTDIAperturePos, 0., 0, "ONLY"); boxpar[0] = 11.0/2.; boxpar[1] = 9.0/2.; boxpar[2] = 540.0/2.; - gMC->Gsvolu("QTD2", "BOX ", idtmed[7], boxpar, 3); - gMC->Gspos("QTD2", 1, "Q13TM", -3.8, -10.5, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QTD2", "BOX ", idtmed[7], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QTD2", 1, "Q13TM", -3.8, -boxpar[1]-fTDIApertureNeg, 0., 0, "ONLY"); boxpar[0] = 5.1/2.; boxpar[1] = 0.2/2.; boxpar[2] = 540.0/2.; - gMC->Gsvolu("QTD3", "BOX ", idtmed[7], boxpar, 3); - gMC->Gspos("QTD3", 1, "Q13TM", -3.8+5.5+boxpar[0], 6.1, 0., 0, "ONLY"); - gMC->Gspos("QTD3", 2, "Q13TM", -3.8+5.5+boxpar[0], -6.1, 0., 0, "ONLY"); - gMC->Gspos("QTD3", 3, "Q13TM", -3.8-5.5-boxpar[0], 6.1, 0., 0, "ONLY"); - gMC->Gspos("QTD3", 4, "Q13TM", -3.8-5.5-boxpar[0], -6.1, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QTD3", "BOX ", idtmed[7], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QTD3", 1, "Q13TM", -3.8+5.5+boxpar[0], fTDIAperturePos, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QTD3", 2, "Q13TM", -3.8+5.5+boxpar[0], -fTDIApertureNeg, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QTD3", 3, "Q13TM", -3.8-5.5-boxpar[0], fTDIAperturePos, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QTD3", 4, "Q13TM", -3.8-5.5-boxpar[0], -fTDIApertureNeg, 0., 0, "ONLY"); + printf(" AliZDCv3 -> TDI apertures +%1.2f/-%1.2f cm\n\n", + fTDIAperturePos, fTDIApertureNeg); // tubspar[0] = 12.0/2.; tubspar[1] = 12.4/2.; tubspar[2] = 540.0/2.; tubspar[3] = 90.; tubspar[4] = 270.; - gMC->Gsvolu("QTD4", "TUBS", idtmed[7], tubspar, 5); - gMC->Gspos("QTD4", 1, "Q13TM", -3.8-10.6, 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QTD4", "TUBS", idtmed[7], tubspar, 5); + TVirtualMC::GetMC()->Gspos("QTD4", 1, "Q13TM", -3.8-10.6, 0., 0., 0, "ONLY"); tubspar[0] = 12.0/2.; tubspar[1] = 12.4/2.; tubspar[2] = 540.0/2.; tubspar[3] = -90.; tubspar[4] = 90.; - gMC->Gsvolu("QTD5", "TUBS", idtmed[7], tubspar, 5); - gMC->Gspos("QTD5", 1, "Q13TM", -3.8+10.6, 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QTD5", "TUBS", idtmed[7], tubspar, 5); + TVirtualMC::GetMC()->Gspos("QTD5", 1, "Q13TM", -3.8+10.6, 0., 0., 0, "ONLY"); //---------------- END DEFINING TDI INSIDE Q13T ------------------------------- - // skewed transition piece (ID=212 mm) (after TDI) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = (20.0-2.41)/2.; - gMC->Gsvolu("QA16", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA16", 1, "ZDCA", 1.10446+2.2, 0., tubpar[2]+2.41/2.+zd2, irotpipe2, "ONLY"); - // Ch.debug - //printf(" QA16 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+2.41+zd2); - - zd2 += 2.*tubpar[2]+2.41; - - // bellow (ID=212 mm) (VMBGA) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = 40.0/2.; - gMC->Gsvolu("QA17", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA17", 1, "ZDCA", 4.4, 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA17 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; - - // TDI valve assembly (ID=212 mm) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = 30.0/2.; - gMC->Gsvolu("QA18", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA18", 1, "ZDCA", 4.4, 0., tubpar[2]+zd2, 0, "ONLY"); + // VCTCG skewed transition piece (ID=332 mm to 212.7 mm) (after TDI) + conpar[0] = (50.0-2.92-1.89)/2.; + conpar[1] = 33.2/2.; + conpar[2] = 33.8/2.; + conpar[3] = 21.27/2.; + conpar[4] = 21.87/2.; + TVirtualMC::GetMC()->Gsvolu("QA11", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA11", 1, "ZDCA", 4.32-3.8, 0., conpar[0]+2.92+zd2, irotpipe5, "ONLY"); + // Ch.debug + //printf(" QA11 skewed CONE from z = %f to z =%f\n",zd2,2*conpar[0]+2.92+1.89+zd2); + + zd2 += 2.*conpar[0]+2.92+1.89; + + // The following tube ID 212.7 mm + // represents VMBGA (400 mm) + VCDWE (300 mm) + VMBGA (400 mm) + + // BTVTS (600 mm) + VMLGB (400 mm) + tubpar[0] = 21.27/2.; + tubpar[1] = 21.87/2.; + tubpar[2] = 210.0/2.; + TVirtualMC::GetMC()->Gsvolu("QA12", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA12", 1, "ZDCA", 4., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" QA18 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" QA12 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; - // bellow (ID=212 mm) (VMBGA) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = 40.0/2.; - gMC->Gsvolu("QA19", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA19", 1, "ZDCA", 4.4, 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA19 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; - - // vacuum chamber (ID=212 mm) (BTVST) - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = 50.0/2.; - gMC->Gsvolu("QA20", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA20", 1, "ZDCA", 4.4, 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA20 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; - - // bellow (ID=212 mm) (VMBGA) repeated 3 times - tubpar[0] = 21.2/2.; - tubpar[1] = 21.8/2.; - tubpar[2] = 120.0/2.; - gMC->Gsvolu("QA21", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA21", 1, "ZDCA", 4.4, 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA21 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); - - zd2 += 2.*tubpar[2]; - - // skewed transition cone from ID=212 mm to ID=797 mm SS for the moment - conpar[0] = (110.0-0.44-1.63)/2.; - conpar[1] = 21.2/2.; - conpar[2] = 21.8/2.; + // First part of VCTCC + // skewed transition cone from ID=212.7 mm to ID=797 mm + conpar[0] = (121.0-0.37-1.35)/2.; + conpar[1] = 21.27/2.; + conpar[2] = 21.87/2.; conpar[3] = 79.7/2.; conpar[4] = 81.3/2.; - gMC->Gsvolu("QA22", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QA22", 1, "ZDCA", 4.4-2.201, 0., conpar[0]+0.44+zd2, irotpipe1, "ONLY"); - //printf(" QA22 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+0.44+1.63+zd2); + TVirtualMC::GetMC()->Gsvolu("QA13", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA13", 1, "ZDCA", 4.-2., 0., conpar[0]+0.37+zd2, irotpipe3, "ONLY"); + // Ch.debug + //printf(" QA13 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+0.37+1.35+zd2); - zd2 += 2.*conpar[0]+0.44+1.63; + zd2 += 2.*conpar[0]+0.37+1.35; - // beam pipe (ID=797 mm) SS + // The following tube ID 797 mm --- (volume QA16) + // represents the second part of VCTCC (4272 mm) + + // 4 x VCDGA (4 x 4272 mm) + + // the first part of VCTCR (850 mm) tubpar[0] = 79.7/2.; tubpar[1] = 81.3/2.; - tubpar[2] = 2393.05/2.; - gMC->Gsvolu("QA23", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA23", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA23 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + tubpar[2] = 2221./2.; + TVirtualMC::GetMC()->Gsvolu("QA14", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA14", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + // Ch.debug + //printf(" QA14 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; - - // Transition from ID=797 mm to ID=196 mm SS for the moment: - // + + // Second part of VCTCR + // Transition from ID=797 mm to ID=196 mm: // in order to simulate the thin window opened in the transition cone // we divide the transition cone in three cones: - // the first 8 mm thick - // the second 3 mm thick - // the third 8 mm thick - // - // First section + // (1) 8 mm thick (2) 3 mm thick (3) the third 8 mm thick + + // (1) 8 mm thick conpar[0] = 9.09/2.; // 15 degree conpar[1] = 79.7/2.; conpar[2] = 81.3/2.; // thickness 8 mm conpar[3] = 74.82868/2.; conpar[4] = 76.42868/2.; // thickness 8 mm - gMC->Gsvolu("Q24A", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("Q24A", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" Q24A CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + TVirtualMC::GetMC()->Gsvolu("QA15", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA15", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + //printf(" QA15 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; - // Second section + // (2) 3 mm thick conpar[0] = 96.2/2.; // 15 degree conpar[1] = 74.82868/2.; conpar[2] = 75.42868/2.; // thickness 3 mm conpar[3] = 23.19588/2.; conpar[4] = 23.79588/2.; // thickness 3 mm - gMC->Gsvolu("QA25", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QA25", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" QA25 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + TVirtualMC::GetMC()->Gsvolu("QA16", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA16", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + //printf(" QA16 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; - // Third section + // (3) 8 mm thick conpar[0] = 6.71/2.; // 15 degree conpar[1] = 23.19588/2.; conpar[2] = 24.79588/2.;// thickness 8 mm conpar[3] = 19.6/2.; conpar[4] = 21.2/2.;// thickness 8 mm - gMC->Gsvolu("QA26", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QA26", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); - //printf(" QA26 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + TVirtualMC::GetMC()->Gsvolu("QA17", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA17", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + //printf(" QA19 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; - - // beam pipe (ID=196 mm) + + // Third part of VCTCR: tube (ID=196 mm) tubpar[0] = 19.6/2.; tubpar[1] = 21.2/2.; tubpar[2] = 9.55/2.; - gMC->Gsvolu("QA27", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA27", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA27 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + TVirtualMC::GetMC()->Gsvolu("QA18", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA18", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + // Ch.debug + //printf(" QA18 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; - // Flange (ID=196 mm) + // Flange (ID=196 mm) (last part of VCTCR and first part of VMZAR) tubpar[0] = 19.6/2.; tubpar[1] = 25.3/2.; tubpar[2] = 4.9/2.; - gMC->Gsvolu("QF01", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QF01", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QF01 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + TVirtualMC::GetMC()->Gsvolu("QF01", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QF01", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + // Ch.debug + //printf(" QF01 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; - // Special Warm Module (made by 5 volumes) + // VMZAR (5 volumes) tubpar[0] = 20.2/2.; tubpar[1] = 20.6/2.; tubpar[2] = 2.15/2.; - gMC->Gsvolu("QA28", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA28", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QA28 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + TVirtualMC::GetMC()->Gsvolu("QA19", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA19", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + // Ch.debug + //printf(" QA19 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -1110,20 +1229,20 @@ void AliZDCv3::CreateBeamLine() conpar[2] = 20.6/2.; conpar[3] = 23.9/2.; conpar[4] = 24.3/2.; - gMC->Gsvolu("QA29", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QA29", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QA20", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA20", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); // Ch.debug - //printf(" QA29 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + //printf(" QA20 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; tubpar[0] = 23.9/2.; tubpar[1] = 25.5/2.; tubpar[2] = 17.0/2.; - gMC->Gsvolu("QA30", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA30", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QA21", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA21", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" QA30 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" QA21 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -1132,44 +1251,42 @@ void AliZDCv3::CreateBeamLine() conpar[2] = 24.3/2.; conpar[3] = 20.2/2.; conpar[4] = 20.6/2.; - gMC->Gsvolu("QA31", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QA31", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QA22", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA22", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); // Ch.debug - //printf(" QA31 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + //printf(" QA22 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; tubpar[0] = 20.2/2.; tubpar[1] = 20.6/2.; tubpar[2] = 2.15/2.; - gMC->Gsvolu("QA32", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA32", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QA23", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA23", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" QA32 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" QA23 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; - // Flange (ID=196 mm) + // Flange (ID=196 mm)(last part of VMZAR and first part of VCTYD) tubpar[0] = 19.6/2.; tubpar[1] = 25.3/2.; tubpar[2] = 4.9/2.; - gMC->Gsvolu("QF02", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QF02", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - // Ch.debug - //printf(" QF02 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + TVirtualMC::GetMC()->Gsvolu("QF02", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QF02", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + // Ch.debug + //printf(" QF02 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; - // simulation of the trousers (VCTYB) - // (last design -mail 3/6/05) - // pipe: a tube (ID = 196. OD = 200.) + // simulation of the trousers (VCTYB) tubpar[0] = 19.6/2.; tubpar[1] = 20.0/2.; tubpar[2] = 3.9/2.; - gMC->Gsvolu("QA33", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA33", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QA24", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA24", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" QA33 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" QA24 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -1179,10 +1296,10 @@ void AliZDCv3::CreateBeamLine() conpar[2] = 20.0/2.; conpar[3] = 21.66/2.; conpar[4] = 22.06/2.; - gMC->Gsvolu("QA34", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QA34", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QA25", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA25", 1, "ZDCA", 0., 0., conpar[0]+zd2, 0, "ONLY"); // Ch.debug - //printf(" QA34 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+zd2); + //printf(" QA25 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+zd2); zd2 += 2.*conpar[0]; @@ -1190,10 +1307,10 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 21.66/2.; tubpar[1] = 22.06/2.; tubpar[2] = 28.6/2.; - gMC->Gsvolu("QA35", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA35", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QA26", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA26", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf("\n QA35 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" QA26 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; @@ -1203,13 +1320,13 @@ void AliZDCv3::CreateBeamLine() // -------------------------------------------------------- // TRANSFORMATION MATRICES // Combi transformation: - Double_t dx = -3.970000; - Double_t dy = 0.000000; - Double_t dz = 0.0; + dx = -3.970000; + dy = 0.000000; + dz = 0.0; // Rotation: - Double_t thx = 84.989100; Double_t phx = 0.000000; - Double_t thy = 90.000000; Double_t phy = 90.000000; - Double_t thz = 5.010900; Double_t phz = 180.000000; + thx = 84.989100; phx = 0.000000; + thy = 90.000000; phy = 90.000000; + thz = 5.010900; phz = 180.000000; TGeoRotation *rotMatrix1 = new TGeoRotation("",thx,phx,thy,phy,thz,phz); // Combi transformation: dx = -3.970000; @@ -1222,39 +1339,39 @@ void AliZDCv3::CreateBeamLine() dy = 0.000000; dz = 0.0; // Rotation: - thx = 95.010900; phx = 0.000000; - thy = 90.000000; phy = 90.000000; + thx = 95.010900; phx = 0.000000; + thy = 90.000000; phy = 90.000000; thz = 5.010900; phz = 0.000000; TGeoRotation *rotMatrix3 = new TGeoRotation("",thx,phx,thy,phy,thz,phz); TGeoCombiTrans *rotMatrix4 = new TGeoCombiTrans("ZDC_c2", dx,dy,dz,rotMatrix3); rotMatrix4->RegisterYourself(); - + + // VOLUMES DEFINITION // Volume: ZDCA TGeoVolume *pZDCA = gGeoManager->GetVolume("ZDCA"); - //pZDCA->PrintNodes(); conpar[0] = (90.1-0.95-0.26)/2.; conpar[1] = 0.0/2.; conpar[2] = 21.6/2.; conpar[3] = 0.0/2.; conpar[4] = 5.8/2.; - TGeoShape *pConeExt = new TGeoCone("QALext", conpar[0],conpar[1],conpar[2],conpar[3],conpar[4]); + new TGeoCone("QALext", conpar[0],conpar[1],conpar[2],conpar[3],conpar[4]); conpar[0] = (90.1-0.95-0.26)/2.; conpar[1] = 0.0/2.; conpar[2] = 21.2/2.; conpar[3] = 0.0/2.; conpar[4] = 5.4/2.; - TGeoShape *pConeInt = new TGeoCone("QALint", conpar[0],conpar[1],conpar[2],conpar[3],conpar[4]); + new TGeoCone("QALint", conpar[0],conpar[1],conpar[2],conpar[3],conpar[4]); // Outer trousers TGeoCompositeShape *pOutTrousers = new TGeoCompositeShape("outTrousers", "QALext:ZDC_c1+QALext:ZDC_c2"); // Volume: QALext - TGeoMedium *medZDCFe = gGeoManager->GetMedium("ZDC_ZIRON"); + //TGeoMedium *medZDCFe = gGeoManager->GetMedium("ZDC_ZIRON"); TGeoVolume *pQALext = new TGeoVolume("QALext",pOutTrousers, medZDCFe); - pQALext->SetLineColor(5); + pQALext->SetLineColor(kBlue); pQALext->SetVisLeaves(kTRUE); // TGeoTranslation *tr1 = new TGeoTranslation(0., 0., (Double_t) conpar[0]+0.95+zd2); @@ -1262,9 +1379,9 @@ void AliZDCv3::CreateBeamLine() // Inner trousers TGeoCompositeShape *pIntTrousers = new TGeoCompositeShape("intTrousers", "QALint:ZDC_c1+QALint:ZDC_c2"); // Volume: QALint - TGeoMedium *medZDCvoid = gGeoManager->GetMedium("ZDC_ZVOID"); + //TGeoMedium *medZDCvoid = gGeoManager->GetMedium("ZDC_ZVOID"); TGeoVolume *pQALint = new TGeoVolume("QALint",pIntTrousers, medZDCvoid); - pQALint->SetLineColor(7); + pQALint->SetLineColor(kAzure); pQALint->SetVisLeaves(kTRUE); pQALext->AddNode(pQALint, 1); @@ -1274,46 +1391,47 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 5.4/2.; tubpar[1] = 5.8/2.; tubpar[2] = 40.0/2.; - gMC->Gsvolu("QA36", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA36", 1, "ZDCA", -15.8/2., 0., tubpar[2]+zd2, 0, "ONLY"); - gMC->Gspos("QA36", 2, "ZDCA", 15.8/2., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QA27", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA27", 1, "ZDCA", -15.8/2., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QA27", 2, "ZDCA", 15.8/2., 0., tubpar[2]+zd2, 0, "ONLY"); // Ch.debug - //printf(" QA36 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + //printf(" QA27 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; - + // transition x2zdc to recombination chamber : skewed cone - conpar[0] = (10.-0.2)/2.; + conpar[0] = (10.-1.)/2.; conpar[1] = 5.4/2.; conpar[2] = 5.8/2.; conpar[3] = 6.3/2.; conpar[4] = 7.0/2.; - gMC->Gsvolu("QA37", "CONE", idtmed[7], conpar, 5); - gMC->Gspos("QA37", 1, "ZDCA", -7.9-0.175, 0., conpar[0]+0.1+zd2, irotpipe7, "ONLY"); - gMC->Gspos("QA37", 2, "ZDCA", 7.9+0.175, 0., conpar[0]+0.1+zd2, irotpipe8, "ONLY"); - //printf(" QA37 CONE from z = %f to z= %f\n",zd2,2*conpar[0]+0.2+zd2); + TVirtualMC::GetMC()->Gsvolu("QA28", "CONE", idtmed[7], conpar, 5); + TVirtualMC::GetMC()->Gspos("QA28", 1, "ZDCA", -7.9-0.175, 0., conpar[0]+0.5+zd2, irotpipe1, "ONLY"); + TVirtualMC::GetMC()->Gspos("QA28", 2, "ZDCA", 7.9+0.175, 0., conpar[0]+0.5+zd2, irotpipe2, "ONLY"); + //printf(" QA28 CONE from z = %1.2f to z= %1.2f\n",zd2,2*conpar[0]+0.2+zd2); - zd2 += 2.*conpar[0]+0.2; + zd2 += 2.*conpar[0]+1.; // 2 tubes (ID = 63 mm OD=70 mm) tubpar[0] = 6.3/2.; tubpar[1] = 7.0/2.; - tubpar[2] = 512.9/2.; - gMC->Gsvolu("QA38", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("QA38", 1, "ZDCA", -16.5/2., 0., tubpar[2]+zd2, 0, "ONLY"); - gMC->Gspos("QA38", 2, "ZDCA", 16.5/2., 0., tubpar[2]+zd2, 0, "ONLY"); - //printf(" QA38 TUBE from z = %f to z= %f\n",zd2,2*tubpar[2]+zd2); + tubpar[2] = (342.5+498.3)/2.; + TVirtualMC::GetMC()->Gsvolu("QA29", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QA29", 1, "ZDCA", -16.5/2., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QA29", 2, "ZDCA", 16.5/2., 0., tubpar[2]+zd2, 0, "ONLY"); + //printf(" QA29 TUBE from z = %1.2f to z= %1.2f\n",zd2,2*tubpar[2]+zd2); zd2 += 2.*tubpar[2]; - //printf("\n END OF BEAM PIPE VOLUME DEFINITION AT z= %f\n",zd2); // -- Luminometer (Cu box) in front of ZN - side A boxpar[0] = 8.0/2.; boxpar[1] = 8.0/2.; - boxpar[2] = 15./2.; - gMC->Gsvolu("QLUA", "BOX ", idtmed[7], boxpar, 3); - gMC->Gspos("QLUA", 1, "ZDCA", 0., 0., fPosZNA[2]-66.-boxpar[2], 0, "ONLY"); - //printf("\n QLUC LUMINOMETER from z = %f to z= %f\n\n", fPosZNA[2]-66., fPosZNA[2]-66.-2*boxpar[2]); + boxpar[2] = fLumiLength/2.; + TVirtualMC::GetMC()->Gsvolu("QLUA", "BOX ", idtmed[9], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QLUA", 1, "ZDCA", 0., 0., fPosZNA[2]-66.-boxpar[2], 0, "ONLY"); + //printf(" QLUA LUMINOMETER from z = %1.2f to z= %1.2f\n\n", fPosZNA[2]-66., fPosZNA[2]-66.-2*boxpar[2]); + + //printf(" END OF BEAM PIPE VOLUME DEFINITION AT z = %f\n",zd2); // ---------------------------------------------------------------- @@ -1323,26 +1441,26 @@ void AliZDCv3::CreateBeamLine() // SIDE C - RB26 (dimuon side) // *************************************************************** // -- COMPENSATOR DIPOLE (MBXW) - zc = 1972.5; + zCorrDip = 1972.5; // -- GAP (VACUUM WITH MAGNETIC FIELD) tubpar[0] = 0.; tubpar[1] = 3.14; tubpar[2] = 153./2.; - gMC->Gsvolu("MBXW", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MBXW", "TUBE", idtmed[11], tubpar, 3); // -- YOKE tubpar[0] = 4.5; tubpar[1] = 55.; tubpar[2] = 153./2.; - gMC->Gsvolu("YMBX", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("YMBX", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("MBXW", 1, "ZDCC", 0., 0., -tubpar[2]-zc, 0, "ONLY"); - gMC->Gspos("YMBX", 1, "ZDCC", 0., 0., -tubpar[2]-zc, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MBXW", 1, "ZDCC", 0., 0., -tubpar[2]-zCorrDip, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YMBX", 1, "ZDCC", 0., 0., -tubpar[2]-zCorrDip, 0, "ONLY"); // -- INNER TRIPLET - zq = 2296.5; + zInnTrip = 2296.5; // -- DEFINE MQXL AND MQX QUADRUPOLE ELEMENT // -- MQXL @@ -1350,88 +1468,88 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 0.; tubpar[1] = 3.14; tubpar[2] = 637./2.; - gMC->Gsvolu("MQXL", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MQXL", "TUBE", idtmed[11], tubpar, 3); // -- YOKE tubpar[0] = 3.5; tubpar[1] = 22.; tubpar[2] = 637./2.; - gMC->Gsvolu("YMQL", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("YMQL", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("MQXL", 1, "ZDCC", 0., 0., -tubpar[2]-zq, 0, "ONLY"); - gMC->Gspos("YMQL", 1, "ZDCC", 0., 0., -tubpar[2]-zq, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MQXL", 1, "ZDCC", 0., 0., -tubpar[2]-zInnTrip, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YMQL", 1, "ZDCC", 0., 0., -tubpar[2]-zInnTrip, 0, "ONLY"); - gMC->Gspos("MQXL", 2, "ZDCC", 0., 0., -tubpar[2]-zq-2400., 0, "ONLY"); - gMC->Gspos("YMQL", 2, "ZDCC", 0., 0., -tubpar[2]-zq-2400., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MQXL", 2, "ZDCC", 0., 0., -tubpar[2]-zInnTrip-2400., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YMQL", 2, "ZDCC", 0., 0., -tubpar[2]-zInnTrip-2400., 0, "ONLY"); // -- MQX // -- GAP (VACUUM WITH MAGNETIC FIELD) tubpar[0] = 0.; tubpar[1] = 3.14; tubpar[2] = 550./2.; - gMC->Gsvolu("MQX ", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MQX ", "TUBE", idtmed[11], tubpar, 3); // -- YOKE tubpar[0] = 3.5; tubpar[1] = 22.; tubpar[2] = 550./2.; - gMC->Gsvolu("YMQ ", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("YMQ ", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("MQX ", 1, "ZDCC", 0., 0., -tubpar[2]-zq-908.5, 0, "ONLY"); - gMC->Gspos("YMQ ", 1, "ZDCC", 0., 0., -tubpar[2]-zq-908.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MQX ", 1, "ZDCC", 0., 0., -tubpar[2]-zInnTrip-908.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YMQ ", 1, "ZDCC", 0., 0., -tubpar[2]-zInnTrip-908.5, 0, "ONLY"); - gMC->Gspos("MQX ", 2, "ZDCC", 0., 0., -tubpar[2]-zq-1558.5, 0, "ONLY"); - gMC->Gspos("YMQ ", 2, "ZDCC", 0., 0., -tubpar[2]-zq-1558.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MQX ", 2, "ZDCC", 0., 0., -tubpar[2]-zInnTrip-1558.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YMQ ", 2, "ZDCC", 0., 0., -tubpar[2]-zInnTrip-1558.5, 0, "ONLY"); // -- SEPARATOR DIPOLE D1 - zd1 = 5838.3; + zD1 = 5838.3001; // -- GAP (VACUUM WITH MAGNETIC FIELD) tubpar[0] = 0.; tubpar[1] = 3.46; tubpar[2] = 945./2.; - gMC->Gsvolu("MD1 ", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MD1 ", "TUBE", idtmed[11], tubpar, 3); // -- Insert horizontal Cu plates inside D1 // -- (to simulate the vacuum chamber) boxpar[0] = TMath::Sqrt(tubpar[1]*tubpar[1]-(2.98+0.2)*(2.98+0.2)) - 0.05; boxpar[1] = 0.2/2.; boxpar[2] = 945./2.; - gMC->Gsvolu("MD1V", "BOX ", idtmed[6], boxpar, 3); - gMC->Gspos("MD1V", 1, "MD1 ", 0., 2.98+boxpar[1], 0., 0, "ONLY"); - gMC->Gspos("MD1V", 2, "MD1 ", 0., -2.98-boxpar[1], 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("MD1V", "BOX ", idtmed[6], boxpar, 3); + TVirtualMC::GetMC()->Gspos("MD1V", 1, "MD1 ", 0., 2.98+boxpar[1], 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MD1V", 2, "MD1 ", 0., -2.98-boxpar[1], 0., 0, "ONLY"); // -- YOKE tubpar[0] = 3.68; tubpar[1] = 110./2.; tubpar[2] = 945./2.; - gMC->Gsvolu("YD1 ", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("YD1 ", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("YD1 ", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); - gMC->Gspos("MD1 ", 1, "ZDCC", 0., 0., -tubpar[2]-zd1, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YD1 ", 1, "ZDCC", 0., 0., -tubpar[2]-zD1, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MD1 ", 1, "ZDCC", 0., 0., -tubpar[2]-zD1, 0, "ONLY"); // Ch debug - //printf("\t **** D1 positioned! It goes from z = %1.2f to z = %1.2f cm\n",-zd1, -zd1-2*tubpar[2]); + //printf(" MD1 from z = %1.2f to z= %1.2f cm\n",-zD1, -zD1-2*tubpar[2]); // -- DIPOLE D2 - // --- LHC optics v6.4 - zd2 = 12167.8; - + zD2 = 12167.8; // -- GAP (VACUUM WITH MAGNETIC FIELD) tubpar[0] = 0.; tubpar[1] = 7.5/2.; tubpar[2] = 945./2.; - gMC->Gsvolu("MD2 ", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MD2 ", "TUBE", idtmed[11], tubpar, 3); // -- YOKE tubpar[0] = 0.; tubpar[1] = 55.; tubpar[2] = 945./2.; - gMC->Gsvolu("YD2 ", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("YD2 ", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("YD2 ", 1, "ZDCC", 0., 0., -tubpar[2]-zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YD2 ", 1, "ZDCC", 0., 0., -tubpar[2]-zD2, 0, "ONLY"); + // Ch debug + //printf(" YD2 from z = %1.2f to z= %1.2f cm\n",-zD2, -zD2-2*tubpar[2]); - gMC->Gspos("MD2 ", 1, "YD2 ", -9.4, 0., 0., 0, "ONLY"); - gMC->Gspos("MD2 ", 2, "YD2 ", 9.4, 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MD2 ", 1, "YD2 ", -9.4, 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MD2 ", 2, "YD2 ", 9.4, 0., 0., 0, "ONLY"); // *************************************************************** // SIDE A - RB24 @@ -1442,69 +1560,67 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 0.; tubpar[1] = 3.; tubpar[2] = 153./2.; - gMC->Gsvolu("MCBW", "TUBE", idtmed[11], tubpar, 3); - gMC->Gspos("MCBW", 1, "ZDCA", 0., 0., tubpar[2]+1972.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("MCBW", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gspos("MCBW", 1, "ZDCA", 0., 0., tubpar[2]+zCorrDip, 0, "ONLY"); // -- YOKE tubpar[0] = 4.5; tubpar[1] = 55.; tubpar[2] = 153./2.; - gMC->Gsvolu("YMCB", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("YMCB", 1, "ZDCA", 0., 0., tubpar[2]+1972.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("YMCB", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gspos("YMCB", 1, "ZDCA", 0., 0., tubpar[2]+zCorrDip, 0, "ONLY"); // -- INNER TRIPLET - zql = 2296.5; - // -- DEFINE MQX1 AND MQX2 QUADRUPOLE ELEMENT // -- MQX1 // -- GAP (VACUUM WITH MAGNETIC FIELD) tubpar[0] = 0.; tubpar[1] = 3.14; tubpar[2] = 637./2.; - gMC->Gsvolu("MQX1", "TUBE", idtmed[11], tubpar, 3); - gMC->Gsvolu("MQX4", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MQX1", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MQX4", "TUBE", idtmed[11], tubpar, 3); // -- YOKE tubpar[0] = 3.5; tubpar[1] = 22.; tubpar[2] = 637./2.; - gMC->Gsvolu("YMQ1", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("YMQ1", "TUBE", idtmed[7], tubpar, 3); // -- Q1 - gMC->Gspos("MQX1", 1, "ZDCA", 0., 0., tubpar[2]+zql, 0, "ONLY"); - gMC->Gspos("YMQ1", 1, "ZDCA", 0., 0., tubpar[2]+zql, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MQX1", 1, "ZDCA", 0., 0., tubpar[2]+zInnTrip, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YMQ1", 1, "ZDCA", 0., 0., tubpar[2]+zInnTrip, 0, "ONLY"); // -- BEAM SCREEN FOR Q1 tubpar[0] = 4.78/2.; tubpar[1] = 5.18/2.; tubpar[2] = 637./2.; - gMC->Gsvolu("QBS1", "TUBE", idtmed[6], tubpar, 3); - gMC->Gspos("QBS1", 1, "MQX1", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QBS1", "TUBE", idtmed[6], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QBS1", 1, "MQX1", 0., 0., 0., 0, "ONLY"); // INSERT VERTICAL PLATE INSIDE Q1 boxpar[0] = 0.2/2.0; boxpar[1] = TMath::Sqrt(tubpar[0]*tubpar[0]-(1.9+0.2)*(1.9+0.2)); boxpar[2] =637./2.; - gMC->Gsvolu("QBS2", "BOX ", idtmed[6], boxpar, 3); - gMC->Gspos("QBS2", 1, "MQX1", 1.9+boxpar[0], 0., 0., 0, "ONLY"); - gMC->Gspos("QBS2", 2, "MQX1", -1.9-boxpar[0], 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QBS2", "BOX ", idtmed[6], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QBS2", 1, "MQX1", 1.9+boxpar[0], 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QBS2", 2, "MQX1", -1.9-boxpar[0], 0., 0., 0, "ONLY"); // -- Q3 - gMC->Gspos("MQX4", 1, "ZDCA", 0., 0., tubpar[2]+zql+2400., 0, "ONLY"); - gMC->Gspos("YMQ1", 2, "ZDCA", 0., 0., tubpar[2]+zql+2400., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MQX4", 1, "ZDCA", 0., 0., tubpar[2]+zInnTrip+2400., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YMQ1", 2, "ZDCA", 0., 0., tubpar[2]+zInnTrip+2400., 0, "ONLY"); // -- BEAM SCREEN FOR Q3 tubpar[0] = 5.79/2.; tubpar[1] = 6.14/2.; tubpar[2] = 637./2.; - gMC->Gsvolu("QBS3", "TUBE", idtmed[6], tubpar, 3); - gMC->Gspos("QBS3", 1, "MQX4", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QBS3", "TUBE", idtmed[6], tubpar, 3); + TVirtualMC::GetMC()->Gspos("QBS3", 1, "MQX4", 0., 0., 0., 0, "ONLY"); // INSERT VERTICAL PLATE INSIDE Q3 boxpar[0] = 0.2/2.0; boxpar[1] = TMath::Sqrt(tubpar[0]*tubpar[0]-(2.405+0.2)*(2.405+0.2)); boxpar[2] =637./2.; - gMC->Gsvolu("QBS4", "BOX ", idtmed[6], boxpar, 3); - gMC->Gspos("QBS4", 1, "MQX4", 2.405+boxpar[0], 0., 0., 0, "ONLY"); - gMC->Gspos("QBS4", 2, "MQX4", -2.405-boxpar[0], 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QBS4", "BOX ", idtmed[6], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QBS4", 1, "MQX4", 2.405+boxpar[0], 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QBS4", 2, "MQX4", -2.405-boxpar[0], 0., 0., 0, "ONLY"); @@ -1513,49 +1629,47 @@ void AliZDCv3::CreateBeamLine() tubpar[0] = 0.; tubpar[1] = 3.14; tubpar[2] = 550./2.; - gMC->Gsvolu("MQX2", "TUBE", idtmed[11], tubpar, 3); - gMC->Gsvolu("MQX3", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MQX2", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MQX3", "TUBE", idtmed[11], tubpar, 3); // -- YOKE tubpar[0] = 3.5; tubpar[1] = 22.; tubpar[2] = 550./2.; - gMC->Gsvolu("YMQ2", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("YMQ2", "TUBE", idtmed[7], tubpar, 3); // -- BEAM SCREEN FOR Q2 tubpar[0] = 5.79/2.; tubpar[1] = 6.14/2.; tubpar[2] = 550./2.; - gMC->Gsvolu("QBS5", "TUBE", idtmed[6], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("QBS5", "TUBE", idtmed[6], tubpar, 3); // VERTICAL PLATE INSIDE Q2 boxpar[0] = 0.2/2.0; boxpar[1] = TMath::Sqrt(tubpar[0]*tubpar[0]-(2.405+0.2)*(2.405+0.2)); boxpar[2] =550./2.; - gMC->Gsvolu("QBS6", "BOX ", idtmed[6], boxpar, 3); + TVirtualMC::GetMC()->Gsvolu("QBS6", "BOX ", idtmed[6], boxpar, 3); // -- Q2A - gMC->Gspos("MQX2", 1, "ZDCA", 0., 0., tubpar[2]+zql+908.5, 0, "ONLY"); - gMC->Gspos("QBS5", 1, "MQX2", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("QBS6", 1, "MQX2", 2.405+boxpar[0], 0., 0., 0, "ONLY"); - gMC->Gspos("QBS6", 2, "MQX2", -2.405-boxpar[0], 0., 0., 0, "ONLY"); - gMC->Gspos("YMQ2", 1, "ZDCA", 0., 0., tubpar[2]+zql+908.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MQX2", 1, "ZDCA", 0., 0., tubpar[2]+zInnTrip+908.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QBS5", 1, "MQX2", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QBS6", 1, "MQX2", 2.405+boxpar[0], 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QBS6", 2, "MQX2", -2.405-boxpar[0], 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YMQ2", 1, "ZDCA", 0., 0., tubpar[2]+zInnTrip+908.5, 0, "ONLY"); // -- Q2B - gMC->Gspos("MQX3", 1, "ZDCA", 0., 0., tubpar[2]+zql+1558.5, 0, "ONLY"); - gMC->Gspos("QBS5", 2, "MQX3", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("QBS6", 3, "MQX3", 2.405+boxpar[0], 0., 0., 0, "ONLY"); - gMC->Gspos("QBS6", 4, "MQX3", -2.405-boxpar[0], 0., 0., 0, "ONLY"); - gMC->Gspos("YMQ2", 2, "ZDCA", 0., 0., tubpar[2]+zql+1558.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MQX3", 1, "ZDCA", 0., 0., tubpar[2]+zInnTrip+1558.5, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QBS5", 2, "MQX3", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QBS6", 3, "MQX3", 2.405+boxpar[0], 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QBS6", 4, "MQX3", -2.405-boxpar[0], 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YMQ2", 2, "ZDCA", 0., 0., tubpar[2]+zInnTrip+1558.5, 0, "ONLY"); - // -- SEPARATOR DIPOLE D1 - zd2 = 5838.3; - + // -- SEPARATOR DIPOLE D1 // -- GAP (VACUUM WITH MAGNETIC FIELD) tubpar[0] = 0.; tubpar[1] = 6.75/2.;//3.375 tubpar[2] = 945./2.; - gMC->Gsvolu("MD1L", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MD1L", "TUBE", idtmed[11], tubpar, 3); // -- The beam screen tube is provided by the beam pipe in D1 (QA03 volume) // -- Insert the beam screen horizontal Cu plates inside D1 @@ -1563,39 +1677,36 @@ void AliZDCv3::CreateBeamLine() boxpar[0] = TMath::Sqrt(tubpar[1]*tubpar[1]-(2.885+0.2)*(2.885+0.2)); boxpar[1] = 0.2/2.; boxpar[2] =945./2.; - gMC->Gsvolu("QBS7", "BOX ", idtmed[6], boxpar, 3); - gMC->Gspos("QBS7", 1, "MD1L", 0., 2.885+boxpar[1],0., 0, "ONLY"); - gMC->Gspos("QBS7", 2, "MD1L", 0., -2.885-boxpar[1],0., 0, "ONLY"); + TVirtualMC::GetMC()->Gsvolu("QBS7", "BOX ", idtmed[6], boxpar, 3); + TVirtualMC::GetMC()->Gspos("QBS7", 1, "MD1L", 0., 2.885+boxpar[1],0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("QBS7", 2, "MD1L", 0., -2.885-boxpar[1],0., 0, "ONLY"); // -- YOKE tubpar[0] = 3.68; tubpar[1] = 110./2; tubpar[2] = 945./2.; - gMC->Gsvolu("YD1L", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("YD1L", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("YD1L", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); - gMC->Gspos("MD1L", 1, "ZDCA", 0., 0., tubpar[2]+zd2, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YD1L", 1, "ZDCA", 0., 0., tubpar[2]+zD1, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MD1L", 1, "ZDCA", 0., 0., tubpar[2]+zD1, 0, "ONLY"); // -- DIPOLE D2 - // --- LHC optics v6.5 - zd2l = 12167.8; - // -- GAP (VACUUM WITH MAGNETIC FIELD) tubpar[0] = 0.; tubpar[1] = 7.5/2.; // this has to be checked tubpar[2] = 945./2.; - gMC->Gsvolu("MD2L", "TUBE", idtmed[11], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("MD2L", "TUBE", idtmed[11], tubpar, 3); // -- YOKE tubpar[0] = 0.; tubpar[1] = 55.; tubpar[2] = 945./2.; - gMC->Gsvolu("YD2L", "TUBE", idtmed[7], tubpar, 3); + TVirtualMC::GetMC()->Gsvolu("YD2L", "TUBE", idtmed[7], tubpar, 3); - gMC->Gspos("YD2L", 1, "ZDCA", 0., 0., tubpar[2]+zd2l, 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("YD2L", 1, "ZDCA", 0., 0., tubpar[2]+zD2, 0, "ONLY"); - gMC->Gspos("MD2L", 1, "YD2L", -9.4, 0., 0., 0, "ONLY"); - gMC->Gspos("MD2L", 2, "YD2L", 9.4, 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MD2L", 1, "YD2L", -9.4, 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("MD2L", 2, "YD2L", 9.4, 0., 0., 0, "ONLY"); // -- END OF MAGNET DEFINITION } @@ -1635,56 +1746,56 @@ void AliZDCv3::CreateZDC() // ------------------------------------------------------------------------------- //--> Neutron calorimeter (ZN) - gMC->Gsvolu("ZNEU", "BOX ", idtmed[1], fDimZN, 3); // Passive material - gMC->Gsvolu("ZNF1", "TUBE", idtmed[3], fFibZN, 3); // Active material - gMC->Gsvolu("ZNF2", "TUBE", idtmed[4], fFibZN, 3); - gMC->Gsvolu("ZNF3", "TUBE", idtmed[4], fFibZN, 3); - gMC->Gsvolu("ZNF4", "TUBE", idtmed[3], fFibZN, 3); - gMC->Gsvolu("ZNG1", "BOX ", idtmed[12], fGrvZN, 3); // Empty grooves - gMC->Gsvolu("ZNG2", "BOX ", idtmed[12], fGrvZN, 3); - gMC->Gsvolu("ZNG3", "BOX ", idtmed[12], fGrvZN, 3); - gMC->Gsvolu("ZNG4", "BOX ", idtmed[12], fGrvZN, 3); + TVirtualMC::GetMC()->Gsvolu("ZNEU", "BOX ", idtmed[1], fDimZN, 3); // Passive material + TVirtualMC::GetMC()->Gsvolu("ZNF1", "TUBE", idtmed[3], fFibZN, 3); // Active material + TVirtualMC::GetMC()->Gsvolu("ZNF2", "TUBE", idtmed[4], fFibZN, 3); + TVirtualMC::GetMC()->Gsvolu("ZNF3", "TUBE", idtmed[4], fFibZN, 3); + TVirtualMC::GetMC()->Gsvolu("ZNF4", "TUBE", idtmed[3], fFibZN, 3); + TVirtualMC::GetMC()->Gsvolu("ZNG1", "BOX ", idtmed[12], fGrvZN, 3); // Empty grooves + TVirtualMC::GetMC()->Gsvolu("ZNG2", "BOX ", idtmed[12], fGrvZN, 3); + TVirtualMC::GetMC()->Gsvolu("ZNG3", "BOX ", idtmed[12], fGrvZN, 3); + TVirtualMC::GetMC()->Gsvolu("ZNG4", "BOX ", idtmed[12], fGrvZN, 3); // Divide ZNEU in towers (for hits purposes) - gMC->Gsdvn("ZNTX", "ZNEU", fTowZN[0], 1); // x-tower - gMC->Gsdvn("ZN1 ", "ZNTX", fTowZN[1], 2); // y-tower + TVirtualMC::GetMC()->Gsdvn("ZNTX", "ZNEU", fTowZN[0], 1); // x-tower + TVirtualMC::GetMC()->Gsdvn("ZN1 ", "ZNTX", fTowZN[1], 2); // y-tower //-- Divide ZN1 in minitowers // fDivZN[0]= NUMBER OF FIBERS PER TOWER ALONG X-AXIS, // fDivZN[1]= NUMBER OF FIBERS PER TOWER ALONG Y-AXIS // (4 fibres per minitower) - gMC->Gsdvn("ZNSL", "ZN1 ", fDivZN[1], 2); // Slices - gMC->Gsdvn("ZNST", "ZNSL", fDivZN[0], 1); // Sticks + TVirtualMC::GetMC()->Gsdvn("ZNSL", "ZN1 ", fDivZN[1], 2); // Slices + TVirtualMC::GetMC()->Gsdvn("ZNST", "ZNSL", fDivZN[0], 1); // Sticks // --- Position the empty grooves in the sticks (4 grooves per stick) Float_t dx = fDimZN[0] / fDivZN[0] / 4.; Float_t dy = fDimZN[1] / fDivZN[1] / 4.; - gMC->Gspos("ZNG1", 1, "ZNST", 0.-dx, 0.+dy, 0., 0, "ONLY"); - gMC->Gspos("ZNG2", 1, "ZNST", 0.+dx, 0.+dy, 0., 0, "ONLY"); - gMC->Gspos("ZNG3", 1, "ZNST", 0.-dx, 0.-dy, 0., 0, "ONLY"); - gMC->Gspos("ZNG4", 1, "ZNST", 0.+dx, 0.-dy, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNG1", 1, "ZNST", 0.-dx, 0.+dy, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNG2", 1, "ZNST", 0.+dx, 0.+dy, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNG3", 1, "ZNST", 0.-dx, 0.-dy, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNG4", 1, "ZNST", 0.+dx, 0.-dy, 0., 0, "ONLY"); // --- Position the fibers in the grooves - gMC->Gspos("ZNF1", 1, "ZNG1", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("ZNF2", 1, "ZNG2", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("ZNF3", 1, "ZNG3", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("ZNF4", 1, "ZNG4", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNF1", 1, "ZNG1", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNF2", 1, "ZNG2", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNF3", 1, "ZNG3", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNF4", 1, "ZNG4", 0., 0., 0., 0, "ONLY"); // --- Position the neutron calorimeter in ZDC // -- Rotation of ZDCs Int_t irotzdc; - gMC->Matrix(irotzdc, 90., 180., 90., 90., 180., 0.); + TVirtualMC::GetMC()->Matrix(irotzdc, 90., 180., 90., 90., 180., 0.); // - gMC->Gspos("ZNEU", 1, "ZDCC", fPosZNC[0], fPosZNC[1], fPosZNC[2]-fDimZN[2], irotzdc, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNEU", 1, "ZDCC", fPosZNC[0], fPosZNC[1], fPosZNC[2]-fDimZN[2], irotzdc, "ONLY"); //Ch debug //printf("\n ZN -> %f < z < %f cm\n",fPosZN[2],fPosZN[2]-2*fDimZN[2]); // --- Position the neutron calorimeter in ZDC2 (left line) // -- No Rotation of ZDCs - gMC->Gspos("ZNEU", 2, "ZDCA", fPosZNA[0], fPosZNA[1], fPosZNA[2]+fDimZN[2], 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZNEU", 2, "ZDCA", fPosZNA[0], fPosZNA[1], fPosZNA[2]+fDimZN[2], 0, "ONLY"); //Ch debug //printf("\n ZN left -> %f < z < %f cm\n",fPosZNl[2],fPosZNl[2]+2*fDimZN[2]); @@ -1692,20 +1803,20 @@ void AliZDCv3::CreateZDC() // ------------------------------------------------------------------------------- //--> Proton calorimeter (ZP) - gMC->Gsvolu("ZPRO", "BOX ", idtmed[2], fDimZP, 3); // Passive material - gMC->Gsvolu("ZPF1", "TUBE", idtmed[3], fFibZP, 3); // Active material - gMC->Gsvolu("ZPF2", "TUBE", idtmed[4], fFibZP, 3); - gMC->Gsvolu("ZPF3", "TUBE", idtmed[4], fFibZP, 3); - gMC->Gsvolu("ZPF4", "TUBE", idtmed[3], fFibZP, 3); - gMC->Gsvolu("ZPG1", "BOX ", idtmed[12], fGrvZP, 3); // Empty grooves - gMC->Gsvolu("ZPG2", "BOX ", idtmed[12], fGrvZP, 3); - gMC->Gsvolu("ZPG3", "BOX ", idtmed[12], fGrvZP, 3); - gMC->Gsvolu("ZPG4", "BOX ", idtmed[12], fGrvZP, 3); + TVirtualMC::GetMC()->Gsvolu("ZPRO", "BOX ", idtmed[2], fDimZP, 3); // Passive material + TVirtualMC::GetMC()->Gsvolu("ZPF1", "TUBE", idtmed[3], fFibZP, 3); // Active material + TVirtualMC::GetMC()->Gsvolu("ZPF2", "TUBE", idtmed[4], fFibZP, 3); + TVirtualMC::GetMC()->Gsvolu("ZPF3", "TUBE", idtmed[4], fFibZP, 3); + TVirtualMC::GetMC()->Gsvolu("ZPF4", "TUBE", idtmed[3], fFibZP, 3); + TVirtualMC::GetMC()->Gsvolu("ZPG1", "BOX ", idtmed[12], fGrvZP, 3); // Empty grooves + TVirtualMC::GetMC()->Gsvolu("ZPG2", "BOX ", idtmed[12], fGrvZP, 3); + TVirtualMC::GetMC()->Gsvolu("ZPG3", "BOX ", idtmed[12], fGrvZP, 3); + TVirtualMC::GetMC()->Gsvolu("ZPG4", "BOX ", idtmed[12], fGrvZP, 3); //-- Divide ZPRO in towers(for hits purposes) - gMC->Gsdvn("ZPTX", "ZPRO", fTowZP[0], 1); // x-tower - gMC->Gsdvn("ZP1 ", "ZPTX", fTowZP[1], 2); // y-tower + TVirtualMC::GetMC()->Gsdvn("ZPTX", "ZPRO", fTowZP[0], 1); // x-tower + TVirtualMC::GetMC()->Gsdvn("ZP1 ", "ZPTX", fTowZP[1], 2); // y-tower //-- Divide ZP1 in minitowers @@ -1713,33 +1824,33 @@ void AliZDCv3::CreateZDC() // fDivZP[1]= NUMBER OF FIBERS ALONG Y-AXIS PER MINITOWER // (4 fiber per minitower) - gMC->Gsdvn("ZPSL", "ZP1 ", fDivZP[1], 2); // Slices - gMC->Gsdvn("ZPST", "ZPSL", fDivZP[0], 1); // Sticks + TVirtualMC::GetMC()->Gsdvn("ZPSL", "ZP1 ", fDivZP[1], 2); // Slices + TVirtualMC::GetMC()->Gsdvn("ZPST", "ZPSL", fDivZP[0], 1); // Sticks // --- Position the empty grooves in the sticks (4 grooves per stick) dx = fDimZP[0] / fTowZP[0] / fDivZP[0] / 2.; dy = fDimZP[1] / fTowZP[1] / fDivZP[1] / 2.; - gMC->Gspos("ZPG1", 1, "ZPST", 0.-dx, 0.+dy, 0., 0, "ONLY"); - gMC->Gspos("ZPG2", 1, "ZPST", 0.+dx, 0.+dy, 0., 0, "ONLY"); - gMC->Gspos("ZPG3", 1, "ZPST", 0.-dx, 0.-dy, 0., 0, "ONLY"); - gMC->Gspos("ZPG4", 1, "ZPST", 0.+dx, 0.-dy, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPG1", 1, "ZPST", 0.-dx, 0.+dy, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPG2", 1, "ZPST", 0.+dx, 0.+dy, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPG3", 1, "ZPST", 0.-dx, 0.-dy, 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPG4", 1, "ZPST", 0.+dx, 0.-dy, 0., 0, "ONLY"); // --- Position the fibers in the grooves - gMC->Gspos("ZPF1", 1, "ZPG1", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("ZPF2", 1, "ZPG2", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("ZPF3", 1, "ZPG3", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("ZPF4", 1, "ZPG4", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPF1", 1, "ZPG1", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPF2", 1, "ZPG2", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPF3", 1, "ZPG3", 0., 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPF4", 1, "ZPG4", 0., 0., 0., 0, "ONLY"); // --- Position the proton calorimeter in ZDCC - gMC->Gspos("ZPRO", 1, "ZDCC", fPosZPC[0], fPosZPC[1], fPosZPC[2]-fDimZP[2], irotzdc, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPRO", 1, "ZDCC", fPosZPC[0], fPosZPC[1], fPosZPC[2]-fDimZP[2], irotzdc, "ONLY"); //Ch debug //printf("\n ZP -> %f < z < %f cm\n",fPosZP[2],fPosZP[2]-2*fDimZP[2]); // --- Position the proton calorimeter in ZDCA // --- No rotation - gMC->Gspos("ZPRO", 2, "ZDCA", fPosZPA[0], fPosZPA[1], fPosZPA[2]+fDimZP[2], 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZPRO", 2, "ZDCA", fPosZPA[0], fPosZPA[1], fPosZPA[2]+fDimZP[2], 0, "ONLY"); //Ch debug //printf("\n ZP left -> %f < z < %f cm\n",fPosZPl[2],fPosZPl[2]+2*fDimZP[2]); @@ -1747,16 +1858,16 @@ void AliZDCv3::CreateZDC() // ------------------------------------------------------------------------------- // -> EM calorimeter (ZEM) - gMC->Gsvolu("ZEM ", "PARA", idtmed[10], fDimZEM, 6); + TVirtualMC::GetMC()->Gsvolu("ZEM ", "PARA", idtmed[10], fDimZEM, 6); Int_t irot1, irot2; - gMC->Matrix(irot1,0.,0.,90.,90.,-90.,0.); // Rotation matrix 1 - gMC->Matrix(irot2,180.,0.,90.,fDimZEM[3]+90.,90.,fDimZEM[3]);// Rotation matrix 2 + TVirtualMC::GetMC()->Matrix(irot1,0.,0.,90.,90.,-90.,0.); // Rotation matrix 1 + TVirtualMC::GetMC()->Matrix(irot2,180.,0.,90.,fDimZEM[3]+90.,90.,fDimZEM[3]);// Rotation matrix 2 //printf("irot1 = %d, irot2 = %d \n", irot1, irot2); - gMC->Gsvolu("ZEMF", "TUBE", idtmed[3], fFibZEM, 3); // Active material + TVirtualMC::GetMC()->Gsvolu("ZEMF", "TUBE", idtmed[3], fFibZEM, 3); // Active material - gMC->Gsdvn("ZETR", "ZEM ", fDivZEM[2], 1); // Tranches + TVirtualMC::GetMC()->Gsdvn("ZETR", "ZEM ", fDivZEM[2], 1); // Tranches dimPb[0] = kDimZEMPb; // Lead slices dimPb[1] = fDimZEM[2]; @@ -1765,15 +1876,15 @@ void AliZDCv3::CreateZDC() dimPb[3] = 90.-fDimZEM[3]; //originale dimPb[4] = 0.; dimPb[5] = 0.; - gMC->Gsvolu("ZEL0", "PARA", idtmed[5], dimPb, 6); - gMC->Gsvolu("ZEL1", "PARA", idtmed[5], dimPb, 6); - gMC->Gsvolu("ZEL2", "PARA", idtmed[5], dimPb, 6); + TVirtualMC::GetMC()->Gsvolu("ZEL0", "PARA", idtmed[5], dimPb, 6); + TVirtualMC::GetMC()->Gsvolu("ZEL1", "PARA", idtmed[5], dimPb, 6); + TVirtualMC::GetMC()->Gsvolu("ZEL2", "PARA", idtmed[5], dimPb, 6); // --- Position the lead slices in the tranche Float_t zTran = fDimZEM[0]/fDivZEM[2]; Float_t zTrPb = -zTran+kDimZEMPb; - gMC->Gspos("ZEL0", 1, "ZETR", zTrPb, 0., 0., 0, "ONLY"); - gMC->Gspos("ZEL1", 1, "ZETR", kDimZEMPb, 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZEL0", 1, "ZETR", zTrPb, 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZEL1", 1, "ZETR", kDimZEMPb, 0., 0., 0, "ONLY"); // --- Vacuum zone (to be filled with fibres) dimVoid[0] = (zTran-2*kDimZEMPb)/2.; @@ -1782,141 +1893,38 @@ void AliZDCv3::CreateZDC() dimVoid[3] = 90.-fDimZEM[3]; dimVoid[4] = 0.; dimVoid[5] = 0.; - gMC->Gsvolu("ZEV0", "PARA", idtmed[10], dimVoid,6); - gMC->Gsvolu("ZEV1", "PARA", idtmed[10], dimVoid,6); + TVirtualMC::GetMC()->Gsvolu("ZEV0", "PARA", idtmed[10], dimVoid,6); + TVirtualMC::GetMC()->Gsvolu("ZEV1", "PARA", idtmed[10], dimVoid,6); // --- Divide the vacuum slice into sticks along x axis - gMC->Gsdvn("ZES0", "ZEV0", fDivZEM[0], 3); - gMC->Gsdvn("ZES1", "ZEV1", fDivZEM[0], 3); + TVirtualMC::GetMC()->Gsdvn("ZES0", "ZEV0", fDivZEM[0], 3); + TVirtualMC::GetMC()->Gsdvn("ZES1", "ZEV1", fDivZEM[0], 3); // --- Positioning the fibers into the sticks - gMC->Gspos("ZEMF", 1,"ZES0", 0., 0., 0., irot2, "ONLY"); - gMC->Gspos("ZEMF", 1,"ZES1", 0., 0., 0., irot2, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZEMF", 1,"ZES0", 0., 0., 0., irot2, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZEMF", 1,"ZES1", 0., 0., 0., irot2, "ONLY"); // --- Positioning the vacuum slice into the tranche //Float_t displFib = fDimZEM[1]/fDivZEM[0]; - gMC->Gspos("ZEV0", 1,"ZETR", -dimVoid[0], 0., 0., 0, "ONLY"); - gMC->Gspos("ZEV1", 1,"ZETR", -dimVoid[0]+zTran, 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZEV0", 1,"ZETR", -dimVoid[0], 0., 0., 0, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZEV1", 1,"ZETR", -dimVoid[0]+zTran, 0., 0., 0, "ONLY"); // --- Positioning the ZEM into the ZDC - rotation for 90 degrees // NB -> ZEM is positioned in ALIC (instead of in ZDC) volume - gMC->Gspos("ZEM ", 1,"ALIC", -fPosZEM[0], fPosZEM[1], fPosZEM[2]+fDimZEM[0], irot1, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZEM ", 1,"ALIC", -fPosZEM[0], fPosZEM[1], fPosZEM[2]+fDimZEM[0], irot1, "ONLY"); // Second EM ZDC (same side w.r.t. IP, just on the other side w.r.t. beam pipe) - gMC->Gspos("ZEM ", 2,"ALIC", fPosZEM[0], fPosZEM[1], fPosZEM[2]+fDimZEM[0], irot1, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZEM ", 2,"ALIC", fPosZEM[0], fPosZEM[1], fPosZEM[2]+fDimZEM[0], irot1, "ONLY"); // --- Adding last slice at the end of the EM calorimeter Float_t zLastSlice = fPosZEM[2]+kDimZEMPb+2*fDimZEM[0]; - gMC->Gspos("ZEL2", 1,"ALIC", fPosZEM[0], fPosZEM[1], zLastSlice, irot1, "ONLY"); + TVirtualMC::GetMC()->Gspos("ZEL2", 1,"ALIC", fPosZEM[0], fPosZEM[1], zLastSlice, irot1, "ONLY"); //Ch debug //printf("\n ZEM lenght = %f cm\n",2*fZEMLength); //printf("\n ZEM -> %f < z < %f cm\n",fPosZEM[2],fPosZEM[2]+2*fZEMLength+zLastSlice+kDimZEMPb); } -//_____________________________________________________________________________ -void AliZDCv3::DrawModule() const -{ - // - // Draw a shaded view of the Zero Degree Calorimeter version 1 - // - - // Set everything unseen - gMC->Gsatt("*", "seen", -1); - // - // Set ALIC mother transparent - gMC->Gsatt("ALIC","SEEN",0); - // - // Set the volumes visible - gMC->Gsatt("ZDCC","SEEN",0); - gMC->Gsatt("QT01","SEEN",1); - gMC->Gsatt("QT02","SEEN",1); - gMC->Gsatt("QT03","SEEN",1); - gMC->Gsatt("QT04","SEEN",1); - gMC->Gsatt("QT05","SEEN",1); - gMC->Gsatt("QT06","SEEN",1); - gMC->Gsatt("QT07","SEEN",1); - gMC->Gsatt("QT08","SEEN",1); - gMC->Gsatt("QT09","SEEN",1); - gMC->Gsatt("QT10","SEEN",1); - gMC->Gsatt("QT11","SEEN",1); - gMC->Gsatt("QT12","SEEN",1); - gMC->Gsatt("QT13","SEEN",1); - gMC->Gsatt("QT14","SEEN",1); - gMC->Gsatt("QT15","SEEN",1); - gMC->Gsatt("QT16","SEEN",1); - gMC->Gsatt("QT17","SEEN",1); - gMC->Gsatt("QT18","SEEN",1); - gMC->Gsatt("QC01","SEEN",1); - gMC->Gsatt("QC02","SEEN",1); - gMC->Gsatt("QC03","SEEN",1); - gMC->Gsatt("QC04","SEEN",1); - gMC->Gsatt("QC05","SEEN",1); - gMC->Gsatt("QTD1","SEEN",1); - gMC->Gsatt("QTD2","SEEN",1); - gMC->Gsatt("QTD3","SEEN",1); - gMC->Gsatt("MQXL","SEEN",1); - gMC->Gsatt("YMQL","SEEN",1); - gMC->Gsatt("MQX ","SEEN",1); - gMC->Gsatt("YMQ ","SEEN",1); - gMC->Gsatt("ZQYX","SEEN",1); - gMC->Gsatt("MD1 ","SEEN",1); - gMC->Gsatt("MD1V","SEEN",1); - gMC->Gsatt("YD1 ","SEEN",1); - gMC->Gsatt("MD2 ","SEEN",1); - gMC->Gsatt("YD2 ","SEEN",1); - gMC->Gsatt("ZNEU","SEEN",0); - gMC->Gsatt("ZNF1","SEEN",0); - gMC->Gsatt("ZNF2","SEEN",0); - gMC->Gsatt("ZNF3","SEEN",0); - gMC->Gsatt("ZNF4","SEEN",0); - gMC->Gsatt("ZNG1","SEEN",0); - gMC->Gsatt("ZNG2","SEEN",0); - gMC->Gsatt("ZNG3","SEEN",0); - gMC->Gsatt("ZNG4","SEEN",0); - gMC->Gsatt("ZNTX","SEEN",0); - gMC->Gsatt("ZN1 ","COLO",4); - gMC->Gsatt("ZN1 ","SEEN",1); - gMC->Gsatt("ZNSL","SEEN",0); - gMC->Gsatt("ZNST","SEEN",0); - gMC->Gsatt("ZPRO","SEEN",0); - gMC->Gsatt("ZPF1","SEEN",0); - gMC->Gsatt("ZPF2","SEEN",0); - gMC->Gsatt("ZPF3","SEEN",0); - gMC->Gsatt("ZPF4","SEEN",0); - gMC->Gsatt("ZPG1","SEEN",0); - gMC->Gsatt("ZPG2","SEEN",0); - gMC->Gsatt("ZPG3","SEEN",0); - gMC->Gsatt("ZPG4","SEEN",0); - gMC->Gsatt("ZPTX","SEEN",0); - gMC->Gsatt("ZP1 ","COLO",6); - gMC->Gsatt("ZP1 ","SEEN",1); - gMC->Gsatt("ZPSL","SEEN",0); - gMC->Gsatt("ZPST","SEEN",0); - gMC->Gsatt("ZEM ","COLO",7); - gMC->Gsatt("ZEM ","SEEN",1); - gMC->Gsatt("ZEMF","SEEN",0); - gMC->Gsatt("ZETR","SEEN",0); - gMC->Gsatt("ZEL0","SEEN",0); - gMC->Gsatt("ZEL1","SEEN",0); - gMC->Gsatt("ZEL2","SEEN",0); - gMC->Gsatt("ZEV0","SEEN",0); - gMC->Gsatt("ZEV1","SEEN",0); - gMC->Gsatt("ZES0","SEEN",0); - gMC->Gsatt("ZES1","SEEN",0); - - // - gMC->Gdopt("hide", "on"); - gMC->Gdopt("shad", "on"); - gMC->Gsatt("*", "fill", 7); - gMC->SetClipBox("."); - gMC->SetClipBox("*", 0, 100, -100, 100, 12000, 16000); - gMC->DefaultRange(); - gMC->Gdraw("alic", 40, 30, 0, 488, 220, .07, .07); - gMC->Gdhead(1111, "Zero Degree Calorimeter Version 3"); - gMC->Gdman(18, 4, "MAN"); -} - //_____________________________________________________________________________ void AliZDCv3::CreateMaterials() { @@ -1960,11 +1968,15 @@ void AliZDCv3::CreateMaterials() // --- Lead ubuf[0] = 1.12; - AliMaterial(5, "LEAD", 207.19, 82., 11.35, .56, 18.5, ubuf, 1); + AliMaterial(5, "LEAD", 207.19, 82., 11.35, .56, 0., ubuf, 1); // --- Copper (energy loss taken into account) ubuf[0] = 1.10; AliMaterial(6, "COPP0", 63.54, 29., 8.96, 1.4, 0., ubuf, 1); + + // --- Copper + ubuf[0] = 1.10; + AliMaterial(9, "COPP1", 63.54, 29., 8.96, 1.4, 0., ubuf, 1); // --- Iron (energy loss taken into account) ubuf[0] = 1.1; @@ -1973,6 +1985,10 @@ void AliZDCv3::CreateMaterials() // --- Iron (no energy loss) ubuf[0] = 1.1; AliMaterial(8, "IRON1", 55.85, 26., 7.87, 1.76, 0., ubuf, 1); + + // --- Tatalum + ubuf[0] = 1.1; + AliMaterial(13, "TANT", 183.84, 74., 19.3, 0.35, 0., ubuf, 1); // --------------------------------------------------------- Float_t aResGas[3]={1.008,12.0107,15.9994}; @@ -2001,8 +2017,8 @@ void AliZDCv3::CreateMaterials() // --- Fibers (SiO2) = 3 ; // --- Fibers (SiO2) = 4 ; // --- Lead = 5 ; - // --- Copper (with energy loss)= 6 ; - // --- Copper (with energy loss)= 13 ; + // --- Copper (with high thr.)= 6 ; + // --- Copper (with low thr.)= 9; // --- Iron (with energy loss) = 7 ; // --- Iron (without energy loss) = 8 ; // --- Vacuum (no field) = 10 @@ -2016,6 +2032,7 @@ void AliZDCv3::CreateMaterials() Float_t stmin = 0.01; // Min. value 4 max. step (cm) Float_t stemax = 1.; // Max. step permitted (cm) Float_t tmaxfd = 0.; // Maximum angle due to field (degrees) + Float_t tmaxfdv = 0.1; // Maximum angle due to field (degrees) Float_t deemax = -1.; // Maximum fractional energy loss Float_t nofieldm = 0.; // Max. field value (no field) Float_t fieldm = 45.; // Max. field value (with field) @@ -2025,7 +2042,7 @@ void AliZDCv3::CreateMaterials() Int_t ifield =2; // IFIELD=2 -> magnetic field defined in AliMagFC.h // ***************************************************** - AliMedium(1, "ZTANT", 1, isvolActive, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(1, "ZWALL", 1, isvolActive, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(2, "ZBRASS",2, isvolActive, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(3, "ZSIO2", 3, isvolActive, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(4, "ZQUAR", 3, isvolActive, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); @@ -2033,11 +2050,12 @@ void AliZDCv3::CreateMaterials() AliMedium(6, "ZCOPP", 6, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(7, "ZIRON", 7, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(8, "ZIRONN",8, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(9, "ZCOPL", 6, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); AliMedium(10,"ZVOID",10, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); - AliMedium(12,"ZAIR", 12, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); - // - AliMedium(11,"ZVOIM",11, isvol, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin); - + AliMedium(11,"ZVOIM",11, isvol, ifield, fieldm, tmaxfdv, stemax, deemax, epsil, stmin); + AliMedium(12,"ZAIR", 12, isvolActive, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(13,"ZTANT",13, isvolActive, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(14, "ZIRONT", 7, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin); } @@ -2079,97 +2097,17 @@ void AliZDCv3::Init() { InitTables(); Int_t *idtmed = fIdtmed->GetArray(); - Int_t i; - // Thresholds for showering in the ZDCs - i = 1; //tantalum - gMC->Gstpar(idtmed[i], "CUTGAM", .001); - gMC->Gstpar(idtmed[i], "CUTELE", .001); - gMC->Gstpar(idtmed[i], "CUTNEU", .01); - gMC->Gstpar(idtmed[i], "CUTHAD", .01); - i = 2; //brass - gMC->Gstpar(idtmed[i], "CUTGAM", .001); - gMC->Gstpar(idtmed[i], "CUTELE", .001); - gMC->Gstpar(idtmed[i], "CUTNEU", .01); - gMC->Gstpar(idtmed[i], "CUTHAD", .01); - i = 5; //lead - gMC->Gstpar(idtmed[i], "CUTGAM", .001); - gMC->Gstpar(idtmed[i], "CUTELE", .001); - gMC->Gstpar(idtmed[i], "CUTNEU", .01); - gMC->Gstpar(idtmed[i], "CUTHAD", .01); - - // Avoid too detailed showering in TDI - i = 6; //copper - gMC->Gstpar(idtmed[i], "CUTGAM", .1); - gMC->Gstpar(idtmed[i], "CUTELE", .1); - gMC->Gstpar(idtmed[i], "CUTNEU", 1.); - gMC->Gstpar(idtmed[i], "CUTHAD", 1.); - - // Avoid too detailed showering along the beam line - i = 7; //iron with energy loss (ZIRON) - gMC->Gstpar(idtmed[i], "CUTGAM", .1); - gMC->Gstpar(idtmed[i], "CUTELE", .1); - gMC->Gstpar(idtmed[i], "CUTNEU", 1.); - gMC->Gstpar(idtmed[i], "CUTHAD", 1.); - - // Avoid too detailed showering along the beam line - i = 8; //iron with energy loss (ZIRONN) - gMC->Gstpar(idtmed[i], "CUTGAM", .1); - gMC->Gstpar(idtmed[i], "CUTELE", .1); - gMC->Gstpar(idtmed[i], "CUTNEU", 1.); - gMC->Gstpar(idtmed[i], "CUTHAD", 1.); - - // Avoid interaction in fibers (only energy loss allowed) - i = 3; //fibers (ZSI02) - gMC->Gstpar(idtmed[i], "DCAY", 0.); - gMC->Gstpar(idtmed[i], "MULS", 0.); - gMC->Gstpar(idtmed[i], "PFIS", 0.); - gMC->Gstpar(idtmed[i], "MUNU", 0.); - gMC->Gstpar(idtmed[i], "LOSS", 1.); - gMC->Gstpar(idtmed[i], "PHOT", 0.); - gMC->Gstpar(idtmed[i], "COMP", 0.); - gMC->Gstpar(idtmed[i], "PAIR", 0.); - gMC->Gstpar(idtmed[i], "BREM", 0.); - gMC->Gstpar(idtmed[i], "DRAY", 0.); - gMC->Gstpar(idtmed[i], "ANNI", 0.); - gMC->Gstpar(idtmed[i], "HADR", 0.); - i = 4; //fibers (ZQUAR) - gMC->Gstpar(idtmed[i], "DCAY", 0.); - gMC->Gstpar(idtmed[i], "MULS", 0.); - gMC->Gstpar(idtmed[i], "PFIS", 0.); - gMC->Gstpar(idtmed[i], "MUNU", 0.); - gMC->Gstpar(idtmed[i], "LOSS", 1.); - gMC->Gstpar(idtmed[i], "PHOT", 0.); - gMC->Gstpar(idtmed[i], "COMP", 0.); - gMC->Gstpar(idtmed[i], "PAIR", 0.); - gMC->Gstpar(idtmed[i], "BREM", 0.); - gMC->Gstpar(idtmed[i], "DRAY", 0.); - gMC->Gstpar(idtmed[i], "ANNI", 0.); - gMC->Gstpar(idtmed[i], "HADR", 0.); - - // Avoid interaction in void - i = 11; //void with field - gMC->Gstpar(idtmed[i], "DCAY", 0.); - gMC->Gstpar(idtmed[i], "MULS", 0.); - gMC->Gstpar(idtmed[i], "PFIS", 0.); - gMC->Gstpar(idtmed[i], "MUNU", 0.); - gMC->Gstpar(idtmed[i], "LOSS", 0.); - gMC->Gstpar(idtmed[i], "PHOT", 0.); - gMC->Gstpar(idtmed[i], "COMP", 0.); - gMC->Gstpar(idtmed[i], "PAIR", 0.); - gMC->Gstpar(idtmed[i], "BREM", 0.); - gMC->Gstpar(idtmed[i], "DRAY", 0.); - gMC->Gstpar(idtmed[i], "ANNI", 0.); - gMC->Gstpar(idtmed[i], "HADR", 0.); - // - fMedSensZN = idtmed[1]; // Sensitive volume: ZN passive material - fMedSensZP = idtmed[2]; // Sensitive volume: ZP passive material - fMedSensF1 = idtmed[3]; // Sensitive volume: fibres type 1 - fMedSensF2 = idtmed[4]; // Sensitive volume: fibres type 2 - fMedSensZEM = idtmed[5]; // Sensitive volume: ZEM passive material - fMedSensTDI = idtmed[6]; // Sensitive volume: TDI Cu shield - fMedSensPI = idtmed[7]; // Sensitive volume: beam pipes - fMedSensGR = idtmed[12]; // Sensitive volume: air into the grooves + fMedSensZN = idtmed[1]; // Sensitive volume: ZN passive material + fMedSensZP = idtmed[2]; // Sensitive volume: ZP passive material + fMedSensF1 = idtmed[3]; // Sensitive volume: fibres type 1 + fMedSensF2 = idtmed[4]; // Sensitive volume: fibres type 2 + fMedSensZEM = idtmed[5]; // Sensitive volume: ZEM passive material + fMedSensTDI = idtmed[6]; // Sensitive volume: TDI Cu shield + fMedSensPI = idtmed[7]; // Sensitive volume: beam pipes + fMedSensLumi = idtmed[9]; // Sensitive volume: luminometer + fMedSensGR = idtmed[12]; // Sensitive volume: air into the grooves + fMedSensVColl = idtmed[13]; // Sensitive volume: collimator jaws } //_____________________________________________________________________________ @@ -2180,80 +2118,132 @@ void AliZDCv3::InitTables() // Int_t k, j; - - char *lightfName1,*lightfName2,*lightfName3,*lightfName4, - *lightfName5,*lightfName6,*lightfName7,*lightfName8; - FILE *fp1, *fp2, *fp3, *fp4, *fp5, *fp6, *fp7, *fp8; + int read=1; // --- Reading light tables for ZN - lightfName1 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620362207s"); - if((fp1 = fopen(lightfName1,"r")) == NULL){ + char *lightfName1 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620362207s"); + FILE *fp1 = fopen(lightfName1,"r"); + if(fp1 == NULL){ printf("Cannot open file fp1 \n"); return; } - lightfName2 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620362208s"); - if((fp2 = fopen(lightfName2,"r")) == NULL){ + else{ + for(k=0; kExpandPathName("$ALICE_ROOT/ZDC/light22620362208s"); + FILE *fp2 = fopen(lightfName2,"r"); + if(fp2 == NULL){ printf("Cannot open file fp2 \n"); return; } - lightfName3 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620362209s"); - if((fp3 = fopen(lightfName3,"r")) == NULL){ + else{ + for(k=0; kExpandPathName("$ALICE_ROOT/ZDC/light22620362209s"); + FILE *fp3 = fopen(lightfName3,"r"); + if(fp3 == NULL){ printf("Cannot open file fp3 \n"); return; } - lightfName4 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620362210s"); - if((fp4 = fopen(lightfName4,"r")) == NULL){ + else{ + for(k=0; kExpandPathName("$ALICE_ROOT/ZDC/light22620362210s"); + FILE *fp4 = fopen(lightfName4,"r"); + if(fp4 == NULL){ printf("Cannot open file fp4 \n"); return; } - - for(k=0; kExpandPathName("$ALICE_ROOT/ZDC/light22620552207s"); - if((fp5 = fopen(lightfName5,"r")) == NULL){ + char *lightfName5 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620552207s"); + FILE *fp5 = fopen(lightfName5,"r"); + if(fp5 == NULL){ printf("Cannot open file fp5 \n"); return; } - lightfName6 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620552208s"); - if((fp6 = fopen(lightfName6,"r")) == NULL){ + else{ + for(k=0; kExpandPathName("$ALICE_ROOT/ZDC/light22620552208s"); + FILE *fp6 = fopen(lightfName6,"r"); + if(fp6 == NULL){ printf("Cannot open file fp6 \n"); return; } - lightfName7 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620552209s"); - if((fp7 = fopen(lightfName7,"r")) == NULL){ + else{ + for(k=0; kExpandPathName("$ALICE_ROOT/ZDC/light22620552209s"); + FILE *fp7 = fopen(lightfName7,"r"); + if(fp7 == NULL){ printf("Cannot open file fp7 \n"); return; } - lightfName8 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620552210s"); - if((fp8 = fopen(lightfName8,"r")) == NULL){ + else{ + for(k=0; kExpandPathName("$ALICE_ROOT/ZDC/light22620552210s"); + FILE *fp8 = fopen(lightfName8,"r"); + if(fp8 == NULL){ printf("Cannot open file fp8 \n"); return; } - - for(k=0; k return - if((gMC->CurrentMedium() == fMedSensPI) || (gMC->CurrentMedium() == fMedSensTDI)){ - // If option NoShower is set -> StopTrack - if(fNoShower==1){ - gMC->TrackPosition(s[0],s[1],s[2]); - if(gMC->CurrentMedium() == fMedSensPI){ - knamed = gMC->CurrentVolName(); + // --- This part is for no shower developement in beam pipe, TDI, VColl + // If particle interacts with beam pipe, TDI, VColl -> return + if(fNoShower==1 && ((TVirtualMC::GetMC()->CurrentMedium() == fMedSensPI) || (TVirtualMC::GetMC()->CurrentMedium() == fMedSensTDI) || + (TVirtualMC::GetMC()->CurrentMedium() == fMedSensVColl || (TVirtualMC::GetMC()->CurrentMedium() == fMedSensLumi)))){ + + // If option NoShower is set -> StopTrack + + Int_t ipr = 0; + TVirtualMC::GetMC()->TrackPosition(s[0],s[1],s[2]); + if(TVirtualMC::GetMC()->CurrentMedium() == fMedSensPI){ + knamed = TVirtualMC::GetMC()->CurrentVolName(); if(!strncmp(knamed,"YMQ",3)){ if(s[2]<0) fpLostITC += 1; else fpLostITA += 1; + ipr=1; } else if(!strncmp(knamed,"YD1",3)){ if(s[2]<0) fpLostD1C += 1; else fpLostD1A += 1; + ipr=1; } - else if(!strncmp(knamed,"QAL",3)) fnTrou++; } - else if(gMC->CurrentMedium() == fMedSensTDI){ - knamed = gMC->CurrentVolName(); + else if(TVirtualMC::GetMC()->CurrentMedium() == fMedSensTDI){ + knamed = TVirtualMC::GetMC()->CurrentVolName(); if(!strncmp(knamed,"MD1",3)){ if(s[2]<0) fpLostD1C += 1; else fpLostD1A += 1; + ipr=1; } else if(!strncmp(knamed,"QTD",3)) fpLostTDI += 1; - else if(!strncmp(knamed,"QLU",3)){ - if(s[2]<0) fnLumiC ++; - else fnLumiA++; - } + } + else if(TVirtualMC::GetMC()->CurrentMedium() == fMedSensVColl){ + knamed = TVirtualMC::GetMC()->CurrentVolName(); + if(!strncmp(knamed,"QCVC",4)) fpcVCollC++; + else if(!strncmp(knamed,"QCVA",4)) fpcVCollA++; + ipr=1; } // - //gMC->TrackMomentum(p[0], p[1], p[2], p[3]); + //TVirtualMC::GetMC()->TrackMomentum(p[0], p[1], p[2], p[3]); //printf("\t Particle: mass = %1.3f, E = %1.3f GeV, pz = %1.2f GeV -> stopped in volume %s\n", - // gMC->TrackMass(), p[3], p[2], gMC->CurrentVolName()); + // TVirtualMC::GetMC()->TrackMass(), p[3], p[2], TVirtualMC::GetMC()->CurrentVolName()); // - printf("\n\t **********************************\n"); - printf("\t ********** Side C **********\n"); - printf("\t # of spectators in IT = %d\n",fpLostITC); - printf("\t # of spectators in D1 = %d\n",fpLostD1C); - printf("\t # of spectators in luminometer = %d\n",fnLumiC); - printf("\t ********** Side A **********\n"); - printf("\t # of spectators in IT = %d\n",fpLostITA); - printf("\t # of spectators in D1 = %d\n",fpLostD1A); - printf("\t # of spectators in TDI = %d\n",fpLostTDI); - printf("\t # of spectators in luminometer = %d\n",fnLumiA); - printf("\t # of spectators in trousers = %d\n",fnTrou); - printf("\t **********************************\n"); - gMC->StopTrack(); - } - return; + if(ipr!=0){ + printf("\n\t **********************************\n"); + printf("\t ********** Side C **********\n"); + printf("\t # of particles in IT = %d\n",fpLostITC); + printf("\t # of particles in D1 = %d\n",fpLostD1C); + printf("\t # of particles in VColl = %d\n",fpcVCollC); + printf("\t ********** Side A **********\n"); + printf("\t # of particles in IT = %d\n",fpLostITA); + printf("\t # of particles in D1 = %d\n",fpLostD1A); + printf("\t # of particles in TDI = %d\n",fpLostTDI); + printf("\t # of particles in VColl = %d\n",fpcVCollA); + printf("\t **********************************\n"); + } + TVirtualMC::GetMC()->StopTrack(); + return; } - - if((gMC->CurrentMedium() == fMedSensZN) || (gMC->CurrentMedium() == fMedSensZP) || - (gMC->CurrentMedium() == fMedSensGR) || (gMC->CurrentMedium() == fMedSensF1) || - (gMC->CurrentMedium() == fMedSensF2) || (gMC->CurrentMedium() == fMedSensZEM)){ + if((TVirtualMC::GetMC()->CurrentMedium() == fMedSensZN) || (TVirtualMC::GetMC()->CurrentMedium() == fMedSensZP) || + (TVirtualMC::GetMC()->CurrentMedium() == fMedSensGR) || (TVirtualMC::GetMC()->CurrentMedium() == fMedSensF1) || + (TVirtualMC::GetMC()->CurrentMedium() == fMedSensF2) || (TVirtualMC::GetMC()->CurrentMedium() == fMedSensZEM)){ //Particle coordinates - gMC->TrackPosition(s[0],s[1],s[2]); + TVirtualMC::GetMC()->TrackPosition(s[0],s[1],s[2]); for(j=0; j<=2; j++) x[j] = s[j]; hits[0] = x[0]; hits[1] = x[1]; hits[2] = x[2]; // Determine in which ZDC the particle is - knamed = gMC->CurrentVolName(); + knamed = TVirtualMC::GetMC()->CurrentVolName(); if(!strncmp(knamed,"ZN",2)){ if(x[2]<0.) vol[0]=1; // ZNC (dimuon side) else if(x[2]>0.) vol[0]=4; //ZNA @@ -2363,9 +2356,6 @@ void AliZDCv3::StepManager() if(xdet[1]<=0.) vol[1]=2; else vol[1]=4; } - if((vol[1]!=1) && (vol[1]!=2) && (vol[1]!=3) && (vol[1]!=4)) - printf("\n ZDC StepManager->ERROR in ZN!!! vol[1] = %d, xdet[0] = %f," - "xdet[1] = %f\n",vol[1], xdet[0], xdet[1]); } else if(vol[0]==2){ //Quadrant in ZPC @@ -2382,9 +2372,6 @@ void AliZDCv3::StepManager() break; } } - if((vol[1]!=1) && (vol[1]!=2) && (vol[1]!=3) && (vol[1]!=4)) - printf(" ZDC StepManager->ERROR in ZP!!! vol[1] = %d, xdet[0] = %f," - "xdet[1] = %f\n",vol[1], xdet[0], xdet[1]); } // // Quadrant in ZEM: vol[1] = 1 -> particle in 1st ZEM (placed at x = 8.5 cm) @@ -2416,9 +2403,6 @@ void AliZDCv3::StepManager() if(xdet[1]<=0.) vol[1]=2; else vol[1]=4; } - if((vol[1]!=1) && (vol[1]!=2) && (vol[1]!=3) && (vol[1]!=4)) - printf("\n ZDC StepManager->ERROR in ZNA!!! vol[1] = %d, xdet[0] = %f," - "xdet[1] = %f\n",vol[1], xdet[0], xdet[1]); } // else if(vol[0]==5){ //Quadrant in ZPA @@ -2435,91 +2419,100 @@ void AliZDCv3::StepManager() break; } } - if((vol[1]!=1) && (vol[1]!=2) && (vol[1]!=3) && (vol[1]!=4)) - printf(" ZDC StepManager->ERROR in ZPA!!! vol[1] = %d, xdet[0] = %f," - "xdet[1] = %f\n",vol[1], xdet[0], xdet[1]); } + if((vol[1]!=1) && (vol[1]!=2) && (vol[1]!=3) && (vol[1]!=4)) + AliError(Form(" WRONG tower for det %d: tow %d with xdet=(%f, %f)\n", + vol[0], vol[1], xdet[0], xdet[1])); + // Ch. debug + //printf("\t *** det %d vol %d xdet(%f, %f)\n",vol[0], vol[1], xdet[0], xdet[1]); - // Store impact point and kinetic energy of the ENTERING particle + // Store impact point and kinetic energy of the ENTERING particle - if(gMC->IsTrackEntering()){ - //Particle energy - gMC->TrackMomentum(p[0],p[1],p[2],p[3]); - hits[3] = p[3]; - // Impact point on ZDC + if(TVirtualMC::GetMC()->IsTrackEntering()){ + //Particle energy + TVirtualMC::GetMC()->TrackMomentum(p[0],p[1],p[2],p[3]); + hits[3] = p[3]; + + // Impact point on ZDC + // X takes into account the LHC x-axis sign + // which is opposite to positive x on detector front face + // for side A detectors (ZNA and ZPA) + if(vol[0]==4 || vol[0]==5){ + hits[4] = -xdet[0]; + } + else{ hits[4] = xdet[0]; - hits[5] = xdet[1]; - hits[6] = 0; - hits[7] = 0; - hits[8] = 0; - hits[9] = 0; - // - Int_t curTrackN = gAlice->GetMCApp()->GetCurrentTrackNumber(); - TParticle *part = (gAlice->GetMCApp())->Particle(curTrackN); - hits[10] = part->GetPdgCode(); - //printf("\t PDGCode = %d\n", part->GetPdgCode()); - - AddHit(curTrackN, vol, hits); - - if(fNoShower==1){ - //printf("\t VolName %s -> det %d quad %d - x = %f, y = %f, z = %f\n", - //knamed, vol[0], vol[1], x[0], x[1], x[2]); - if(vol[0]==1){ - fnDetectedC += 1; - printf("\n # of particles in ZNC = %d\n\n",fnDetectedC); - } - else if(vol[0]==2){ - fpDetectedC += 1; - printf("\n # of particles in ZPC = %d\n\n",fpDetectedC); - } - else if(vol[0]==4){ - fnDetectedA += 1; - printf("\n # of particles in ZNA = %d\n\n",fnDetectedA); - } - else if(vol[0]==5){ - fpDetectedA += 1; - printf("\n # of particles in ZPA = %d\n\n",fpDetectedA); - } - // - //printf("\t Particle: mass = %1.3f, E = %1.3f GeV, pz = %1.2f GeV -> stopped in volume %s\n", - // gMC->TrackMass(), p[3], p[2], gMC->CurrentVolName()); - // - gMC->StopTrack(); - return; - } } - - // Charged particles -> Energy loss - if((destep=gMC->Edep())){ - if(gMC->IsTrackStop()){ - gMC->TrackMomentum(p[0],p[1],p[2],p[3]); - m = gMC->TrackMass(); - ekin = p[3]-m; - hits[9] = ekin; - hits[7] = 0.; - hits[8] = 0.; - AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits); - } - else{ - hits[9] = destep; - hits[7] = 0.; - hits[8] = 0.; - AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits); - } + hits[5] = xdet[1]; + hits[6] = 0; + hits[7] = 0; + hits[8] = 0; + hits[9] = 0; + // + Int_t curTrackN = gAlice->GetMCApp()->GetCurrentTrackNumber(); + TParticle *part = gAlice->GetMCApp()->Particle(curTrackN); + hits[10] = part->GetPdgCode(); + //printf("\t PDGCode = %d\n", part->GetPdgCode()); + // + Int_t imo = part->GetFirstMother(); + if(imo>0){ + TParticle * pmot = gAlice->GetMCApp()->Particle(imo); + hits[11] = pmot->GetPdgCode(); } + else hits[11]=0; + // + hits[12] = 1.0e09*TVirtualMC::GetMC()->TrackTime(); // in ns! + //printf("\t TrackTime = %f\n", hits[12]); + hits[13] = part->Eta(); + + AddHit(curTrackN, vol, hits); + + if(fNoShower==1){ + if(vol[0]==1){ + fnDetectedC += 1; + if(fnDetectedC==1) printf(" ### Particle in ZNC\n\n"); + } + else if(vol[0]==2){ + fpDetectedC += 1; + if(fpDetectedC==1) printf(" ### Particle in ZPC\n\n"); + } + else if(vol[0]==4){ + fnDetectedA += 1; + if(fnDetectedA==1) printf(" ### Particle in ZNA\n\n"); + } + else if(vol[0]==5){ + fpDetectedA += 1; + if(fpDetectedA==1) printf(" ### Particle in ZPA\n\n"); + } + // + //printf("\t Pc: x %1.2f y %1.2f z %1.2f E %1.2f GeV pz = %1.2f GeV in volume %s\n", + // x[0],x[1],x[3],p[3],p[2],TVirtualMC::GetMC()->CurrentVolName()); + // + TVirtualMC::GetMC()->StopTrack(); + return; + } + } + + // Particle energy loss + if(TVirtualMC::GetMC()->Edep() != 0){ + hits[9] = TVirtualMC::GetMC()->Edep(); + hits[7] = 0.; + hits[8] = 0.; + AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits); + } } // *** Light production in fibres - if((gMC->CurrentMedium() == fMedSensF1) || (gMC->CurrentMedium() == fMedSensF2)){ + if((TVirtualMC::GetMC()->CurrentMedium() == fMedSensF1) || (TVirtualMC::GetMC()->CurrentMedium() == fMedSensF2)){ //Select charged particles - if((destep=gMC->Edep())){ + if((destep=TVirtualMC::GetMC()->Edep())){ // Particle velocity Float_t beta = 0.; - gMC->TrackMomentum(p[0],p[1],p[2],p[3]); + TVirtualMC::GetMC()->TrackMomentum(p[0],p[1],p[2],p[3]); Float_t ptot=TMath::Sqrt(p[0]*p[0]+p[1]*p[1]+p[2]*p[2]); if(p[3] > 0.00001) beta = ptot/p[3]; else return; @@ -2534,7 +2527,7 @@ void AliZDCv3::StepManager() um[0] = p[0]/ptot; um[1] = p[1]/ptot; um[2] = p[2]/ptot; - gMC->Gmtod(um,ud,2); + TVirtualMC::GetMC()->Gmtod(um,ud,2); // 2 -> Angle < limit angle Double_t alfar = TMath::ACos(ud[2]); Double_t alfa = alfar*kRaddeg; @@ -2543,11 +2536,11 @@ void AliZDCv3::StepManager() ialfa = Int_t(1.+alfa/2.); // Distance between particle trajectory and fibre axis - gMC->TrackPosition(s[0],s[1],s[2]); + TVirtualMC::GetMC()->TrackPosition(s[0],s[1],s[2]); for(j=0; j<=2; j++){ x[j] = s[j]; } - gMC->Gmtod(x,xdet,1); + TVirtualMC::GetMC()->Gmtod(x,xdet,1); if(TMath::Abs(ud[0])>0.00001){ Float_t dcoeff = ud[1]/ud[0]; be = TMath::Abs((xdet[1]-dcoeff*xdet[0])/TMath::Sqrt(dcoeff*dcoeff+1.)); @@ -2557,11 +2550,9 @@ void AliZDCv3::StepManager() } ibe = Int_t(be*1000.+1); - //if((vol[0]==1)) radius = fFibZN[1]; - //else if((vol[0]==2)) radius = fFibZP[1]; - + //Looking into the light tables - Float_t charge = gMC->TrackCharge(); + Float_t charge = TVirtualMC::GetMC()->TrackCharge(); if(vol[0]==1 || vol[0]==4) { // (1) ZN fibres if(ibe>fNben) ibe=fNben; @@ -2570,7 +2561,7 @@ void AliZDCv3::StepManager() // Ch. debug //if(ibeta==3) printf("\t %f \t %f \t %f\n",alfa, be, out); //printf("\t ibeta = %d, ialfa = %d, ibe = %d -> nphe = %d\n\n",ibeta,ialfa,ibe,nphe); - if(gMC->CurrentMedium() == fMedSensF1){ + if(TVirtualMC::GetMC()->CurrentMedium() == fMedSensF1){ hits[7] = nphe; //fLightPMQ hits[8] = 0; hits[9] = 0; @@ -2587,7 +2578,7 @@ void AliZDCv3::StepManager() if(ibe>fNbep) ibe=fNbep; out = charge*charge*fTablep[ibeta][ialfa][ibe]; nphe = gRandom->Poisson(out); - if(gMC->CurrentMedium() == fMedSensF1){ + if(TVirtualMC::GetMC()->CurrentMedium() == fMedSensF1){ hits[7] = nphe; //fLightPMQ hits[8] = 0; hits[9] = 0; @@ -2600,10 +2591,10 @@ void AliZDCv3::StepManager() AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits); } } - else if((vol[0]==3)) { // (3) ZEM fibres + else if(vol[0]==3) { // (3) ZEM fibres if(ibe>fNbep) ibe=fNbep; out = charge*charge*fTablep[ibeta][ialfa][ibe]; - gMC->TrackPosition(s[0],s[1],s[2]); + TVirtualMC::GetMC()->TrackPosition(s[0],s[1],s[2]); Float_t xalic[3]; for(j=0; j<3; j++){ xalic[j] = s[j]; @@ -2611,12 +2602,16 @@ void AliZDCv3::StepManager() // z-coordinate from ZEM front face // NB-> fPosZEM[2]+fZEMLength = -1000.+2*10.3 = 979.69 cm Float_t z = -xalic[2]+fPosZEM[2]+2*fZEMLength-xalic[1]; -// z = xalic[2]-fPosZEM[2]-fZEMLength-xalic[1]*(TMath::Tan(45.*kDegrad)); -// printf("\n fPosZEM[2]+2*fZEMLength = %f", fPosZEM[2]+2*fZEMLength); + //z = xalic[2]-fPosZEM[2]-fZEMLength-xalic[1]*(TMath::Tan(45.*kDegrad)); + //printf(" fPosZEM[2]+2*fZEMLength = %f", fPosZEM[2]+2*fZEMLength); + // + // Parametrization for light guide uniformity + // NEW!!! Light guide tilted @ 51 degrees + Float_t guiPar[4]={0.31,-0.0006305,0.01337,0.8895}; Float_t guiEff = guiPar[0]*(guiPar[1]*z*z+guiPar[2]*z+guiPar[3]); out = out*guiEff; nphe = gRandom->Poisson(out); -// printf(" out*guiEff = %f nphe = %d", out, nphe); + //printf(" out*guiEff = %f nphe = %d", out, nphe); if(vol[1] == 1){ hits[7] = 0; hits[8] = nphe; //fLightPMC (ZEM1)