X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDgeometry.cxx;h=83e6b8ae57c687d61707586f7aeda11b417e8c92;hb=d41c0c328c5594a38d685e3d6e10f47f703e4932;hp=9d44eeae74edfedfd18d6c4d4211e88f88c63a1f;hpb=075abeb7efa892991585bc2f4bc45e300e7154db;p=u%2Fmrichter%2FAliRoot.git diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx index 9d44eeae74e..83e6b8ae57c 100644 --- a/TRD/AliTRDgeometry.cxx +++ b/TRD/AliTRDgeometry.cxx @@ -24,11 +24,11 @@ #include #include #include +#include #include "AliLog.h" #include "AliAlignObjParams.h" -#include "AliTRDcalibDB.h" #include "AliTRDgeometry.h" #include "AliTRDpadPlane.h" @@ -195,32 +195,32 @@ ClassImp(AliTRDgeometry) const Double_t AliTRDgeometry::fgkXtrdBeg = 288.43; // Values depend on position of TRD const Double_t AliTRDgeometry::fgkXtrdEnd = 366.33; // mother volume inside space frame !!! -//_____________________________________________________________________________ -AliTRDgeometry::AliTRDgeometry() - :AliGeometry() - ,fClusterMatrixArray(0) - ,fPadPlaneArray(0) -{ - // - // AliTRDgeometry default constructor - // + // The outer width of the chambers + const Float_t AliTRDgeometry::fgkCwidth[kNlayer] = { 90.4, 94.8, 99.3, 103.7, 108.1, 112.6 }; + + // The outer lengths of the chambers + // Includes the spacings between the chambers! + const Float_t AliTRDgeometry::fgkClength[kNlayer][kNstack] = { { 124.0, 124.0, 110.0, 124.0, 124.0 } + , { 124.0, 124.0, 110.0, 124.0, 124.0 } + , { 131.0, 131.0, 110.0, 131.0, 131.0 } + , { 138.0, 138.0, 110.0, 138.0, 138.0 } + , { 145.0, 145.0, 110.0, 145.0, 145.0 } + , { 147.0, 147.0, 110.0, 147.0, 147.0 } }; - Init(); + Char_t AliTRDgeometry::fgSMstatus[kNsector] = { 1, 1, 1, 1, 1, 1, 1, 1, 1 + , 1, 1, 1, 1, 1, 1, 1, 1, 1 }; -} + TObjArray* AliTRDgeometry::fgClusterMatrixArray = NULL; + + TObjArray* AliTRDgeometry::fgPadPlaneArray = NULL; //_____________________________________________________________________________ -AliTRDgeometry::AliTRDgeometry(const AliTRDgeometry &g) - :AliGeometry(g) - ,fClusterMatrixArray(0) - ,fPadPlaneArray(0) +AliTRDgeometry::AliTRDgeometry() { // - // AliTRDgeometry copy constructor + // AliTRDgeometry default constructor // - Init(); - } //_____________________________________________________________________________ @@ -230,84 +230,6 @@ AliTRDgeometry::~AliTRDgeometry() // AliTRDgeometry destructor // - if (fClusterMatrixArray) { - fClusterMatrixArray->Delete(); - delete fClusterMatrixArray; - fClusterMatrixArray = 0; - } - - if (fPadPlaneArray) { - fPadPlaneArray->Delete(); - delete fPadPlaneArray; - fPadPlaneArray = 0; - } - -} - -//_____________________________________________________________________________ -AliTRDgeometry &AliTRDgeometry::operator=(const AliTRDgeometry &g) -{ - // - // Assignment operator - // - - if (this != &g) { - Init(); - } - - return *this; - -} - -//_____________________________________________________________________________ -void AliTRDgeometry::Init() -{ - // - // Initializes the geometry parameter - // - - Int_t istack; - Int_t ilayer; - Int_t isector; - - // The outer width of the chambers - fCwidth[0] = 90.4; - fCwidth[1] = 94.8; - fCwidth[2] = 99.3; - fCwidth[3] = 103.7; - fCwidth[4] = 108.1; - fCwidth[5] = 112.6; - - // The outer lengths of the chambers - // Includes the spacings between the chambers! - Float_t length[kNlayer][kNstack] = { { 124.0, 124.0, 110.0, 124.0, 124.0 } - , { 124.0, 124.0, 110.0, 124.0, 124.0 } - , { 131.0, 131.0, 110.0, 131.0, 131.0 } - , { 138.0, 138.0, 110.0, 138.0, 138.0 } - , { 145.0, 145.0, 110.0, 145.0, 145.0 } - , { 147.0, 147.0, 110.0, 147.0, 147.0 } }; - - for (istack = 0; istack < kNstack; istack++) { - for (ilayer = 0; ilayer < kNlayer; ilayer++) { - fClength[ilayer][istack] = length[ilayer][istack]; - } - } - - // The rotation matrix elements - Float_t phi = 0.0; - for (isector = 0; isector < fgkNsector; isector++) { - phi = 2.0 * TMath::Pi() / (Float_t) fgkNsector * ((Float_t) isector + 0.5); - fRotB11[isector] = TMath::Cos(phi); - fRotB12[isector] = TMath::Sin(phi); - fRotB21[isector] = TMath::Sin(phi); - fRotB22[isector] = TMath::Cos(phi); - } - - // SM status - for (Int_t i = 0; i < kNsector; i++) { - fSMstatus[i] = 1; - } - } //_____________________________________________________________________________ @@ -317,16 +239,14 @@ void AliTRDgeometry::CreatePadPlaneArray() // Creates the array of AliTRDpadPlane objects // - if (fPadPlaneArray) { - fPadPlaneArray->Delete(); - delete fPadPlaneArray; - } + if (fgPadPlaneArray) + return; - fPadPlaneArray = new TObjArray(fgkNlayer * fgkNstack); + fgPadPlaneArray = new TObjArray(fgkNlayer * fgkNstack); for (Int_t ilayer = 0; ilayer < fgkNlayer; ilayer++) { for (Int_t istack = 0; istack < fgkNstack; istack++) { Int_t ipp = GetDetectorSec(ilayer,istack); - fPadPlaneArray->AddAt(CreatePadPlane(ilayer,istack),ipp); + fgPadPlaneArray->AddAt(CreatePadPlane(ilayer,istack),ipp); } } @@ -357,150 +277,125 @@ AliTRDpadPlane *AliTRDgeometry::CreatePadPlane(Int_t ilayer, Int_t istack) // // The pad plane parameter // + const Float_t kTiltAngle = 2.0; switch (ilayer) { case 0: if (istack == 2) { // L0C0 type padPlane->SetNrows(12); padPlane->SetLength(108.0); - padPlane->SetWidth(92.2); padPlane->SetLengthOPad(8.0); - padPlane->SetWidthOPad(0.515); padPlane->SetLengthIPad(9.0); - padPlane->SetWidthIPad(0.635); - padPlane->SetTiltingAngle(2.0); } else { // L0C1 type padPlane->SetNrows(16); padPlane->SetLength(122.0); - padPlane->SetWidth(92.2); padPlane->SetLengthOPad(7.5); - padPlane->SetWidthOPad(0.515); padPlane->SetLengthIPad(7.5); - padPlane->SetWidthIPad(0.635); - padPlane->SetTiltingAngle(2.0); } + padPlane->SetWidth(92.2); + padPlane->SetWidthOPad(0.515); + padPlane->SetWidthIPad(0.635); + padPlane->SetTiltingAngle(-kTiltAngle); break; case 1: if (istack == 2) { // L1C0 type padPlane->SetNrows(12); padPlane->SetLength(108.0); - padPlane->SetWidth(96.6); padPlane->SetLengthOPad(8.0); - padPlane->SetWidthOPad(0.585); padPlane->SetLengthIPad(9.0); - padPlane->SetWidthIPad(0.665); - padPlane->SetTiltingAngle(-2.0); } else { // L1C1 type padPlane->SetNrows(16); padPlane->SetLength(122.0); - padPlane->SetWidth(96.6); padPlane->SetLengthOPad(7.5); - padPlane->SetWidthOPad(0.585); padPlane->SetLengthIPad(7.5); - padPlane->SetWidthIPad(0.665); - padPlane->SetTiltingAngle(-2.0); } + padPlane->SetWidth(96.6); + padPlane->SetWidthOPad(0.585); + padPlane->SetWidthIPad(0.665); + padPlane->SetTiltingAngle(kTiltAngle); break; case 2: if (istack == 2) { // L2C0 type padPlane->SetNrows(12); padPlane->SetLength(108.0); - padPlane->SetWidth(101.1); padPlane->SetLengthOPad(8.0); - padPlane->SetWidthOPad(0.705); padPlane->SetLengthIPad(9.0); - padPlane->SetWidthIPad(0.695); - padPlane->SetTiltingAngle(2.0); } else { // L2C1 type padPlane->SetNrows(16); padPlane->SetLength(129.0); - padPlane->SetWidth(101.1); padPlane->SetLengthOPad(7.5); - padPlane->SetWidthOPad(0.705); padPlane->SetLengthIPad(8.0); - padPlane->SetWidthIPad(0.695); - padPlane->SetTiltingAngle(2.0); } + padPlane->SetWidth(101.1); + padPlane->SetWidthOPad(0.705); + padPlane->SetWidthIPad(0.695); + padPlane->SetTiltingAngle(-kTiltAngle); break; case 3: if (istack == 2) { // L3C0 type padPlane->SetNrows(12); padPlane->SetLength(108.0); - padPlane->SetWidth(105.5); padPlane->SetLengthOPad(8.0); - padPlane->SetWidthOPad(0.775); padPlane->SetLengthIPad(9.0); - padPlane->SetWidthIPad(0.725); - padPlane->SetTiltingAngle(-2.0); } else { // L3C1 type padPlane->SetNrows(16); padPlane->SetLength(136.0); - padPlane->SetWidth(105.5); padPlane->SetLengthOPad(7.5); - padPlane->SetWidthOPad(0.775); padPlane->SetLengthIPad(8.5); - padPlane->SetWidthIPad(0.725); - padPlane->SetTiltingAngle(-2.0); } + padPlane->SetWidth(105.5); + padPlane->SetWidthOPad(0.775); + padPlane->SetWidthIPad(0.725); + padPlane->SetTiltingAngle(kTiltAngle); break; case 4: if (istack == 2) { // L4C0 type padPlane->SetNrows(12); padPlane->SetLength(108.0); - padPlane->SetWidth(109.9); padPlane->SetLengthOPad(8.0); - padPlane->SetWidthOPad(0.845); - padPlane->SetLengthIPad(9.0); - padPlane->SetWidthIPad(0.755); - padPlane->SetTiltingAngle(2.0); } else { // L4C1 type padPlane->SetNrows(16); padPlane->SetLength(143.0); - padPlane->SetWidth(109.9); padPlane->SetLengthOPad(7.5); - padPlane->SetWidthOPad(0.845); - padPlane->SetLengthIPad(9.0); - padPlane->SetWidthIPad(0.755); - padPlane->SetTiltingAngle(2.0); } + padPlane->SetWidth(109.9); + padPlane->SetWidthOPad(0.845); + padPlane->SetLengthIPad(9.0); + padPlane->SetWidthIPad(0.755); + padPlane->SetTiltingAngle(-kTiltAngle); break; case 5: if (istack == 2) { // L5C0 type padPlane->SetNrows(12); padPlane->SetLength(108.0); - padPlane->SetWidth(114.4); padPlane->SetLengthOPad(8.0); - padPlane->SetWidthOPad(0.965); - padPlane->SetLengthIPad(9.0); - padPlane->SetWidthIPad(0.785); - padPlane->SetTiltingAngle(-2.0); } else { // L5C1 type padPlane->SetNrows(16); padPlane->SetLength(145.0); - padPlane->SetWidth(114.4); padPlane->SetLengthOPad(8.5); - padPlane->SetWidthOPad(0.965); - padPlane->SetLengthIPad(9.0); - padPlane->SetWidthIPad(0.785); - padPlane->SetTiltingAngle(-2.0); } + padPlane->SetWidth(114.4); + padPlane->SetWidthOPad(0.965); + padPlane->SetLengthIPad(9.0); + padPlane->SetWidthIPad(0.785); + padPlane->SetTiltingAngle(kTiltAngle); break; }; @@ -509,7 +404,7 @@ AliTRDpadPlane *AliTRDgeometry::CreatePadPlane(Int_t ilayer, Int_t istack) // // Row direction // - Double_t row = fClength[ilayer][istack] / 2.0 + Double_t row = fgkClength[ilayer][istack] / 2.0 - fgkRpadW - padPlane->GetLengthRim(); for (Int_t ir = 0; ir < padPlane->GetNrows(); ir++) { @@ -525,7 +420,7 @@ AliTRDpadPlane *AliTRDgeometry::CreatePadPlane(Int_t ilayer, Int_t istack) // // Column direction // - Double_t col = - fCwidth[ilayer] / 2.0 + Double_t col = - fgkCwidth[ilayer] / 2.0 - fgkCroW + padPlane->GetWidthRim(); for (Int_t ic = 0; ic < padPlane->GetNcols(); ic++) { @@ -540,13 +435,13 @@ AliTRDpadPlane *AliTRDgeometry::CreatePadPlane(Int_t ilayer, Int_t istack) } // Calculate the offset to translate from the local ROC system into // the local supermodule system, which is used for clusters - Double_t rowTmp = fClength[ilayer][0] - + fClength[ilayer][1] - + fClength[ilayer][2] / 2.0; + Double_t rowTmp = fgkClength[ilayer][0] + + fgkClength[ilayer][1] + + fgkClength[ilayer][2] / 2.0; for (Int_t jstack = 0; jstack < istack; jstack++) { - rowTmp -= fClength[ilayer][jstack]; + rowTmp -= fgkClength[ilayer][jstack]; } - padPlane->SetPadRowSMOffset(rowTmp - fClength[ilayer][istack]/2.0); + padPlane->SetPadRowSMOffset(rowTmp - fgkClength[ilayer][istack]/2.0); return padPlane; @@ -608,8 +503,9 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed) Float_t parTrd[kNparTrd]; Float_t parCha[kNparCha]; - Char_t cTagV[100]; - Char_t cTagM[100]; + const Int_t kTag = 100; + Char_t cTagV[kTag]; + Char_t cTagM[kTag]; // There are three TRD volumes for the supermodules in order to accomodate // the different arrangements in front of PHOS @@ -660,70 +556,70 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed) // The lower part of the readout chambers (drift volume + radiator) // The aluminum frames - sprintf(cTagV,"UA%02d",iDet); - parCha[0] = fCwidth[ilayer]/2.0; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0; + snprintf(cTagV,kTag,"UA%02d",iDet); + parCha[0] = fgkCwidth[ilayer]/2.0; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0; parCha[2] = fgkCraH/2.0 + fgkCdrH/2.0; gMC->Gsvolu(cTagV,"BOX ",idtmed[1301-1],parCha,kNparCha); // The additional aluminum on the frames // This part has not the correct shape but is just supposed to // represent the missing material. The correct form of the L-shaped // profile would not fit into the alignable volume. - sprintf(cTagV,"UZ%02d",iDet); + snprintf(cTagV,kTag,"UZ%02d",iDet); parCha[0] = fgkCalWmod/2.0; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0; parCha[2] = fgkCalHmod/2.0; gMC->Gsvolu(cTagV,"BOX ",idtmed[1301-1],parCha,kNparCha); // The additional Wacosit on the frames - sprintf(cTagV,"UP%02d",iDet); + snprintf(cTagV,kTag,"UP%02d",iDet); parCha[0] = fgkCwsW/2.0; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0; parCha[2] = fgkCwsH/2.0; gMC->Gsvolu(cTagV,"BOX ",idtmed[1307-1],parCha,kNparCha); // The Wacosit frames - sprintf(cTagV,"UB%02d",iDet); - parCha[0] = fCwidth[ilayer]/2.0 - fgkCalT; + snprintf(cTagV,kTag,"UB%02d",iDet); + parCha[0] = fgkCwidth[ilayer]/2.0 - fgkCalT; parCha[1] = -1.0; parCha[2] = -1.0; gMC->Gsvolu(cTagV,"BOX ",idtmed[1307-1],parCha,kNparCha); // The glue around the radiator - sprintf(cTagV,"UX%02d",iDet); - parCha[0] = fCwidth[ilayer]/2.0 - fgkCalT - fgkCclsT; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCclfT; + snprintf(cTagV,kTag,"UX%02d",iDet); + parCha[0] = fgkCwidth[ilayer]/2.0 - fgkCalT - fgkCclsT; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCclfT; parCha[2] = fgkCraH/2.0; gMC->Gsvolu(cTagV,"BOX ",idtmed[1311-1],parCha,kNparCha); // The inner part of radiator (air) - sprintf(cTagV,"UC%02d",iDet); - parCha[0] = fCwidth[ilayer]/2.0 - fgkCalT - fgkCclsT - fgkCglT; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCclfT - fgkCglT; + snprintf(cTagV,kTag,"UC%02d",iDet); + parCha[0] = fgkCwidth[ilayer]/2.0 - fgkCalT - fgkCclsT - fgkCglT; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCclfT - fgkCglT; parCha[2] = -1.0; gMC->Gsvolu(cTagV,"BOX ",idtmed[1302-1],parCha,kNparCha); // The upper part of the readout chambers (amplification volume) // The Wacosit frames - sprintf(cTagV,"UD%02d",iDet); - parCha[0] = fCwidth[ilayer]/2.0 + fgkCroW; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0; + snprintf(cTagV,kTag,"UD%02d",iDet); + parCha[0] = fgkCwidth[ilayer]/2.0 + fgkCroW; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0; parCha[2] = fgkCamH/2.0; gMC->Gsvolu(cTagV,"BOX ",idtmed[1307-1],parCha,kNparCha); // The inner part of the Wacosit frame (air) - sprintf(cTagV,"UE%02d",iDet); - parCha[0] = fCwidth[ilayer]/2.0 + fgkCroW - fgkCcuTb; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCcuTa; + snprintf(cTagV,kTag,"UE%02d",iDet); + parCha[0] = fgkCwidth[ilayer]/2.0 + fgkCroW - fgkCcuTb; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCcuTa; parCha[2] = -1.; gMC->Gsvolu(cTagV,"BOX ",idtmed[1302-1],parCha,kNparCha); // The back panel, including pad plane and readout boards // The aluminum frames - sprintf(cTagV,"UF%02d",iDet); - parCha[0] = fCwidth[ilayer]/2.0 + fgkCroW; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0; + snprintf(cTagV,kTag,"UF%02d",iDet); + parCha[0] = fgkCwidth[ilayer]/2.0 + fgkCroW; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0; parCha[2] = fgkCroH/2.0; gMC->Gsvolu(cTagV,"BOX ",idtmed[1301-1],parCha,kNparCha); // The inner part of the aluminum frames - sprintf(cTagV,"UG%02d",iDet); - parCha[0] = fCwidth[ilayer]/2.0 + fgkCroW - fgkCauT; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCauT; + snprintf(cTagV,kTag,"UG%02d",iDet); + parCha[0] = fgkCwidth[ilayer]/2.0 + fgkCroW - fgkCauT; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCauT; parCha[2] = -1.0; gMC->Gsvolu(cTagV,"BOX ",idtmed[1302-1],parCha,kNparCha); @@ -735,100 +631,100 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkRMyThick/2.0; - sprintf(cTagV,"URMY%02d",iDet); + snprintf(cTagV,kTag,"URMY%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1327-1],parCha,kNparCha); // Carbon layer (radiator) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkRCbThick/2.0; - sprintf(cTagV,"URCB%02d",iDet); + snprintf(cTagV,kTag,"URCB%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1326-1],parCha,kNparCha); // Araldite layer (radiator) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkRGlThick/2.0; - sprintf(cTagV,"URGL%02d",iDet); + snprintf(cTagV,kTag,"URGL%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1311-1],parCha,kNparCha); // Rohacell layer (radiator) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkRRhThick/2.0; - sprintf(cTagV,"URRH%02d",iDet); + snprintf(cTagV,kTag,"URRH%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1315-1],parCha,kNparCha); // Fiber layer (radiator) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkRFbThick/2.0; - sprintf(cTagV,"URFB%02d",iDet); + snprintf(cTagV,kTag,"URFB%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1328-1],parCha,kNparCha); // Xe/Isobutane layer (drift volume) - parCha[0] = fCwidth[ilayer]/2.0 - fgkCalT - fgkCclsT; - parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCclfT; + parCha[0] = fgkCwidth[ilayer]/2.0 - fgkCalT - fgkCclsT; + parCha[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCclfT; parCha[2] = fgkDrThick/2.0; - sprintf(cTagV,"UJ%02d",iDet); + snprintf(cTagV,kTag,"UJ%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1309-1],parCha,kNparCha); // Xe/Isobutane layer (amplification volume) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkAmThick/2.0; - sprintf(cTagV,"UK%02d",iDet); + snprintf(cTagV,kTag,"UK%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1309-1],parCha,kNparCha); // Cu layer (wire plane) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkWrThick/2.0; - sprintf(cTagV,"UW%02d",iDet); + snprintf(cTagV,kTag,"UW%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1303-1],parCha,kNparCha); // Cu layer (pad plane) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkPPdThick/2.0; - sprintf(cTagV,"UPPD%02d",iDet); + snprintf(cTagV,kTag,"UPPD%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1305-1],parCha,kNparCha); // G10 layer (pad plane) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkPPpThick/2.0; - sprintf(cTagV,"UPPP%02d",iDet); + snprintf(cTagV,kTag,"UPPP%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1313-1],parCha,kNparCha); // Araldite layer (glue) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkPGlThick/2.0; - sprintf(cTagV,"UPGL%02d",iDet); + snprintf(cTagV,kTag,"UPGL%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1311-1],parCha,kNparCha); // Carbon layer (carbon fiber mats) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkPCbThick/2.0; - sprintf(cTagV,"UPCB%02d",iDet); + snprintf(cTagV,kTag,"UPCB%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1326-1],parCha,kNparCha); // Aramide layer (honeycomb) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkPHcThick/2.0; - sprintf(cTagV,"UPHC%02d",iDet); + snprintf(cTagV,kTag,"UPHC%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1310-1],parCha,kNparCha); // G10 layer (PCB readout board) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkPPcThick/2; - sprintf(cTagV,"UPPC%02d",iDet); + snprintf(cTagV,kTag,"UPPC%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1313-1],parCha,kNparCha); // Cu layer (traces in readout board) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkPRbThick/2.0; - sprintf(cTagV,"UPRB%02d",iDet); + snprintf(cTagV,kTag,"UPRB%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1306-1],parCha,kNparCha); // Cu layer (other material on in readout board, incl. screws) parCha[0] = -1.0; parCha[1] = -1.0; parCha[2] = fgkPElThick/2.0; - sprintf(cTagV,"UPEL%02d",iDet); + snprintf(cTagV,kTag,"UPEL%02d",iDet); gMC->Gsvolu(cTagV,"BOX ",idtmed[1304-1],parCha,kNparCha); // @@ -840,112 +736,112 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed) // Lower part // Mylar layers (radiator) zpos = fgkRMyThick/2.0 - fgkCraH/2.0; - sprintf(cTagV,"URMY%02d",iDet); - sprintf(cTagM,"UC%02d",iDet); + snprintf(cTagV,kTag,"URMY%02d",iDet); + snprintf(cTagM,kTag,"UC%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); zpos = -fgkRMyThick/2.0 + fgkCraH/2.0; - sprintf(cTagV,"URMY%02d",iDet); - sprintf(cTagM,"UC%02d",iDet); + snprintf(cTagV,kTag,"URMY%02d",iDet); + snprintf(cTagM,kTag,"UC%02d",iDet); gMC->Gspos(cTagV,2,cTagM,xpos,ypos,zpos,0,"ONLY"); // Carbon layers (radiator) zpos = fgkRCbThick/2.0 + fgkRMyThick - fgkCraH/2.0; - sprintf(cTagV,"URCB%02d",iDet); - sprintf(cTagM,"UC%02d",iDet); + snprintf(cTagV,kTag,"URCB%02d",iDet); + snprintf(cTagM,kTag,"UC%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); zpos = -fgkRCbThick/2.0 - fgkRMyThick + fgkCraH/2.0; - sprintf(cTagV,"URCB%02d",iDet); - sprintf(cTagM,"UC%02d",iDet); + snprintf(cTagV,kTag,"URCB%02d",iDet); + snprintf(cTagM,kTag,"UC%02d",iDet); gMC->Gspos(cTagV,2,cTagM,xpos,ypos,zpos,0,"ONLY"); // Carbon layers (radiator) zpos = fgkRGlThick/2.0 + fgkRCbThick + fgkRMyThick - fgkCraH/2.0; - sprintf(cTagV,"URGL%02d",iDet); - sprintf(cTagM,"UC%02d",iDet); + snprintf(cTagV,kTag,"URGL%02d",iDet); + snprintf(cTagM,kTag,"UC%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); zpos = -fgkRGlThick/2.0 - fgkRCbThick - fgkRMyThick + fgkCraH/2.0; - sprintf(cTagV,"URGL%02d",iDet); - sprintf(cTagM,"UC%02d",iDet); + snprintf(cTagV,kTag,"URGL%02d",iDet); + snprintf(cTagM,kTag,"UC%02d",iDet); gMC->Gspos(cTagV,2,cTagM,xpos,ypos,zpos,0,"ONLY"); // Rohacell layers (radiator) zpos = fgkRRhThick/2.0 + fgkRGlThick + fgkRCbThick + fgkRMyThick - fgkCraH/2.0; - sprintf(cTagV,"URRH%02d",iDet); - sprintf(cTagM,"UC%02d",iDet); + snprintf(cTagV,kTag,"URRH%02d",iDet); + snprintf(cTagM,kTag,"UC%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); zpos = -fgkRRhThick/2.0 - fgkRGlThick - fgkRCbThick - fgkRMyThick + fgkCraH/2.0; - sprintf(cTagV,"URRH%02d",iDet); - sprintf(cTagM,"UC%02d",iDet); + snprintf(cTagV,kTag,"URRH%02d",iDet); + snprintf(cTagM,kTag,"UC%02d",iDet); gMC->Gspos(cTagV,2,cTagM,xpos,ypos,zpos,0,"ONLY"); // Fiber layers (radiator) zpos = 0.0; - sprintf(cTagV,"URFB%02d",iDet); - sprintf(cTagM,"UC%02d",iDet); + snprintf(cTagV,kTag,"URFB%02d",iDet); + snprintf(cTagM,kTag,"UC%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // Xe/Isobutane layer (drift volume) zpos = fgkDrZpos; - sprintf(cTagV,"UJ%02d",iDet); - sprintf(cTagM,"UB%02d",iDet); + snprintf(cTagV,kTag,"UJ%02d",iDet); + snprintf(cTagM,kTag,"UB%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // Upper part // Xe/Isobutane layer (amplification volume) zpos = fgkAmZpos; - sprintf(cTagV,"UK%02d",iDet); - sprintf(cTagM,"UE%02d",iDet); + snprintf(cTagV,kTag,"UK%02d",iDet); + snprintf(cTagM,kTag,"UE%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // Cu layer (wire planes inside amplification volume) zpos = fgkWrZposA; - sprintf(cTagV,"UW%02d",iDet); - sprintf(cTagM,"UK%02d",iDet); + snprintf(cTagV,kTag,"UW%02d",iDet); + snprintf(cTagM,kTag,"UK%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); zpos = fgkWrZposB; - sprintf(cTagV,"UW%02d",iDet); - sprintf(cTagM,"UK%02d",iDet); + snprintf(cTagV,kTag,"UW%02d",iDet); + snprintf(cTagM,kTag,"UK%02d",iDet); gMC->Gspos(cTagV,2,cTagM,xpos,ypos,zpos,0,"ONLY"); // Back panel + pad plane + readout part // Cu layer (pad plane) zpos = fgkPPdThick/2.0 - fgkCroH/2.0; - sprintf(cTagV,"UPPD%02d",iDet); - sprintf(cTagM,"UG%02d",iDet); + snprintf(cTagV,kTag,"UPPD%02d",iDet); + snprintf(cTagM,kTag,"UG%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // G10 layer (pad plane) zpos = fgkPPpThick/2.0 + fgkPPdThick - fgkCroH/2.0; - sprintf(cTagV,"UPPP%02d",iDet); - sprintf(cTagM,"UG%02d",iDet); + snprintf(cTagV,kTag,"UPPP%02d",iDet); + snprintf(cTagM,kTag,"UG%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // Araldite layer (glue) zpos = fgkPGlThick/2.0 + fgkPPpThick + fgkPPdThick - fgkCroH/2.0; - sprintf(cTagV,"UPGL%02d",iDet); - sprintf(cTagM,"UG%02d",iDet); + snprintf(cTagV,kTag,"UPGL%02d",iDet); + snprintf(cTagM,kTag,"UG%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // Carbon layers (carbon fiber mats) zpos = fgkPCbThick/2.0 + fgkPGlThick + fgkPPpThick + fgkPPdThick - fgkCroH/2.0; - sprintf(cTagV,"UPCB%02d",iDet); - sprintf(cTagM,"UG%02d",iDet); + snprintf(cTagV,kTag,"UPCB%02d",iDet); + snprintf(cTagM,kTag,"UG%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); zpos = -fgkPCbThick/2.0 - fgkPPcThick - fgkPRbThick - fgkPElThick + fgkCroH/2.0; - sprintf(cTagV,"UPCB%02d",iDet); - sprintf(cTagM,"UG%02d",iDet); + snprintf(cTagV,kTag,"UPCB%02d",iDet); + snprintf(cTagM,kTag,"UG%02d",iDet); gMC->Gspos(cTagV,2,cTagM,xpos,ypos,zpos,0,"ONLY"); // Aramide layer (honeycomb) zpos = fgkPHcThick/2.0 + fgkPCbThick + fgkPGlThick + fgkPPpThick + fgkPPdThick - fgkCroH/2.0; - sprintf(cTagV,"UPHC%02d",iDet); - sprintf(cTagM,"UG%02d",iDet); + snprintf(cTagV,kTag,"UPHC%02d",iDet); + snprintf(cTagM,kTag,"UG%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // G10 layer (PCB readout board) zpos = -fgkPPcThick/2.0 - fgkPRbThick - fgkPElThick + fgkCroH/2.0; - sprintf(cTagV,"UPPC%02d",iDet); - sprintf(cTagM,"UG%02d",iDet); + snprintf(cTagV,kTag,"UPPC%02d",iDet); + snprintf(cTagM,kTag,"UG%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // Cu layer (traces in readout board) zpos = -fgkPRbThick/2.0 - fgkPElThick + fgkCroH/2.0; - sprintf(cTagV,"UPRB%02d",iDet); - sprintf(cTagM,"UG%02d",iDet); + snprintf(cTagV,kTag,"UPRB%02d",iDet); + snprintf(cTagM,kTag,"UG%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // Cu layer (other materials on readout board, incl. screws) zpos = -fgkPElThick/2.0 + fgkCroH/2.0; - sprintf(cTagV,"UPEL%02d",iDet); - sprintf(cTagM,"UG%02d",iDet); + snprintf(cTagV,kTag,"UPEL%02d",iDet); + snprintf(cTagM,kTag,"UG%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // Position the inner volumes of the chambers in the frames @@ -954,30 +850,30 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed) // The inner part of the radiator (air) zpos = 0.0; - sprintf(cTagV,"UC%02d",iDet); - sprintf(cTagM,"UX%02d",iDet); + snprintf(cTagV,kTag,"UC%02d",iDet); + snprintf(cTagM,kTag,"UX%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // The glue around the radiator zpos = fgkCraH/2.0 - fgkCdrH/2.0 - fgkCraH/2.0; - sprintf(cTagV,"UX%02d",iDet); - sprintf(cTagM,"UB%02d",iDet); + snprintf(cTagV,kTag,"UX%02d",iDet); + snprintf(cTagM,kTag,"UB%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // The lower Wacosit frame inside the aluminum frame zpos = 0.0; - sprintf(cTagV,"UB%02d",iDet); - sprintf(cTagM,"UA%02d",iDet); + snprintf(cTagV,kTag,"UB%02d",iDet); + snprintf(cTagM,kTag,"UA%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // The inside of the upper Wacosit frame zpos = 0.0; - sprintf(cTagV,"UE%02d",iDet); - sprintf(cTagM,"UD%02d",iDet); + snprintf(cTagV,kTag,"UE%02d",iDet); + snprintf(cTagM,kTag,"UD%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); // The inside of the upper aluminum frame zpos = 0.0; - sprintf(cTagV,"UG%02d",iDet); - sprintf(cTagM,"UF%02d",iDet); + snprintf(cTagV,kTag,"UG%02d",iDet); + snprintf(cTagM,kTag,"UF%02d",iDet); gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY"); } @@ -1016,7 +912,7 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed) zpos = 0.0; for (Int_t isector = 0; isector < kNsector; isector++) { if (GetSMstatus(isector)) { - sprintf(cTagV,"BTRD%d",isector); + snprintf(cTagV,kTag,"BTRD%d",isector); switch (isector) { case 13: case 14: @@ -1043,7 +939,7 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed) zpos = 0.0; for (Int_t isector = 0; isector < kNsector; isector++) { if (GetSMstatus(isector)) { - sprintf(cTagV,"BTRD%d",isector); + snprintf(cTagV,kTag,"BTRD%d",isector); gMC->Gspos("UTF1",1,cTagV,xpos, ypos,zpos,0,"ONLY"); gMC->Gspos("UTF2",1,cTagV,xpos,-ypos,zpos,0,"ONLY"); } @@ -1071,8 +967,9 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) Float_t ypos = 0.0; Float_t zpos = 0.0; - Char_t cTagV[100]; - Char_t cTagM[100]; + const Int_t kTag = 100; + Char_t cTagV[kTag]; + Char_t cTagM[kTag]; const Int_t kNparTRD = 4; Float_t parTRD[kNparTRD]; @@ -1200,7 +1097,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) ypos = 0.0; zpos = 0.0; for (ilayer = 1; ilayer < kNlayer; ilayer++) { - xpos = fCwidth[ilayer]/2.0 + kSRLwidA/2.0 + kSRLdst; + xpos = fgkCwidth[ilayer]/2.0 + kSRLwidA/2.0 + kSRLdst; ypos = 0.0; zpos = fgkVrocsm + fgkSMpltT - fgkCalZpos - fgkSheight/2.0 + fgkCraH + fgkCdrH - fgkCalH - kSRLhgt/2.0 @@ -1236,8 +1133,8 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) for (ilayer = 0; ilayer < kNlayer; ilayer++) { // The aluminum of the cross bars - parSCB[0] = fCwidth[ilayer]/2.0 + kSRLdst/2.0; - sprintf(cTagV,"USF%01d",ilayer); + parSCB[0] = fgkCwidth[ilayer]/2.0 + kSRLdst/2.0; + snprintf(cTagV,kTag,"USF%01d",ilayer); gMC->Gsvolu(cTagV,"BOX ",idtmed[1301-1],parSCB,kNparSCB); // The empty regions in the cross bars @@ -1247,11 +1144,11 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) } parSCI[2] = parSCB[2] - thkSCB; parSCI[0] = parSCB[0]/4.0 - kSCBthk; - sprintf(cTagV,"USI%01d",ilayer); + snprintf(cTagV,kTag,"USI%01d",ilayer); gMC->Gsvolu(cTagV,"BOX ",idtmed[1302-1],parSCI,kNparSCI); - sprintf(cTagV,"USI%01d",ilayer); - sprintf(cTagM,"USF%01d",ilayer); + snprintf(cTagV,kTag,"USI%01d",ilayer); + snprintf(cTagM,kTag,"USF%01d",ilayer); ypos = 0.0; zpos = 0.0; xpos = parSCI[0] + thkSCB/2.0; @@ -1263,17 +1160,17 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) xpos = - 3.0 * parSCI[0] - 1.5 * thkSCB; gMC->Gspos(cTagV,4,cTagM,xpos,ypos,zpos,0,"ONLY"); - sprintf(cTagV,"USF%01d",ilayer); + snprintf(cTagV,kTag,"USF%01d",ilayer); xpos = 0.0; zpos = fgkVrocsm + fgkSMpltT + parSCB[2] - fgkSheight/2.0 + ilayer * (fgkCH + fgkVspace); - ypos = fClength[ilayer][2]/2.0 + fClength[ilayer][1]; + ypos = fgkClength[ilayer][2]/2.0 + fgkClength[ilayer][1]; gMC->Gspos(cTagV, 1,"UTI1", xpos,ypos,zpos,0,"ONLY"); gMC->Gspos(cTagV, 3,"UTI2", xpos,ypos,zpos,0,"ONLY"); gMC->Gspos(cTagV, 5,"UTI3", xpos,ypos,zpos,0,"ONLY"); - ypos = - fClength[ilayer][2]/2.0 - fClength[ilayer][1]; + ypos = - fgkClength[ilayer][2]/2.0 - fgkClength[ilayer][1]; gMC->Gspos(cTagV, 2,"UTI1", xpos,ypos,zpos,0,"ONLY"); gMC->Gspos(cTagV, 4,"UTI2", xpos,ypos,zpos,0,"ONLY"); gMC->Gspos(cTagV, 6,"UTI3", xpos,ypos,zpos,0,"ONLY"); @@ -1289,15 +1186,15 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) for (ilayer = 1; ilayer < kNlayer-1; ilayer++) { - parSCH[0] = fCwidth[ilayer]/2.0; - parSCH[1] = (fClength[ilayer+1][2]/2.0 + fClength[ilayer+1][1] - - fClength[ilayer ][2]/2.0 - fClength[ilayer ][1])/2.0; + parSCH[0] = fgkCwidth[ilayer]/2.0; + parSCH[1] = (fgkClength[ilayer+1][2]/2.0 + fgkClength[ilayer+1][1] + - fgkClength[ilayer ][2]/2.0 - fgkClength[ilayer ][1])/2.0; parSCH[2] = kSCHhgt/2.0; - sprintf(cTagV,"USH%01d",ilayer); + snprintf(cTagV,kTag,"USH%01d",ilayer); gMC->Gsvolu(cTagV,"BOX ",idtmed[1301-1],parSCH,kNparSCH); xpos = 0.0; - ypos = fClength[ilayer][2]/2.0 + fClength[ilayer][1] + parSCH[1]; + ypos = fgkClength[ilayer][2]/2.0 + fgkClength[ilayer][1] + parSCH[1]; zpos = fgkVrocsm + fgkSMpltT - kSCHhgt/2.0 - fgkSheight/2.0 + (ilayer+1) * (fgkCH + fgkVspace); gMC->Gspos(cTagV,1,"UTI1", xpos,ypos,zpos,0,"ONLY"); @@ -1415,7 +1312,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) zpos = 0.4; gMC->Gspos("USD6",1,"USDB", xpos, ypos, zpos,matrix[2],"ONLY"); xpos = 0.0; - ypos = fClength[5][2]/2.0; + ypos = fgkClength[5][2]/2.0; zpos = 0.04; gMC->Gspos("USDB",1,"UTI1", xpos, ypos, zpos, 0,"ONLY"); gMC->Gspos("USDB",2,"UTI1", xpos,-ypos, zpos, 0,"ONLY"); @@ -1429,7 +1326,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) parBOX[2] = 3.00/2.0; gMC->Gsvolu("USD7","BOX ",idtmed[1301-1],parBOX,kNparBOX); xpos = 0.0; - ypos = fClength[5][2]/2.0; + ypos = fgkClength[5][2]/2.0; zpos = fgkSheight/2.0 - fgkSMpltT - 3.00/2.0; gMC->Gspos("USD7",1,"UTI1", xpos, ypos, zpos, 0,"ONLY"); gMC->Gspos("USD7",2,"UTI1", xpos,-ypos, zpos, 0,"ONLY"); @@ -1443,7 +1340,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) parBOX[2] = 1.74/2.0; gMC->Gsvolu("USD8","BOX ",idtmed[1301-1],parBOX,kNparBOX); xpos = 0.0; - ypos = fClength[5][2]/2.0 - 0.1; + ypos = fgkClength[5][2]/2.0 - 0.1; zpos = -fgkSheight/2.0 + fgkSMpltT + 2.27; gMC->Gspos("USD8",1,"UTI1", xpos, ypos, zpos, 0,"ONLY"); gMC->Gspos("USD8",2,"UTI1", xpos,-ypos, zpos, 0,"ONLY"); @@ -1457,7 +1354,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) parBOX[2] = 1.40/2.0; gMC->Gsvolu("USD9","BOX ",idtmed[1301-1],parBOX,kNparBOX); xpos = 0.0; - ypos = fClength[5][2]/2.0; + ypos = fgkClength[5][2]/2.0; zpos = -fgkSheight/2.0 + fgkSMpltT + 1.40/2.0; gMC->Gspos("USD9",1,"UTI1", xpos, ypos, zpos, 0,"ONLY"); gMC->Gspos("USD9",2,"UTI1", xpos,-ypos, zpos, 0,"ONLY"); @@ -1479,7 +1376,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) parTRP[10] = -5.0; gMC->Gsvolu("USDF","TRAP",idtmed[1302-1],parTRP,kNparTRP); xpos = -32.0; - ypos = fClength[5][2]/2.0 + 1.20/2.0 + 0.10/2.0; + ypos = fgkClength[5][2]/2.0 + 1.20/2.0 + 0.10/2.0; zpos = 0.0; gMC->Gspos("USDF",1,"UTI1", xpos, ypos, zpos,matrix[2],"ONLY"); gMC->Gspos("USDF",2,"UTI1", xpos,-ypos, zpos,matrix[2],"ONLY"); @@ -1537,7 +1434,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) gMC->Gspos("USC3",1,"USCB", xpos, ypos, zpos,matrix[4],"ONLY"); gMC->Gspos("USC3",2,"USCB",-xpos, ypos, zpos,matrix[5],"ONLY"); xpos = 0.0; - ypos = fClength[5][2]/2.0 + fClength[5][1] + fClength[5][0]; + ypos = fgkClength[5][2]/2.0 + fgkClength[5][1] + fgkClength[5][0]; zpos = 0.0; gMC->Gspos("USCB",1,"UTI1", xpos, ypos, zpos, 0,"ONLY"); gMC->Gspos("USCB",2,"UTI1", xpos,-ypos, zpos, 0,"ONLY"); @@ -1551,7 +1448,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) parBOX[2] = 3.00/2.0; gMC->Gsvolu("USC4","BOX ",idtmed[1301-1],parBOX,kNparBOX); xpos = 0.0; - ypos = fClength[5][2]/2.0 + fClength[5][1] + fClength[5][0]; + ypos = fgkClength[5][2]/2.0 + fgkClength[5][1] + fgkClength[5][0]; zpos = fgkSheight/2.0 - fgkSMpltT - 3.00/2.0; gMC->Gspos("USC4",1,"UTI1", xpos, ypos, zpos, 0,"ONLY"); gMC->Gspos("USC4",2,"UTI1", xpos,-ypos, zpos, 0,"ONLY"); @@ -1565,7 +1462,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) parBOX[2] = 2.00/2.0; gMC->Gsvolu("USC5","BOX ",idtmed[1301-1],parBOX,kNparBOX); xpos = 0.0; - ypos = fClength[5][2]/2.0 + fClength[5][1] + fClength[5][0]; + ypos = fgkClength[5][2]/2.0 + fgkClength[5][1] + fgkClength[5][0]; zpos = -fgkSheight/2.0 + fgkSMpltT + 2.60; gMC->Gspos("USC5",1,"UTI1", xpos, ypos, zpos, 0,"ONLY"); gMC->Gspos("USC5",2,"UTI1", xpos,-ypos, zpos, 0,"ONLY"); @@ -1579,7 +1476,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed) parBOX[2] = 1.60/2.0; gMC->Gsvolu("USC6","BOX ",idtmed[1301-1],parBOX,kNparBOX); xpos = 0.0; - ypos = fClength[5][2]/2.0 + fClength[5][1] + fClength[5][0]; + ypos = fgkClength[5][2]/2.0 + fgkClength[5][1] + fgkClength[5][0]; zpos = -fgkSheight/2.0 + fgkSMpltT + 1.60/2.0; gMC->Gspos("USC6",1,"UTI1", xpos, ypos, zpos, 0,"ONLY"); gMC->Gspos("USC6",2,"UTI1", xpos,-ypos, zpos, 0,"ONLY"); @@ -1770,7 +1667,8 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) Float_t ypos = 0.0; Float_t zpos = 0.0; - Char_t cTagV[100]; + const Int_t kTag = 100; + Char_t cTagV[kTag]; const Int_t kNparBox = 3; Float_t parBox[kNparBox]; @@ -1835,7 +1733,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) for (ilayer = 1; ilayer < kNlayer; ilayer++) { // Along the chambers - xpos = fCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx; + xpos = fgkCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx; ypos = 0.0; zpos = fgkVrocsm + fgkSMpltT - fgkCalZpos + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz @@ -1857,7 +1755,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) ,matrix[1],"ONLY",parCOL,kNparCOL); // Front of supermodules - xpos = fCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx; + xpos = fgkCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx; ypos = 0.0; zpos = fgkVrocsm + fgkSMpltT - fgkCalZpos + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz @@ -1879,7 +1777,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) for (ilayer = 1; ilayer < kNlayer; ilayer++) { // In baby frame - xpos = fCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx - 2.5; + xpos = fgkCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx - 2.5; ypos = kBBSdz/2.0 - kBBMdz/2.0; zpos = fgkVrocsm + fgkSMpltT - fgkCalZpos + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz @@ -1897,7 +1795,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) for (ilayer = 1; ilayer < kNlayer; ilayer++) { // In back frame - xpos = fCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx - 0.3; + xpos = fgkCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx - 0.3; ypos = -kBFSdz/2.0 + kBFMdz/2.0; zpos = fgkVrocsm + fgkSMpltT - fgkCalZpos + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz @@ -1914,7 +1812,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) // The upper most layer // Along the chambers - xpos = fCwidth[5]/2.0 - kCOLhgt/2.0 - 1.3; + xpos = fgkCwidth[5]/2.0 - kCOLhgt/2.0 - 1.3; ypos = 0.0; zpos = fgkSheight/2.0 - fgkSMpltT - 0.4 - kCOLwid/2.0; parCOL[0] = kCOLwid /2.0; @@ -1933,7 +1831,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) gMC->Gsposp("UTC1",6+9*kNlayer,"UTI3",-xpos,ypos,zpos ,matrix[3],"ONLY",parCOL,kNparCOL); // Front of supermodules - xpos = fCwidth[5]/2.0 - kCOLhgt/2.0 - 1.3; + xpos = fgkCwidth[5]/2.0 - kCOLhgt/2.0 - 1.3; ypos = 0.0; zpos = fgkSheight/2.0 - fgkSMpltT - 0.4 - kCOLwid/2.0; parCOL[0] = kCOLwid /2.0; @@ -1948,7 +1846,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) gMC->Gsposp("UTC3",6+5*kNlayer,"UTF2",-xpos,ypos,zpos ,matrix[3],"ONLY",parCOL,kNparCOL); // In baby frame - xpos = fCwidth[5]/2.0 - kCOLhgt/2.0 - 3.1; + xpos = fgkCwidth[5]/2.0 - kCOLhgt/2.0 - 3.1; ypos = kBBSdz/2.0 - kBBMdz/2.0; zpos = fgkSheight/2.0 - fgkSMpltT - 0.4 - kCOLwid/2.0; parCOL[0] = kCOLwid/2.0; @@ -1959,7 +1857,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) gMC->Gsposp("UTC3",6+7*kNlayer,"BBTRD",-xpos, ypos, zpos ,matrix[3],"ONLY",parCOL,kNparCOL); // In back frame - xpos = fCwidth[5]/2.0 - kCOLhgt/2.0 - 1.3; + xpos = fgkCwidth[5]/2.0 - kCOLhgt/2.0 - 1.3; ypos = -kBFSdz/2.0 + kBFMdz/2.0; zpos = fgkSheight/2.0 - fgkSMpltT - 0.4 - kCOLwid/2.0; parCOL[0] = kCOLwid/2.0; @@ -1992,7 +1890,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) for (ilayer = 1; ilayer < kNlayer; ilayer++) { // Along the chambers - xpos = fCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx; + xpos = fgkCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx; ypos = 0.0; zpos = fgkVrocsm + fgkSMpltT - fgkCalZpos + kPWRhgtA/2.0 - fgkSheight/2.0 + kPWRposz @@ -2014,7 +1912,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) ,matrix[1],"ONLY",parPWR,kNparPWR); // Front of supermodule - xpos = fCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx; + xpos = fgkCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx; ypos = 0.0; zpos = fgkVrocsm + fgkSMpltT - fgkCalZpos + kPWRhgtA/2.0 - fgkSheight/2.0 + kPWRposz @@ -2036,7 +1934,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) for (ilayer = 1; ilayer < kNlayer; ilayer++) { // In baby frame - xpos = fCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx - 2.5; + xpos = fgkCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx - 2.5; ypos = kBBSdz/2.0 - kBBMdz/2.0; zpos = fgkVrocsm + fgkSMpltT - fgkCalZpos + kPWRhgtB/2.0 - fgkSheight/2.0 + kPWRposz @@ -2054,7 +1952,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) for (ilayer = 1; ilayer < kNlayer; ilayer++) { // In back frame - xpos = fCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx - 0.3; + xpos = fgkCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx - 0.3; ypos = -kBFSdz/2.0 + kBFMdz/2.0; zpos = fgkVrocsm + fgkSMpltT - fgkCalZpos + kPWRhgtB/2.0 - fgkSheight/2.0 + kPWRposz @@ -2071,7 +1969,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) // The upper most layer // Along the chambers - xpos = fCwidth[5]/2.0 + kPWRhgtB/2.0 - 1.3; + xpos = fgkCwidth[5]/2.0 + kPWRhgtB/2.0 - 1.3; ypos = 0.0; zpos = fgkSheight/2.0 - fgkSMpltT - 0.6 - kPWRwid/2.0; parPWR[0] = kPWRwid /2.0; @@ -2090,7 +1988,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) gMC->Gsposp("UTP1",6+9*kNlayer,"UTI3",-xpos,ypos,zpos ,matrix[3],"ONLY",parPWR,kNparPWR); // Front of supermodules - xpos = fCwidth[5]/2.0 + kPWRhgtB/2.0 - 1.3; + xpos = fgkCwidth[5]/2.0 + kPWRhgtB/2.0 - 1.3; ypos = 0.0; zpos = fgkSheight/2.0 - fgkSMpltT - 0.6 - kPWRwid/2.0; parPWR[0] = kPWRwid /2.0; @@ -2105,7 +2003,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) gMC->Gsposp("UTP3",6+5*kNlayer,"UTF2",-xpos,ypos,zpos ,matrix[3],"ONLY",parPWR,kNparPWR); // In baby frame - xpos = fCwidth[5]/2.0 + kPWRhgtB/2.0 - 3.0; + xpos = fgkCwidth[5]/2.0 + kPWRhgtB/2.0 - 3.0; ypos = kBBSdz/2.0 - kBBMdz/2.0; zpos = fgkSheight/2.0 - fgkSMpltT - 0.6 - kPWRwid/2.0; parPWR[0] = kPWRwid /2.0; @@ -2116,7 +2014,7 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) gMC->Gsposp("UTP3",6+7*kNlayer,"BBTRD",-xpos, ypos, zpos ,matrix[3],"ONLY",parPWR,kNparPWR); // In back frame - xpos = fCwidth[5]/2.0 + kPWRhgtB/2.0 - 1.3; + xpos = fgkCwidth[5]/2.0 + kPWRhgtB/2.0 - 1.3; ypos = -kBFSdz/2.0 + kBFMdz/2.0; zpos = fgkSheight/2.0 - fgkSMpltT - 0.6 - kPWRwid/2.0; parPWR[0] = kPWRwid /2.0; @@ -2134,18 +2032,18 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) parTube[0] = 0.0; parTube[1] = 2.2/2.0; - parTube[2] = fClength[5][2]/2.0 - fgkHspace/2.0; + parTube[2] = fgkClength[5][2]/2.0 - fgkHspace/2.0; gMC->Gsvolu("UTG1","TUBE",idtmed[1308-1],parTube,kNparTube); parTube[0] = 0.0; parTube[1] = 2.1/2.0; - parTube[2] = fClength[5][2]/2.0 - fgkHspace/2.0; + parTube[2] = fgkClength[5][2]/2.0 - fgkHspace/2.0; gMC->Gsvolu("UTG2","TUBE",idtmed[1309-1],parTube,kNparTube); xpos = 0.0; ypos = 0.0; zpos = 0.0; gMC->Gspos("UTG2",1,"UTG1",xpos,ypos,zpos,0,"ONLY"); for (ilayer = 0; ilayer < kNlayer; ilayer++) { - xpos = fCwidth[ilayer]/2.0 + kCOLwid/2.0 - 1.5; + xpos = fgkCwidth[ilayer]/2.0 + kCOLwid/2.0 - 1.5; ypos = 0.0; zpos = fgkVrocsm + fgkSMpltT + kCOLhgt/2.0 - fgkSheight/2.0 + 5.0 + ilayer * (fgkCH + fgkVspace); @@ -2165,9 +2063,9 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) Int_t iDet = GetDetectorSec(ilayer,istack); - sprintf(cTagV,"UU%02d",iDet); - parServ[0] = fCwidth[ilayer] /2.0; - parServ[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0; + snprintf(cTagV,kTag,"UU%02d",iDet); + parServ[0] = fgkCwidth[ilayer] /2.0; + parServ[1] = fgkClength[ilayer][istack]/2.0 - fgkHspace/2.0; parServ[2] = fgkCsvH /2.0; gMC->Gsvolu(cTagV,"BOX",idtmed[1302-1],parServ,kNparServ); @@ -2202,16 +2100,16 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) Int_t nMCMrow = GetRowMax(ilayer,istack,0); Float_t ySize = (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) / ((Float_t) nMCMrow); - sprintf(cTagV,"UU%02d",iDet); + snprintf(cTagV,kTag,"UU%02d",iDet); for (Int_t iMCMrow = 0; iMCMrow < nMCMrow; iMCMrow++) { xpos = 0.0; ypos = (0.5 + iMCMrow) * ySize - - fClength[ilayer][istack]/2.0 + fgkHspace/2.0; + - fgkClength[ilayer][istack]/2.0 + fgkHspace/2.0; zpos = 0.0 + 0.742/2.0; // The cooling pipes parTube[0] = 0.0; parTube[1] = 0.3/2.0; // Thickness of the cooling pipes - parTube[2] = fCwidth[ilayer]/2.0; + parTube[2] = fgkCwidth[ilayer]/2.0; gMC->Gsposp("UTCP",iCopy+iMCMrow,cTagV,xpos,ypos,zpos ,matrix[2],"ONLY",parTube,kNparTube); } @@ -2236,15 +2134,15 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) Int_t nMCMrow = GetRowMax(ilayer,istack,0); Float_t ySize = (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) / ((Float_t) nMCMrow); - sprintf(cTagV,"UU%02d",iDet); + snprintf(cTagV,kTag,"UU%02d",iDet); for (Int_t iMCMrow = 0; iMCMrow < nMCMrow; iMCMrow++) { xpos = 0.0; ypos = (0.5 + iMCMrow) * ySize - 1.0 - - fClength[ilayer][istack]/2.0 + fgkHspace/2.0; + - fgkClength[ilayer][istack]/2.0 + fgkHspace/2.0; zpos = -0.4 + 0.742/2.0; parTube[0] = 0.0; parTube[1] = 0.2/2.0; // Thickness of the power lines - parTube[2] = fCwidth[ilayer]/2.0; + parTube[2] = fgkCwidth[ilayer]/2.0; gMC->Gsposp("UTPL",iCopy+iMCMrow,cTagV,xpos,ypos,zpos ,matrix[2],"ONLY",parTube,kNparTube); } @@ -2317,22 +2215,22 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) Float_t xSize = (GetChamberWidth(ilayer) - 2.0*fgkCpadW) / ((Float_t) nMCMcol + 6); // Introduce 6 gaps Int_t iMCM[8] = { 1, 2, 3, 5, 8, 9, 10, 12 }; // 0..7 MCM + 6 gap structure - sprintf(cTagV,"UU%02d",iDet); + snprintf(cTagV,kTag,"UU%02d",iDet); for (Int_t iMCMrow = 0; iMCMrow < nMCMrow; iMCMrow++) { for (Int_t iMCMcol = 0; iMCMcol < nMCMcol; iMCMcol++) { xpos = (0.5 + iMCM[iMCMcol]) * xSize + 1.0 - - fCwidth[ilayer]/2.0; + - fgkCwidth[ilayer]/2.0; ypos = (0.5 + iMCMrow) * ySize + 1.0 - - fClength[ilayer][istack]/2.0 + fgkHspace/2.0; + - fgkClength[ilayer][istack]/2.0 + fgkHspace/2.0; zpos = -0.4 + 0.742/2.0; gMC->Gspos("UMCM",iCopy+iMCMrow*10+iMCMcol,cTagV ,xpos,ypos,zpos,0,"ONLY"); // Add two additional smaller cooling pipes on top of the MCMs // to mimic the meandering structure xpos = (0.5 + iMCM[iMCMcol]) * xSize + 1.0 - - fCwidth[ilayer]/2.0; + - fgkCwidth[ilayer]/2.0; ypos = (0.5 + iMCMrow) * ySize - - fClength[ilayer][istack]/2.0 + fgkHspace/2.0; + - fgkClength[ilayer][istack]/2.0 + fgkHspace/2.0; zpos = 0.0 + 0.742/2.0; parTube[0] = 0.0; parTube[1] = 0.3/2.0; // Thickness of the cooling pipes @@ -2401,11 +2299,11 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) for (ilayer = 0; ilayer < kNlayer; ilayer++) { Int_t iDet = GetDetectorSec(ilayer,istack); Int_t iCopy = iDet + 1; - xpos = fCwidth[ilayer]/2.0 - 1.9 * (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) + xpos = fgkCwidth[ilayer]/2.0 - 1.9 * (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) / ((Float_t) GetRowMax(ilayer,istack,0)); - ypos = 0.05 * fClength[ilayer][istack]; + ypos = 0.05 * fgkClength[ilayer][istack]; zpos = kDCSz/2.0 - fgkCsvH/2.0; - sprintf(cTagV,"UU%02d",iDet); + snprintf(cTagV,kTag,"UU%02d",iDet); gMC->Gspos("UDCS",iCopy,cTagV,xpos,ypos,zpos,0,"ONLY"); } } @@ -2461,17 +2359,17 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) for (ilayer = 0; ilayer < kNlayer; ilayer++) { Int_t iDet = GetDetectorSec(ilayer,istack); Int_t iCopy = iDet + 1; - xpos = fCwidth[ilayer]/2.0 - 1.92 * (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) + xpos = fgkCwidth[ilayer]/2.0 - 1.92 * (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) / ((Float_t) GetRowMax(ilayer,istack,0)); ypos = -16.0; zpos = kORIz/2.0 - fgkCsvH/2.0; - sprintf(cTagV,"UU%02d",iDet); + snprintf(cTagV,kTag,"UU%02d",iDet); gMC->Gspos("UORI",iCopy ,cTagV,xpos,ypos,zpos,0,"ONLY"); - xpos = -fCwidth[ilayer]/2.0 + 3.8 * (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) + xpos = -fgkCwidth[ilayer]/2.0 + 3.8 * (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) / ((Float_t) GetRowMax(ilayer,istack,0)); ypos = -16.0; zpos = kORIz/2.0 - fgkCsvH/2.0; - sprintf(cTagV,"UU%02d",iDet); + snprintf(cTagV,kTag,"UU%02d",iDet); gMC->Gspos("UORI",iCopy+kNdet,cTagV,xpos,ypos,zpos,0,"ONLY"); } } @@ -2496,14 +2394,14 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) gMC->Gspos("UTG4",1,"UTG3",xpos,ypos,zpos,0,"ONLY"); for (ilayer = 0; ilayer < kNlayer-1; ilayer++) { xpos = 0.0; - ypos = fClength[ilayer][2]/2.0 - + fClength[ilayer][1] - + fClength[ilayer][0]; + ypos = fgkClength[ilayer][2]/2.0 + + fgkClength[ilayer][1] + + fgkClength[ilayer][0]; zpos = 9.0 - fgkSheight/2.0 + ilayer * (fgkCH + fgkVspace); parTube[0] = 0.0; parTube[1] = 1.5/2.0; - parTube[2] = fCwidth[ilayer]/2.0 - 2.5; + parTube[2] = fgkCwidth[ilayer]/2.0 - 2.5; gMC->Gsposp("UTG3",ilayer+1 ,"UTI1", xpos, ypos, zpos ,matrix[2],"ONLY",parTube,kNparTube); gMC->Gsposp("UTG3",ilayer+1+1*kNlayer,"UTI1", xpos,-ypos, zpos @@ -2623,14 +2521,14 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed) parBox[2] = 7.0/2.0; gMC->Gsvolu("UTPC","BOX ",idtmed[1325-1],parBox,kNparBox); for (ilayer = 0; ilayer < kNlayer-1; ilayer++) { - xpos = fCwidth[ilayer]/2.0 + kPWRwid/2.0; + xpos = fgkCwidth[ilayer]/2.0 + kPWRwid/2.0; ypos = 0.0; zpos = fgkVrocsm + fgkSMpltT + kPWRhgtA/2.0 - fgkSheight/2.0 + kPWRposz + (ilayer+1) * (fgkCH + fgkVspace); gMC->Gspos("UTPC",ilayer ,"UTF1", xpos,ypos,zpos,matrix[0],"ONLY"); gMC->Gspos("UTPC",ilayer+kNlayer,"UTF1",-xpos,ypos,zpos,matrix[1],"ONLY"); } - xpos = fCwidth[5]/2.0 + kPWRhgtA/2.0 - 2.0; + xpos = fgkCwidth[5]/2.0 + kPWRhgtA/2.0 - 2.0; ypos = 0.0; zpos = fgkSheight/2.0 - fgkSMpltT - 2.0; gMC->Gspos("UTPC",5 ,"UTF1", xpos,ypos,zpos,matrix[3],"ONLY"); @@ -2727,8 +2625,9 @@ void AliTRDgeometry::AssembleChamber(Int_t ilayer, Int_t istack) // alignable volume of a single readout chamber // - Char_t cTagM[100]; - Char_t cTagV[100]; + const Int_t kTag = 100; + Char_t cTagV[kTag]; + Char_t cTagM[kTag]; Double_t xpos = 0.0; Double_t ypos = 0.0; @@ -2737,7 +2636,7 @@ void AliTRDgeometry::AssembleChamber(Int_t ilayer, Int_t istack) Int_t idet = GetDetectorSec(ilayer,istack); // Create the assembly for a given ROC - sprintf(cTagM,"UT%02d",idet); + snprintf(cTagM,kTag,"UT%02d",idet); TGeoVolume *roc = new TGeoVolumeAssembly(cTagM); // Add the lower part of the chamber (aluminum frame), @@ -2745,24 +2644,24 @@ void AliTRDgeometry::AssembleChamber(Int_t ilayer, Int_t istack) xpos = 0.0; ypos = 0.0; zpos = fgkCraH/2.0 + fgkCdrH/2.0 - fgkCHsv/2.0; - sprintf(cTagV,"UA%02d",idet); + snprintf(cTagV,kTag,"UA%02d",idet); TGeoVolume *rocA = gGeoManager->GetVolume(cTagV); roc->AddNode(rocA,1,new TGeoTranslation(xpos,ypos,zpos)); // Add the additional aluminum ledges - xpos = fCwidth[ilayer]/2.0 + fgkCalWmod/2.0; + xpos = fgkCwidth[ilayer]/2.0 + fgkCalWmod/2.0; ypos = 0.0; zpos = fgkCraH + fgkCdrH - fgkCalZpos - fgkCalHmod/2.0 - fgkCHsv/2.0; - sprintf(cTagV,"UZ%02d",idet); + snprintf(cTagV,kTag,"UZ%02d",idet); TGeoVolume *rocZ = gGeoManager->GetVolume(cTagV); roc->AddNode(rocZ,1,new TGeoTranslation( xpos,ypos,zpos)); roc->AddNode(rocZ,2,new TGeoTranslation(-xpos,ypos,zpos)); // Add the additional wacosit ledges - xpos = fCwidth[ilayer]/2.0 + fgkCwsW/2.0; + xpos = fgkCwidth[ilayer]/2.0 + fgkCwsW/2.0; ypos = 0.0; zpos = fgkCraH + fgkCdrH - fgkCwsH/2.0 - fgkCHsv/2.0; - sprintf(cTagV,"UP%02d",idet); + snprintf(cTagV,kTag,"UP%02d",idet); TGeoVolume *rocP = gGeoManager->GetVolume(cTagV); roc->AddNode(rocP,1,new TGeoTranslation( xpos,ypos,zpos)); roc->AddNode(rocP,2,new TGeoTranslation(-xpos,ypos,zpos)); @@ -2772,7 +2671,7 @@ void AliTRDgeometry::AssembleChamber(Int_t ilayer, Int_t istack) xpos = 0.0; ypos = 0.0; zpos = fgkCamH/2.0 + fgkCraH + fgkCdrH - fgkCHsv/2.0; - sprintf(cTagV,"UD%02d",idet); + snprintf(cTagV,kTag,"UD%02d",idet); TGeoVolume *rocD = gGeoManager->GetVolume(cTagV); roc->AddNode(rocD,1,new TGeoTranslation(xpos,ypos,zpos)); @@ -2781,7 +2680,7 @@ void AliTRDgeometry::AssembleChamber(Int_t ilayer, Int_t istack) xpos = 0.0; ypos = 0.0; zpos = fgkCroH/2.0 + fgkCamH + fgkCraH + fgkCdrH - fgkCHsv/2.0; - sprintf(cTagV,"UF%02d",idet); + snprintf(cTagV,kTag,"UF%02d",idet); TGeoVolume *rocF = gGeoManager->GetVolume(cTagV); roc->AddNode(rocF,1,new TGeoTranslation(xpos,ypos,zpos)); @@ -2789,18 +2688,18 @@ void AliTRDgeometry::AssembleChamber(Int_t ilayer, Int_t istack) xpos = 0.0; ypos = 0.0; zpos = fgkCsvH/2.0 + fgkCroH + fgkCamH + fgkCraH + fgkCdrH - fgkCHsv/2.0; - sprintf(cTagV,"UU%02d",idet); + snprintf(cTagV,kTag,"UU%02d",idet); TGeoVolume *rocU = gGeoManager->GetVolume(cTagV); roc->AddNode(rocU,1,new TGeoTranslation(xpos,ypos,zpos)); // Place the ROC assembly into the super modules xpos = 0.0; ypos = 0.0; - ypos = fClength[ilayer][0] + fClength[ilayer][1] + fClength[ilayer][2]/2.0; + ypos = fgkClength[ilayer][0] + fgkClength[ilayer][1] + fgkClength[ilayer][2]/2.0; for (Int_t ic = 0; ic < istack; ic++) { - ypos -= fClength[ilayer][ic]; + ypos -= fgkClength[ilayer][ic]; } - ypos -= fClength[ilayer][istack]/2.0; + ypos -= fgkClength[ilayer][istack]/2.0; zpos = fgkVrocsm + fgkSMpltT + fgkCHsv/2.0 - fgkSheight/2.0 + ilayer * (fgkCH + fgkVspace); TGeoVolume *sm1 = gGeoManager->GetVolume("UTI1"); @@ -2816,17 +2715,20 @@ void AliTRDgeometry::AssembleChamber(Int_t ilayer, Int_t istack) } //_____________________________________________________________________________ -Bool_t AliTRDgeometry::RotateBack(Int_t det, Double_t *loc, Double_t *glb) const +Bool_t AliTRDgeometry::RotateBack(Int_t det + , const Double_t * const loc + , Double_t *glb) const { // // Rotates a chambers to transform the corresponding local frame // coordinates into the coordinates of the ALICE restframe . // - Int_t sector = GetSector(det); + Int_t sector = GetSector(det); + Float_t phi = 2.0 * TMath::Pi() / (Float_t) fgkNsector * ((Float_t) sector + 0.5); - glb[0] = loc[0] * fRotB11[sector] - loc[1] * fRotB12[sector]; - glb[1] = loc[0] * fRotB21[sector] + loc[1] * fRotB22[sector]; + glb[0] = loc[0] * TMath::Cos(phi) - loc[1] * TMath::Sin(phi); + glb[1] = loc[0] * TMath::Sin(phi) + loc[1] * TMath::Cos(phi); glb[2] = loc[2]; return kTRUE; @@ -2890,8 +2792,8 @@ Int_t AliTRDgeometry::GetStack(Double_t z, Int_t layer) (layer >= fgkNlayer)) return -1; Int_t istck = fgkNstack; - Double_t zmin; - Double_t zmax; + Double_t zmin = 0.0; + Double_t zmax = 0.0; do { istck--; @@ -2926,12 +2828,12 @@ AliTRDpadPlane *AliTRDgeometry::GetPadPlane(Int_t layer, Int_t stack) // Returns the pad plane for a given plane and stack number // - if (!fPadPlaneArray) { + if (!fgPadPlaneArray) { CreatePadPlaneArray(); } Int_t ipp = GetDetectorSec(layer,stack); - return ((AliTRDpadPlane *) fPadPlaneArray->At(ipp)); + return ((AliTRDpadPlane *) fgPadPlaneArray->At(ipp)); } @@ -2991,6 +2893,9 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray() return kFALSE; } + if(fgClusterMatrixArray) + return kTRUE; + TString volPath; TString vpStr = "ALIC_1/B077_1/BSEGMO"; TString vpApp1 = "_1/BTRD"; @@ -2999,7 +2904,7 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray() TString vpApp3b = "/UTR2_1/UTS2_1/UTI2_1"; TString vpApp3c = "/UTR3_1/UTS3_1/UTI3_1"; - fClusterMatrixArray = new TObjArray(kNdet); + fgClusterMatrixArray = new TObjArray(kNdet); AliAlignObjParams o; for (Int_t iLayer = AliGeomManager::kTRD1; iLayer <= AliGeomManager::kTRD6; iLayer++) { @@ -3020,6 +2925,7 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray() case 13: case 14: case 15: + // Check for holes in from of PHOS if (istack == 2) { continue; } @@ -3036,12 +2942,6 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray() continue; } - // Check for holes in from of PHOS - if (((isector == 13) || (isector == 14) || (isector == 15)) && - (istack == 2)) { - continue; - } - UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule); const char *symname = AliGeomManager::SymName(volid); TGeoPNEntry *pne = gGeoManager->GetAlignableEntry(symname); @@ -3053,11 +2953,11 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray() continue; } if (!strstr(path,"ALIC")) { - AliDebug(1,Form("Not a valid path: %s\n",path)); + AliDebugClass(1,Form("Not a valid path: %s\n",path)); continue; } if (!gGeoManager->cd(path)) { - AliError(Form("Cannot go to path: %s\n",path)); + AliErrorClass(Form("Cannot go to path: %s\n",path)); continue; } TGeoHMatrix *m = gGeoManager->GetCurrentMatrix(); @@ -3076,7 +2976,7 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray() rotSector.RotateZ(sectorAngle); rotMatrix.MultiplyLeft(&rotSector.Inverse()); - fClusterMatrixArray->AddAt(new TGeoHMatrix(rotMatrix),lid); + fgClusterMatrixArray->AddAt(new TGeoHMatrix(rotMatrix),lid); } } @@ -3086,15 +2986,27 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray() } //_____________________________________________________________________________ -Bool_t AliTRDgeometry::ChamberInGeometry(Int_t det) +TGeoHMatrix *AliTRDgeometry::GetClusterMatrix(Int_t det) { // - // Checks whether the given detector is part of the current geometry + // Returns the cluster transformation matrix for a given detector // - if (!fClusterMatrixArray) { - CreateClusterMatrixArray(); + if (!fgClusterMatrixArray) { + if (!CreateClusterMatrixArray()) { + return NULL; + } } + return (TGeoHMatrix *) fgClusterMatrixArray->At(det); + +} + +//_____________________________________________________________________________ +Bool_t AliTRDgeometry::ChamberInGeometry(Int_t det) +{ + // + // Checks whether the given detector is part of the current geometry + // if (!GetClusterMatrix(det)) { return kFALSE; @@ -3136,7 +3048,7 @@ Bool_t AliTRDgeometry::IsOnBoundary(Int_t det, Float_t y, Float_t z, Float_t eps if ((stk < 0) || (stk >= fgkNstack)) return kTRUE; - AliTRDpadPlane *pp = (AliTRDpadPlane*) fPadPlaneArray->At(GetDetectorSec(ly, stk)); + AliTRDpadPlane *pp = (AliTRDpadPlane*) fgPadPlaneArray->At(GetDetectorSec(ly, stk)); if(!pp) return kTRUE; Double_t max = pp->GetRow0();