]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDgeometry.cxx
Fix Coverity defects
[u/mrichter/AliRoot.git] / TRD / AliTRDgeometry.cxx
index c1669fd8050e2e4fc228720002a31cd37ccbc0ae..b2427a6b31c1a479a4964f83a6dd13ba6301727c 100644 (file)
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-
 #include <TGeoManager.h>
 #include <TGeoPhysicalNode.h>
-#include <TGeoMatrix.h>
+#include <TVirtualMC.h>
+#include <TMath.h>
 
 #include "AliLog.h"
-#include "AliRunLoader.h"
-#include "AliAlignObj.h"
 #include "AliAlignObjParams.h"
-#include "AliRun.h"
 
-#include "AliTRD.h"
-#include "AliTRDcalibDB.h"
 #include "AliTRDgeometry.h"
 #include "AliTRDpadPlane.h"
 
@@ -70,6 +65,13 @@ ClassImp(AliTRDgeometry)
   // The super module side plates
   const Float_t  AliTRDgeometry::fgkSMpltT    =   0.2;
 
+  // Vertical spacing of the chambers
+  const Float_t  AliTRDgeometry::fgkVspace    =   1.784;
+  // Horizontal spacing of the chambers
+  const Float_t  AliTRDgeometry::fgkHspace    =   2.0;
+  // Radial distance of the first ROC to the outer plates of the SM
+  const Float_t  AliTRDgeometry::fgkVrocsm    =   1.2;
+
   // Height of different chamber parts
   // Radiator
   const Float_t  AliTRDgeometry::fgkCraH      =   4.8; 
@@ -79,18 +81,26 @@ ClassImp(AliTRDgeometry)
   const Float_t  AliTRDgeometry::fgkCamH      =   0.7;
   // Readout
   const Float_t  AliTRDgeometry::fgkCroH      =   2.316;
-  // Total height
+  // Additional width of the readout chamber frames
+  const Float_t  AliTRDgeometry::fgkCroW      =   0.9;
+  // Services on top of ROC
+  const Float_t  AliTRDgeometry::fgkCsvH      = AliTRDgeometry::fgkVspace 
+                                              -   0.742;
+  // Total height (w/o services)
   const Float_t  AliTRDgeometry::fgkCH        = AliTRDgeometry::fgkCraH
                                               + AliTRDgeometry::fgkCdrH
                                               + AliTRDgeometry::fgkCamH
                                               + AliTRDgeometry::fgkCroH;  
+  // Total height (with services)
 
-  // Vertical spacing of the chambers
-  const Float_t  AliTRDgeometry::fgkVspace    =   1.784;
-  // Horizontal spacing of the chambers
-  const Float_t  AliTRDgeometry::fgkHspace    =   2.0;
-  // Radial distance of the first ROC to the outer plates of the SM
-  const Float_t  AliTRDgeometry::fgkVrocsm    =   1.2;
+  const Float_t  AliTRDgeometry::fgkCHsv      = AliTRDgeometry::fgkCH 
+                                              + AliTRDgeometry::fgkCsvH;
+
+  // Distance of anode wire plane relative to middle of alignable volume
+  const Float_t  AliTRDgeometry::fgkAnodePos  = AliTRDgeometry::fgkCraH 
+                                              + AliTRDgeometry::fgkCdrH 
+                                              + AliTRDgeometry::fgkCamH/2.0
+                                              - AliTRDgeometry::fgkCHsv/2.0;
 
   // Thicknesses of different parts of the chamber frame
   // Lower aluminum frame
@@ -101,15 +111,22 @@ ClassImp(AliTRDgeometry)
   const Float_t  AliTRDgeometry::fgkCclfT     =   1.0;
   // Thickness of glue around radiator
   const Float_t  AliTRDgeometry::fgkCglT      =   0.25;
-  // Upper Wacosit frame
-  const Float_t  AliTRDgeometry::fgkCcuT      =   0.9;
+  // Upper Wacosit frame around amplification region
+  const Float_t  AliTRDgeometry::fgkCcuTa     =   1.0;
+  const Float_t  AliTRDgeometry::fgkCcuTb     =   0.8;
   // Al frame of back panel
   const Float_t  AliTRDgeometry::fgkCauT      =   1.5;
-  // Additional Al of the lower chamber frame
-  const Float_t  AliTRDgeometry::fgkCalW      =   1.11;
-
-  // Additional width of the readout chamber frames
-  const Float_t  AliTRDgeometry::fgkCroW      =   0.9;
+  // Additional Al ledge at the lower chamber frame
+  // Actually the dimensions are not realistic, but 
+  // modified in order to allow to mis-alignment. 
+  // The amount of material is, however, correct 
+  const Float_t  AliTRDgeometry::fgkCalW      =   2.5;
+  const Float_t  AliTRDgeometry::fgkCalH      =   0.4;
+  const Float_t  AliTRDgeometry::fgkCalWmod   =   0.4;
+  const Float_t  AliTRDgeometry::fgkCalHmod   =   2.5;
+  // Additional Wacosit ledge at the lower chamber frame
+  const Float_t  AliTRDgeometry::fgkCwsW      =   1.2;
+  const Float_t  AliTRDgeometry::fgkCwsH      =   0.3;
 
   // Difference of outer chamber width and pad plane width
   const Float_t  AliTRDgeometry::fgkCpadW     =   0.0;
@@ -118,33 +135,43 @@ ClassImp(AliTRDgeometry)
   //
   // Thickness of the the material layers
   //
-  const Float_t  AliTRDgeometry::fgkMyThick   = 0.005;
-  const Float_t  AliTRDgeometry::fgkRaThick   = 0.3233;  
   const Float_t  AliTRDgeometry::fgkDrThick   = AliTRDgeometry::fgkCdrH;    
   const Float_t  AliTRDgeometry::fgkAmThick   = AliTRDgeometry::fgkCamH;
   const Float_t  AliTRDgeometry::fgkXeThick   = AliTRDgeometry::fgkDrThick
                                               + AliTRDgeometry::fgkAmThick;
-  const Float_t  AliTRDgeometry::fgkWrThick   = 0.0002;
-  const Float_t  AliTRDgeometry::fgkCuThick   = 0.0072; 
-  const Float_t  AliTRDgeometry::fgkGlThick   = 0.05;
-  const Float_t  AliTRDgeometry::fgkSuThick   = 0.0919; 
-  const Float_t  AliTRDgeometry::fgkRcThick   = 0.0058;
-  const Float_t  AliTRDgeometry::fgkRpThick   = 0.0632;
-  const Float_t  AliTRDgeometry::fgkRoThick   = 0.0028;
+  const Float_t  AliTRDgeometry::fgkWrThick   = 0.00011;
+
+  const Float_t  AliTRDgeometry::fgkRMyThick  = 0.0015;
+  const Float_t  AliTRDgeometry::fgkRCbThick  = 0.0055;
+  const Float_t  AliTRDgeometry::fgkRGlThick  = 0.0065;
+  const Float_t  AliTRDgeometry::fgkRRhThick  = 0.8;
+  const Float_t  AliTRDgeometry::fgkRFbThick  = fgkCraH - 2.0 * (fgkRMyThick 
+                                                               + fgkRCbThick 
+                                                               + fgkRRhThick);
+
+  const Float_t  AliTRDgeometry::fgkPPdThick  = 0.0025; 
+  const Float_t  AliTRDgeometry::fgkPPpThick  = 0.0356; 
+  const Float_t  AliTRDgeometry::fgkPGlThick  = 0.1428;
+  const Float_t  AliTRDgeometry::fgkPCbThick  = 0.019;
+  const Float_t  AliTRDgeometry::fgkPPcThick  = 0.0486;
+  const Float_t  AliTRDgeometry::fgkPRbThick  = 0.0057;
+  const Float_t  AliTRDgeometry::fgkPElThick  = 0.0029;
+  const Float_t  AliTRDgeometry::fgkPHcThick  = fgkCroH - fgkPPdThick 
+                                                        - fgkPPpThick
+                                                        - fgkPGlThick 
+                                                        - fgkPCbThick * 2.0
+                                                        - fgkPPcThick
+                                                        - fgkPRbThick
+                                                        - fgkPElThick;
 
   //
   // Position of the material layers
   //
-  const Float_t  AliTRDgeometry::fgkRaZpos    =  0.0;
   const Float_t  AliTRDgeometry::fgkDrZpos    =  2.4;
   const Float_t  AliTRDgeometry::fgkAmZpos    =  0.0;
-  const Float_t  AliTRDgeometry::fgkWrZpos    =  0.0;
-  const Float_t  AliTRDgeometry::fgkCuZpos    = -0.9995;
-  const Float_t  AliTRDgeometry::fgkGlZpos    = -0.5; 
-  const Float_t  AliTRDgeometry::fgkSuZpos    =  0.0;
-  const Float_t  AliTRDgeometry::fgkRcZpos    =  1.04;
-  const Float_t  AliTRDgeometry::fgkRpZpos    =  1.0;
-  const Float_t  AliTRDgeometry::fgkRoZpos    =  1.05;
+  const Float_t  AliTRDgeometry::fgkWrZposA   =  0.0;
+  const Float_t  AliTRDgeometry::fgkWrZposB   = -fgkAmThick/2.0 + 0.001;
+  const Float_t  AliTRDgeometry::fgkCalZpos   =  0.3;
 
   const Int_t    AliTRDgeometry::fgkMCMmax    = 16;   
   const Int_t    AliTRDgeometry::fgkMCMrow    = 4;   
@@ -165,11 +192,28 @@ ClassImp(AliTRDgeometry)
                                                 , fgkTime0Base + 4 * (Cheight() + Cspace()) 
                                                 , fgkTime0Base + 5 * (Cheight() + Cspace())};
 
+  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 !!!
+
+  // 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 } };
+
+  TObjArray* AliTRDgeometry::fgClusterMatrixArray = NULL;
+
+  TObjArray* AliTRDgeometry::fgPadPlaneArray = NULL;
+
 //_____________________________________________________________________________
 AliTRDgeometry::AliTRDgeometry()
   :AliGeometry()
-  ,fClusterMatrixArray(0)
-  ,fPadPlaneArray(0)
 {
   //
   // AliTRDgeometry default constructor
@@ -182,8 +226,6 @@ AliTRDgeometry::AliTRDgeometry()
 //_____________________________________________________________________________
 AliTRDgeometry::AliTRDgeometry(const AliTRDgeometry &g)
   :AliGeometry(g)
-  ,fClusterMatrixArray(0)
-  ,fPadPlaneArray(0)
 {
   //
   // AliTRDgeometry copy constructor
@@ -200,18 +242,6 @@ AliTRDgeometry::~AliTRDgeometry()
   // AliTRDgeometry destructor
   //
 
-  if (fClusterMatrixArray) {
-    fClusterMatrixArray->Delete();
-    delete fClusterMatrixArray;
-    fClusterMatrixArray = 0;
-  }
-
-  if (fPadPlaneArray) {
-    fPadPlaneArray->Delete();
-    delete fPadPlaneArray;
-    fPadPlaneArray = 0;
-  }
-
 }
 
 //_____________________________________________________________________________
@@ -236,48 +266,21 @@ 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++) {
+  for (Int_t 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);
   }
-
-  // Initialize the SM status
-  for (isector = 0; isector < fgkNsector; isector++) {
-    SetSMstatus(isector,1);
-  }
  
+  // SM status
+  for (Int_t i = 0; i < kNsector; i++) {
+    fSMstatus[i] = 1;
+  }
+
 }
 
 //_____________________________________________________________________________
@@ -287,16 +290,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);
     }
   }
 
@@ -322,153 +323,130 @@ AliTRDpadPlane *AliTRDgeometry::CreatePadPlane(Int_t ilayer, Int_t istack)
 
   padPlane->SetNcols(144);
 
+  padPlane->SetAnodeWireOffset(0.25);
+
   //
   // 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;
   };
 
@@ -477,7 +455,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++) {
@@ -493,28 +471,28 @@ AliTRDpadPlane *AliTRDgeometry::CreatePadPlane(Int_t ilayer, Int_t istack)
   //
   // Column direction
   //
-  Double_t col = fCwidth[ilayer] / 2.0
-               + fgkCroW
-               - padPlane->GetWidthRim();
+  Double_t col = - fgkCwidth[ilayer] / 2.0
+                 - fgkCroW
+                 + padPlane->GetWidthRim();
   for (Int_t ic = 0; ic < padPlane->GetNcols(); ic++) {
     padPlane->SetPadCol(ic,col);
-    col -= padPlane->GetColSpacing();
+    col += padPlane->GetColSpacing();
     if (ic == 0) {
-      col -= padPlane->GetWidthOPad();
+      col += padPlane->GetWidthOPad();
     }
     else {
-      col -= padPlane->GetWidthIPad();
+      col += padPlane->GetWidthIPad();
     }
   }
   // 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;
 
@@ -524,45 +502,46 @@ AliTRDpadPlane *AliTRDgeometry::CreatePadPlane(Int_t ilayer, Int_t istack)
 void AliTRDgeometry::CreateGeometry(Int_t *idtmed)
 {
   //
-  // Create the TRD geometry without hole
+  // Create the TRD geometry
   //
   //
   // Names of the TRD volumina (xx = detector number):
   //
-  //      Volume (Air) wrapping the readout chamber components
-  //        UTxx    includes: UAxx, UDxx, UFxx, UUxx
-  //
-  //      Volume (Air) wrapping the services (fee + cooling)
-  //        UUxx    the services volume has been reduced by 7.42 mm
-  //                in order to allow shifts in radial direction
-  //
-  //      Lower part of the readout chambers (drift volume + radiator)
-  //
-  //        UAxx    Aluminum frames                 (Al)
-  //        UBxx    Wacosit frames                  (C)
-  //        UXxx    Glue around radiator            (Epoxy)
-  //        UCxx    Inner volumes                   (Air)
-  //        UZxx    Additional aluminum ledges      (Al)
-  //
-  //      Upper part of the readout chambers (readout plane + fee)
-  //
-  //        UDxx    Wacosit frames of amp. region   (C)
-  //        UExx    Inner volumes of the frame      (Air)
-  //        UFxx    Aluminum frame of back panel    (Al)
-  //        UGxx    Inner volumes of the back panel (Air)
-  //
-  //      Inner material layers
-  //
-  //        UHxx    Radiator                        (Rohacell)
-  //        UJxx    Drift volume                    (Xe/CO2)
-  //        UKxx    Amplification volume            (Xe/CO2)
-  //        UWxx    Wire plane                      (Cu)
-  //        ULxx    Pad plane                       (Cu)
-  //        UYxx    Glue layer                      (Epoxy)
-  //        UMxx    Support structure               (Rohacell)
-  //        UNxx    ROB base material               (C)
-  //        UOxx    ROB copper                      (Cu)
-  //        UVxx    ROB other materials             (Cu)
+  //   Volume (Air) wrapping the readout chamber components
+  //     UTxx    includes: UAxx, UDxx, UFxx, UUxx
+  //
+  //   Lower part of the readout chambers (drift volume + radiator)
+  //     UAxx    Aluminum frames                (Al)
+  //
+  //   Upper part of the readout chambers (readout plane + fee)
+  //     UDxx    Wacosit frames of amp. region  (Wacosit)
+  //     UFxx    Aluminum frame of back panel   (Al)
+  //
+  //   Services on chambers (cooling, cables, MCMs, DCS boards, ...)
+  //     UUxx    Volume containing the services (Air) 
+  //
+  //   Material layers inside sensitive area:
+  //     Name    Description                     Mat.      Thick.   Dens.    Radl.    X/X_0
+  //                                                        
+  //     URMYxx  Mylar layers (x2)               Mylar     0.0015   1.39     28.5464  0.005%
+  //     URCBxx  Carbon layer (x2)               Carbon    0.0055   1.75     24.2824  0.023%
+  //     URGLxx  Glue on the carbon layers (x2)  Araldite  0.0065   1.12     37.0664  0.018%
+  //     URRHxx  Rohacell layer (x2)             Rohacell  0.8      0.075    536.005  0.149%
+  //     URFBxx  Fiber mat layer                 PP        3.186    0.068    649.727  0.490%
+  //     
+  //     UJxx    Drift region                    Xe/CO2    3.0      0.00495  1792.37  0.167%
+  //     UKxx    Amplification region            Xe/CO2    0.7      0.00495  1792.37  0.039%
+  //     UWxx    Wire planes (x2)                Copper    0.00011  8.96     1.43503  0.008%
+  //
+  //     UPPDxx  Copper of pad plane             Copper    0.0025   8.96     1.43503  0.174%
+  //     UPPPxx  PCB of pad plane                G10       0.0356   2.0      14.9013  0.239%
+  //     UPGLxx  Glue on pad planes              Araldite  0.0923   1.12     37.0664  0.249%
+  //             + add. glue (ca. 600g)          Araldite  0.0505   1.12     37.0663  0.107%
+  //     UPCBxx  Carbon fiber mats (x2)          Carbon    0.019    1.75     24.2824  0.078%
+  //     UPHCxx  Honeycomb structure             Aramide   2.0299   0.032    1198.84  0.169%
+  //     UPPCxx  PCB of readout board            G10       0.0486   2.0      14.9013  0.326%
+  //     UPRDxx  Copper of readout board         Copper    0.0057   8.96     1.43503  0.404%
+  //     UPELxx  Electronics + cables            Copper    0.0029   8.96     1.43503  0.202%
   //
 
   const Int_t kNparTrd = 4;
@@ -575,8 +554,9 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed)
   Float_t parTrd[kNparTrd];
   Float_t parCha[kNparCha];
 
-  Char_t  cTagV[6];
-  Char_t  cTagM[5];
+  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
@@ -627,252 +607,326 @@ 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;
-      fChamberUAboxd[iDet][0] = parCha[0];
-      fChamberUAboxd[iDet][1] = parCha[1];
-      fChamberUAboxd[iDet][2] = parCha[2];
       gMC->Gsvolu(cTagV,"BOX ",idtmed[1301-1],parCha,kNparCha);
       // The additional aluminum on the frames
-      // This part has not the correct postion but is just supposed to
+      // 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);
-      parCha[0] = fgkCroW/2.0;
-      parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0;
-      parCha[2] = fgkCalW/2.0;
-      fChamberUAboxd[iDet][0] = fChamberUAboxd[iDet][0] + fgkCroW;
+      snprintf(cTagV,kTag,"UZ%02d",iDet);
+      parCha[0] = fgkCalWmod/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
+      snprintf(cTagV,kTag,"UP%02d",iDet);
+      parCha[0] = fgkCwsW/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;
-      fChamberUDboxd[iDet][0] = parCha[0];
-      fChamberUDboxd[iDet][1] = parCha[1];
-      fChamberUDboxd[iDet][2] = parCha[2];
       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 - fgkCcuT
-      parCha[1] = fClength[ilayer][istack]/2.0 - fgkHspace/2.0 - fgkCcuT;
+      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 support structure (pad plane, back panel, readout boards)
+      // 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;
-      fChamberUFboxd[iDet][0] = parCha[0];
-      fChamberUFboxd[iDet][1] = parCha[1];
-      fChamberUFboxd[iDet][2] = parCha[2];
       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);
 
+      //
       // The material layers inside the chambers
+      //
+
+      // Mylar layer (radiator)
+      parCha[0] = -1.0;
+      parCha[1] = -1.0;
+      parCha[2] = fgkRMyThick/2.0;
+      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;
+      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;
+      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] = fgkRaThick/2.0;
-      sprintf(cTagV,"UH%02d",iDet);
+      parCha[2] = fgkRRhThick/2.0;
+      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;
+      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] = fgkCuThick/2.0;
-      sprintf(cTagV,"UL%02d",iDet);
+      parCha[2] = fgkPPdThick/2.0;
+      snprintf(cTagV,kTag,"UPPD%02d",iDet);
       gMC->Gsvolu(cTagV,"BOX ",idtmed[1305-1],parCha,kNparCha);
-      // Epoxy layer (glue)
+      // G10 layer (pad plane)
+      parCha[0] = -1.0;
+      parCha[1] = -1.0;
+      parCha[2] = fgkPPpThick/2.0;
+      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] = fgkGlThick/2.0;
-      sprintf(cTagV,"UY%02d",iDet);
+      parCha[2] = fgkPGlThick/2.0;
+      snprintf(cTagV,kTag,"UPGL%02d",iDet);
       gMC->Gsvolu(cTagV,"BOX ",idtmed[1311-1],parCha,kNparCha);
-      // G10 layer (support structure / honeycomb)
+      // Carbon layer (carbon fiber mats)
       parCha[0] = -1.0;
       parCha[1] = -1.0;
-      parCha[2] = fgkSuThick/2.0;
-      sprintf(cTagV,"UM%02d",iDet);
+      parCha[2] = fgkPCbThick/2.0;
+      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;
+      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] = fgkRpThick/2;
-      sprintf(cTagV,"UN%02d",iDet);
+      parCha[2] = fgkPPcThick/2;
+      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] = fgkRcThick/2.0;
-      sprintf(cTagV,"UO%02d",iDet);
+      parCha[2] = fgkPRbThick/2.0;
+      snprintf(cTagV,kTag,"UPRB%02d",iDet);
       gMC->Gsvolu(cTagV,"BOX ",idtmed[1306-1],parCha,kNparCha);
-      // Cu layer (other material on in readout board)
+      // Cu layer (other material on in readout board, incl. screws)
       parCha[0] = -1.0;
       parCha[1] = -1.0;
-      parCha[2] = fgkRoThick/2.0;
-      sprintf(cTagV,"UV%02d",iDet);
+      parCha[2] = fgkPElThick/2.0;
+      snprintf(cTagV,kTag,"UPEL%02d",iDet);
       gMC->Gsvolu(cTagV,"BOX ",idtmed[1304-1],parCha,kNparCha);
 
+      //
       // Position the layers in the chambers
+      //
       xpos = 0.0;
       ypos = 0.0;
+
       // Lower part
-      // Rohacell layer (radiator)
-      zpos = fgkRaZpos;
-      sprintf(cTagV,"UH%02d",iDet);
-      sprintf(cTagM,"UC%02d",iDet);
+      // Mylar layers (radiator)
+      zpos =  fgkRMyThick/2.0 - fgkCraH/2.0;
+      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;
+      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;
+      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;
+      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;
+      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;
+      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;
+      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;
+      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;
+      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 plane inside amplification volume)
-      zpos = fgkWrZpos; 
-      sprintf(cTagV,"UW%02d",iDet);
-      sprintf(cTagM,"UK%02d",iDet);
+      // Cu layer (wire planes inside amplification volume)
+      zpos = fgkWrZposA
+      snprintf(cTagV,kTag,"UW%02d",iDet);
+      snprintf(cTagM,kTag,"UK%02d",iDet);
       gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY");
-      // Readout part + support plane
+      zpos = fgkWrZposB; 
+      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 = fgkCuZpos; 
-      sprintf(cTagV,"UL%02d",iDet);
-      sprintf(cTagM,"UG%02d",iDet);
+      zpos =  fgkPPdThick/2.0 - fgkCroH/2.0;
+      snprintf(cTagV,kTag,"UPPD%02d",iDet);
+      snprintf(cTagM,kTag,"UG%02d",iDet);
       gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY");
-      // Epoxy layer (glue)
-      zpos = fgkGlZpos; 
-      sprintf(cTagV,"UY%02d",iDet);
-      sprintf(cTagM,"UG%02d",iDet);
+      // G10  layer (pad plane)
+      zpos =  fgkPPpThick/2.0 + fgkPPdThick - fgkCroH/2.0;
+      snprintf(cTagV,kTag,"UPPP%02d",iDet);
+      snprintf(cTagM,kTag,"UG%02d",iDet);
       gMC->Gspos(cTagV,1,cTagM,xpos,ypos,zpos,0,"ONLY");
-      // G10 layer (support structure)
-      zpos = fgkSuZpos;
-      sprintf(cTagV,"UM%02d",iDet);
-      sprintf(cTagM,"UG%02d",iDet);
+      // Araldite layer (glue)
+      zpos =  fgkPGlThick/2.0 + fgkPPpThick + fgkPPdThick - fgkCroH/2.0;
+      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;
+      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;
+      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;
+      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 = fgkRpZpos;
-      sprintf(cTagV,"UN%02d",iDet);
-      sprintf(cTagM,"UG%02d",iDet);
+      zpos = -fgkPPcThick/2.0 - fgkPRbThick - fgkPElThick + fgkCroH/2.0;
+      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 = fgkRcZpos;
-      sprintf(cTagV,"UO%02d",iDet);
-      sprintf(cTagM,"UG%02d",iDet);
+      zpos = -fgkPRbThick/2.0 - fgkPElThick + fgkCroH/2.0;
+      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)
-      zpos = fgkRoZpos;
-      sprintf(cTagV,"UV%02d",iDet);
-      sprintf(cTagM,"UG%02d",iDet);
+      // Cu layer (other materials on readout board, incl. screws)
+      zpos = -fgkPElThick/2.0 + fgkCroH/2.0;
+      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
       xpos = 0.0;
       ypos = 0.0;
-      // The inner part of the radiator
+
+      // 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");      
 
-      // Position the frames of the chambers in the TRD mother volume
-      xpos  = 0.0;
-      ypos  = fClength[ilayer][0] + fClength[ilayer][1] + fClength[ilayer][2]/2.0;
-      for (Int_t ic = 0; ic < istack; ic++) {
-        ypos -= fClength[ilayer][ic];
-      }
-      ypos -= fClength[ilayer][istack]/2.0;
-      zpos  = fgkVrocsm + fgkSMpltT + fgkCraH/2.0 + fgkCdrH/2.0 - fgkSheight/2.0
-            + ilayer * (fgkCH + fgkVspace);
-      // The lower aluminum frame, radiator + drift region
-      sprintf(cTagV,"UA%02d",iDet);      
-      fChamberUAorig[iDet][0] = xpos;
-      fChamberUAorig[iDet][1] = ypos;
-      fChamberUAorig[iDet][2] = zpos;
-      // The upper G10 frame, amplification region
-      sprintf(cTagV,"UD%02d",iDet);
-      zpos += fgkCamH/2.0 + fgkCraH/2.0 + fgkCdrH/2.0;      
-      fChamberUDorig[iDet][0] = xpos;
-      fChamberUDorig[iDet][1] = ypos;
-      fChamberUDorig[iDet][2] = zpos;
-      // The upper aluminum frame
-      sprintf(cTagV,"UF%02d",iDet);
-      zpos += fgkCroH/2.0 + fgkCamH/2.0;      
-      fChamberUForig[iDet][0] = xpos;
-      fChamberUForig[iDet][1] = ypos;
-      fChamberUForig[iDet][2] = zpos;
-
     }
   }
 
@@ -884,7 +938,7 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed)
   
   for (Int_t istack = 0; istack < kNstack; istack++) {
     for (Int_t ilayer = 0; ilayer < kNlayer; ilayer++) {  
-      GroupChamber(ilayer,istack,idtmed);
+      AssembleChamber(ilayer,istack);
     }
   }
   
@@ -908,8 +962,8 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed)
   ypos = 0.0;
   zpos = 0.0;
   for (Int_t isector = 0; isector < kNsector; isector++) {
-    if (fSMstatus[isector]) {
-      sprintf(cTagV,"BTRD%d",isector);
+    if (GetSMstatus(isector)) {
+      snprintf(cTagV,kTag,"BTRD%d",isector);
       switch (isector) {
       case 13:
       case 14:
@@ -935,8 +989,8 @@ void AliTRDgeometry::CreateGeometry(Int_t *idtmed)
   ypos = 0.5*fgkSlength + 0.5*fgkFlength;
   zpos = 0.0;
   for (Int_t isector = 0; isector < kNsector; isector++) {
-    if (fSMstatus[isector]) {
-      sprintf(cTagV,"BTRD%d",isector);
+    if (GetSMstatus(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");
     }
@@ -964,8 +1018,9 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed)
   Float_t ypos  = 0.0;
   Float_t zpos  = 0.0;
 
-  Char_t  cTagV[5];
-  Char_t  cTagM[5];
+  const Int_t kTag = 100;
+  Char_t  cTagV[kTag];
+  Char_t  cTagM[kTag];
 
   const Int_t kNparTRD = 4;
   Float_t parTRD[kNparTRD];
@@ -975,7 +1030,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed)
   Float_t parTRP[kNparTRP];
 
   // The rotation matrices
-  const Int_t kNmatrix = 6;
+  const Int_t kNmatrix = 7;
   Int_t   matrix[kNmatrix];
   gMC->Matrix(matrix[0], 100.0,   0.0,  90.0,  90.0,  10.0,   0.0);
   gMC->Matrix(matrix[1],  80.0,   0.0,  90.0,  90.0,  10.0, 180.0);
@@ -994,7 +1049,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed)
   parCrb[0] = 0.0;
   parCrb[1] = 0.0;
   parCrb[2] = 0.0;
-  gMC->Gsvolu("USCR","BOX ",idtmed[1307-1],parCrb,0);
+  gMC->Gsvolu("USCR","BOX ",idtmed[1326-1],parCrb,0);
   // Bottom 1 (all sectors)
   parCrb[0] =  77.49/2.0;
   parCrb[1] = 104.60/2.0;
@@ -1069,31 +1124,41 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed)
   // The chamber support rails
   //
 
-  const Float_t kSRLwid  = 2.00;
-  const Float_t kSRLhgt  = 2.3;
-  const Float_t kSRLdst  = 1.0;
-  const Int_t   kNparSRL = 3;
+  const Float_t kSRLhgt  = 2.00;
+  const Float_t kSRLwidA = 2.3;
+  const Float_t kSRLwidB = 1.947;
+  const Float_t kSRLdst  = 1.135;
+  const Int_t   kNparSRL = 11;
   Float_t parSRL[kNparSRL];
-  parSRL[0] = kSRLwid   /2.0;
-  parSRL[1] = fgkSlength/2.0;
-  parSRL[2] = kSRLhgt   /2.0;
-  gMC->Gsvolu("USRL","BOX ",idtmed[1301-1],parSRL,kNparSRL);
+  // Trapezoidal shape
+  parSRL[ 0] = fgkSlength/2.0;
+  parSRL[ 1] = 0.0;
+  parSRL[ 2] = 0.0;
+  parSRL[ 3] = kSRLhgt  /2.0;
+  parSRL[ 4] = kSRLwidB /2.0;
+  parSRL[ 5] = kSRLwidA /2.0;
+  parSRL[ 6] = 5.0;
+  parSRL[ 7] = kSRLhgt  /2.0;
+  parSRL[ 8] = kSRLwidB /2.0;
+  parSRL[ 9] = kSRLwidA /2.0;
+  parSRL[10] = 5.0;
+  gMC->Gsvolu("USRL","TRAP",idtmed[1301-1],parSRL,kNparSRL);
 
   xpos  = 0.0;
   ypos  = 0.0;
   zpos  = 0.0;
-  for (ilayer = 0; ilayer < kNlayer; ilayer++) {
-    xpos  = fCwidth[ilayer]/2.0 + kSRLwid/2.0 + kSRLdst;
+  for (ilayer = 1; ilayer < kNlayer; ilayer++) {
+    xpos  = fgkCwidth[ilayer]/2.0 + kSRLwidA/2.0 + kSRLdst;
     ypos  = 0.0;
-    zpos  = fgkVrocsm + fgkSMpltT + fgkCraH + fgkCdrH + fgkCamH 
-          - fgkSheight/2.0  
+    zpos  = fgkVrocsm + fgkSMpltT - fgkCalZpos - fgkSheight/2.0  
+          + fgkCraH + fgkCdrH - fgkCalH - kSRLhgt/2.0 
           + ilayer * (fgkCH + fgkVspace);
-    gMC->Gspos("USRL",ilayer+1          ,"UTI1", xpos,ypos,zpos,0,"ONLY");
-    gMC->Gspos("USRL",ilayer+1+  kNlayer,"UTI1",-xpos,ypos,zpos,0,"ONLY");
-    gMC->Gspos("USRL",ilayer+1+2*kNlayer,"UTI2", xpos,ypos,zpos,0,"ONLY");
-    gMC->Gspos("USRL",ilayer+1+3*kNlayer,"UTI2",-xpos,ypos,zpos,0,"ONLY");
-    gMC->Gspos("USRL",ilayer+1+4*kNlayer,"UTI3", xpos,ypos,zpos,0,"ONLY");
-    gMC->Gspos("USRL",ilayer+1+5*kNlayer,"UTI3",-xpos,ypos,zpos,0,"ONLY");
+    gMC->Gspos("USRL",ilayer+1          ,"UTI1", xpos,ypos,zpos,matrix[2],"ONLY");
+    gMC->Gspos("USRL",ilayer+1+  kNlayer,"UTI1",-xpos,ypos,zpos,matrix[3],"ONLY");
+    gMC->Gspos("USRL",ilayer+1+2*kNlayer,"UTI2", xpos,ypos,zpos,matrix[2],"ONLY");
+    gMC->Gspos("USRL",ilayer+1+3*kNlayer,"UTI2",-xpos,ypos,zpos,matrix[3],"ONLY");
+    gMC->Gspos("USRL",ilayer+1+4*kNlayer,"UTI3", xpos,ypos,zpos,matrix[2],"ONLY");
+    gMC->Gspos("USRL",ilayer+1+5*kNlayer,"UTI3",-xpos,ypos,zpos,matrix[3],"ONLY");
   }
 
   //
@@ -1119,8 +1184,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
@@ -1130,11 +1195,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;
@@ -1146,17 +1211,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");
@@ -1172,15 +1237,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");
@@ -1298,8 +1363,8 @@ 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;
-  zpos       =   0.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");
   gMC->Gspos("USDB",3,"UTI2", xpos, ypos, zpos,        0,"ONLY");
@@ -1312,7 +1377,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");
@@ -1326,7 +1391,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");
@@ -1340,7 +1405,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");
@@ -1362,7 +1427,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");
@@ -1376,8 +1441,8 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed)
   //
 
   // The envelope volume (aluminum)
-  parTRD[0]  =  90.00/2.0;
-  parTRD[1]  = 114.00/2.0;
+  parTRD[0]  =  90.00/2.0 - 0.1;
+  parTRD[1]  = 114.00/2.0 - 0.1;
   parTRD[2]  =   1.50/2.0;
   parTRD[3]  =  70.30/2.0;
   gMC->Gsvolu("USCB","TRD1",idtmed[1301-1],parTRD,kNparTRD);
@@ -1420,7 +1485,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");
@@ -1434,7 +1499,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");
@@ -1448,7 +1513,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");
@@ -1462,7 +1527,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");
@@ -1524,13 +1589,13 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed)
   const Float_t kSCLthkLa  =  2.464; 
   const Float_t kSCLthkLb  =  1.0; 
   // Width of the corner ledges
-  const Float_t kSCLwidLa  =  8.5;
-  const Float_t kSCLwidLb  =  3.3;
+  const Float_t kSCLwidLa  =  8.3;
+  const Float_t kSCLwidLb  =  4.0;
   // Position of the corner ledges
-  const Float_t kSCLposxLa =  0.15;
-  const Float_t kSCLposxLb =  2.7;
-  const Float_t kSCLposzLa = -4.25;
-  const Float_t kSCLposzLb = -0.5;
+  const Float_t kSCLposxLa = (3.0 * kSCLthkLb - kSCLthkLa) / 4.0 + 0.05;
+  const Float_t kSCLposxLb = kSCLthkLb + kSCLwidLb/2.0 + 0.05;
+  const Float_t kSCLposzLa = kSCLwidLa/2.0;
+  const Float_t kSCLposzLb = kSCLthkLb/2.0;
   // Vertical
   // Trapezoidal shape
   parSCLb[ 0] = fgkSlength/2.0;
@@ -1547,7 +1612,7 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed)
   gMC->Gsvolu("USL3","TRAP",idtmed[1301-1],parSCLb,kNparSCLb);
   xpos  =   fgkSwidth1/2.0 - fgkSMpltT - kSCLposxLa;
   ypos  =   0.0;
-  zpos  = - fgkSheight/2.0 + fgkSMpltT - kSCLposzLa;
+  zpos  = - fgkSheight/2.0 + fgkSMpltT + kSCLposzLa;
   gMC->Gspos("USL3",1,"UTI1", xpos,ypos,zpos,matrix[2],"ONLY");
   gMC->Gspos("USL3",3,"UTI2", xpos,ypos,zpos,matrix[2],"ONLY");
   gMC->Gspos("USL3",5,"UTI3", xpos,ypos,zpos,matrix[2],"ONLY");
@@ -1555,14 +1620,14 @@ void AliTRDgeometry::CreateFrame(Int_t *idtmed)
   gMC->Gspos("USL3",2,"UTI1", xpos,ypos,zpos,matrix[3],"ONLY");
   gMC->Gspos("USL3",4,"UTI2", xpos,ypos,zpos,matrix[3],"ONLY");
   gMC->Gspos("USL3",6,"UTI3", xpos,ypos,zpos,matrix[3],"ONLY");
-  // Horizontal
+  // Horizontal part
   parSCL[0]  = kSCLwidLb /2.0;
   parSCL[1]  = fgkSlength/2.0;
   parSCL[2]  = kSCLthkLb /2.0;
   gMC->Gsvolu("USL4","BOX ",idtmed[1301-1],parSCL,kNparSCL);
   xpos  =   fgkSwidth1/2.0 - fgkSMpltT - kSCLposxLb;
   ypos  =   0.0;
-  zpos  = - fgkSheight/2.0 + fgkSMpltT - kSCLposzLb;
+  zpos  = - fgkSheight/2.0 + fgkSMpltT + kSCLposzLb;
   gMC->Gspos("USL4",1,"UTI1", xpos,ypos,zpos,        0,"ONLY");
   gMC->Gspos("USL4",3,"UTI2", xpos,ypos,zpos,        0,"ONLY");
   gMC->Gspos("USL4",5,"UTI3", xpos,ypos,zpos,        0,"ONLY");
@@ -1637,11 +1702,12 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
   //        UTC1    Cooling arterias (Al)
   //        UTC2    Cooling arterias (Water)
   //        UUxx    Volumes for the services at the chambers (Air)
+  //        UMCM    Readout MCMs     (G10/Cu/Si)
+  //        UDCS    DCSs boards      (G10/Cu)
   //        UTP1    Power bars       (Cu)
   //        UTCP    Cooling pipes    (Fe)
   //        UTCH    Cooling pipes    (Water)
   //        UTPL    Power lines      (Cu)
-  //        UMCM    Readout MCMs     (G10/Cu/Si)
   //        UTGD    Gas distribution box (V2A)
   //
 
@@ -1652,7 +1718,8 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
   Float_t ypos  = 0.0;
   Float_t zpos  = 0.0;
 
-  Char_t  cTagV[5];
+  const Int_t kTag = 100;
+  Char_t  cTagV[kTag];
 
   const Int_t kNparBox  = 3;
   Float_t parBox[kNparBox];
@@ -1691,8 +1758,8 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
   // Height of the cooling arterias
   const Float_t kCOLhgt  =  6.5;
   // Positioning of the cooling 
-  const Float_t kCOLposx =  1.8;
-  const Float_t kCOLposz = -0.1;
+  const Float_t kCOLposx =  1.0;
+  const Float_t kCOLposz = -1.2;
   // Thickness of the walls of the cooling arterias
   const Float_t kCOLthk  =  0.1;
   const Int_t   kNparCOL =  3;
@@ -1717,9 +1784,10 @@ 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 + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz 
+    zpos      = fgkVrocsm + fgkSMpltT - fgkCalZpos 
+              + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz 
               + ilayer * (fgkCH + fgkVspace);
     parCOL[0] = kCOLwid   /2.0;
     parCOL[1] = fgkSlength/2.0;
@@ -1738,9 +1806,10 @@ 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 + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz 
+    zpos      = fgkVrocsm + fgkSMpltT - fgkCalZpos 
+              + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz 
               + ilayer * (fgkCH + fgkVspace);
     parCOL[0] = kCOLwid   /2.0;
     parCOL[1] = fgkFlength/2.0;
@@ -1759,9 +1828,10 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
   for (ilayer = 1; ilayer < kNlayer; ilayer++) { 
 
     // In baby frame
-    xpos      = fCwidth[ilayer]/2.0 + kCOLwid/2.0 - 1.04;
+    xpos      = fgkCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx - 2.5;
     ypos      = kBBSdz/2.0 - kBBMdz/2.0;
-    zpos      = fgkVrocsm + fgkSMpltT + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz 
+    zpos      = fgkVrocsm + fgkSMpltT - fgkCalZpos 
+              + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz 
               + ilayer * (fgkCH + fgkVspace);
     parCOL[0] = kCOLwid/2.0;
     parCOL[1] = kBBSdz /2.0;
@@ -1776,9 +1846,10 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
   for (ilayer = 1; ilayer < kNlayer; ilayer++) { 
 
     // In back frame
-    xpos      = fCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx;
+    xpos      = fgkCwidth[ilayer]/2.0 + kCOLwid/2.0 + kCOLposx - 0.3;
     ypos      = -kBFSdz/2.0 + kBFMdz/2.0;
-    zpos      = fgkVrocsm + fgkSMpltT + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz 
+    zpos      = fgkVrocsm + fgkSMpltT - fgkCalZpos 
+              + kCOLhgt/2.0 - fgkSheight/2.0 + kCOLposz 
               + ilayer * (fgkCH + fgkVspace);
     parCOL[0] = kCOLwid/2.0;
     parCOL[1] = kBFSdz /2.0;
@@ -1790,9 +1861,9 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
 
   }
 
-  // The upper most layer (reaching into TOF acceptance)
+  // 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;
@@ -1811,7 +1882,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;
@@ -1826,7 +1897,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;
@@ -1837,7 +1908,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;
@@ -1849,13 +1920,16 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
                     ,matrix[3],"ONLY",parCOL,kNparCOL);
 
   //
-  // The power bars
+  // The power bus bars
   //
 
   const Float_t kPWRwid  =  0.6;
-  const Float_t kPWRhgt  =  5.0;
-  const Float_t kPWRposx =  1.4;
-  const Float_t kPWRposz =  1.9;
+  // Increase the height of the power bus bars to take into
+  // account the material of additional cables, etc.
+  const Float_t kPWRhgtA =  5.0 + 0.2;
+  const Float_t kPWRhgtB =  5.0;
+  const Float_t kPWRposx =  2.0;
+  const Float_t kPWRposz =  0.1;
   const Int_t   kNparPWR =  3;
   Float_t parPWR[kNparPWR];
   parPWR[0] = 0.0;
@@ -1867,13 +1941,14 @@ 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 + kPWRhgt/2.0 - fgkSheight/2.0 + kPWRposz 
+    zpos      = fgkVrocsm + fgkSMpltT - fgkCalZpos 
+              + kPWRhgtA/2.0 - fgkSheight/2.0 + kPWRposz 
               + ilayer * (fgkCH + fgkVspace);
     parPWR[0] = kPWRwid   /2.0;
     parPWR[1] = fgkSlength/2.0;
-    parPWR[2] = kPWRhgt   /2.0;
+    parPWR[2] = kPWRhgtA  /2.0;
     gMC->Gsposp("UTP1",ilayer          ,"UTI1", xpos,ypos,zpos
                       ,matrix[0],"ONLY",parPWR,kNparPWR);
     gMC->Gsposp("UTP1",ilayer+  kNlayer,"UTI1",-xpos,ypos,zpos
@@ -1888,13 +1963,14 @@ 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 + kPWRhgt/2.0 - fgkSheight/2.0 + kPWRposz 
+    zpos      = fgkVrocsm + fgkSMpltT - fgkCalZpos 
+              + kPWRhgtA/2.0 - fgkSheight/2.0 + kPWRposz 
               + ilayer * (fgkCH + fgkVspace);
     parPWR[0] = kPWRwid   /2.0;
     parPWR[1] = fgkFlength/2.0;
-    parPWR[2] = kPWRhgt   /2.0;
+    parPWR[2] = kPWRhgtA  /2.0;
     gMC->Gsposp("UTP3",ilayer+2*kNlayer,"UTF1", xpos,ypos,zpos
                       ,matrix[0],"ONLY",parPWR,kNparPWR);
     gMC->Gsposp("UTP3",ilayer+3*kNlayer,"UTF1",-xpos,ypos,zpos
@@ -1909,13 +1985,14 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
   for (ilayer = 1; ilayer < kNlayer; ilayer++) { 
 
     // In baby frame
-    xpos      = fCwidth[ilayer]/2.0 + kPWRwid/2.0;
+    xpos      = fgkCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx - 2.5;
     ypos      = kBBSdz/2.0 - kBBMdz/2.0;
-    zpos      = fgkVrocsm + fgkSMpltT + kPWRhgt/2.0 - fgkSheight/2.0 + kPWRposz 
+    zpos      = fgkVrocsm + fgkSMpltT - fgkCalZpos 
+              + kPWRhgtB/2.0 - fgkSheight/2.0 + kPWRposz 
               + ilayer * (fgkCH + fgkVspace);
-    parPWR[0] = kPWRwid/2.0;
-    parPWR[1] = kBBSdz /2.0;
-    parPWR[2] = kPWRhgt/2.0;
+    parPWR[0] = kPWRwid /2.0;
+    parPWR[1] = kBBSdz  /2.0;
+    parPWR[2] = kPWRhgtB/2.0;
     gMC->Gsposp("UTP3",ilayer+6*kNlayer,"BBTRD", xpos, ypos, zpos
                       ,matrix[0],"ONLY",parPWR,kNparPWR);
     gMC->Gsposp("UTP3",ilayer+7*kNlayer,"BBTRD",-xpos, ypos, zpos
@@ -1926,13 +2003,14 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
   for (ilayer = 1; ilayer < kNlayer; ilayer++) { 
 
     // In back frame
-    xpos      = fCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx;
+    xpos      = fgkCwidth[ilayer]/2.0 + kPWRwid/2.0 + kPWRposx - 0.3;
     ypos      = -kBFSdz/2.0 + kBFMdz/2.0;
-    zpos      = fgkVrocsm + fgkSMpltT + kPWRhgt/2.0 - fgkSheight/2.0 + kPWRposz 
+    zpos      = fgkVrocsm + fgkSMpltT - fgkCalZpos 
+              + kPWRhgtB/2.0 - fgkSheight/2.0 + kPWRposz 
               + ilayer * (fgkCH + fgkVspace);
-    parPWR[0] = kPWRwid/2.0;
-    parPWR[1] = kBFSdz /2.0;
-    parPWR[2] = kPWRhgt/2.0;
+    parPWR[0] = kPWRwid /2.0;
+    parPWR[1] = kBFSdz  /2.0;
+    parPWR[2] = kPWRhgtB/2.0;
     gMC->Gsposp("UTP3",ilayer+8*kNlayer,"BFTRD", xpos,ypos,zpos
                       ,matrix[0],"ONLY",parPWR,kNparPWR);
     gMC->Gsposp("UTP3",ilayer+9*kNlayer,"BFTRD",-xpos,ypos,zpos
@@ -1942,12 +2020,12 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
 
   // The upper most layer
   // Along the chambers
-  xpos      = fCwidth[5]/2.0 + kPWRhgt/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;
   parPWR[1] = fgkSlength/2.0;
-  parPWR[2] = kPWRhgt   /2.0;
+  parPWR[2] = kPWRhgtB  /2.0 ;
   gMC->Gsposp("UTP1",6          ,"UTI1", xpos,ypos,zpos
                     ,matrix[3],"ONLY",parPWR,kNparPWR);
   gMC->Gsposp("UTP1",6+  kNlayer,"UTI1",-xpos,ypos,zpos
@@ -1961,12 +2039,12 @@ 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 + kPWRhgt/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;
   parPWR[1] = fgkFlength/2.0;
-  parPWR[2] = kPWRhgt   /2.0;
+  parPWR[2] = kPWRhgtB  /2.0;
   gMC->Gsposp("UTP3",6+2*kNlayer,"UTF1", xpos,ypos,zpos
                     ,matrix[3],"ONLY",parPWR,kNparPWR);
   gMC->Gsposp("UTP3",6+3*kNlayer,"UTF1",-xpos,ypos,zpos
@@ -1976,23 +2054,23 @@ 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 + kPWRhgt/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;
-  parPWR[1] = kBBSdz /2.0;
-  parPWR[2] = kPWRhgt/2.0;
+  parPWR[0] = kPWRwid /2.0;
+  parPWR[1] = kBBSdz  /2.0;
+  parPWR[2] = kPWRhgtB/2.0;
   gMC->Gsposp("UTP3",6+6*kNlayer,"BBTRD", xpos, ypos, zpos
                     ,matrix[3],"ONLY",parPWR,kNparPWR);
   gMC->Gsposp("UTP3",6+7*kNlayer,"BBTRD",-xpos, ypos, zpos
                     ,matrix[3],"ONLY",parPWR,kNparPWR);
   // In back frame
-  xpos      = fCwidth[5]/2.0 + kPWRhgt/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;
-  parPWR[1] = kBFSdz /2.0;
-  parPWR[2] = kPWRhgt/2.0;
+  parPWR[0] = kPWRwid /2.0;
+  parPWR[1] = kBFSdz  /2.0;
+  parPWR[2] = kPWRhgtB/2.0;
   gMC->Gsposp("UTP3",6+8*kNlayer,"BFTRD", xpos,ypos,zpos
                     ,matrix[3],"ONLY",parPWR,kNparPWR);
   gMC->Gsposp("UTP3",6+9*kNlayer,"BFTRD",-xpos,ypos,zpos
@@ -2005,18 +2083,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);
@@ -2036,28 +2114,12 @@ 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;
-      parServ[2] = fgkVspace               /2.0 - 0.742/2.0; 
-      fChamberUUboxd[iDet][0] = parServ[0];
-      fChamberUUboxd[iDet][1] = parServ[1];
-      fChamberUUboxd[iDet][2] = parServ[2];
+      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);
 
-      xpos  = 0.0;
-      ypos  = fClength[ilayer][0] + fClength[ilayer][1] + fClength[ilayer][2]/2.0;
-      for (Int_t ic = 0; ic < istack; ic++) {
-        ypos -= fClength[ilayer][ic];
-      }
-      ypos -= fClength[ilayer][istack]/2.0;
-      zpos  = fgkVrocsm + fgkSMpltT + fgkCH + fgkVspace/2.0 - fgkSheight/2.0
-            + ilayer * (fgkCH + fgkVspace);
-      zpos -= 0.742/2.0;
-      fChamberUUorig[iDet][0] = xpos;
-      fChamberUUorig[iDet][1] = ypos;
-      fChamberUUorig[iDet][2] = zpos;
-
     }
   }
 
@@ -2089,16 +2151,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 - 1.9 
-               - fClength[ilayer][istack]/2.0 + fgkHspace/2.0;
+        ypos   = (0.5 + iMCMrow) * ySize 
+               - 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);
       }
@@ -2123,15 +2185,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);
       }
@@ -2198,27 +2260,171 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
       Int_t   iDet    = GetDetectorSec(ilayer,istack);
       Int_t   iCopy   = GetDetector(ilayer,istack,0) * 1000;
       Int_t   nMCMrow = GetRowMax(ilayer,istack,0);
-      Float_t ySize   = (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) 
+      Float_t ySize   = (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW)
                       / ((Float_t) nMCMrow);
       Int_t   nMCMcol = 8;
       Float_t xSize   = (GetChamberWidth(ilayer)         - 2.0*fgkCpadW)
-                     / ((Float_t) nMCMcol);
-      sprintf(cTagV,"UU%02d",iDet);
+                      / ((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
+      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 + iMCMcol) * xSize + 1.0 
-                    - fCwidth[ilayer]/2.0;
-          ypos      = (0.5 + iMCMrow) * ySize + 1.0 
-                    - fClength[ilayer][istack]/2.0 + fgkHspace/2.0;
+          xpos      = (0.5 + iMCM[iMCMcol]) * xSize + 1.0
+                    - fgkCwidth[ilayer]/2.0;
+          ypos      = (0.5 + iMCMrow) * ySize + 1.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
+                    - fgkCwidth[ilayer]/2.0;
+          ypos      = (0.5 + iMCMrow) * ySize
+                    - 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
+          parTube[2] = kMCMx/2.0;
+          gMC->Gsposp("UTCP",iCopy+iMCMrow*10+iMCMcol+ 50,cTagV
+                            ,xpos,ypos+1.0,zpos
+                            ,matrix[2],"ONLY",parTube,kNparTube);
+          gMC->Gsposp("UTCP",iCopy+iMCMrow*10+iMCMcol+500,cTagV
+                            ,xpos,ypos+2.0,zpos
+                            ,matrix[2],"ONLY",parTube,kNparTube);
+
+        }
       }
 
     }
   }
 
