#include <TVirtualMC.h>
#include <TGeoMatrix.h>
+#include <TArrayI.h>
#include "AliLog.h"
#include "AliRun.h"
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};
// 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)) -
par[0] = AliMUONConstants::Rmin(5+istation);
par[1] = AliMUONConstants::Rmax(5+istation);
Char_t volName[6];
- sprintf(volName,"%s%d", "SC",11+icount);
+ snprintf(volName,6,"%s%d", "SC",11+icount);
gMC->Gsvolu(volName,"TUBE", idAir, par, 3);
//SetVolume(10+icount, volName);
// Float_t zpos = AliMUONConstants::DefaultChamberZ(10+icount);
tpar[0] = (kXMAX/2.) * zRatio;
if (iline==5) tpar[0] = ((kXMAX-kXMED)/2.)*zRatio;
if (icolumn==0)
- sprintf(volEnv[i],"S%dR%d",icount,iline);
+ snprintf(volEnv[i],5,"S%dR%d",icount,iline);
else
- sprintf(volEnv[i],"S%dL%d",icount,iline);
+ snprintf(volEnv[i],5,"S%dL%d",icount,iline);
// gMC->Gsvolu(volEnv[i],"BOX",idAir,tpar,0);
i++;
}
// chamber prototype
tpar[0]= 0.;
tpar[1]= 0.;
- tpar[2]= 0.; char volAlu[5]; // Alu
+ tpar[2]= 0.;
+ char volAlu[5]; // Alu
char volBak[5]; // Bakelite
char volGaz[5]; // Gas streamer
- sprintf(volAlu,"SC%dA",icount+1);
- sprintf(volBak,"SB%dA",icount+1);
- sprintf(volGaz,"S%dG",icount+11);
+ snprintf(volAlu,5,"SC%dA",icount+1);
+ snprintf(volBak,5,"SB%dA",icount+1);
+ snprintf(volGaz,5,"S%dG",icount+11);
gMC->Gsvolu(volAlu,"BOX",idAlu1,tpar,0); // Al
gMC->Gsvolu(volBak,"BOX",idtmed[1107],tpar,0); // Bakelite
gMC->Gsvolu(volGaz,"BOX",idtmed[1106],tpar,0); // Gas streamer
// RPC supports (vertical)
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++)
+ snprintf(volAluSupport,5,"SAL%d",icount+1);
+ snprintf(volAirSupport,5,"SAI%d",icount+1);
+ char volEnvSupport[12][7];
for(Int_t ii=0;ii<8;ii++){
- sprintf(volEnvSupport[ii],"A%dV%d",icount+1,ii);
+ snprintf(volEnvSupport[ii],7,"SEA%dV%d",icount+1,ii);
}
tpar[0]= 0.;
tpar[1]= 0.;
// supports for cables
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];
+ snprintf(volAluSupportH,6,"SALH%d",icount+1);
+ snprintf(volAirSupportH,6,"SAIH%d",icount+1);
+ 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)snprintf(volEnvSupportHA[3*jj+ii],8,"SA%dHA%d",icount+1,3*jj+ii);
+ snprintf(volEnvSupportHBC[6*jj+ii],8,"SA%dHB%d",icount+1,6*jj+ii);
+ snprintf(volEnvSupportHD[6*jj+ii],8,"SA%dHD%d",icount+1,6*jj+ii);
+ snprintf(volEnvSupportHE[6*jj+ii],8,"SA%dHE%d",icount+1,6*jj+ii);
+ snprintf(volEnvSupportHF[6*jj+ii],8,"SA%dHF%d",icount+1,6*jj+ii);
}
}
tpar[0]= 0.;
// Angular supports for chambers
char volAluAngSupport1V[6],volAluAngSupport1H[6];
- sprintf(volAluAngSupport1H,"SA1H%d",icount+1);
- sprintf(volAluAngSupport1V,"SA1V%d",icount+1);
+ snprintf(volAluAngSupport1H,6,"SA1H%d",icount+1);
+ snprintf(volAluAngSupport1V,6,"SA1V%d",icount+1);
char volAluAngSupport2V[6],volAluAngSupport2H[6];
- sprintf(volAluAngSupport2H,"SA2H%d",icount+1);
- sprintf(volAluAngSupport2V,"SA2V%d",icount+1);
+ snprintf(volAluAngSupport2H,6,"SA2H%d",icount+1);
+ snprintf(volAluAngSupport2V,6,"SA2V%d",icount+1);
char volAluAngSupport3V[6],volAluAngSupport3H[6];
- sprintf(volAluAngSupport3H,"SA3H%d",icount+1);
- sprintf(volAluAngSupport3V,"SA3V%d",icount+1);
+ snprintf(volAluAngSupport3H,6,"SA3H%d",icount+1);
+ snprintf(volAluAngSupport3V,6,"SA3V%d",icount+1);
char volAluAngSupport4V[6],volAluAngSupport4H[6];
- sprintf(volAluAngSupport4H,"SA4H%d",icount+1);
- sprintf(volAluAngSupport4V,"SA4V%d",icount+1);
+ snprintf(volAluAngSupport4H,6,"SA4H%d",icount+1);
+ snprintf(volAluAngSupport4V,6,"SA4V%d",icount+1);
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];
+ snprintf(volAluAngSupportXH,6,"SAXH%d",icount+1);
+ snprintf(volAluAngSupportXV,6,"SAXV%d",icount+1);
+ 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)snprintf(volEnvSuppAng1HA[ii],7,"SH1%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAng1HBC[ii],7,"SH1%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAng1HD[ii],7,"SH1%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAng1HE[ii],7,"SH1%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAng1HF[ii],7,"SH1%dF%d",icount+1,ii);
+ if(ii<2)snprintf(volEnvSuppAng1VA[ii],7,"SV1%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAng1VBC[ii],7,"SV1%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAng1VD[ii],7,"SV1%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAng1VE[ii],7,"SV1%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAng1VF[ii],7,"SV1%dF%d",icount+1,ii);
+ if(ii<2)snprintf(volEnvSuppAng2HA[ii],7,"SH2%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAng2HBC[ii],7,"SH2%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAng2HD[ii],7,"SH2%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAng2HE[ii],7,"SH2%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAng2HF[ii],7,"SH2%dF%d",icount+1,ii);
+ if(ii<2)snprintf(volEnvSuppAng2VA[ii],7,"SV2%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAng2VBC[ii],7,"SV2%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAng2VD[ii],7,"SV2%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAng2VE[ii],7,"SV2%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAng2VF[ii],7,"SV2%dF%d",icount+1,ii);
+ if(ii<2)snprintf(volEnvSuppAng3HA[ii],7,"SH3%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAng3HBC[ii],7,"SH3%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAng3HD[ii],7,"SH3%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAng3HE[ii],7,"SH3%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAng3HF[ii],7,"SH3%dF%d",icount+1,ii);
+ if(ii<2)snprintf(volEnvSuppAng3VA[ii],7,"SV3%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAng3VBC[ii],7,"SV3%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAng3VD[ii],7,"SV3%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAng3VE[ii],7,"SV3%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAng3VF[ii],7,"SV3%dF%d",icount+1,ii);
+ if(ii<2)snprintf(volEnvSuppAng4HA[ii],7,"SH4%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAng4HBC[ii],7,"SH4%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAng4HD[ii],7,"SH4%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAng4HE[ii],7,"SH4%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAng4HF[ii],7,"SH4%dF%d",icount+1,ii);
+ if(ii<2)snprintf(volEnvSuppAng4VA[ii],7,"SV4%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAng4VBC[ii],7,"SV4%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAng4VD[ii],7,"SV4%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAng4VE[ii],7,"SV4%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAng4VF[ii],7,"SV4%dF%d",icount+1,ii);
+ if(ii<2)snprintf(volEnvSuppAngXHA[ii],7,"SHX%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAngXHBC[ii],7,"SHX%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAngXHD[ii],7,"SHX%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAngXHE[ii],7,"SHX%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAngXHF[ii],7,"SHX%dF%d",icount+1,ii);
+ if(ii<2)snprintf(volEnvSuppAngXVA[ii],7,"SVX%dA%d",icount+1,ii);
+ snprintf(volEnvSuppAngXVBC[ii],7,"SVX%dB%d",icount+1,ii);
+ snprintf(volEnvSuppAngXVD[ii],7,"SVX%dD%d",icount+1,ii);
+ snprintf(volEnvSuppAngXVE[ii],7,"SVX%dE%d",icount+1,ii);
+ snprintf(volEnvSuppAngXVF[ii],7,"SVX%dF%d",icount+1,ii);
}
tpar[0]= 0.;
tpar[1]= 0.;
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];
+ snprintf(volInoxGasPipe,7,"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)snprintf(volEnvInoxGasPipe1A[ii],7,"SP1%dA%d",icount+1,ii);
+ snprintf(volEnvInoxGasPipe1BC[ii],8,"SP1%dBC%d",icount+1,ii);
+ snprintf(volEnvInoxGasPipe1D[ii],7,"SP1%dD%d",icount+1,ii);
+ snprintf(volEnvInoxGasPipe1E[ii],7,"SP1%dE%d",icount+1,ii);
+ snprintf(volEnvInoxGasPipe1F[ii],7,"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)snprintf(volEnvInoxGasPipe2A[ii],7,"SP2%dA%d",icount+1,ii);
+ snprintf(volEnvInoxGasPipe2BC[ii],8,"SP2%dBC%d",icount+1,ii);
+ snprintf(volEnvInoxGasPipe2D[ii],7,"SP2%dD%d",icount+1,ii);
+ snprintf(volEnvInoxGasPipe2E[ii],7,"SP2%dE%d",icount+1,ii);
+ snprintf(volEnvInoxGasPipe2F[ii],7,"SP2%dF%d",icount+1,ii);
}
tpar[0]= 0.;
tpar[1]= 0.;
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);
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,
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);
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,
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);
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,
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);
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.));
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,
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);
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,
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);
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,
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);
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,
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);
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,
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);
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,
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);
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,
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);
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,
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);
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,
{
/// Defines the transformations for the trigger chambers.
+ TGeoRotation st345inclination("rotbeam");
+ st345inclination.RotateX(-AliMUONConstants::St345Inclination());
+
Double_t zpos1= AliMUONConstants::DefaultChamberZ(10);
- SetTranslation(16, TGeoTranslation(0., 0., zpos1));
+ SetTransformation(16, TGeoTranslation(0., 0, zpos1), st345inclination);
zpos1= AliMUONConstants::DefaultChamberZ(11);
- SetTranslation(17, TGeoTranslation(0., 0., zpos1));
+ SetTransformation(17, TGeoTranslation(0., 0, zpos1), st345inclination);
zpos1= AliMUONConstants::DefaultChamberZ(12);
- SetTranslation(18, TGeoTranslation(0., 0., zpos1));
+ SetTransformation(18, TGeoTranslation(0., 0, zpos1), st345inclination);
zpos1= AliMUONConstants::DefaultChamberZ(13);
- SetTranslation(19, TGeoTranslation(0., 0., zpos1));
+ SetTransformation(19, TGeoTranslation(0., 0, zpos1), st345inclination);
}
//______________________________________________________________________________
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff