X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerGeometryBuilder.cxx;h=ec490dff4e06ca547dc563c48cf4844e1fb977bf;hb=fe783497aa0aaff1c97abeb441670f3722df96a4;hp=37f8782becc63d808c59fa676cf8bb901de0d5fb;hpb=b96f7067073d736140204422008b9b40580c7f12;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONTriggerGeometryBuilder.cxx b/MUON/AliMUONTriggerGeometryBuilder.cxx index 37f8782becc..ec490dff4e0 100644 --- a/MUON/AliMUONTriggerGeometryBuilder.cxx +++ b/MUON/AliMUONTriggerGeometryBuilder.cxx @@ -118,7 +118,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() const Float_t kSizeVSupInt[3]={1.2,1.2,306.+5.}; // transverse dimensions of angular supports const Float_t kSizeSupport1V[3]={0.,1.5,0.1}; - const Float_t kSizeSupport1H[3]={0.,0.1,1.2}; // z should be 1.4 in the installed set-up + const Float_t kSizeSupport1H[3]={0.,0.1,1.15}; // z should be 1.4 in the installed set-up const Float_t kSizeSupport2V[3]={0.,3.0,0.1}; const Float_t kSizeSupport2H[3]={0.,0.1,1.9}; const Float_t kSizeSupportXV[3]={0.,1.25,0.25}; @@ -130,7 +130,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() // Position of gas pipe with respect to angular support const Float_t kOffsetGasPipe=0.75; // Small cut on some volumes to avoid extrusion from SC1x - const Float_t kAvoidExtrusion=2.7; + const Float_t kAvoidExtrusion=2.9; Float_t zpos1= AliMUONConstants::DefaultChamberZ(10); Double_t dstation = ( ( - AliMUONConstants::DefaultChamberZ(11)) - @@ -221,10 +221,9 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() char volAluSupport[5],volAirSupport[5]; sprintf(volAluSupport,"SAL%d",icount+1); sprintf(volAirSupport,"SAI%d",icount+1); - char volEnvSupport[12][5]; - for(Int_t jj=0;jj<2;jj++) + char volEnvSupport[12][7]; for(Int_t ii=0;ii<8;ii++){ - sprintf(volEnvSupport[ii],"A%dV%d",icount+1,ii); + sprintf(volEnvSupport[ii],"SEA%dV%d",icount+1,ii); } tpar[0]= 0.; tpar[1]= 0.; @@ -258,14 +257,14 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() char volAluSupportH[6],volAirSupportH[6]; sprintf(volAluSupportH,"SALH%d",icount+1); sprintf(volAirSupportH,"SAIH%d",icount+1); - char volEnvSupportHA[6][7],volEnvSupportHBC[12][7],volEnvSupportHD[12][7],volEnvSupportHE[12][7],volEnvSupportHF[12][7]; + char volEnvSupportHA[6][8],volEnvSupportHBC[12][8],volEnvSupportHD[12][8],volEnvSupportHE[12][8],volEnvSupportHF[12][8]; for(Int_t jj=0;jj<2;jj++){ for(Int_t ii=0;ii<6;ii++){ - if(ii<3)sprintf(volEnvSupportHA[3*jj+ii],"A%dHA%d",icount+1,3*jj+ii); - sprintf(volEnvSupportHBC[6*jj+ii],"A%dHB%d",icount+1,6*jj+ii); - sprintf(volEnvSupportHD[6*jj+ii],"A%dHD%d",icount+1,6*jj+ii); - sprintf(volEnvSupportHE[6*jj+ii],"A%dHE%d",icount+1,6*jj+ii); - sprintf(volEnvSupportHF[6*jj+ii],"A%dHF%d",icount+1,6*jj+ii); + if(ii<3)sprintf(volEnvSupportHA[3*jj+ii],"SA%dHA%d",icount+1,3*jj+ii); + sprintf(volEnvSupportHBC[6*jj+ii],"SA%dHB%d",icount+1,6*jj+ii); + sprintf(volEnvSupportHD[6*jj+ii],"SA%dHD%d",icount+1,6*jj+ii); + sprintf(volEnvSupportHE[6*jj+ii],"SA%dHE%d",icount+1,6*jj+ii); + sprintf(volEnvSupportHF[6*jj+ii],"SA%dHF%d",icount+1,6*jj+ii); } } tpar[0]= 0.; @@ -294,67 +293,67 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() char volAluAngSupportXV[6],volAluAngSupportXH[6]; sprintf(volAluAngSupportXH,"SAXH%d",icount+1); sprintf(volAluAngSupportXV,"SAXV%d",icount+1); - char volEnvSuppAng1HA[2][6],volEnvSuppAng1HBC[4][6],volEnvSuppAng1HD[4][6],volEnvSuppAng1HE[4][6],volEnvSuppAng1HF[4][6]; - char volEnvSuppAng1VA[2][6],volEnvSuppAng1VBC[4][6],volEnvSuppAng1VD[4][6],volEnvSuppAng1VE[4][6],volEnvSuppAng1VF[4][6]; - char volEnvSuppAng2HA[2][6],volEnvSuppAng2HBC[4][6],volEnvSuppAng2HD[4][6],volEnvSuppAng2HE[4][6],volEnvSuppAng2HF[4][6]; - char volEnvSuppAng2VA[2][6],volEnvSuppAng2VBC[4][6],volEnvSuppAng2VD[4][6],volEnvSuppAng2VE[4][6],volEnvSuppAng2VF[4][6]; - char volEnvSuppAng3HA[2][6],volEnvSuppAng3HBC[4][6],volEnvSuppAng3HD[4][6],volEnvSuppAng3HE[4][6],volEnvSuppAng3HF[4][6]; - char volEnvSuppAng3VA[2][6],volEnvSuppAng3VBC[4][6],volEnvSuppAng3VD[4][6],volEnvSuppAng3VE[4][6],volEnvSuppAng3VF[4][6]; - char volEnvSuppAng4HA[2][6],volEnvSuppAng4HBC[4][6],volEnvSuppAng4HD[4][6],volEnvSuppAng4HE[4][6],volEnvSuppAng4HF[4][6]; - char volEnvSuppAng4VA[2][6],volEnvSuppAng4VBC[4][6],volEnvSuppAng4VD[4][6],volEnvSuppAng4VE[4][6],volEnvSuppAng4VF[4][6]; - char volEnvSuppAngXHA[2][6],volEnvSuppAngXHBC[4][6],volEnvSuppAngXHD[4][6],volEnvSuppAngXHE[4][6],volEnvSuppAngXHF[4][6]; - char volEnvSuppAngXVA[2][6],volEnvSuppAngXVBC[4][6],volEnvSuppAngXVD[4][6],volEnvSuppAngXVE[4][6],volEnvSuppAngXVF[4][6]; + char volEnvSuppAng1HA[2][7],volEnvSuppAng1HBC[4][7],volEnvSuppAng1HD[4][7],volEnvSuppAng1HE[4][7],volEnvSuppAng1HF[4][7]; + char volEnvSuppAng1VA[2][7],volEnvSuppAng1VBC[4][7],volEnvSuppAng1VD[4][7],volEnvSuppAng1VE[4][7],volEnvSuppAng1VF[4][7]; + char volEnvSuppAng2HA[2][7],volEnvSuppAng2HBC[4][7],volEnvSuppAng2HD[4][7],volEnvSuppAng2HE[4][7],volEnvSuppAng2HF[4][7]; + char volEnvSuppAng2VA[2][7],volEnvSuppAng2VBC[4][7],volEnvSuppAng2VD[4][7],volEnvSuppAng2VE[4][7],volEnvSuppAng2VF[4][7]; + char volEnvSuppAng3HA[2][7],volEnvSuppAng3HBC[4][7],volEnvSuppAng3HD[4][7],volEnvSuppAng3HE[4][7],volEnvSuppAng3HF[4][7]; + char volEnvSuppAng3VA[2][7],volEnvSuppAng3VBC[4][7],volEnvSuppAng3VD[4][7],volEnvSuppAng3VE[4][7],volEnvSuppAng3VF[4][7]; + char volEnvSuppAng4HA[2][7],volEnvSuppAng4HBC[4][7],volEnvSuppAng4HD[4][7],volEnvSuppAng4HE[4][7],volEnvSuppAng4HF[4][7]; + char volEnvSuppAng4VA[2][7],volEnvSuppAng4VBC[4][7],volEnvSuppAng4VD[4][7],volEnvSuppAng4VE[4][7],volEnvSuppAng4VF[4][7]; + char volEnvSuppAngXHA[2][7],volEnvSuppAngXHBC[4][7],volEnvSuppAngXHD[4][7],volEnvSuppAngXHE[4][7],volEnvSuppAngXHF[4][7]; + char volEnvSuppAngXVA[2][7],volEnvSuppAngXVBC[4][7],volEnvSuppAngXVD[4][7],volEnvSuppAngXVE[4][7],volEnvSuppAngXVF[4][7]; for(Int_t ii=0;ii<4;ii++){ - if(ii<2)sprintf(volEnvSuppAng1HA[ii],"H1%dA%d",icount+1,ii); - sprintf(volEnvSuppAng1HBC[ii],"H1%dB%d",icount+1,ii); - sprintf(volEnvSuppAng1HD[ii],"H1%dD%d",icount+1,ii); - sprintf(volEnvSuppAng1HE[ii],"H1%dE%d",icount+1,ii); - sprintf(volEnvSuppAng1HF[ii],"H1%dF%d",icount+1,ii); - if(ii<2)sprintf(volEnvSuppAng1VA[ii],"V1%dA%d",icount+1,ii); - sprintf(volEnvSuppAng1VBC[ii],"V1%dB%d",icount+1,ii); - sprintf(volEnvSuppAng1VD[ii],"V1%dD%d",icount+1,ii); - sprintf(volEnvSuppAng1VE[ii],"V1%dE%d",icount+1,ii); - sprintf(volEnvSuppAng1VF[ii],"V1%dF%d",icount+1,ii); - if(ii<2)sprintf(volEnvSuppAng2HA[ii],"H2%dA%d",icount+1,ii); - sprintf(volEnvSuppAng2HBC[ii],"H2%dB%d",icount+1,ii); - sprintf(volEnvSuppAng2HD[ii],"H2%dD%d",icount+1,ii); - sprintf(volEnvSuppAng2HE[ii],"H2%dE%d",icount+1,ii); - sprintf(volEnvSuppAng2HF[ii],"H2%dF%d",icount+1,ii); - if(ii<2)sprintf(volEnvSuppAng2VA[ii],"V2%dA%d",icount+1,ii); - sprintf(volEnvSuppAng2VBC[ii],"V2%dB%d",icount+1,ii); - sprintf(volEnvSuppAng2VD[ii],"V2%dD%d",icount+1,ii); - sprintf(volEnvSuppAng2VE[ii],"V2%dE%d",icount+1,ii); - sprintf(volEnvSuppAng2VF[ii],"V2%dF%d",icount+1,ii); - if(ii<2)sprintf(volEnvSuppAng3HA[ii],"H3%dA%d",icount+1,ii); - sprintf(volEnvSuppAng3HBC[ii],"H3%dB%d",icount+1,ii); - sprintf(volEnvSuppAng3HD[ii],"H3%dD%d",icount+1,ii); - sprintf(volEnvSuppAng3HE[ii],"H3%dE%d",icount+1,ii); - sprintf(volEnvSuppAng3HF[ii],"H3%dF%d",icount+1,ii); - if(ii<2)sprintf(volEnvSuppAng3VA[ii],"V3%dA%d",icount+1,ii); - sprintf(volEnvSuppAng3VBC[ii],"V3%dB%d",icount+1,ii); - sprintf(volEnvSuppAng3VD[ii],"V3%dD%d",icount+1,ii); - sprintf(volEnvSuppAng3VE[ii],"V3%dE%d",icount+1,ii); - sprintf(volEnvSuppAng3VF[ii],"V3%dF%d",icount+1,ii); - if(ii<2)sprintf(volEnvSuppAng4HA[ii],"H4%dA%d",icount+1,ii); - sprintf(volEnvSuppAng4HBC[ii],"H4%dB%d",icount+1,ii); - sprintf(volEnvSuppAng4HD[ii],"H4%dD%d",icount+1,ii); - sprintf(volEnvSuppAng4HE[ii],"H4%dE%d",icount+1,ii); - sprintf(volEnvSuppAng4HF[ii],"H4%dF%d",icount+1,ii); - if(ii<2)sprintf(volEnvSuppAng4VA[ii],"V4%dA%d",icount+1,ii); - sprintf(volEnvSuppAng4VBC[ii],"V4%dB%d",icount+1,ii); - sprintf(volEnvSuppAng4VD[ii],"V4%dD%d",icount+1,ii); - sprintf(volEnvSuppAng4VE[ii],"V4%dE%d",icount+1,ii); - sprintf(volEnvSuppAng4VF[ii],"V4%dF%d",icount+1,ii); - if(ii<2)sprintf(volEnvSuppAngXHA[ii],"HX%dA%d",icount+1,ii); - sprintf(volEnvSuppAngXHBC[ii],"HX%dB%d",icount+1,ii); - sprintf(volEnvSuppAngXHD[ii],"HX%dD%d",icount+1,ii); - sprintf(volEnvSuppAngXHE[ii],"HX%dE%d",icount+1,ii); - sprintf(volEnvSuppAngXHF[ii],"HX%dF%d",icount+1,ii); - if(ii<2)sprintf(volEnvSuppAngXVA[ii],"VX%dA%d",icount+1,ii); - sprintf(volEnvSuppAngXVBC[ii],"VX%dB%d",icount+1,ii); - sprintf(volEnvSuppAngXVD[ii],"VX%dD%d",icount+1,ii); - sprintf(volEnvSuppAngXVE[ii],"VX%dE%d",icount+1,ii); - sprintf(volEnvSuppAngXVF[ii],"VX%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAng1HA[ii],"SH1%dA%d",icount+1,ii); + sprintf(volEnvSuppAng1HBC[ii],"SH1%dB%d",icount+1,ii); + sprintf(volEnvSuppAng1HD[ii],"SH1%dD%d",icount+1,ii); + sprintf(volEnvSuppAng1HE[ii],"SH1%dE%d",icount+1,ii); + sprintf(volEnvSuppAng1HF[ii],"SH1%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAng1VA[ii],"SV1%dA%d",icount+1,ii); + sprintf(volEnvSuppAng1VBC[ii],"SV1%dB%d",icount+1,ii); + sprintf(volEnvSuppAng1VD[ii],"SV1%dD%d",icount+1,ii); + sprintf(volEnvSuppAng1VE[ii],"SV1%dE%d",icount+1,ii); + sprintf(volEnvSuppAng1VF[ii],"SV1%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAng2HA[ii],"SH2%dA%d",icount+1,ii); + sprintf(volEnvSuppAng2HBC[ii],"SH2%dB%d",icount+1,ii); + sprintf(volEnvSuppAng2HD[ii],"SH2%dD%d",icount+1,ii); + sprintf(volEnvSuppAng2HE[ii],"SH2%dE%d",icount+1,ii); + sprintf(volEnvSuppAng2HF[ii],"SH2%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAng2VA[ii],"SV2%dA%d",icount+1,ii); + sprintf(volEnvSuppAng2VBC[ii],"SV2%dB%d",icount+1,ii); + sprintf(volEnvSuppAng2VD[ii],"SV2%dD%d",icount+1,ii); + sprintf(volEnvSuppAng2VE[ii],"SV2%dE%d",icount+1,ii); + sprintf(volEnvSuppAng2VF[ii],"SV2%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAng3HA[ii],"SH3%dA%d",icount+1,ii); + sprintf(volEnvSuppAng3HBC[ii],"SH3%dB%d",icount+1,ii); + sprintf(volEnvSuppAng3HD[ii],"SH3%dD%d",icount+1,ii); + sprintf(volEnvSuppAng3HE[ii],"SH3%dE%d",icount+1,ii); + sprintf(volEnvSuppAng3HF[ii],"SH3%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAng3VA[ii],"SV3%dA%d",icount+1,ii); + sprintf(volEnvSuppAng3VBC[ii],"SV3%dB%d",icount+1,ii); + sprintf(volEnvSuppAng3VD[ii],"SV3%dD%d",icount+1,ii); + sprintf(volEnvSuppAng3VE[ii],"SV3%dE%d",icount+1,ii); + sprintf(volEnvSuppAng3VF[ii],"SV3%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAng4HA[ii],"SH4%dA%d",icount+1,ii); + sprintf(volEnvSuppAng4HBC[ii],"SH4%dB%d",icount+1,ii); + sprintf(volEnvSuppAng4HD[ii],"SH4%dD%d",icount+1,ii); + sprintf(volEnvSuppAng4HE[ii],"SH4%dE%d",icount+1,ii); + sprintf(volEnvSuppAng4HF[ii],"SH4%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAng4VA[ii],"SV4%dA%d",icount+1,ii); + sprintf(volEnvSuppAng4VBC[ii],"SV4%dB%d",icount+1,ii); + sprintf(volEnvSuppAng4VD[ii],"SV4%dD%d",icount+1,ii); + sprintf(volEnvSuppAng4VE[ii],"SV4%dE%d",icount+1,ii); + sprintf(volEnvSuppAng4VF[ii],"SV4%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAngXHA[ii],"SHX%dA%d",icount+1,ii); + sprintf(volEnvSuppAngXHBC[ii],"SHX%dB%d",icount+1,ii); + sprintf(volEnvSuppAngXHD[ii],"SHX%dD%d",icount+1,ii); + sprintf(volEnvSuppAngXHE[ii],"SHX%dE%d",icount+1,ii); + sprintf(volEnvSuppAngXHF[ii],"SHX%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvSuppAngXVA[ii],"SVX%dA%d",icount+1,ii); + sprintf(volEnvSuppAngXVBC[ii],"SVX%dB%d",icount+1,ii); + sprintf(volEnvSuppAngXVD[ii],"SVX%dD%d",icount+1,ii); + sprintf(volEnvSuppAngXVE[ii],"SVX%dE%d",icount+1,ii); + sprintf(volEnvSuppAngXVF[ii],"SVX%dF%d",icount+1,ii); } tpar[0]= 0.; tpar[1]= 0.; @@ -371,23 +370,23 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() gMC->Gsvolu(volAluAngSupportXH,"BOX",idAlu1,tpar,0); // gas pipes - char volInoxGasPipe[6]; - sprintf(volInoxGasPipe,"PINO%d",icount+1); - char volEnvInoxGasPipe1A[2][6],volEnvInoxGasPipe1BC[4][7],volEnvInoxGasPipe1D[4][6],volEnvInoxGasPipe1E[4][6],volEnvInoxGasPipe1F[4][6]; - char volEnvInoxGasPipe2A[2][6],volEnvInoxGasPipe2BC[4][7],volEnvInoxGasPipe2D[4][6],volEnvInoxGasPipe2E[4][6],volEnvInoxGasPipe2F[4][6]; + char volInoxGasPipe[7]; + sprintf(volInoxGasPipe,"SPINO%d",icount+1); + char volEnvInoxGasPipe1A[2][7],volEnvInoxGasPipe1BC[4][8],volEnvInoxGasPipe1D[4][7],volEnvInoxGasPipe1E[4][7],volEnvInoxGasPipe1F[4][7]; + char volEnvInoxGasPipe2A[2][7],volEnvInoxGasPipe2BC[4][8],volEnvInoxGasPipe2D[4][7],volEnvInoxGasPipe2E[4][7],volEnvInoxGasPipe2F[4][7]; for(Int_t ii=0;ii<4;ii++){ - if(ii<2)sprintf(volEnvInoxGasPipe1A[ii],"P1%dA%d",icount+1,ii); - sprintf(volEnvInoxGasPipe1BC[ii],"P1%dBC%d",icount+1,ii); - sprintf(volEnvInoxGasPipe1D[ii],"P1%dD%d",icount+1,ii); - sprintf(volEnvInoxGasPipe1E[ii],"P1%dE%d",icount+1,ii); - sprintf(volEnvInoxGasPipe1F[ii],"P1%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvInoxGasPipe1A[ii],"SP1%dA%d",icount+1,ii); + sprintf(volEnvInoxGasPipe1BC[ii],"SP1%dBC%d",icount+1,ii); + sprintf(volEnvInoxGasPipe1D[ii],"SP1%dD%d",icount+1,ii); + sprintf(volEnvInoxGasPipe1E[ii],"SP1%dE%d",icount+1,ii); + sprintf(volEnvInoxGasPipe1F[ii],"SP1%dF%d",icount+1,ii); } for(Int_t ii=0;ii<4;ii++){ - if(ii<2)sprintf(volEnvInoxGasPipe2A[ii],"P2%dA%d",icount+1,ii); - sprintf(volEnvInoxGasPipe2BC[ii],"P2%dBC%d",icount+1,ii); - sprintf(volEnvInoxGasPipe2D[ii],"P2%dD%d",icount+1,ii); - sprintf(volEnvInoxGasPipe2E[ii],"P2%dE%d",icount+1,ii); - sprintf(volEnvInoxGasPipe2F[ii],"P2%dF%d",icount+1,ii); + if(ii<2)sprintf(volEnvInoxGasPipe2A[ii],"SP2%dA%d",icount+1,ii); + sprintf(volEnvInoxGasPipe2BC[ii],"SP2%dBC%d",icount+1,ii); + sprintf(volEnvInoxGasPipe2D[ii],"SP2%dD%d",icount+1,ii); + sprintf(volEnvInoxGasPipe2E[ii],"SP2%dE%d",icount+1,ii); + sprintf(volEnvInoxGasPipe2F[ii],"SP2%dF%d",icount+1,ii); } tpar[0]= 0.; tpar[1]= 0.; @@ -440,9 +439,9 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; Float_t sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VA[0], 0, true, - TGeoTranslation(xEnv,yEnvP-dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,yEnvP-dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VA[1], 0, true, - TGeoTranslation(-xEnv,yEnvM-dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,yEnvM-dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport1V,volEnvSuppAng1VA[0],iVolNum++,3, spar); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport1V,volEnvSuppAng1VA[1],iVolNum++,3, spar); @@ -476,7 +475,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VA[0], 0, true, TGeoTranslation(xEnv,yEnvP-dpar[1],kSizeVSupExt[0]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VA[1], 0, true, @@ -505,9 +504,9 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VA[0], 0, true, - TGeoTranslation(xEnv,yEnvP+dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,yEnvP+dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VA[1], 0, true, - TGeoTranslation(-xEnv,yEnvM+dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,yEnvM+dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport3V,volEnvSuppAng3VA[0],iVolNum++,3, spar); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport3V,volEnvSuppAng3VA[1],iVolNum++,3, spar); @@ -541,7 +540,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VA[0], 0, true, TGeoTranslation(xEnv,yEnvP+dpar[1],kSizeVSupExt[0]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VA[1], 0, true, @@ -651,9 +650,9 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VBC[0], 0, true, - TGeoTranslation(xEnv,-yEnvM-dpar[1]-dysave,kZm-dpar[2]-spar[2]/2.)); + TGeoTranslation(xEnv,-yEnvM-dpar[1]-dysave,kZm-dpar[2]-spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VBC[2], 0, true, - TGeoTranslation(-xEnv,-yEnvP-dpar[1]-dysave,kZp+dpar[2]+spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,-yEnvP-dpar[1]-dysave,kZp+dpar[2]+spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport1V,volEnvSuppAng1VBC[0],iVolNum++,3, spar); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport1V,volEnvSuppAng1VBC[2],iVolNum++,3, spar); @@ -686,7 +685,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VBC[0], 0, true, TGeoTranslation(xEnv,-yEnvM-dpar[1]-dysave,-(kSizeVSupExt[0]+spar[2]))); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VBC[2], 0, true, @@ -712,11 +711,10 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[1]=kSizeSupport1V[1]; spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; - GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VBC[0], 0, true, - TGeoTranslation(xEnv+xpossave,-yEnvM+dpar[1]+dysave,kZm-dpar[2]-spar[2]/2.)); + TGeoTranslation(xEnv+xpossave,-yEnvM+dpar[1]+dysave,kZm-dpar[2]-spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VBC[2], 0, true, - TGeoTranslation(-xEnv-xpossave,-yEnvP+dpar[1]+dysave,kZp+dpar[2]+spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv-xpossave,-yEnvP+dpar[1]+dysave,kZp+dpar[2]+spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport3V,volEnvSuppAng3VBC[0],iVolNum++,3, spar); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport3V,volEnvSuppAng3VBC[2],iVolNum++,3, spar); @@ -725,8 +723,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dxsave-kAvoidExtrusion; spar[1]=kSizeSupport1H[1]; spar[2]=kSizeSupport1H[2]; - - GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3HBC[0], 0, true, + GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3HBC[0], 0, true, TGeoTranslation(xEnv+xpossave,-yEnvM+dpar[1]+dysave+sparysave,kZm-(dpar[2]-spar[2]))); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3HBC[2], 0, true, TGeoTranslation(-xEnv-xpossave,-yEnvP+dpar[1]+dysave+sparysave,kZp+dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); @@ -749,7 +746,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dxsave-kAvoidExtrusion; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VBC[0], 0, true, TGeoTranslation(xEnv+xpossave,-yEnvM+dpar[1]+dysave,-(kSizeVSupExt[0]+spar[2]))); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VBC[2], 0, true, @@ -802,9 +799,9 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VBC[1], 0, true, - TGeoTranslation(xEnv+xpossave,yEnvM-dpar[1]-dysave,kZm-dpar[2]-spar[2]/2.)); + TGeoTranslation(xEnv+xpossave,yEnvM-dpar[1]-dysave,kZm-dpar[2]-spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VBC[3], 0, true, - TGeoTranslation(-xEnv-xpossave,yEnvP-dpar[1]-dysave,kZp+dpar[2]+spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv-xpossave,yEnvP-dpar[1]-dysave,kZp+dpar[2]+spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport1V,volEnvSuppAng1VBC[1],iVolNum++,3, spar); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport1V,volEnvSuppAng1VBC[3],iVolNum++,3, spar); @@ -837,7 +834,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dxsave-kAvoidExtrusion; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VBC[1], 0, true, TGeoTranslation(xEnv+xpossave,yEnvM-dpar[1]-dysave,-(kSizeVSupExt[0]+spar[2]))); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VBC[3], 0, true, @@ -864,9 +861,10 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VBC[1], 0, true, - TGeoTranslation(xEnv,yEnvM+dpar[1]+dysave,kZm-dpar[2]-spar[2]/2.)); + TGeoTranslation(xEnv,yEnvM+dpar[1]+dysave,kZm-dpar[2]-spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VBC[3], 0, true, - TGeoTranslation(-xEnv,yEnvP+dpar[1]+dysave,kZp+dpar[2]+spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,yEnvP+dpar[1]+dysave,kZp+dpar[2]+spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport3V,volEnvSuppAng3VBC[1],iVolNum++,3, spar); GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport3V,volEnvSuppAng3VBC[3],iVolNum++,3, spar); @@ -897,7 +895,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VBC[1], 0, true, TGeoTranslation(xEnv,yEnvM+dpar[1]+dysave,-(kSizeVSupExt[0]+spar[2]))); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VBC[3], 0, true, @@ -988,13 +986,13 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VD[0], 0, true, - TGeoTranslation(xEnv,-yEnvP-dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,-yEnvP-dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VD[1], 0, true, - TGeoTranslation(xEnv,yEnvP-dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,yEnvP-dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VD[2], 0, true, - TGeoTranslation(-xEnv,-yEnvM-dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,-yEnvM-dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VD[3], 0, true, - TGeoTranslation(-xEnv,yEnvM-dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,yEnvM-dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); for(i=0;i<4;i++) GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport1V,volEnvSuppAng1VD[i],iVolNum++,3, spar); @@ -1038,7 +1036,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VD[0], 0, true, TGeoTranslation(xEnv,-yEnvP-dpar[1],kSizeVSupExt[0]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VD[1], 0, true, @@ -1075,13 +1073,13 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VD[0], 0, true, - TGeoTranslation(xEnv,-yEnvP+dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,-yEnvP+dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VD[1], 0, true, - TGeoTranslation(xEnv,yEnvP+dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,yEnvP+dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VD[2], 0, true, - TGeoTranslation(-xEnv,-yEnvM+dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,-yEnvM+dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VD[3], 0, true, - TGeoTranslation(-xEnv,yEnvM+dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,yEnvM+dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); for(i=0;i<4;i++) GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport3V,volEnvSuppAng3VD[i],iVolNum++,3, spar); @@ -1125,7 +1123,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VD[0], 0, true, TGeoTranslation(xEnv,-yEnvP+dpar[1],kSizeVSupExt[0]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VD[1], 0, true, @@ -1230,13 +1228,13 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VE[0], 0, true, - TGeoTranslation(xEnv,-yEnvM-dpar[1],kZm-dpar[2]-spar[2]/2.)); + TGeoTranslation(xEnv,-yEnvM-dpar[1],kZm-dpar[2]-spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VE[1], 0, true, - TGeoTranslation(xEnv,yEnvM-dpar[1],kZm-dpar[2]-spar[2]/2.)); + TGeoTranslation(xEnv,yEnvM-dpar[1],kZm-dpar[2]-spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VE[2], 0, true, - TGeoTranslation(-xEnv,-yEnvP-dpar[1],kZp+dpar[2]+spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,-yEnvP-dpar[1],kZp+dpar[2]+spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VE[3], 0, true, - TGeoTranslation(-xEnv,yEnvP-dpar[1],kZp+dpar[2]+spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,yEnvP-dpar[1],kZp+dpar[2]+spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); for(i=0;i<4;i++) GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport1V,volEnvSuppAng1VE[i],iVolNum++,3, spar); @@ -1280,7 +1278,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VE[0], 0, true, TGeoTranslation(xEnv,-yEnvM-dpar[1],-(kSizeVSupExt[0]+spar[2]))); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VE[1], 0, true, @@ -1317,13 +1315,13 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VE[0], 0, true, - TGeoTranslation(xEnv,-yEnvM+dpar[1],kZm-dpar[2]-spar[2]/2.)); + TGeoTranslation(xEnv,-yEnvM+dpar[1],kZm-dpar[2]-spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VE[1], 0, true, - TGeoTranslation(xEnv,yEnvM+dpar[1],kZm-dpar[2]-spar[2]/2.)); + TGeoTranslation(xEnv,yEnvM+dpar[1],kZm-dpar[2]-spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VE[2], 0, true, - TGeoTranslation(-xEnv,-yEnvP+dpar[1],kZp+dpar[2]+spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,-yEnvP+dpar[1],kZp+dpar[2]+spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VE[3], 0, true, - TGeoTranslation(-xEnv,yEnvP+dpar[1],kZp+dpar[2]+spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,yEnvP+dpar[1],kZp+dpar[2]+spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); for(i=0;i<4;i++) GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport3V,volEnvSuppAng3VE[i],iVolNum++,3, spar); @@ -1367,7 +1365,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VE[0], 0, true, TGeoTranslation(xEnv,-yEnvM+dpar[1],-(kSizeVSupExt[0]+spar[2]))); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VE[1], 0, true, @@ -1472,13 +1470,13 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VF[0], 0, true, - TGeoTranslation(xEnv,-yEnvP-dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,-yEnvP-dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VF[1], 0, true, - TGeoTranslation(xEnv,yEnvP-dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,yEnvP-dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VF[2], 0, true, - TGeoTranslation(-xEnv,-yEnvM-dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,-yEnvM-dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng1VF[3], 0, true, - TGeoTranslation(-xEnv,yEnvM-dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,yEnvM-dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); for(i=0;i<4;i++) GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport1V,volEnvSuppAng1VF[i],iVolNum++,3, spar); @@ -1521,7 +1519,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VF[0], 0, true, TGeoTranslation(xEnv,-yEnvP-dpar[1],kSizeVSupExt[0]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng2VF[1], 0, true, @@ -1558,13 +1556,13 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[2]=kSizeSupport1V[2]; sparysave=spar[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VF[0], 0, true, - TGeoTranslation(xEnv,-yEnvP+dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,-yEnvP+dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VF[1], 0, true, - TGeoTranslation(xEnv,yEnvP+dpar[1],kZp+dpar[2]+spar[2]/2.)); + TGeoTranslation(xEnv,yEnvP+dpar[1],kZp+dpar[2]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VF[2], 0, true, - TGeoTranslation(-xEnv,-yEnvM+dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,-yEnvM+dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng3VF[3], 0, true, - TGeoTranslation(-xEnv,yEnvM+dpar[1],kZm-dpar[2]-spar[2]/2.),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); + TGeoTranslation(-xEnv,yEnvM+dpar[1],kZm-dpar[2]-spar[2]),TGeoRotation("rot1",90.,180.,90.,90.,180.,0.)); for(i=0;i<4;i++) GetEnvelopes(16+icount)->AddEnvelopeConstituentParam(volAluAngSupport3V,volEnvSuppAng3VF[i],iVolNum++,3, spar); @@ -1607,7 +1605,7 @@ void AliMUONTriggerGeometryBuilder::CreateGeometry() spar[0]=dpar[0]; spar[1]=kSizeSupport2V[1]; spar[2]=kSizeSupport2V[2]; - sparysave=spar[1]; + sparysave=spar[1]+kSizeSupport2H[1]; GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VF[0], 0, true, TGeoTranslation(xEnv,-yEnvP+dpar[1],kSizeVSupExt[0]+spar[2])); GetEnvelopes(16+icount)->AddEnvelope(volEnvSuppAng4VF[1], 0, true,