+  //
+  // The DCS boards
+  //
+
+  const Float_t kDCSx    =  9.0;
+  const Float_t kDCSy    = 14.5;
+  const Float_t kDCSz    =  0.3;
+  
+  const Float_t kDCSpcTh =  0.15;
+  const Float_t kDCScuTh =  0.01;
+  const Float_t kDCScoTh =  0.04;
+
+  // The mother volume for the DCSs (air)
+  const Int_t kNparDCS = 3;
+  Float_t parDCS[kNparDCS];
+  parDCS[0] = kDCSx   /2.0;
+  parDCS[1] = kDCSy   /2.0;
+  parDCS[2] = kDCSz   /2.0;
+  gMC->Gsvolu("UDCS","BOX",idtmed[1302-1],parDCS,kNparDCS);
+
+  // The DCS carrier G10 layer
+  parDCS[0] = kDCSx   /2.0;
+  parDCS[1] = kDCSy   /2.0;
+  parDCS[2] = kDCSpcTh/2.0;
+  gMC->Gsvolu("UDC1","BOX",idtmed[1319-1],parDCS,kNparDCS);
+  // The DCS carrier Cu layer
+  parDCS[0] = kDCSx   /2.0;
+  parDCS[1] = kDCSy   /2.0;
+  parDCS[2] = kDCScuTh/2.0;
+  gMC->Gsvolu("UDC2","BOX",idtmed[1318-1],parDCS,kNparDCS);
+  // The aluminum of the cooling plates
+  parDCS[0] = 5.0     /2.0;
+  parDCS[1] = 5.0     /2.0;
+  parDCS[2] = kDCScoTh/2.0;
+  gMC->Gsvolu("UDC3","BOX",idtmed[1324-1],parDCS,kNparDCS);
+
+  // Put the DCS material inside the DCS mother volume
+  xpos  =  0.0;
+  ypos  =  0.0;
+  zpos  = -kDCSz   /2.0 + kDCSpcTh/2.0;
+  gMC->Gspos("UDC1",1,"UDCS",xpos,ypos,zpos,0,"ONLY");
+  zpos +=  kDCSpcTh/2.0 + kDCScuTh/2.0;
+  gMC->Gspos("UDC2",1,"UDCS",xpos,ypos,zpos,0,"ONLY");
+  zpos +=  kDCScuTh/2.0 + kDCScoTh/2.0;
+  gMC->Gspos("UDC3",1,"UDCS",xpos,ypos,zpos,0,"ONLY");
+
+  // Put the DCS board in the chamber services mother volume
+  for (istack = 0; istack < kNstack; istack++) {
+    for (ilayer = 0; ilayer < kNlayer; ilayer++) {
+      Int_t   iDet    = GetDetectorSec(ilayer,istack);
+      Int_t   iCopy   = iDet + 1;
+      xpos =  fgkCwidth[ilayer]/2.0 - 1.9 * (GetChamberLength(ilayer,istack) - 2.0*fgkRpadW) 
+                                        / ((Float_t) GetRowMax(ilayer,istack,0));
+      ypos =  0.05 * fgkClength[ilayer][istack];
+      zpos =  kDCSz/2.0 - fgkCsvH/2.0;
+      snprintf(cTagV,kTag,"UU%02d",iDet);
+      gMC->Gspos("UDCS",iCopy,cTagV,xpos,ypos,zpos,0,"ONLY");
+    }
+  }
+
+  //
+  // The ORI boards
+  //
+
+  const Float_t kORIx    =  4.2;
+  const Float_t kORIy    = 13.5;
+  const Float_t kORIz    =  0.3;
+  
+  const Float_t kORIpcTh =  0.15;
+  const Float_t kORIcuTh =  0.01;
+  const Float_t kORIcoTh =  0.04;
+
+  // The mother volume for the ORIs (air)
+  const Int_t kNparORI = 3;
+  Float_t parORI[kNparORI];
+  parORI[0] = kORIx   /2.0;
+  parORI[1] = kORIy   /2.0;
+  parORI[2] = kORIz   /2.0;
+  gMC->Gsvolu("UORI","BOX",idtmed[1302-1],parORI,kNparORI);
+
+  // The ORI carrier G10 layer
+  parORI[0] = kORIx   /2.0;
+  parORI[1] = kORIy   /2.0;
+  parORI[2] = kORIpcTh/2.0;
+  gMC->Gsvolu("UOR1","BOX",idtmed[1319-1],parORI,kNparORI);
+  // The ORI carrier Cu layer
+  parORI[0] = kORIx   /2.0;
+  parORI[1] = kORIy   /2.0;
+  parORI[2] = kORIcuTh/2.0;
+  gMC->Gsvolu("UOR2","BOX",idtmed[1318-1],parORI,kNparORI);
+  // The aluminum of the cooling plates
+  parORI[0] = kORIx   /2.0;
+  parORI[1] = kORIy   /2.0;
+  parORI[2] = kORIcoTh/2.0;
+  gMC->Gsvolu("UOR3","BOX",idtmed[1324-1],parORI,kNparORI);
+
+  // Put the ORI material inside the ORI mother volume
+  xpos  =  0.0;
+  ypos  =  0.0;
+  zpos  = -kORIz   /2.0 + kORIpcTh/2.0;
+  gMC->Gspos("UOR1",1,"UORI",xpos,ypos,zpos,0,"ONLY");
+  zpos +=  kORIpcTh/2.0 + kORIcuTh/2.0;
+  gMC->Gspos("UOR2",1,"UORI",xpos,ypos,zpos,0,"ONLY");
+  zpos +=  kORIcuTh/2.0 + kORIcoTh/2.0;
+  gMC->Gspos("UOR3",1,"UORI",xpos,ypos,zpos,0,"ONLY");
+
+  // Put the ORI board in the chamber services mother volume
+  for (istack = 0; istack < kNstack; istack++) {
+    for (ilayer = 0; ilayer < kNlayer; ilayer++) {
+      Int_t   iDet    = GetDetectorSec(ilayer,istack);
+      Int_t   iCopy   = iDet + 1;
+      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;
+      snprintf(cTagV,kTag,"UU%02d",iDet);
+      gMC->Gspos("UORI",iCopy      ,cTagV,xpos,ypos,zpos,0,"ONLY");
+      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;
+      snprintf(cTagV,kTag,"UU%02d",iDet);
+      gMC->Gspos("UORI",iCopy+kNdet,cTagV,xpos,ypos,zpos,0,"ONLY");
+    }
+  }
+
   //
   // Services in front of the super module
   //
@@ -2239,14 +2445,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
@@ -2366,14 +2572,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 + kPWRhgt/2.0 - fgkSheight/2.0 + kPWRposz 
+    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 + kPWRhgt/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");
@@ -2463,117 +2669,106 @@ void AliTRDgeometry::CreateServices(Int_t *idtmed)
 }
 
 //_____________________________________________________________________________
-void AliTRDgeometry::GroupChamber(Int_t ilayer, Int_t istack, Int_t *idtmed)
+void AliTRDgeometry::AssembleChamber(Int_t ilayer, Int_t istack)
 {
   //
-  // Group volumes UA, UD, UF, UU in a single chamber (Air)
-  // UA, UD, UF, UU are boxes
-  // UT will be a box
+  // Group volumes UA, UD, UF, UU into an assembly that defines the
+  // alignable volume of a single readout chamber
   //
 
-  const Int_t kNparCha = 3;
-
-  Int_t iDet = GetDetectorSec(ilayer,istack);
-
-  Float_t xyzMin[3];
-  Float_t xyzMax[3];
-  Float_t xyzOrig[3];
-  Float_t xyzBoxd[3];
+  const Int_t kTag = 100;
+  Char_t  cTagV[kTag];
+  Char_t  cTagM[kTag];
 
-  Char_t  cTagV[5];
-  Char_t  cTagM[5];
+  Double_t xpos = 0.0;
+  Double_t ypos = 0.0;
+  Double_t zpos = 0.0;
 
-  for (Int_t i = 0; i < 3; i++) {
-    xyzMin[i] = +9999.0; 
-    xyzMax[i] = -9999.0;
-  }
-
-  for (Int_t i = 0; i < 3; i++) {
+  Int_t idet = GetDetectorSec(ilayer,istack);
 
-    xyzMin[i] = TMath::Min(xyzMin[i],fChamberUAorig[iDet][i]-fChamberUAboxd[iDet][i]);
-    xyzMax[i] = TMath::Max(xyzMax[i],fChamberUAorig[iDet][i]+fChamberUAboxd[iDet][i]);
+  // Create the assembly for a given ROC
+  snprintf(cTagM,kTag,"UT%02d",idet);
+  TGeoVolume *roc = new TGeoVolumeAssembly(cTagM);
 
-    xyzMin[i] = TMath::Min(xyzMin[i],fChamberUDorig[iDet][i]-fChamberUDboxd[iDet][i]);
-    xyzMax[i] = TMath::Max(xyzMax[i],fChamberUDorig[iDet][i]+fChamberUDboxd[iDet][i]);
+  // Add the lower part of the chamber (aluminum frame),
+  // including radiator and drift region
+  xpos = 0.0;
+  ypos = 0.0;
+  zpos = fgkCraH/2.0 + fgkCdrH/2.0 - fgkCHsv/2.0;
+  snprintf(cTagV,kTag,"UA%02d",idet);
+  TGeoVolume *rocA = gGeoManager->GetVolume(cTagV);
+  roc->AddNode(rocA,1,new TGeoTranslation(xpos,ypos,zpos));
 
-    xyzMin[i] = TMath::Min(xyzMin[i],fChamberUForig[iDet][i]-fChamberUFboxd[iDet][i]);
-    xyzMax[i] = TMath::Max(xyzMax[i],fChamberUForig[iDet][i]+fChamberUFboxd[iDet][i]);
+  // Add the additional aluminum ledges
+  xpos = fgkCwidth[ilayer]/2.0 + fgkCalWmod/2.0;
+  ypos = 0.0;
+  zpos = fgkCraH + fgkCdrH - fgkCalZpos - fgkCalHmod/2.0 - fgkCHsv/2.0;
+  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 = fgkCwidth[ilayer]/2.0 + fgkCwsW/2.0;
+  ypos = 0.0;
+  zpos = fgkCraH + fgkCdrH - fgkCwsH/2.0 - fgkCHsv/2.0;
+  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));
+
+  // Add the middle part of the chamber (G10 frame),
+  // including amplification region
+  xpos = 0.0;
+  ypos = 0.0;
+  zpos = fgkCamH/2.0 + fgkCraH + fgkCdrH - fgkCHsv/2.0;
+  snprintf(cTagV,kTag,"UD%02d",idet);
+  TGeoVolume *rocD = gGeoManager->GetVolume(cTagV);
+  roc->AddNode(rocD,1,new TGeoTranslation(xpos,ypos,zpos));
 
-    xyzMin[i] = TMath::Min(xyzMin[i],fChamberUUorig[iDet][i]-fChamberUUboxd[iDet][i]);
-    xyzMax[i] = TMath::Max(xyzMax[i],fChamberUUorig[iDet][i]+fChamberUUboxd[iDet][i]);
+  // Add the upper part of the chamber (aluminum frame),
+  // including back panel and FEE
+  xpos = 0.0;
+  ypos = 0.0;
+  zpos = fgkCroH/2.0 + fgkCamH + fgkCraH + fgkCdrH - fgkCHsv/2.0;
+  snprintf(cTagV,kTag,"UF%02d",idet);
+  TGeoVolume *rocF = gGeoManager->GetVolume(cTagV);
+  roc->AddNode(rocF,1,new TGeoTranslation(xpos,ypos,zpos));
 
-    xyzOrig[i] = 0.5*(xyzMax[i]+xyzMin[i]);
-    xyzBoxd[i] = 0.5*(xyzMax[i]-xyzMin[i]);
+  // Add the volume with services on top of the back panel
+  xpos = 0.0;
+  ypos = 0.0;
+  zpos = fgkCsvH/2.0 + fgkCroH + fgkCamH + fgkCraH + fgkCdrH - fgkCHsv/2.0;
+  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  = fgkClength[ilayer][0] + fgkClength[ilayer][1] + fgkClength[ilayer][2]/2.0;
+  for (Int_t ic = 0; ic < istack; ic++) {
+    ypos -= fgkClength[ilayer][ic];
   }
-  
-  sprintf(cTagM,"UT%02d",iDet);
-  gMC->Gsvolu(cTagM,"BOX ",idtmed[1302-1],xyzBoxd,kNparCha);
-
-  sprintf(cTagV,"UA%02d",iDet);
-  gMC->Gspos(cTagV,1,cTagM
-           ,fChamberUAorig[iDet][0]-xyzOrig[0]
-           ,fChamberUAorig[iDet][1]-xyzOrig[1]
-           ,fChamberUAorig[iDet][2]-xyzOrig[2]
-           ,0,"ONLY");
-
-  sprintf(cTagV,"UZ%02d",iDet);
-  gMC->Gspos(cTagV,1,cTagM
-           ,fChamberUAorig[iDet][0]-xyzOrig[0] + fChamberUAboxd[iDet][0] - fgkCroW/2.0
-           ,fChamberUAorig[iDet][1]-xyzOrig[1]
-           ,fChamberUAorig[iDet][2]-xyzOrig[2] + fgkCraH/2.0 + fgkCdrH/2.0 - fgkCalW/2.0
-           ,0,"ONLY");
-  gMC->Gspos(cTagV,2,cTagM
-           ,fChamberUAorig[iDet][0]-xyzOrig[0] - fChamberUAboxd[iDet][0] + fgkCroW/2.0
-           ,fChamberUAorig[iDet][1]-xyzOrig[1]
-           ,fChamberUAorig[iDet][2]-xyzOrig[2] + fgkCraH/2.0 + fgkCdrH/2.0 - fgkCalW/2.0
-           ,0,"ONLY");
-
-  sprintf(cTagV,"UD%02d",iDet);
-  gMC->Gspos(cTagV,1,cTagM
-           ,fChamberUDorig[iDet][0]-xyzOrig[0]
-           ,fChamberUDorig[iDet][1]-xyzOrig[1]
-           ,fChamberUDorig[iDet][2]-xyzOrig[2]
-           ,0,"ONLY");
-
-  sprintf(cTagV,"UF%02d",iDet);
-  gMC->Gspos(cTagV,1,cTagM
-           ,fChamberUForig[iDet][0]-xyzOrig[0]
-           ,fChamberUForig[iDet][1]-xyzOrig[1]
-           ,fChamberUForig[iDet][2]-xyzOrig[2]
-           ,0,"ONLY");
-  
-  sprintf(cTagV,"UU%02d",iDet);
-  gMC->Gspos(cTagV,1,cTagM
-            ,fChamberUUorig[iDet][0]-xyzOrig[0]
-            ,fChamberUUorig[iDet][1]-xyzOrig[1]
-            ,fChamberUUorig[iDet][2]-xyzOrig[2]
-            ,0,"ONLY");
-
-  sprintf(cTagV,"UT%02d",iDet);
-  gMC->Gspos(cTagV,1,"UTI1"
-            ,xyzOrig[0]
-            ,xyzOrig[1]
-            ,xyzOrig[2]
-            ,0,"ONLY");
-  gMC->Gspos(cTagV,1,"UTI2"
-            ,xyzOrig[0]
-            ,xyzOrig[1]
-            ,xyzOrig[2]
-            ,0,"ONLY");
+  ypos -= fgkClength[ilayer][istack]/2.0;
+  zpos  = fgkVrocsm + fgkSMpltT + fgkCHsv/2.0 - fgkSheight/2.0
+        + ilayer * (fgkCH + fgkVspace);
+  TGeoVolume *sm1 = gGeoManager->GetVolume("UTI1");
+  TGeoVolume *sm2 = gGeoManager->GetVolume("UTI2");
+  TGeoVolume *sm3 = gGeoManager->GetVolume("UTI3");
+  sm1->AddNode(roc,1,new TGeoTranslation(xpos,ypos,zpos));
+  sm2->AddNode(roc,1,new TGeoTranslation(xpos,ypos,zpos));
   if (istack != 2) {
-    // W/o middle stack
-    gMC->Gspos(cTagV,1,"UTI3"
-              ,xyzOrig[0]
-              ,xyzOrig[1]
-              ,xyzOrig[2]
-              ,0,"ONLY");
+    // w/o middle stack
+    sm3->AddNode(roc,1,new TGeoTranslation(xpos,ypos,zpos));
   }
 
 }
 
 //_____________________________________________________________________________
-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
@@ -2624,7 +2819,7 @@ Int_t AliTRDgeometry::GetLayer(Int_t det)
 }
 
 //_____________________________________________________________________________
-Int_t AliTRDgeometry::GetStack(Int_t det) const
+Int_t AliTRDgeometry::GetStack(Int_t det)
 {
   //
   // Reconstruct the stack number from the detector number
@@ -2666,7 +2861,7 @@ Int_t AliTRDgeometry::GetStack(Double_t z, Int_t layer)
 }
 
 //_____________________________________________________________________________
-Int_t AliTRDgeometry::GetSector(Int_t det) const
+Int_t AliTRDgeometry::GetSector(Int_t det)
 {
   //
   // Reconstruct the sector number from the detector number
@@ -2683,12 +2878,12 @@ AliTRDpadPlane *AliTRDgeometry::GetPadPlane(Int_t layer, Int_t stack)
   // Returns the pad plane for a given plane <pl> and stack <st> number
   //
 
-  if (!fPadPlaneArray) {
+  if (!fgPadPlaneArray) {
     CreatePadPlaneArray();
   }
 
   Int_t ipp = GetDetectorSec(layer,stack);
-  return ((AliTRDpadPlane *) fPadPlaneArray->At(ipp));
+  return ((AliTRDpadPlane *) fgPadPlaneArray->At(ipp));
 
 }
 
@@ -2748,7 +2943,18 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray()
     return kFALSE;
   }
 
-  fClusterMatrixArray = new TObjArray(kNdet);
+  if(fgClusterMatrixArray)
+    return kTRUE;
+
+  TString volPath;
+  TString vpStr   = "ALIC_1/B077_1/BSEGMO";
+  TString vpApp1  = "_1/BTRD";
+  TString vpApp2  = "_1";
+  TString vpApp3a = "/UTR1_1/UTS1_1/UTI1_1";
+  TString vpApp3b = "/UTR2_1/UTS2_1/UTI2_1";
+  TString vpApp3c = "/UTR3_1/UTS3_1/UTI3_1";
+
+  fgClusterMatrixArray = new TObjArray(kNdet);
   AliAlignObjParams o;
 
   for (Int_t iLayer = AliGeomManager::kTRD1; iLayer <= AliGeomManager::kTRD6; iLayer++) {
@@ -2759,9 +2965,32 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray()
       Int_t        iLayerTRD = iLayer - AliGeomManager::kTRD1;
       Int_t        lid       = GetDetector(iLayerTRD,istack,isector);    
 
-      // Taking holes into account
-      if (((isector == 13) || (isector == 14) || (isector == 15)) && 
-          (istack == 2)) continue; 
+      // Check for disabled supermodules
+      volPath  = vpStr;
+      volPath += isector;
+      volPath += vpApp1;
+      volPath += isector;
+      volPath += vpApp2;
+      switch (isector) {
+      case 13:
+      case 14:
+      case 15:
+        // Check for holes in from of PHOS
+        if (istack == 2) {
+          continue;
+       }
+        volPath += vpApp3c;
+        break;
+      case 11:
+      case 12:
+        volPath += vpApp3b;
+        break;
+      default:
+        volPath += vpApp3a;
+      };
+      if (!gGeoManager->CheckPath(volPath)) {
+       continue;
+      }
 
       UShort_t     volid   = AliGeomManager::LayerToVolUID(iLayer,iModule);
       const char  *symname = AliGeomManager::SymName(volid);
@@ -2774,11 +3003,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();
@@ -2797,7 +3026,7 @@ Bool_t AliTRDgeometry::CreateClusterMatrixArray()
       rotSector.RotateZ(sectorAngle);
       rotMatrix.MultiplyLeft(&rotSector.Inverse());
 
-      fClusterMatrixArray->AddAt(new TGeoHMatrix(rotMatrix),lid);       
+      fgClusterMatrixArray->AddAt(new TGeoHMatrix(rotMatrix),lid);       
 
     }    
   }
@@ -2807,15 +3036,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;
@@ -2825,3 +3066,60 @@ Bool_t AliTRDgeometry::ChamberInGeometry(Int_t det)
   }
 
 }
+
+//_____________________________________________________________________________
+Bool_t AliTRDgeometry::IsHole(Int_t /*la*/, Int_t st, Int_t se) const
+{
+  //
+  // Checks for holes in front of PHOS
+  //
+
+  if (((se == 13) || (se == 14) || (se == 15)) && 
+      (st == 2)) {
+    return kTRUE; 
+  }
+
+  return kFALSE;
+
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDgeometry::IsOnBoundary(Int_t det, Float_t y, Float_t z, Float_t eps) const
+{
+  //
+  // Checks whether position is at the boundary of the sensitive volume 
+  //
+
+  Int_t ly = GetLayer(det);
+  if ((ly <          0) || 
+      (ly >= fgkNlayer)) return kTRUE;
+       
+  Int_t stk = GetStack(det);
+  if ((stk <          0) || 
+      (stk >= fgkNstack)) return kTRUE;
+
+  AliTRDpadPlane *pp = (AliTRDpadPlane*) fgPadPlaneArray->At(GetDetectorSec(ly, stk));
+  if(!pp) return kTRUE;
+
+  Double_t max  = pp->GetRow0();
+  Int_t n = pp->GetNrows();
+  Double_t min = max - 2 * pp->GetLengthOPad() 
+                 - (n-2) * pp->GetLengthIPad() 
+                 - (n-1) * pp->GetRowSpacing();
+  if(z < min+eps || z > max-eps){ 
+    //printf("z : min[%7.2f (%7.2f)] %7.2f max[(%7.2f) %7.2f]\n", min, min+eps, z, max-eps, max);
+    return kTRUE;
+  }
+  min  = pp->GetCol0();
+  n = pp->GetNcols();
+  max = min +2 * pp->GetWidthOPad() 
+       + (n-2) * pp->GetWidthIPad() 
+       + (n-1) * pp->GetColSpacing();
+  if(y < min+eps || y > max-eps){ 
+    //printf("y : min[%7.2f (%7.2f)] %7.2f max[(%7.2f) %7.2f]\n", min, min+eps, y, max-eps, max);
+    return kTRUE;
+  }
+
+  return kFALSE;
+
+}