]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOFv6T0.cxx
Set to zero the offset for TOF time measurements. In the past we needed it to calibra...
[u/mrichter/AliRoot.git] / TOF / AliTOFv6T0.cxx
index 8a0e24546acb75123a390975224d5343a3caa98e..82f49bca8498e637c829266252da93f1af4abd0d 100644 (file)
 
 /*
 $Log$
+Revision 1.11  2007/10/08 17:52:55  decaro
+hole region in front of PHOS detector: update of sectors' numbers
+
+Revision 1.10  2007/10/07 19:40:46  decaro
+right handling of l2t matrices and alignable entries in case of TOF staging geometry
+
+Revision 1.9  2007/10/07 19:36:29  decaro
+TOF materials and volumes description: update
+
+Revision 1.8  2007/10/04 13:15:37  arcelli
+updates to comply with AliTOFGeometryV5 becoming AliTOFGeometry
+
+Revision 1.7  2007/10/03 18:07:26  arcelli
+right handling of l2t matrices and alignable entries in case of TOF holes (Annalisa)
+
 Revision 1.6  2007/10/03 10:41:16  arcelli
 adding tracking-to-local matrices for new AliTOFcluster
 
@@ -74,17 +89,17 @@ Revision 0.1 2007 March G. Cara Romeo and A. De Caro
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "TBRIK.h"
-#include "TGeometry.h"
-#include "TLorentzVector.h"
-#include "TNode.h"
-#include "TVirtualMC.h"
-#include "TGeoManager.h"
+#include <TDirectory.h>
+#include <TGeoGlobalMagField.h>
+#include <TGeoManager.h>
 #include <TGeoMatrix.h>
 #include <TGeoPhysicalNode.h>
 #include <TGeoVolume.h>
+#include <TLorentzVector.h>
+#include <TVirtualMC.h>
 
 #include "AliConst.h"
+#include "AliGeomManager.h"
 #include "AliLog.h"
 #include "AliMagF.h"
 #include "AliMC.h"
@@ -92,7 +107,6 @@ Revision 0.1 2007 March G. Cara Romeo and A. De Caro
 #include "AliTrackReference.h"
 
 #include "AliTOFGeometry.h"
-#include "AliTOFGeometryV5.h"
 #include "AliTOFv6T0.h"
 
 extern TDirectory *gDirectory;
@@ -103,6 +117,41 @@ extern AliRun *gAlice;
 
 ClassImp(AliTOFv6T0)
 
+// TOF sectors with Nino masks: 0, 8, 9, 10, 16
+const Bool_t AliTOFv6T0::fgkFEAwithMasks[18] = 
+{kTRUE , kFALSE, kFALSE, kFALSE, kFALSE, kFALSE,
+ kFALSE, kFALSE, kTRUE , kTRUE , kTRUE , kFALSE,
+ kFALSE, kFALSE, kFALSE, kFALSE, kTRUE , kFALSE};
+const Float_t AliTOFv6T0::fgkModuleWallThickness   =   0.33; // cm
+const Float_t AliTOFv6T0::fgkInterCentrModBorder1  =  49.5 ; // cm
+const Float_t AliTOFv6T0::fgkInterCentrModBorder2  =  57.5 ; // cm
+const Float_t AliTOFv6T0::fgkExterInterModBorder1  = 196.0 ; // cm
+const Float_t AliTOFv6T0::fgkExterInterModBorder2  = 203.5 ; // cm
+//const Float_t AliTOFv6T0::fgkLengthInCeModBorder   =   7.2 ; // cm // it was 4.7 cm (AdC)
+const Float_t AliTOFv6T0::fgkLengthInCeModBorderU  =   5.0 ; // cm
+const Float_t AliTOFv6T0::fgkLengthInCeModBorderD  =   7.0 ; // cm
+const Float_t AliTOFv6T0::fgkLengthExInModBorder   =   5.0 ; // cm // it was 7.0 cm (AdC)
+const Float_t AliTOFv6T0::fgkModuleCoverThickness  =   2.0 ; // cm
+const Float_t AliTOFv6T0::fgkFEAwidth1    = 19.0; // cm
+const Float_t AliTOFv6T0::fgkFEAwidth2    = 39.5;//38.5; // cm
+const Float_t AliTOFv6T0::fgkSawThickness =  1.0; // cm
+const Float_t AliTOFv6T0::fgkCBLw  = 13.5; // cm
+const Float_t AliTOFv6T0::fgkCBLh1 =  2.0; // cm
+const Float_t AliTOFv6T0::fgkCBLh2 = 12.3; // cm
+const Float_t AliTOFv6T0::fgkBetweenLandMask = 0.1; // cm
+const Float_t AliTOFv6T0::fgkAl1parameters[3] = {fgkFEAwidth1*0.5, 0.4, 0.2}; // cm
+const Float_t AliTOFv6T0::fgkAl2parameters[3] = {7.25, 0.75, 0.25}; // cm
+const Float_t AliTOFv6T0::fgkAl3parameters[3] = {3., 4., 0.1}; // cm
+const Float_t AliTOFv6T0::fgkRoof1parameters[3] = {fgkAl1parameters[0], fgkAl1parameters[2], 1.45}; // cm
+const Float_t AliTOFv6T0::fgkRoof2parameters[3] = {fgkAl3parameters[0], 0.1, 1.15}; // cm
+const Float_t AliTOFv6T0::fgkFEAparameters[3] = {fgkFEAwidth1*0.5, 5.6, 0.1}; // cm
+const Float_t AliTOFv6T0::fgkBar[3] = {8.575, 0.6, 0.25}; // cm
+const Float_t AliTOFv6T0::fgkBar1[3] = {fgkBar[0], fgkBar[1], 0.1}; // cm
+const Float_t AliTOFv6T0::fgkBar2[3] = {fgkBar[0], 0.1, fgkBar[1] - 2.*fgkBar1[2]}; // cm
+const Float_t AliTOFv6T0::fgkBarS[3] = {2., fgkBar[1], fgkBar[2]}; // cm
+const Float_t AliTOFv6T0::fgkBarS1[3] = {fgkBarS[0], fgkBar1[1], fgkBar1[2]}; // cm
+const Float_t AliTOFv6T0::fgkBarS2[3] = {fgkBarS[0], fgkBar2[1], fgkBar2[2]}; // cm
+
 //_____________________________________________________________________________
   AliTOFv6T0::AliTOFv6T0():
   fIdFTOA(-1),
@@ -110,12 +159,13 @@ ClassImp(AliTOFv6T0)
   fIdFTOC(-1),
   fIdFLTA(-1),
   fIdFLTB(-1),
-  fIdFLTC(-1),
-  fTOFHoles(kFALSE)
+  fIdFLTC(-1)//,
+//fTOFHoles(kFALSE)
 {
   //
   // Default constructor
   //
+
 }
  
 //_____________________________________________________________________________
@@ -126,41 +176,47 @@ AliTOFv6T0::AliTOFv6T0(const char *name, const char *title):
   fIdFTOC(-1),
   fIdFLTA(-1),
   fIdFLTB(-1),
-  fIdFLTC(-1),
-  fTOFHoles(kFALSE)
+  fIdFLTC(-1)//,
+  //fTOFHoles(kFALSE)
 {
   //
   // Standard constructor
   //
+
   //
   // Check that FRAME is there otherwise we have no place where to
   // put TOF
 
-
+  /*
   AliModule* frame = (AliModule*)gAlice->GetModule("FRAME");
+
   if(!frame) {
     AliFatal("TOF needs FRAME to be present");
-  } else{
-    
+  } else {
     if (fTOFGeometry) delete fTOFGeometry;
-    fTOFGeometry = new AliTOFGeometryV5();
+    fTOFGeometry = new AliTOFGeometry();
 
     if(frame->IsVersion()==1) {
       AliDebug(1,Form("Frame version %d", frame->IsVersion())); 
       AliDebug(1,"Full Coverage for TOF");
-      fTOFHoles=false;}    
+      fTOFHoles=false;}
     else {
       AliDebug(1,Form("Frame version %d", frame->IsVersion())); 
       AliDebug(1,"TOF with Holes for PHOS");
-      fTOFHoles=true;}      
+      fTOFHoles=true;}
+
   }
+  */
+
+  if (fTOFGeometry) delete fTOFGeometry;
+  fTOFGeometry = new AliTOFGeometry();
   fTOFGeometry->SetHoles(fTOFHoles);
 
   //AliTOF::fTOFGeometry = fTOFGeometry;
 
   // Save the geometry
   TDirectory* saveDir = gDirectory;
-  gAlice->GetRunLoader()->CdGAFile();
+  AliRunLoader::Instance()->CdGAFile();
   fTOFGeometry->Write("TOFgeometry");
   saveDir->cd();
 
@@ -175,6 +231,9 @@ void AliTOFv6T0::AddAlignableVolumes() const
   // eventual changes in the geometry.
   //
 
+  AliGeomManager::ELayerID idTOF = AliGeomManager::kTOF;
+  Int_t modUID, modnum=0;
+
   TString volPath;
   TString symName;
 
@@ -203,7 +262,10 @@ void AliTOFv6T0::AddAlignableVolumes() const
   for (Int_t isect = 0; isect < nSectors; isect++) {
     for (Int_t istr = 1; istr <= nStrips; istr++) {
 
-      if (fTOFHoles && (isect==11 || isect==12)) {
+      modUID = AliGeomManager::LayerToVolUID(idTOF, modnum++);
+      if (fTOFSectors[isect]==-1) continue;
+
+      if (fTOFHoles && (isect==13 || isect==14 || isect==15)) {
        if (istr<39) {
          vpL3 = "/FTOB_0";
          vpL4 = "/FLTB_0/FSTR_";
@@ -240,16 +302,13 @@ void AliTOFv6T0::AddAlignableVolumes() const
       AliDebug(2,Form("symName=%s\n",symName.Data()));
       AliDebug(2,"--------------------------------------------"); 
              
-      gGeoManager->SetAlignableEntry(symName.Data(),volPath.Data());
+      if(!gGeoManager->SetAlignableEntry(symName.Data(),volPath.Data(),modUID))
+       AliError(Form("Alignable entry %s not set",symName.Data()));
 
       //T2L matrices for alignment
-      TGeoPNEntry *e = gGeoManager->GetAlignableEntry(symName.Data());
+      TGeoPNEntry *e = gGeoManager->GetAlignableEntryByUID(modUID);
       if (e) {
-       const char *path = e->GetTitle();
-       if (!gGeoManager->cd(path)) {
-         AliFatal(Form("Volume path %s not valid!",path));
-       }
-       TGeoHMatrix *globMatrix = gGeoManager->GetCurrentMatrix();
+       TGeoHMatrix *globMatrix = e->GetGlobalOrig();
        Double_t phi = 20.0 * (isect % 18) + 10.0;
        TGeoHMatrix *t2l  = new TGeoHMatrix();
        t2l->RotateZ(phi);
@@ -259,7 +318,6 @@ void AliTOFv6T0::AddAlignableVolumes() const
       else {
        AliError(Form("Alignable entry %s is not valid!",symName.Data()));
       }
-
       imod++;
     }
   }
@@ -282,99 +340,16 @@ void AliTOFv6T0::AddAlignableVolumes() const
     symName  = snSM;
     symName += Form("%02d",isect);
 
-      AliDebug(2,"--------------------------------------------"); 
-      AliDebug(2,Form("Alignable object %d", isect+imod)); 
-      AliDebug(2,Form("volPath=%s\n",volPath.Data()));
-      AliDebug(2,Form("symName=%s\n",symName.Data()));
-      AliDebug(2,"--------------------------------------------"); 
-             
-    gGeoManager->SetAlignableEntry(symName.Data(),volPath.Data());
+    AliDebug(2,"--------------------------------------------"); 
+    AliDebug(2,Form("Alignable object %d", isect+imod)); 
+    AliDebug(2,Form("volPath=%s\n",volPath.Data()));
+    AliDebug(2,Form("symName=%s\n",symName.Data()));
+    AliDebug(2,"--------------------------------------------"); 
 
-  }
-  
-}
-//____________________________________________________________________________
-void AliTOFv6T0::BuildGeometry()
-{
-  //
-  // Build TOF ROOT geometry for the ALICE event display
-  //
-  TNode *node, *top;
-  const int kColorTOF  = 27;
-  
-  TGeometry *globalGeometry = (TGeometry*)gAlice->GetGeometry();
-
-  // Find top TNODE
-  top = globalGeometry->GetNode("alice");
-  
-  // Position the different copies
-  const Float_t krTof  =(fTOFGeometry->Rmax()+fTOFGeometry->Rmin())/2.;
-  const Float_t khTof  = fTOFGeometry->Rmax()-fTOFGeometry->Rmin();
-  const Int_t   kNTof  = fTOFGeometry->NSectors();
-  const Float_t kangle = k2PI/kNTof;
-
-  const Float_t kInterCentrModBorder1 = 49.5;
-  const Float_t kInterCentrModBorder2 = 57.5;
-
-  Float_t ang;
-  
-  // define offset for nodes
-  Float_t zOffsetB = (fTOFGeometry->ZlenA()*0.5 + (kInterCentrModBorder1+kInterCentrModBorder2)*0.5)*0.5;
-  Float_t zOffsetA = 0.;
-  // Define TOF basic volume
-  
-  char nodeName0[16], nodeName1[16], nodeName2[16];
-  char nodeName3[16], nodeName4[16], rotMatNum[16];
+    gGeoManager->SetAlignableEntry(symName.Data(),volPath.Data());
 
-  if (fTOFHoles) {
-    new TBRIK("S_TOF_B","TOF box","void",
-             fTOFGeometry->StripLength()*0.5, khTof*0.5, fTOFGeometry->ZlenB()*0.5);
-    new TBRIK("S_TOF_C","TOF box","void",
-             fTOFGeometry->StripLength()*0.5, khTof*0.5, fTOFGeometry->ZlenB()*0.5);
   }
-  new TBRIK("S_TOF_A","TOF box","void",
-            fTOFGeometry->StripLength()*0.5, khTof*0.5, fTOFGeometry->ZlenA()*0.5);
   
-  for (Int_t nodeNum=1;nodeNum<kNTof+1;nodeNum++){
-    
-    if (nodeNum<10) {
-      sprintf(rotMatNum,"rot50%i",nodeNum);
-      sprintf(nodeName0,"FTO00%i",nodeNum);
-      sprintf(nodeName1,"FTO10%i",nodeNum);
-      sprintf(nodeName2,"FTO20%i",nodeNum);
-      sprintf(nodeName3,"FTO30%i",nodeNum);
-      sprintf(nodeName4,"FTO40%i",nodeNum);
-    }
-    if (nodeNum>9) {
-      sprintf(rotMatNum,"rot5%i",nodeNum);
-      sprintf(nodeName0,"FTO0%i",nodeNum);
-      sprintf(nodeName1,"FTO1%i",nodeNum);
-      sprintf(nodeName2,"FTO2%i",nodeNum);
-      sprintf(nodeName3,"FTO3%i",nodeNum);
-      sprintf(nodeName4,"FTO4%i",nodeNum);
-    }
-    
-    new TRotMatrix(rotMatNum,rotMatNum,90,-20*nodeNum,90,90-20*nodeNum,0,0);
-    ang = (4.5-nodeNum) * kangle;
-
-    if (fTOFHoles) {   
-      top->cd();
-      node = new TNode(nodeName2,nodeName2,"S_TOF_B", krTof*TMath::Cos(ang), krTof*TMath::Sin(ang), zOffsetB,rotMatNum);
-      node->SetLineColor(kColorTOF);
-      fNodes->Add(node);
-      
-      top->cd();
-      node = new TNode(nodeName3,nodeName3,"S_TOF_C", krTof*TMath::Cos(ang), krTof*TMath::Sin(ang),-zOffsetB,rotMatNum);
-      node->SetLineColor(kColorTOF);
-      fNodes->Add(node);
-    }
-
-    top->cd();
-    node = new TNode(nodeName4,nodeName4,"S_TOF_A", krTof*TMath::Cos(ang), krTof*TMath::Sin(ang), zOffsetA,rotMatNum);
-    node->SetLineColor(kColorTOF);
-    fNodes->Add(node);
-  } // end loop on nodeNum
-
 }
 
 //_____________________________________________________________________________
@@ -402,274 +377,637 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
   // Definition of the Time Of Fligh Resistive Plate Chambers
   //
 
-  const Float_t kPi = TMath::Pi();
+  AliDebug(1, "************************* TOF geometry **************************");
+  AliDebug(1,Form(" xtof   %f",  xtof));
+  AliDebug(1,Form(" ytof   %f",  ytof));
+  AliDebug(1,Form(" zlenA   %f", zlenA));
+  AliDebug(2,Form(" zlenA*0.5 = %f", zlenA*0.5));
 
-  const Float_t kInterCentrModBorder1 = 49.5;
-  const Float_t kInterCentrModBorder2 = 57.5;
-  const Float_t kExterInterModBorder1 = 196.0;
-  const Float_t kExterInterModBorder2 = 203.5;
+  Float_t xFLT, yFLT, zFLTA;
+  xFLT  = xtof     - 2.*fgkModuleWallThickness;
+  yFLT  = ytof*0.5 -    fgkModuleWallThickness;
+  zFLTA = zlenA    - 2.*fgkModuleWallThickness;
 
-  const Float_t kLengthExInModBorder  = 4.7;
-  const Float_t kLengthInCeModBorder  = 7.0;
+  CreateModules(xtof, ytof, zlenA, xFLT, yFLT, zFLTA);
+  MakeStripsInModules(ytof, zlenA);
 
-  // module wall thickness (cm)
-  const Float_t kModuleWallThickness = 0.33;
+  CreateModuleCovers(xtof, zlenA);
 
-  // honeycomb layer between strips and cards (cm)
-  const Float_t kHoneycombLayerThickness = 2.;
+  CreateBackZone(xtof, ytof, zlenA);
+  MakeFrontEndElectronics(xtof);
+  MakeFEACooling(xtof);
+  MakeNinoMask(xtof);
+  MakeSuperModuleCooling(xtof, ytof, zlenA);
+  MakeSuperModuleServices(xtof, ytof, zlenA);
+
+  MakeModulesInBTOFvolumes(ytof, zlenA);
+  MakeCoversInBTOFvolumes();
+  MakeBackInBTOFvolumes(ytof);
+
+  MakeReadoutCrates(ytof);
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
+                              Float_t xFLT,  Float_t yFLT, Float_t zFLTA) const
+{
+  //
+  // Create supermodule volume
+  // and wall volumes to separate 5 modules
+  //
+
+  const Float_t kPi = TMath::Pi();
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  Int_t idrotm[8];
 
-  AliDebug(1, "************************* TOF geometry **************************");
-  AliDebug(1,Form(" xtof   %d",  xtof));
-  AliDebug(1,Form(" ytof   %d",  ytof));
-  AliDebug(1,Form(" zlenA   %d", zlenA));
-  AliDebug(2,Form(" zlenA*0.5 = %d", zlenA*0.5));
-  
   // Definition of the of fibre glass modules (FTOA, FTOB and FTOC)
-    
-  Float_t  xcoor, ycoor, zcoor;
   Float_t  par[3];
-  Int_t    *idtmed = fIdtmed->GetArray()-499;
-  Int_t    idrotm[100];
-
   par[0] = xtof * 0.5;
   par[1] = ytof * 0.25;
   par[2] = zlenA * 0.5;
-  gMC->Gsvolu("FTOA", "BOX ", idtmed[503], par, 3);  // fibre glass
-   
+  gMC->Gsvolu("FTOA", "BOX ", idtmed[503], par, 3);  // Fibre glass
+
   if (fTOFHoles) {
     par[0] =  xtof * 0.5;
     par[1] =  ytof * 0.25;
-    par[2] = (zlenA*0.5 - kInterCentrModBorder1)*0.5;
-    gMC->Gsvolu("FTOB", "BOX ", idtmed[503], par, 3);  // fibre glass
-    gMC->Gsvolu("FTOC", "BOX ", idtmed[503], par, 3);  // fibre glass
-  }
-
-  // New supermodule card section description
-  //  2 cm  honeycomb layer between strips and cards
-  par[0] = xtof*0.5 + 2.;
-  par[1] = kHoneycombLayerThickness*0.5;
-  par[2] = zlenA*0.5 + 2.;
-  gMC->Gsvolu("FPEA", "BOX ", idtmed[506], par, 3);    // Al + Cu honeycomb
-  if (fTOFHoles) {
-    //par[0] = xtof*0.5 + 2.;
-    //par[1] = kHoneycombLayerThickness*0.5;
-    par[2] = (zlenA*0.5 - kInterCentrModBorder1)*0.5 + 2.;
-    gMC->Gsvolu("FPEB", "BOX ", idtmed[506], par, 3);  // Al + Cu honeycomb
+    par[2] = (zlenA*0.5 - fgkInterCentrModBorder1)*0.5;
+    gMC->Gsvolu("FTOB", "BOX ", idtmed[503], par, 3);  // Fibre glass
+    gMC->Gsvolu("FTOC", "BOX ", idtmed[503], par, 3);  // Fibre glass
   }
 
-  // Definition of the air card containers (FAIA and FAIB)
-
-  par[0] = xtof*0.5;
-  par[1] = (ytof*0.5 - kHoneycombLayerThickness)*0.5;
-  par[2] = zlenA*0.5;
-  gMC->Gsvolu("FAIA", "BOX ", idtmed[500], par, 3);                // Air
-  if (fTOFHoles) gMC->Gsvolu("FAIB", "BOX ", idtmed[500], par, 3); // Air
-
-  // Positioning of fibre glass modules (FTOA, FTOB and FTOC) and
-  // card containers (FPEA, FAIA and FAIB)
-
-  //AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,-90.);
-  AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,270.);
-  xcoor = 0.;
-  for(Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++){
-    if(fTOFSectors[isec]==-1)continue;
-    char name[16];
-    sprintf(name, "BTOF%d",isec);
-    if (fTOFHoles && (isec==11||isec==12)) {
-    //if (fTOFHoles && (isec==16||isec==17)) { \\Old 6h convention
-      //xcoor = 0.;
-      ycoor = (zlenA*0.5 + kInterCentrModBorder1)*0.5;
-      zcoor = -ytof * 0.25;
-      gMC->Gspos("FTOB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-      gMC->Gspos("FTOC", 0, name, xcoor,-ycoor, zcoor, idrotm[0], "ONLY");
-      //xcoor = 0.;
-      //ycoor = (zlenA*0.5 + kInterCentrModBorder1)*0.5;
-      zcoor = kHoneycombLayerThickness*0.5;
-      gMC->Gspos("FPEB", 1, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-      gMC->Gspos("FPEB", 2, name, xcoor,-ycoor, zcoor, idrotm[0], "ONLY");
-      //xcoor = 0.;
-      ycoor = 0.;
-      zcoor = kHoneycombLayerThickness + (ytof*0.5 - kHoneycombLayerThickness)*0.5;
-      gMC->Gspos("FAIB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-    }
-    else {
-      //xcoor = 0.;
-      ycoor = 0.;
-      zcoor = -ytof * 0.25;
-      gMC->Gspos("FTOA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-      //xcoor = 0.;
-      //ycoor = 0.;
-      zcoor = kHoneycombLayerThickness*0.5;
-      gMC->Gspos("FPEA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-      //xcoor = 0.;
-      //ycoor = 0.;
-      zcoor = kHoneycombLayerThickness + (ytof*0.5 - kHoneycombLayerThickness)*0.5;
-      gMC->Gspos("FAIA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-    }
-  }
 
   // Definition and positioning
   // of the not sensitive volumes with Insensitive Freon (FLTA, FLTB and FLTC)
-
-  Float_t xFLT, yFLT, zFLTA;
-  
-  xFLT  = xtof     - kModuleWallThickness*2.;
-  yFLT  = ytof*0.5 - kModuleWallThickness;
-  zFLTA = zlenA    - kModuleWallThickness*2.;
-  
   par[0] = xFLT*0.5;
   par[1] = yFLT*0.5;
   par[2] = zFLTA*0.5;
-  gMC->Gsvolu("FLTA", "BOX ", idtmed[507], par, 3); //  Freon mix
+  gMC->Gsvolu("FLTA", "BOX ", idtmed[506], par, 3); // Freon mix
 
+  Float_t xcoor, ycoor, zcoor;
   xcoor = 0.;
-  ycoor = kModuleWallThickness*0.5;
+  ycoor = fgkModuleWallThickness*0.5;
   zcoor = 0.;
   gMC->Gspos ("FLTA", 0, "FTOA", xcoor, ycoor, zcoor, 0, "ONLY");
 
   if (fTOFHoles) {
-    par[2] = (zlenA*0.5 - kInterCentrModBorder1 - kModuleWallThickness)*0.5;
-    gMC->Gsvolu("FLTB", "BOX ", idtmed[507], par, 3); // Freon mix
-    gMC->Gsvolu("FLTC", "BOX ", idtmed[507], par, 3); // Freon mix
+    par[2] = (zlenA*0.5 - 2.*fgkModuleWallThickness - fgkInterCentrModBorder1)*0.5;
+    gMC->Gsvolu("FLTB", "BOX ", idtmed[506], par, 3); // Freon mix
+    gMC->Gsvolu("FLTC", "BOX ", idtmed[506], par, 3); // Freon mix
 
     //xcoor = 0.;
-    //ycoor = kModuleWallThickness*0.5;
-    //zcoor = 0.;
+    //ycoor = fgkModuleWallThickness*0.5;
+    zcoor = fgkModuleWallThickness;
     gMC->Gspos ("FLTB", 0, "FTOB", xcoor, ycoor, zcoor, 0, "ONLY");
-    gMC->Gspos ("FLTC", 0, "FTOC", xcoor, ycoor, zcoor, 0, "ONLY");
+    gMC->Gspos ("FLTC", 0, "FTOC", xcoor, ycoor,-zcoor, 0, "ONLY");
   }
 
-  Float_t alpha, tgal, beta, tgbe, trpa[11];
-
   // Definition and positioning
   // of the fibre glass walls between central and intermediate modules (FWZ1 and FWZ2)
-
-  tgal = (yFLT - 2.*kLengthInCeModBorder)/(kInterCentrModBorder2 - kInterCentrModBorder1);
+  Float_t alpha, tgal, beta, tgbe, trpa[11];
+  //tgal  = (yFLT - 2.*fgkLengthInCeModBorder)/(fgkInterCentrModBorder2 - fgkInterCentrModBorder1);
+  tgal  = (yFLT - fgkLengthInCeModBorderU - fgkLengthInCeModBorderD)/(fgkInterCentrModBorder2 - fgkInterCentrModBorder1);
   alpha = TMath::ATan(tgal);
-  beta = (kPi*0.5 - alpha)*0.5;
-  tgbe = TMath::Tan(beta);
+  beta  = (kPi*0.5 - alpha)*0.5;
+  tgbe  = TMath::Tan(beta);
   trpa[0]  = xFLT*0.5;
   trpa[1]  = 0.;
   trpa[2]  = 0.;
-  trpa[3]  = kModuleWallThickness;
-  trpa[4]  = (kLengthInCeModBorder - kModuleWallThickness*tgbe)*0.5;
-  trpa[5]  = (kLengthInCeModBorder + kModuleWallThickness*tgbe)*0.5;
+  trpa[3]  = 2.*fgkModuleWallThickness;
+  //trpa[4]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[5]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[4]  = (fgkLengthInCeModBorderD - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[5]  = (fgkLengthInCeModBorderD + 2.*fgkModuleWallThickness*tgbe)*0.5;
   trpa[6]  = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
-  trpa[7]  = kModuleWallThickness;
-  trpa[8]  = (kLengthInCeModBorder - kModuleWallThickness*tgbe)*0.5;
-  trpa[9]  = (kLengthInCeModBorder + kModuleWallThickness*tgbe)*0.5;
+  trpa[7]  = 2.*fgkModuleWallThickness;
+  trpa[8]  = (fgkLengthInCeModBorderD - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[9]  = (fgkLengthInCeModBorderD + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[8]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[9]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
   trpa[10] = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
-  gMC->Gsvolu("FWZ1","TRAP", idtmed[503], trpa, 11);   // fibre glass
+  gMC->Gsvolu("FWZ1D", "TRAP", idtmed[503], trpa, 11); // Fibre glass
 
-  AliMatrix (idrotm[1],90., 90.,180.,0.,90.,180.);
-  AliMatrix (idrotm[4],90., 90.,  0.,0.,90.,  0.);
+  AliMatrix (idrotm[0],90., 90.,180.,0.,90.,180.);
+  AliMatrix (idrotm[1],90., 90.,  0.,0.,90.,  0.);
+
+  //xcoor = 0.;
+  //ycoor = -(yFLT - fgkLengthInCeModBorder)*0.5;
+  ycoor = -(yFLT - fgkLengthInCeModBorderD)*0.5;
+  zcoor = fgkInterCentrModBorder1;
+  gMC->Gspos("FWZ1D", 1, "FLTA", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  gMC->Gspos("FWZ1D", 2, "FLTA", xcoor, ycoor,-zcoor, idrotm[1], "ONLY");
+
+  Float_t y0B, ycoorB, zcoorB;
+
+  if (fTOFHoles) {
+    //y0B = fgkLengthInCeModBorder - fgkModuleWallThickness*tgbe;
+    y0B = fgkLengthInCeModBorderD - fgkModuleWallThickness*tgbe;
+    trpa[0]  = xFLT*0.5;
+    trpa[1]  = 0.;
+    trpa[2]  = 0.;
+    trpa[3]  = fgkModuleWallThickness;
+    trpa[4]  = (y0B - fgkModuleWallThickness*tgbe)*0.5;
+    trpa[5]  = (y0B + fgkModuleWallThickness*tgbe)*0.5;
+    trpa[6]  = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
+    trpa[7]  = fgkModuleWallThickness;
+    trpa[8]  = (y0B - fgkModuleWallThickness*tgbe)*0.5;
+    trpa[9]  = (y0B + fgkModuleWallThickness*tgbe)*0.5;
+    trpa[10] = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
+    //xcoor = 0.;
+    ycoorB = ycoor - fgkModuleWallThickness*0.5*tgbe;
+    zcoorB = (zlenA*0.5 - 2.*fgkModuleWallThickness - fgkInterCentrModBorder1)*0.5 - 2.*fgkModuleWallThickness;
+    gMC->Gsvolu("FWZAD", "TRAP", idtmed[503], trpa, 11); // Fibre glass
+    gMC->Gspos("FWZAD", 1, "FLTB", xcoor, ycoorB, zcoorB, idrotm[1], "ONLY");
+    gMC->Gspos("FWZAD", 2, "FLTC", xcoor, ycoorB,-zcoorB, idrotm[0], "ONLY");
+  }
+
+
+
+  tgal  = (yFLT - fgkLengthInCeModBorderU - fgkLengthInCeModBorderD)/(fgkInterCentrModBorder2 - fgkInterCentrModBorder1);
+  alpha = TMath::ATan(tgal);
+  beta  = (kPi*0.5 - alpha)*0.5;
+  tgbe  = TMath::Tan(beta);
+  trpa[0]  = xFLT*0.5;
+  trpa[1]  = 0.;
+  trpa[2]  = 0.;
+  trpa[3]  = 2.*fgkModuleWallThickness;
+  //trpa[4]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[5]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[4]  = (fgkLengthInCeModBorderU - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[5]  = (fgkLengthInCeModBorderU + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[6]  = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
+  trpa[7]  = 2.*fgkModuleWallThickness;
+  trpa[8]  = (fgkLengthInCeModBorderU - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[9]  = (fgkLengthInCeModBorderU + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[8]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[9]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[10] = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
+  gMC->Gsvolu("FWZ1U", "TRAP", idtmed[503], trpa, 11); // Fibre glass
 
-  xcoor = 0.;
-  ycoor = -(yFLT - kLengthInCeModBorder)*0.5;
-  zcoor = kInterCentrModBorder1;
-  gMC->Gspos("FWZ1", 1,"FLTA", xcoor, ycoor, zcoor,idrotm[1],"ONLY");
-  gMC->Gspos("FWZ1", 2,"FLTA", xcoor, ycoor,-zcoor,idrotm[4],"ONLY");
 
   AliMatrix (idrotm[2],90.,270.,  0.,0.,90.,180.);
-  AliMatrix (idrotm[5],90.,270.,180.,0.,90.,  0.);
+  AliMatrix (idrotm[3],90.,270.,180.,0.,90.,  0.);
 
-  xcoor = 0.;
-  ycoor = (yFLT - kLengthInCeModBorder)*0.5;
-  zcoor = kInterCentrModBorder2;
-  gMC->Gspos("FWZ1", 3,"FLTA", xcoor, ycoor, zcoor,idrotm[2],"ONLY");
-  gMC->Gspos("FWZ1", 4,"FLTA", xcoor, ycoor,-zcoor,idrotm[5],"ONLY");
+  //xcoor = 0.;
+  //ycoor = (yFLT - fgkLengthInCeModBorder)*0.5;
+  ycoor = (yFLT - fgkLengthInCeModBorderU)*0.5;
+  zcoor = fgkInterCentrModBorder2;
+  gMC->Gspos("FWZ1U", 1, "FLTA", xcoor, ycoor, zcoor,idrotm[2], "ONLY");
+  gMC->Gspos("FWZ1U", 2, "FLTA", xcoor, ycoor,-zcoor,idrotm[3], "ONLY");
 
-  trpa[0] = 0.5*(kInterCentrModBorder2 - kInterCentrModBorder1)/TMath::Cos(alpha);
-  trpa[1] = kModuleWallThickness;
+  if (fTOFHoles) {
+    //y0B = fgkLengthInCeModBorder + fgkModuleWallThickness*tgbe;
+    y0B = fgkLengthInCeModBorderU + fgkModuleWallThickness*tgbe;
+    trpa[0]  = xFLT*0.5;
+    trpa[1]  = 0.;
+    trpa[2]  = 0.;
+    trpa[3]  = fgkModuleWallThickness;
+    trpa[4]  = (y0B - fgkModuleWallThickness*tgbe)*0.5;
+    trpa[5]  = (y0B + fgkModuleWallThickness*tgbe)*0.5;
+    trpa[6]  = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
+    trpa[7]  = fgkModuleWallThickness;
+    trpa[8]  = (y0B - fgkModuleWallThickness*tgbe)*0.5;
+    trpa[9]  = (y0B + fgkModuleWallThickness*tgbe)*0.5;
+    trpa[10] = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
+    gMC->Gsvolu("FWZBU", "TRAP", idtmed[503], trpa, 11); // Fibre glass
+    //xcoor = 0.;
+    ycoorB = ycoor - fgkModuleWallThickness*0.5*tgbe;
+    zcoorB = (zlenA*0.5 - 2.*fgkModuleWallThickness - fgkInterCentrModBorder1)*0.5 -
+      (fgkInterCentrModBorder2 - fgkInterCentrModBorder1) - 2.*fgkModuleWallThickness;
+    gMC->Gspos("FWZBU", 1, "FLTB", xcoor, ycoorB, zcoorB, idrotm[3], "ONLY");
+    gMC->Gspos("FWZBU", 2, "FLTC", xcoor, ycoorB,-zcoorB, idrotm[2], "ONLY");
+  }
+
+  trpa[0] = 0.5*(fgkInterCentrModBorder2 - fgkInterCentrModBorder1)/TMath::Cos(alpha);
+  trpa[1] = 2.*fgkModuleWallThickness;
   trpa[2] = xFLT*0.5;
   trpa[3] = -beta*kRaddeg;
   trpa[4] = 0.;
   trpa[5] = 0.;
-  gMC->Gsvolu("FWZ2","PARA", idtmed[503], trpa, 6);    // fibre glass
+  gMC->Gsvolu("FWZ2", "PARA", idtmed[503], trpa, 6); // Fibre glass
 
-  AliMatrix (idrotm[3],     alpha*kRaddeg,90.,90.+alpha*kRaddeg,90.,90.,180.);
-  AliMatrix (idrotm[6],180.-alpha*kRaddeg,90.,90.-alpha*kRaddeg,90.,90.,  0.);
+  AliMatrix (idrotm[4],     alpha*kRaddeg,90.,90.+alpha*kRaddeg,90.,90.,180.);
+  AliMatrix (idrotm[5],180.-alpha*kRaddeg,90.,90.-alpha*kRaddeg,90.,90.,  0.);
+
+  //xcoor = 0.;
+  //ycoor = 0.;
+  ycoor = (fgkLengthInCeModBorderD - fgkLengthInCeModBorderU)*0.5;
+  zcoor = (fgkInterCentrModBorder2 + fgkInterCentrModBorder1)*0.5;
+  gMC->Gspos("FWZ2", 1, "FLTA", xcoor, ycoor, zcoor, idrotm[4], "ONLY");
+  gMC->Gspos("FWZ2", 2, "FLTA", xcoor, ycoor,-zcoor, idrotm[5], "ONLY");
+
+  if (fTOFHoles) {
+    trpa[0] = 0.5*(fgkInterCentrModBorder2 - fgkInterCentrModBorder1)/TMath::Cos(alpha);
+    trpa[1] = fgkModuleWallThickness;
+    trpa[2] = xFLT*0.5;
+    trpa[3] = -beta*kRaddeg;
+    trpa[4] = 0.;
+    trpa[5] = 0.;
+    gMC->Gsvolu("FWZC", "PARA", idtmed[503], trpa, 6); // Fibre glass
+    //xcoor = 0.;
+    ycoorB = ycoor - fgkModuleWallThickness*tgbe;
+    zcoorB = (zlenA*0.5 - 2.*fgkModuleWallThickness - fgkInterCentrModBorder1)*0.5 -
+      (fgkInterCentrModBorder2 - fgkInterCentrModBorder1)*0.5 - 2.*fgkModuleWallThickness;
+    gMC->Gspos("FWZC", 1, "FLTB", xcoor, ycoorB, zcoorB, idrotm[5], "ONLY");
+    gMC->Gspos("FWZC", 2, "FLTC", xcoor, ycoorB,-zcoorB, idrotm[4], "ONLY");
+  }
 
-  xcoor = 0.;
-  ycoor = 0.;
-  zcoor = (kInterCentrModBorder2 + kInterCentrModBorder1)*0.5;
-  gMC->Gspos("FWZ2", 1,"FLTA", xcoor, ycoor, zcoor,idrotm[3],"ONLY");
-  gMC->Gspos("FWZ2", 2,"FLTA", xcoor, ycoor,-zcoor,idrotm[6],"ONLY");
 
   // Definition and positioning
   // of the fibre glass walls between intermediate and lateral modules (FWZ3 and FWZ4)
-
-  tgal = (yFLT - 2.*kLengthExInModBorder)/(kExterInterModBorder2 - kExterInterModBorder1);
+  tgal  = (yFLT - 2.*fgkLengthExInModBorder)/(fgkExterInterModBorder2 - fgkExterInterModBorder1);
   alpha = TMath::ATan(tgal);
-  beta = (kPi*0.5 - alpha)*0.5;
-  tgbe = TMath::Tan(beta);
+  beta  = (kPi*0.5 - alpha)*0.5;
+  tgbe  = TMath::Tan(beta);
   trpa[0]  = xFLT*0.5;
   trpa[1]  = 0.;
   trpa[2]  = 0.;
-  trpa[3]  = kModuleWallThickness;
-  trpa[4]  = (kLengthExInModBorder - kModuleWallThickness*tgbe)*0.5;
-  trpa[5]  = (kLengthExInModBorder + kModuleWallThickness*tgbe)*0.5;
+  trpa[3]  = 2.*fgkModuleWallThickness;
+  trpa[4]  = (fgkLengthExInModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[5]  = (fgkLengthExInModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
   trpa[6]  = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
-  trpa[7]  = kModuleWallThickness;
-  trpa[8]  = (kLengthExInModBorder - kModuleWallThickness*tgbe)*0.5;
-  trpa[9]  = (kLengthExInModBorder + kModuleWallThickness*tgbe)*0.5;
+  trpa[7]  = 2.*fgkModuleWallThickness;
+  trpa[8]  = (fgkLengthExInModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[9]  = (fgkLengthExInModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
   trpa[10] = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
-  gMC->Gsvolu("FWZ3","TRAP", idtmed[503], trpa, 11);    // fibre glass
+  gMC->Gsvolu("FWZ3", "TRAP", idtmed[503], trpa, 11); // Fibre glass
 
-  xcoor = 0.;
-  ycoor = (yFLT - kLengthExInModBorder)*0.5;
-  zcoor = kExterInterModBorder1;
-  gMC->Gspos("FWZ3", 1,"FLTA", xcoor, ycoor, zcoor,idrotm[5],"ONLY");
-  gMC->Gspos("FWZ3", 2,"FLTA", xcoor, ycoor,-zcoor,idrotm[2],"ONLY");
+  //xcoor = 0.;
+  ycoor = (yFLT - fgkLengthExInModBorder)*0.5;
+  zcoor = fgkExterInterModBorder1;
+  gMC->Gspos("FWZ3", 1, "FLTA", xcoor, ycoor, zcoor,idrotm[3], "ONLY");
+  gMC->Gspos("FWZ3", 2, "FLTA", xcoor, ycoor,-zcoor,idrotm[2], "ONLY");
 
   if (fTOFHoles) {
     //xcoor = 0.;
-    //ycoor = (yFLT - kLengthExInModBorder)*0.5;
-    zcoor = -kExterInterModBorder1 + (zlenA*0.5 + kInterCentrModBorder1 - kModuleWallThickness)*0.5;
-    gMC->Gspos("FWZ3", 5,"FLTB", xcoor, ycoor, zcoor,idrotm[2],"ONLY");
-    gMC->Gspos("FWZ3", 6,"FLTC", xcoor, ycoor,-zcoor,idrotm[5],"ONLY");
+    //ycoor = (yFLT - fgkLengthExInModBorder)*0.5;
+    zcoor = -fgkExterInterModBorder1 + (zlenA*0.5 + fgkInterCentrModBorder1 - 2.*fgkModuleWallThickness)*0.5;
+    gMC->Gspos("FWZ3", 5, "FLTB", xcoor, ycoor, zcoor, idrotm[2], "ONLY");
+    gMC->Gspos("FWZ3", 6, "FLTC", xcoor, ycoor,-zcoor, idrotm[3], "ONLY");
   }
 
   //xcoor = 0.;
-  ycoor = -(yFLT - kLengthExInModBorder)*0.5;
-  zcoor = kExterInterModBorder2;
-  gMC->Gspos("FWZ3", 3,"FLTA", xcoor, ycoor, zcoor,idrotm[4],"ONLY");
-  gMC->Gspos("FWZ3", 4,"FLTA", xcoor, ycoor,-zcoor,idrotm[1],"ONLY");
+  ycoor = -(yFLT - fgkLengthExInModBorder)*0.5;
+  zcoor = fgkExterInterModBorder2;
+  gMC->Gspos("FWZ3", 3, "FLTA", xcoor, ycoor, zcoor, idrotm[1], "ONLY");
+  gMC->Gspos("FWZ3", 4, "FLTA", xcoor, ycoor,-zcoor, idrotm[0], "ONLY");
 
   if (fTOFHoles) {
     //xcoor = 0.;
-    //ycoor = -(yFLT - kLengthExInModBorder)*0.5;
-    zcoor = -kExterInterModBorder2 + (zlenA*0.5 + kInterCentrModBorder1 - kModuleWallThickness)*0.5;
-    gMC->Gspos("FWZ3", 7,"FLTB", xcoor, ycoor, zcoor,idrotm[1],"ONLY");
-    gMC->Gspos("FWZ3", 8,"FLTC", xcoor, ycoor,-zcoor,idrotm[4],"ONLY");
+    //ycoor = -(yFLT - fgkLengthExInModBorder)*0.5;
+    zcoor = -fgkExterInterModBorder2 + (zlenA*0.5 + fgkInterCentrModBorder1 - 2.*fgkModuleWallThickness)*0.5;
+    gMC->Gspos("FWZ3", 7, "FLTB", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+    gMC->Gspos("FWZ3", 8, "FLTC", xcoor, ycoor,-zcoor, idrotm[1], "ONLY");
   }
 
-  trpa[0] = 0.5*(kExterInterModBorder2 - kExterInterModBorder1)/TMath::Cos(alpha);
-  trpa[1] = kModuleWallThickness;
+  trpa[0] = 0.5*(fgkExterInterModBorder2 - fgkExterInterModBorder1)/TMath::Cos(alpha);
+  trpa[1] = 2.*fgkModuleWallThickness;
   trpa[2] = xFLT*0.5;
   trpa[3] = -beta*kRaddeg;
   trpa[4] = 0.;
   trpa[5] = 0.;
-  gMC->Gsvolu("FWZ4","PARA", idtmed[503], trpa, 6);    // fibre glass
+  gMC->Gsvolu("FWZ4", "PARA", idtmed[503], trpa, 6); // Fibre glass
 
-  AliMatrix (idrotm[13],alpha*kRaddeg,90.,90.+alpha*kRaddeg,90.,90.,180.);
-  AliMatrix (idrotm[16],180.-alpha*kRaddeg,90.,90.-alpha*kRaddeg,90.,90.,0.);
+  AliMatrix (idrotm[6],alpha*kRaddeg,90.,90.+alpha*kRaddeg,90.,90.,180.);
+  AliMatrix (idrotm[7],180.-alpha*kRaddeg,90.,90.-alpha*kRaddeg,90.,90.,0.);
 
   //xcoor = 0.;
   ycoor = 0.;
-  zcoor = (kExterInterModBorder2 + kExterInterModBorder1)*0.5;
-  gMC->Gspos("FWZ4", 1,"FLTA", xcoor, ycoor, zcoor,idrotm[16],"ONLY");
-  gMC->Gspos("FWZ4", 2,"FLTA", xcoor, ycoor,-zcoor,idrotm[13],"ONLY");
+  zcoor = (fgkExterInterModBorder2 + fgkExterInterModBorder1)*0.5;
+  gMC->Gspos("FWZ4", 1, "FLTA", xcoor, ycoor, zcoor, idrotm[7], "ONLY");
+  gMC->Gspos("FWZ4", 2, "FLTA", xcoor, ycoor,-zcoor, idrotm[6], "ONLY");
 
   if (fTOFHoles) {
     //xcoor = 0.;
     //ycoor = 0.;
-    zcoor = -(kExterInterModBorder2 + kExterInterModBorder1)*0.5 +
-      (zlenA*0.5 + kInterCentrModBorder1 - kModuleWallThickness)*0.5;
-    gMC->Gspos("FWZ4", 3,"FLTB", xcoor, ycoor, zcoor,idrotm[13],"ONLY");
-    gMC->Gspos("FWZ4", 4,"FLTC", xcoor, ycoor,-zcoor,idrotm[16],"ONLY");
+    zcoor = -(fgkExterInterModBorder2 + fgkExterInterModBorder1)*0.5 +
+      (zlenA*0.5 + fgkInterCentrModBorder1 - 2.*fgkModuleWallThickness)*0.5;
+    gMC->Gspos("FWZ4", 3, "FLTB", xcoor, ycoor, zcoor, idrotm[6], "ONLY");
+    gMC->Gspos("FWZ4", 4, "FLTC", xcoor, ycoor,-zcoor, idrotm[7], "ONLY");
   }
 
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::CreateModuleCovers(Float_t xtof, Float_t zlenA) const
+{
+  //
+  // Create covers for module:
+  //   per each module zone, defined according to
+  //   fgkInterCentrModBorder2, fgkExterInterModBorder1 and zlenA+2 values,
+  //   there is a frame of thickness 2cm in Al
+  //   and the contained zones in honeycomb of Al.
+  //   There is also an interface layer (1.6mm thichness)
+  //   and plastic and Cu corresponding to the flat cables.
+  //
+
+  Int_t  *idtmed = fIdtmed->GetArray()-499;
+
+  Float_t par[3];
+  par[0] = xtof*0.5 + 2.;
+  par[1] = fgkModuleCoverThickness*0.5;
+  par[2] = zlenA*0.5 + 2.;
+  gMC->Gsvolu("FPEA", "BOX ", idtmed[500], par, 3); // Air
+  if (fTOFHoles) gMC->Gsvolu("FPEB", "BOX ", idtmed[500], par, 3); // Air
+
+  const Float_t kAlCoverThickness = 1.5;
+  const Float_t kInterfaceCardThickness = 0.16;
+  const Float_t kAlSkinThickness = 0.1;
+
+  //par[0] = xtof*0.5 + 2.;
+  par[1] = kAlCoverThickness*0.5;
+  //par[2] = zlenA*0.5 + 2.;
+  gMC->Gsvolu("FALT", "BOX ", idtmed[504], par, 3); // Al
+  if (fTOFHoles) gMC->Gsvolu("FALB", "BOX ", idtmed[504], par, 3); // Al
+  Float_t  xcoor, ycoor, zcoor;
+  xcoor = 0.;
+  ycoor = 0.;
+  zcoor = 0.;
+  gMC->Gspos("FALT", 0, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  if (fTOFHoles) gMC->Gspos("FALB", 0, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  par[0] = xtof*0.5;
+  //par[1] = kAlCoverThickness*0.5;
+  par[2] = fgkInterCentrModBorder2 - 2.;
+  gMC->Gsvolu("FPE1", "BOX ", idtmed[505], par, 3); // Al honeycomb
+  //xcoor = 0.;
+  //ycoor = 0.;
+  //zcoor = 0.;
+  gMC->Gspos("FPE1", 0, "FALT", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  if (fTOFHoles) {
+    //par[0] = xtof*0.5;
+    par[1] = kAlCoverThickness*0.5 - kAlSkinThickness;
+    //par[2] = fgkInterCentrModBorder2 - 2.;
+    gMC->Gsvolu("FPE4", "BOX ", idtmed[515], par, 3); // Al honeycomb for holes
+    //xcoor = 0.;
+    //ycoor = 0.;
+    //zcoor = 0.;
+    gMC->Gspos("FPE4", 0, "FALB", xcoor, ycoor, zcoor, 0, "ONLY");
+  }
+
+  //par[0] = xtof*0.5;
+  //par[1] = kAlCoverThickness*0.5;
+  par[2] = (fgkExterInterModBorder1 - fgkInterCentrModBorder2)*0.5 - 2.;
+  gMC->Gsvolu("FPE2", "BOX ", idtmed[505], par, 3); // Al honeycomb
+  //xcoor = 0.;
+  //ycoor = 0.;
+  zcoor = (fgkExterInterModBorder1 + fgkInterCentrModBorder2)*0.5;
+  gMC->Gspos("FPE2", 1, "FALT", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FPE2", 2, "FALT", xcoor, ycoor,-zcoor, 0, "ONLY");
+
+  if (fTOFHoles) {
+    //xcoor = 0.;
+    //ycoor = 0.;
+    //zcoor = (fgkExterInterModBorder1 + fgkInterCentrModBorder2)*0.5;
+    gMC->Gspos("FPE2", 1, "FALB", xcoor, ycoor, zcoor, 0, "ONLY");
+    gMC->Gspos("FPE2", 2, "FALB", xcoor, ycoor,-zcoor, 0, "ONLY");
+  }
+
+  //par[0] = xtof*0.5;
+  //par[1] = kAlCoverThickness*0.5;
+  par[2] = (zlenA*0.5 + 2. - fgkExterInterModBorder1)*0.5 - 2.;
+  gMC->Gsvolu("FPE3", "BOX ", idtmed[505], par, 3); // Al honeycomb
+  //xcoor = 0.;
+  //ycoor = 0.;
+  zcoor = (zlenA*0.5 + 2. + fgkExterInterModBorder1)*0.5;
+  gMC->Gspos("FPE3", 1, "FALT", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FPE3", 2, "FALT", xcoor, ycoor,-zcoor, 0, "ONLY");
+
+  if (fTOFHoles) {
+    //xcoor = 0.;
+    //ycoor = 0.;
+    zcoor = (zlenA*0.5 + 2. + fgkExterInterModBorder1)*0.5;
+    gMC->Gspos("FPE3", 1, "FALB", xcoor, ycoor, zcoor, 0, "ONLY");
+    gMC->Gspos("FPE3", 2, "FALB", xcoor, ycoor,-zcoor, 0, "ONLY");
+  }
+
+  // volumes for Interface cards
+  par[0] = xtof*0.5;
+  par[1] = kInterfaceCardThickness*0.5;
+  par[2] = fgkInterCentrModBorder2 - 2.;
+  gMC->Gsvolu("FIF1", "BOX ", idtmed[502], par, 3); // G10
+  //xcoor = 0.;
+  ycoor = kAlCoverThickness*0.5 + kInterfaceCardThickness*0.5;
+  zcoor = 0.;
+  gMC->Gspos("FIF1", 0, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  //par[0] = xtof*0.5;
+  //par[1] = kInterfaceCardThickness*0.5;
+  par[2] = (fgkExterInterModBorder1 - fgkInterCentrModBorder2)*0.5 - 2.;
+  gMC->Gsvolu("FIF2", "BOX ", idtmed[502], par, 3); // G10
+  //xcoor = 0.;
+  //ycoor = kAlCoverThickness*0.5 + kInterfaceCardThickness*0.5;
+  zcoor = (fgkExterInterModBorder1 + fgkInterCentrModBorder2)*0.5;
+  gMC->Gspos("FIF2", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FIF2", 2, "FPEA", xcoor, ycoor,-zcoor, 0, "ONLY");
+  if (fTOFHoles) {
+    gMC->Gspos("FIF2", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    gMC->Gspos("FIF2", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
+  }
+
+  //par[0] = xtof*0.5;
+  //par[1] = kInterfaceCardThickness*0.5;
+  par[2] = (zlenA*0.5 + 2. - fgkExterInterModBorder1)*0.5 - 2.;
+  gMC->Gsvolu("FIF3", "BOX ", idtmed[502], par, 3); // G10
+  //xcoor = 0.;
+  //ycoor = kAlCoverThickness*0.5 + kInterfaceCardThickness*0.5;
+  zcoor = (zlenA*0.5 + 2. + fgkExterInterModBorder1)*0.5;
+  gMC->Gspos("FIF3", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FIF3", 2, "FPEA", xcoor, ycoor,-zcoor, 0, "ONLY");
+  if (fTOFHoles) {
+    gMC->Gspos("FIF3", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    gMC->Gspos("FIF3", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
+  }
+
+  // volumes for flat cables
+  // plastic
+  const Float_t kPlasticFlatCableThickness = 0.25;
+  par[0] = xtof*0.5;
+  par[1] = kPlasticFlatCableThickness*0.5;
+  par[2] = fgkInterCentrModBorder2 - 2.;
+  gMC->Gsvolu("FFC1", "BOX ", idtmed[513], par, 3); // Plastic (CH2)
+  //xcoor = 0.;
+  ycoor = -kAlCoverThickness*0.5 - kPlasticFlatCableThickness*0.5;
+  zcoor = 0.;
+  gMC->Gspos("FFC1", 0, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  //par[0] = xtof*0.5;
+  //par[1] = kPlasticFlatCableThickness*0.5;
+  par[2] = (fgkExterInterModBorder1 - fgkInterCentrModBorder2)*0.5 - 2.;
+  gMC->Gsvolu("FFC2", "BOX ", idtmed[513], par, 3); // Plastic (CH2)
+  //xcoor = 0.;
+  //ycoor = -kAlCoverThickness*0.5 - kPlasticFlatCableThickness*0.5;
+  zcoor = (fgkExterInterModBorder1 + fgkInterCentrModBorder2)*0.5;
+  gMC->Gspos("FFC2", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FFC2", 2, "FPEA", xcoor, ycoor,-zcoor, 0, "ONLY");
+  if (fTOFHoles) {
+    gMC->Gspos("FFC2", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    gMC->Gspos("FFC2", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
+  }
+
+  //par[0] = xtof*0.5;
+  //par[1] = kPlasticFlatCableThickness*0.5;
+  par[2] = (zlenA*0.5 + 2. - fgkExterInterModBorder1)*0.5 - 2.;
+  gMC->Gsvolu("FFC3", "BOX ", idtmed[513], par, 3); // Plastic (CH2)
+  //xcoor = 0.;
+  //ycoor = -kAlCoverThickness*0.5 - kPlasticFlatCableThickness*0.5;
+  zcoor = (zlenA*0.5 + 2. + fgkExterInterModBorder1)*0.5;
+  gMC->Gspos("FFC3", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FFC3", 2, "FPEA", xcoor, ycoor,-zcoor, 0, "ONLY");
+  if (fTOFHoles) {
+    gMC->Gspos("FFC3", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    gMC->Gspos("FFC3", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
+  }
+
+  // Cu
+  const Float_t kCopperFlatCableThickness = 0.01;
+  par[0] = xtof*0.5;
+  par[1] = kCopperFlatCableThickness*0.5;
+  par[2] = fgkInterCentrModBorder2 - 2.;
+  gMC->Gsvolu("FCC1", "BOX ", idtmed[512], par, 3); // Cu
+  gMC->Gspos("FCC1", 0, "FFC1", 0., 0., 0., 0, "ONLY");
+
+  //par[0] = xtof*0.5;
+  //par[1] = kCopperFlatCableThickness*0.5;
+  par[2] = (fgkExterInterModBorder1 - fgkInterCentrModBorder2)*0.5 - 2.;
+  gMC->Gsvolu("FCC2", "BOX ", idtmed[512], par, 3); // Cu
+  gMC->Gspos("FCC2", 0, "FFC2", 0., 0., 0., 0, "ONLY");
+
+  //par[0] = xtof*0.5;
+  //par[1] = kCopperFlatCableThickness*0.5;
+  par[2] = (zlenA*0.5 + 2. - fgkExterInterModBorder1)*0.5 - 2.;
+  gMC->Gsvolu("FCC3", "BOX ", idtmed[512], par, 3); // Cu
+  gMC->Gspos("FCC3", 0, "FFC3", 0., 0., 0., 0, "ONLY");
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeModulesInBTOFvolumes(Float_t ytof, Float_t zlenA) const
+{
+  //
+  // Fill BTOF_%i (for i=0,...17) volumes
+  // with volumes FTOA (MRPC strip container),
+  // In case of TOF holes, three sectors (i.e. 13th, 14th and 15th)
+  // are filled with volumes: FTOB and FTOC (MRPC containers),
+  //
+
+  Int_t idrotm[1];
+
+  //AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,-90.);
+  AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,270.);
+
+  Float_t xcoor, ycoor, zcoor;
+  xcoor = 0.;
+
+  // Positioning of fibre glass modules (FTOA, FTOB and FTOC)
+  for(Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++){
+    if(fTOFSectors[isec]==-1)continue;
+    char name[16];
+    sprintf(name, "BTOF%d",isec);
+    if (fTOFHoles && (isec==13 || isec==14 || isec==15)) {
+      //xcoor = 0.;
+      ycoor = (zlenA*0.5 + fgkInterCentrModBorder1)*0.5;
+      zcoor = -ytof * 0.25;
+      gMC->Gspos("FTOB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+      gMC->Gspos("FTOC", 0, name, xcoor,-ycoor, zcoor, idrotm[0], "ONLY");
+    }
+    else {
+      //xcoor = 0.;
+      ycoor = 0.;
+      zcoor = -ytof * 0.25;
+      gMC->Gspos("FTOA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+    }
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeCoversInBTOFvolumes() const
+{
+  //
+  // Fill BTOF_%i (for i=0,...17) volumes
+  // with volumes FPEA (to separate strips from FEA cards)
+  // In case of TOF holes, three sectors (i.e. 13th, 14th and 15th)
+  // are filled with FPEB volumes
+  // (to separate MRPC strips from FEA cards)
+  //
+
+  Int_t idrotm[1];
+
+  //AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,-90.);
+  AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,270.);
+
+  Float_t xcoor, ycoor, zcoor;
+  xcoor = 0.;
+  ycoor = 0.;
+  zcoor = fgkModuleCoverThickness*0.5;
+
+  char name[16];
+
+  // Positioning of module covers (FPEA, FPEB)
+  for(Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++) {
+    if(fTOFSectors[isec]==-1)continue;
+    sprintf(name, "BTOF%d",isec);
+    if (fTOFHoles && (isec==13 || isec==14 || isec==15))
+      gMC->Gspos("FPEB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+    else
+      gMC->Gspos("FPEA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeBackInBTOFvolumes(Float_t ytof) const
+{
+  //
+  // Fill BTOF_%i (for i=0,...17) volumes with volumes called FAIA and
+  // FAIC (FEA cards and services container).
+  // In case of TOF holes, three sectors (i.e. 13th, 14th and 15th) are
+  // filled with volumes FAIB (FEA cards and services container).
+  //
+
+  Int_t idrotm[1];
+
+  //AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,-90.);
+  AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,270.);
+
+  Float_t xcoor, ycoor, zcoor;
+  xcoor = 0.;
+  ycoor = 0.;
+  zcoor = fgkModuleCoverThickness + (ytof*0.5 - fgkModuleCoverThickness)*0.5;
+
+  char name[16];
+
+  // Positioning of FEA cards and services containers (FAIA, FAIC and FAIB)
+  for(Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++) {
+    if(fTOFSectors[isec]==-1)continue;
+    sprintf(name, "BTOF%d",isec);
+    if (fgkFEAwithMasks[isec])
+      gMC->Gspos("FAIA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+    else {
+      if (fTOFHoles && (isec==13 || isec==14 || isec==15))
+       gMC->Gspos("FAIB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+      else
+       gMC->Gspos("FAIC", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+    }
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeStripsInModules(Float_t ytof, Float_t zlenA) const
+{
+  //
+  // Define MRPC strip volume, called FSTR
+  // Insert FSTR volume in FLTA/B/C volumes
+  //
+
+  Float_t yFLT  = ytof*0.5 - fgkModuleWallThickness;
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
 
   ///////////////// Detector itself //////////////////////
 
@@ -680,124 +1018,129 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
 
   // new description for strip volume -double stack strip-
   // -- all constants are expressed in cm
-  // heigth of different layers
-  const Float_t khhony   = 1.0;       // heigth of HONY  Layer
-  const Float_t khpcby   = 0.08;      // heigth of PCB   Layer
-  const Float_t khrgly   = 0.055;     // heigth of RED GLASS  Layer
-
-  const Float_t khfiliy  = 0.125;     // heigth of FISHLINE  Layer
-  const Float_t khglassy = 0.160*0.5; // heigth of GLASS  Layer
-  const Float_t khglfy   = khfiliy+2.*khglassy; // heigth of GLASS+FISHLINE  Layer
-
-  const Float_t khcpcby  = 0.16;      // heigth of PCB  Central Layer
-  const Float_t kwhonz   = 8.1;       // z dimension of HONEY  Layer
-  const Float_t kwpcbz1  = 10.6;      // z dimension of PCB  Lower Layer
-  const Float_t kwpcbz2  = 11.6;      // z dimension of PCB  Upper Layer
-  const Float_t kwcpcbz  = 13.;       // z dimension of PCB  Central Layer
-  const Float_t kwrglz   = 8.;        // z dimension of RED GLASS  Layer
-  const Float_t kwglfz   = 7.;        // z dimension of GLASS+FISHLN Layer
+  // height of different layers
+  const Float_t khhony   = 1.0;       // height of HONY Layer
+  const Float_t khpcby   = 0.08;      // height of PCB Layer
+  const Float_t khrgly   = 0.055;     // height of RED GLASS Layer
+
+  const Float_t khfiliy  = 0.125;     // height of FISHLINE Layer
+  const Float_t khglassy = 0.160*0.5; // semi-height of GLASS Layer
+  const Float_t khglfy   = khfiliy+2.*khglassy; // height of GLASS Layer
+
+  const Float_t khcpcby  = 0.16;      // height of PCB  Central Layer
+  const Float_t kwhonz   = 8.1;       // z dimension of HONEY Layer
+  const Float_t kwpcbz1  = 10.64;     // z dimension of PCB Lower Layer
+  const Float_t kwpcbz2  = 11.6;      // z dimension of PCB Upper Layer
+  const Float_t kwcpcbz  = 12.4;      // z dimension of PCB Central Layer
+
+  const Float_t kwrglz   = 8.;        // z dimension of RED GLASS Layer
+  const Float_t kwglfz   = 7.;        // z dimension of GLASS Layer
   const Float_t klsensmx = knx*kPadX; // length of Sensitive Layer
-  const Float_t khsensmy = 0.05;      // heigth of Sensitive Layer
+  const Float_t khsensmy = 0.0105;    // height of Sensitive Layer
   const Float_t kwsensmz = knz*kPadZ; // width of Sensitive Layer
 
-  // heigth of the FSTR Volume (the strip volume)
+  // height of the FSTR Volume (the strip volume)
   const Float_t khstripy = 2.*khhony+2.*khpcby+4.*khrgly+2.*khglfy+khcpcby;
 
   // width  of the FSTR Volume (the strip volume)
   const Float_t kwstripz = kwcpcbz;
   // length of the FSTR Volume (the strip volume)
   const Float_t klstripx = fTOFGeometry->StripLength();
-  
-  Float_t parfp[3]={klstripx*0.5, khstripy*0.5, kwstripz*0.5};
-  // Coordinates of the strip center in the strip reference frame;
-  // used for positioning internal strip volumes
-  Float_t posfp[3]={0.,0.,0.};
+
 
   // FSTR volume definition-filling this volume with non sensitive Gas Mixture
-  gMC->Gsvolu("FSTR","BOX",idtmed[507],parfp,3); // Freon mix
+  Float_t parfp[3]={klstripx*0.5, khstripy*0.5, kwstripz*0.5};
+  gMC->Gsvolu("FSTR", "BOX", idtmed[506], parfp, 3); // Freon mix
 
-  //-- HONY Layer definition
+  Float_t posfp[3]={0.,0.,0.};
+
+  // NOMEX (HONEYCOMB) Layer definition
   //parfp[0] = klstripx*0.5;
   parfp[1] = khhony*0.5;
   parfp[2] = kwhonz*0.5;
-  gMC->Gsvolu("FHON","BOX",idtmed[501],parfp,3); // honeycomb (Nomex)
-  // positioning 2 HONY Layers on FSTR volume
+  gMC->Gsvolu("FHON", "BOX", idtmed[501], parfp, 3); // Nomex (Honeycomb)
+  // positioning 2 NOMEX Layers on FSTR volume
   //posfp[0] = 0.;
-  posfp[1] =-khstripy*0.5+parfp[1];
+  posfp[1] =-khstripy*0.5 + parfp[1];
   //posfp[2] = 0.;
-  gMC->Gspos("FHON",1,"FSTR",0., posfp[1],0.,0,"ONLY");
-  gMC->Gspos("FHON",2,"FSTR",0.,-posfp[1],0.,0,"ONLY");
+  gMC->Gspos("FHON", 1, "FSTR", 0., posfp[1], 0., 0, "ONLY");
+  gMC->Gspos("FHON", 2, "FSTR", 0.,-posfp[1], 0., 0, "ONLY");
   
-  //-- PCB Layer definition
+  // Lower PCB Layer definition
   //parfp[0] = klstripx*0.5;
   parfp[1] = khpcby*0.5;
   parfp[2] = kwpcbz1*0.5;
-  gMC->Gsvolu("FPC1","BOX",idtmed[502],parfp,3); // G10
+  gMC->Gsvolu("FPC1", "BOX", idtmed[502], parfp, 3); // G10
+
+  // Upper PCB Layer definition
   //parfp[0] = klstripx*0.5;
   //parfp[1] = khpcby*0.5;
   parfp[2] = kwpcbz2*0.5;
-  gMC->Gsvolu("FPC2","BOX",idtmed[502],parfp,3); // G10
-  // positioning 2 PCB Layers on FSTR volume
+  gMC->Gsvolu("FPC2", "BOX", idtmed[502], parfp, 3); // G10
+
+  // positioning 2 external PCB Layers in FSTR volume
   //posfp[0] = 0.;
   posfp[1] =-khstripy*0.5+khhony+parfp[1];
   //posfp[2] = 0.;
-  gMC->Gspos("FPC1",1,"FSTR",0.,-posfp[1],0.,0,"ONLY");
-  gMC->Gspos("FPC2",1,"FSTR",0., posfp[1],0.,0,"ONLY");
+  gMC->Gspos("FPC1", 1, "FSTR", 0.,-posfp[1], 0., 0, "ONLY");
+  gMC->Gspos("FPC2", 1, "FSTR", 0., posfp[1], 0., 0, "ONLY");
 
-  //-- central PCB layer definition
+  // Central PCB layer definition
   //parfp[0] = klstripx*0.5;
   parfp[1] = khcpcby*0.5;
   parfp[2] = kwcpcbz*0.5;
-  gMC->Gsvolu("FPCB","BOX",idtmed[502],parfp,3); // G10
+  gMC->Gsvolu("FPCB", "BOX", idtmed[502], parfp, 3); // G10
+  gGeoManager->GetVolume("FPCB")->VisibleDaughters(kFALSE);
   // positioning the central PCB layer
-  gMC->Gspos("FPCB",1,"FSTR",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("FPCB", 1, "FSTR", 0., 0., 0., 0, "ONLY");
 
-  //      Sensitive volume
+  // Sensitive volume definition
   Float_t parfs[3] = {klsensmx*0.5, khsensmy*0.5, kwsensmz*0.5};
-  gMC->Gsvolu("FSEN","BOX",idtmed[508],parfs,3); // sensitive
+  gMC->Gsvolu("FSEN", "BOX", idtmed[507], parfs, 3); // Cu sensitive
   // dividing FSEN along z in knz=2 and along x in knx=48
-  gMC->Gsdvn("FSEZ","FSEN",knz,3);
-  gMC->Gsdvn("FPAD","FSEZ",knx,1);
-  // positioning a Sensitive layer inside FPCB
-  gMC->Gspos("FSEN",1,"FPCB",0.,0.,0.,0,"ONLY");
+  gMC->Gsdvn("FSEZ", "FSEN", knz, 3);
+  gMC->Gsdvn("FPAD", "FSEZ", knx, 1);
+  // positioning sensitive layer inside FPCB
+  gMC->Gspos("FSEN", 1, "FPCB", 0., 0., 0., 0, "ONLY");
 
-  //-- RED GLASS Layer definition
+  // RED GLASS Layer definition
   //parfp[0] = klstripx*0.5;
   parfp[1] = khrgly*0.5;
   parfp[2] = kwrglz*0.5;
-  gMC->Gsvolu("FRGL","BOX",idtmed[509],parfp,3); // glass
-  // positioning 4 RED GLASS Layers on FSTR volume
+  gMC->Gsvolu("FRGL", "BOX", idtmed[508], parfp, 3); // red glass
+  // positioning 4 RED GLASS Layers in FSTR volume
   //posfp[0] = 0.;
   posfp[1] = -khstripy*0.5+khhony+khpcby+parfp[1];
   //posfp[2] = 0.;
-  gMC->Gspos("FRGL",1,"FSTR",0., posfp[1],0.,0,"ONLY");
-  gMC->Gspos("FRGL",4,"FSTR",0.,-posfp[1],0.,0,"ONLY");
+  gMC->Gspos("FRGL", 1, "FSTR", 0., posfp[1], 0., 0, "ONLY");
+  gMC->Gspos("FRGL", 4, "FSTR", 0.,-posfp[1], 0., 0, "ONLY");
   //posfp[0] = 0.;
   posfp[1] = (khcpcby+khrgly)*0.5;
   //posfp[2] = 0.;
-  gMC->Gspos("FRGL",2,"FSTR",0.,-posfp[1],0.,0,"ONLY");
-  gMC->Gspos("FRGL",3,"FSTR",0., posfp[1],0.,0,"ONLY");
+  gMC->Gspos("FRGL", 2, "FSTR", 0.,-posfp[1], 0., 0, "ONLY");
+  gMC->Gspos("FRGL", 3, "FSTR", 0., posfp[1], 0., 0, "ONLY");
 
-  //-- GLASS+FISHLINE Layer definition
+  // GLASS Layer definition
   //parfp[0] = klstripx*0.5;
-  parfp[1] = khglfy*0.5;
+  parfp[1] = khglassy;
   parfp[2] = kwglfz*0.5;
-  gMC->Gsvolu("FGLF","BOX",idtmed[504],parfp,3);
-
-  // positioning 2 GLASS+FISHLINE Layers on FSTR volume
+  gMC->Gsvolu("FGLF", "BOX", idtmed[508], parfp, 3); // glass
+  // positioning 2 GLASS Layers in FSTR volume
   //posfp[0] = 0.;
   posfp[1] = (khcpcby + khglfy)*0.5 + khrgly;
   //posfp[2] = 0.;
-  gMC->Gspos("FGLF",1,"FSTR",0.,-posfp[1],0.,0,"ONLY");
-  gMC->Gspos("FGLF",2,"FSTR",0., posfp[1],0.,0,"ONLY");
+  gMC->Gspos("FGLF", 1, "FSTR", 0.,-posfp[1], 0., 0, "ONLY");
+  gMC->Gspos("FGLF", 2, "FSTR", 0., posfp[1], 0., 0, "ONLY");
 
-  //  Positioning the Strips (FSTR volumes) in the FLT volumes
+  // Positioning the Strips (FSTR volumes) in the FLT volumes
   Int_t maxStripNumbers [5] ={fTOFGeometry->NStripC(),
                              fTOFGeometry->NStripB(),
                              fTOFGeometry->NStripA(),
                              fTOFGeometry->NStripB(),
                              fTOFGeometry->NStripC()};
 
+  Int_t idrotm[91];
+
   Int_t totalStrip = 0;
   Float_t xpos, zpos, ypos, ang;
   for(Int_t iplate = 0; iplate < fTOFGeometry->NPlates(); iplate++){
@@ -807,117 +1150,81 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
       ang = fTOFGeometry->GetAngles(iplate,istrip);
       AliDebug(1, Form(" iplate = %1i, istrip = %2i ---> ang = %f", iplate, istrip, ang));
  
-      if (ang>0.)       AliMatrix (idrotm[istrip+totalStrip+1],90.,0.,90.+ang,90., ang, 90.);
-      else if (ang==0.) AliMatrix (idrotm[istrip+totalStrip+1],90.,0.,90.,90., 0., 0.);
-      else if (ang<0.)  AliMatrix (idrotm[istrip+totalStrip+1],90.,0.,90.+ang,90.,-ang,270.);
+      if (ang>0.)       AliMatrix (idrotm[istrip+totalStrip],90.,0.,90.+ang,90., ang, 90.);
+      else if (ang==0.) AliMatrix (idrotm[istrip+totalStrip],90.,0.,90.,90., 0., 0.);
+      else if (ang<0.)  AliMatrix (idrotm[istrip+totalStrip],90.,0.,90.+ang,90.,-ang,270.);
 
       xpos = 0.;
-      zpos = fTOFGeometry->GetDistances(iplate,istrip);
       ypos = fTOFGeometry->GetHeights(iplate,istrip) + yFLT*0.5;
-
-      gMC->Gspos("FSTR",istrip+totalStrip+1,"FLTA", xpos, ypos,-zpos,idrotm[istrip+totalStrip+1],  "ONLY");
+      zpos = fTOFGeometry->GetDistances(iplate,istrip);
+      gMC->Gspos("FSTR", istrip+totalStrip+1, "FLTA", xpos, ypos,-zpos, idrotm[istrip+totalStrip], "ONLY");
 
       if (fTOFHoles) {
        if (istrip+totalStrip+1>53)
-         gMC->Gspos("FSTR",istrip+totalStrip+1,"FLTC", xpos, ypos,-zpos-(zlenA*0.5 + kInterCentrModBorder1 - kModuleWallThickness)*0.5,idrotm[istrip+totalStrip+1],"ONLY");
+         gMC->Gspos("FSTR", istrip+totalStrip+1, "FLTC", xpos, ypos,-zpos-(zlenA*0.5 - 2.*fgkModuleWallThickness + fgkInterCentrModBorder1)*0.5, idrotm[istrip+totalStrip], "ONLY");
        if (istrip+totalStrip+1<39)
-         gMC->Gspos("FSTR",istrip+totalStrip+1,"FLTB", xpos, ypos,-zpos+(zlenA*0.5 + kInterCentrModBorder1 - kModuleWallThickness)*0.5,idrotm[istrip+totalStrip+1],"ONLY");
+         gMC->Gspos("FSTR", istrip+totalStrip+1, "FLTB", xpos, ypos,-zpos+(zlenA*0.5 - 2.*fgkModuleWallThickness + fgkInterCentrModBorder1)*0.5, idrotm[istrip+totalStrip], "ONLY");
       }
     }
   }
 
-  // Definition of the cards, cooling tubes and layer for thermal dispersion
-  // (3 volumes)
-
-  // card volume definition
-  //Float_t carpar[3] = {9.5, 5.75, 0.5};
-  Float_t carpar[3] = {9.5, 5.6, 0.55};
-  //gMC->Gsvolu("FCA1", "BOX ", idtmed[514], carpar, 3);   // PCB+Alu small Card 
-  gMC->Gsvolu("FCA1", "BOX ", idtmed[500], carpar, 3);   // air
-  carpar[0] = 19.25;
-  //carpar[1] =  5.6;//5.75;
-  //carpar[2] =  0.55;//0.5;
-  //gMC->Gsvolu("FCA2", "BOX ", idtmed[514], carpar, 3);   // PCB+Alu long Card 
-  gMC->Gsvolu("FCA2", "BOX ", idtmed[500], carpar, 3);   // air
-
-
-  Float_t feaParam1[3] = {9.5, 5.6, 0.1};
-  gMC->Gsvolu("FFEA", "BOX ", idtmed[502], feaParam1, 3);   // G10
-
-  Float_t al1[3] = {9.5, 0.5, 0.25};
-  gMC->Gsvolu("FAL1", "BOX ", idtmed[505], al1, 3);   // Aluminium
-  Float_t al2[3] = {7.2, 0.8, 0.25};
-  gMC->Gsvolu("FAL2", "BOX ", idtmed[505], al2, 3);   // Aluminium
-  Float_t al3[3] = {3.35, 3.7, 0.1};
-  gMC->Gsvolu("FAL3", "BOX ", idtmed[505], al3, 3);   // Aluminium
-
-  gMC->Gspos("FFEA", 1, "FCA1", 0., 0., -carpar[2]+feaParam1[2], 0, "ONLY");
-  gMC->Gspos("FAL1", 1, "FCA1", 0., carpar[1]-al1[1], -carpar[2]+2.*feaParam1[2]+al1[2], 0, "ONLY");
-  gMC->Gspos("FAL3", 1, "FCA1", 0., carpar[1]-al3[1],  carpar[2]-al3[2], 0, "ONLY");
-  gMC->Gspos("FAL2", 1, "FCA1", 0., carpar[1]-2.*al3[1],  carpar[2]-2.*al3[2]-al2[2], 0, "ONLY");
-
-
-  gMC->Gspos("FFEA", 2, "FCA2", -(feaParam1[0]+0.25), 0., -carpar[2]+feaParam1[2], 0, "ONLY");
-  gMC->Gspos("FAL1", 2, "FCA2", -(feaParam1[0]+0.25), carpar[1]-al1[1], -carpar[2]+2.*feaParam1[2]+al1[2], 0, "ONLY");
-  gMC->Gspos("FAL3", 2, "FCA2", -(feaParam1[0]+0.25), carpar[1]-al3[1],  carpar[2]-al3[2], 0, "ONLY");
-  gMC->Gspos("FAL2", 2, "FCA2", -(feaParam1[0]+0.25), carpar[1]-2.*al3[1],  carpar[2]-2.*al3[2]-al2[2], 0, "ONLY");
-
-  gMC->Gspos("FFEA", 3, "FCA2",  (feaParam1[0]+0.25), 0., -carpar[2]+feaParam1[2], 0, "ONLY");
-  gMC->Gspos("FAL1", 3, "FCA2",  (feaParam1[0]+0.25), carpar[1]-al1[1], -carpar[2]+2.*feaParam1[2]+al1[2], 0, "ONLY");
-  gMC->Gspos("FAL3", 3, "FCA2",  (feaParam1[0]+0.25), carpar[1]-al3[1],  carpar[2]-al3[2], 0, "ONLY");
-  gMC->Gspos("FAL2", 3, "FCA2",  (feaParam1[0]+0.25), carpar[1]-2.*al3[1],  carpar[2]-2.*al3[2]-al2[2], 0, "ONLY");
-
-  Float_t feaRoof1[3] = {9.5, 0.25, 1.7};
-  gMC->Gsvolu("FRO1", "BOX ", idtmed[505], feaRoof1, 3);   // Aluminium
-  Float_t feaRoof2[3] = {3.35, 0.05, 1.5};
-  gMC->Gsvolu("FRO2", "BOX ", idtmed[505], feaRoof2, 3);   // Aluminium
-  Float_t feaRoof3[3] = {3.35, feaRoof1[1]+feaRoof2[1], 0.1};
-  gMC->Gsvolu("FRO3", "BOX ", idtmed[505], feaRoof3, 3);   // Aluminium
-
-  Float_t feaRoof4[3] = {3.35,
-                        0.05,
-                        carpar[2]-feaParam1[2]-al1[2]-al3[2]};
-  gMC->Gsvolu("FRO4", "BOX ", idtmed[505], feaRoof4, 3);   // Aluminium
-
-  Float_t bar[3] = {8.575, 0.6, 0.15};
-  gMC->Gsvolu("FBAR", "BOX ", idtmed[505], bar, 3);   // Aluminium
-
-
-  // tube volume definition
-  Float_t tubepar[3] = {0., 0.4, xFLT*0.5-15.};
-  gMC->Gsvolu("FTUB", "TUBE", idtmed[513], tubepar, 3);  // copper cooling tubes
-  //tubepar[0]= 0.;
-  tubepar[1]= 0.3;
-  //tubepar[2]= xFLT*0.5 - 15.;
-  gMC->Gsvolu("FITU", "TUBE", idtmed[510], tubepar, 3);  // cooling water
-  // Positioning of the water tube into the steel one
-  gMC->Gspos("FITU",1,"FTUB",0.,0.,0.,0,"ONLY");
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::CreateBackZone(Float_t xtof, Float_t ytof, Float_t zlenA) const
+{
+  //
+  // Define:
+  //        - containers for FEA cards, cooling system
+  //          signal cables and supermodule support structure
+  //          (volumes called FAIA/B/C),
+  //        - containers for FEA cards and some cooling
+  //          elements for a FEA (volumes called FCA1/2).
+  //
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  Int_t idrotm[1];
+
+  // Definition of the air card containers (FAIA, FAIC and FAIB)
+
+  Float_t  par[3];
+  par[0] = xtof*0.5;
+  par[1] = (ytof*0.5 - fgkModuleCoverThickness)*0.5;
+  par[2] = zlenA*0.5;
+  gMC->Gsvolu("FAIA", "BOX ", idtmed[500], par, 3); // Air
+  if (fTOFHoles) gMC->Gsvolu("FAIB", "BOX ", idtmed[500], par, 3); // Air
+  gMC->Gsvolu("FAIC", "BOX ", idtmed[500], par, 3); // Air
 
-  // cable
-  Float_t cbpar[3] = {0., 0.5, tubepar[2]};
-  gMC->Gsvolu("FCAB", "TUBE", idtmed[511], cbpar, 3);    // copper+alu
+  Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
+  Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
+  Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
 
-  // Alluminium components
-  Float_t lonpar[3] = {tubepar[2], 6.15, 0.7};
-  gMC->Gsvolu("FTLN", "BOX ", idtmed[505], lonpar, 3);   // alluminium
-  lonpar[0] = 2.;
-  lonpar[1] = 1.;
-  lonpar[2] = zlenA*0.5;
-  gMC->Gsvolu("FLON", "BOX ", idtmed[505], lonpar, 3);   // alluminium
+  // FEA card mother-volume definition
+  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
+                      feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
+                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+  gMC->Gsvolu("FCA1", "BOX ", idtmed[500], carpar, 3); // Air
+  gMC->Gsvolu("FCA2", "BOX ", idtmed[500], carpar, 3); // Air
 
   // rotation matrix
-  AliMatrix(idrotm[99], 180., 90., 90., 90., 90., 0.);
-  AliMatrix(idrotm[98],  90.,180., 90., 90.,180., 0.);
+  AliMatrix(idrotm[0],  90.,180., 90., 90.,180., 0.);
 
-  // cards, tubes, cables  positioning
-  Float_t carpos[3], rowstep = 6.66, ytub= 3.65, ycab= ytub-3.;
+  // FEA card mother-volume positioning
+  Float_t rowstep = 6.66;
   Float_t rowgap[5] = {13.5, 22.9, 16.94, 23.8, 20.4};
-  Int_t row, rowb[5] = {6, 7, 6, 19, 7}, nrow;
-  carpos[0] = 25. - xtof*0.5;
-  carpos[1] = (11.5 - (ytof*0.5 - kHoneycombLayerThickness))*0.5;
-  row = 1;
+  Int_t rowb[5] = {6, 7, 6, 19, 7};
+  Float_t carpos[3] = {0.,
+                      -(ytof*0.5 - fgkModuleCoverThickness)*0.5 + carpar[1],
+                      -0.8};
+  gMC->Gspos("FCA1", 91, "FAIA", carpos[0], carpos[1], carpos[2], 0, "MANY");
+  gMC->Gspos("FCA2", 91, "FAIC", carpos[0], carpos[1], carpos[2], 0, "MANY");
+
+  Int_t row = 1;
+  Int_t nrow = 0;
   for (Int_t sg= -1; sg< 2; sg+= 2) {
-    carpos[2] = sg*zlenA*0.5;
+    carpos[2] = sg*zlenA*0.5 - 0.8;
     for (Int_t nb=0; nb<5; ++nb) {
       carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
       nrow = row + rowb[nb];
@@ -926,132 +1233,32 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
         carpos[2] -= sg*rowstep;
 
        if (nb==4) {
-         gMC->Gspos("FCA1",2*row,  "FAIA", carpos[0],carpos[1],carpos[2], 0,"ONLY");
-         gMC->Gspos("FCA1",2*row-1,"FAIA",-carpos[0],carpos[1],carpos[2], 0,"ONLY");
-         gMC->Gspos("FCA2", row,   "FAIA", 0., carpos[1], carpos[2], 0, "ONLY");
-
-         //gMC->Gspos("FTUB", row, "FAIA", 0., ytub, carpos[2]-sg, idrotm[99], "ONLY");
-         gMC->Gspos("FTUB", row, "FAIA", 0., carpos[1]+carpar[1]-bar[1], carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-bar[1]), idrotm[99], "ONLY");
-         gMC->Gspos("FCAB", row, "FAIA", 0., ycab, carpos[2]-1.1, idrotm[99], "ONLY");
-
-         gMC->Gspos("FRO1",4*row,  "FAIA", carpos[0],carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-         gMC->Gspos("FRO1",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-         gMC->Gspos("FRO1",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-         gMC->Gspos("FRO1",4*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-
-         gMC->Gspos("FRO2",4*row,  "FAIA", carpos[0],carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-         gMC->Gspos("FRO2",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-         gMC->Gspos("FRO2",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-         gMC->Gspos("FRO2",4*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-
-         gMC->Gspos("FRO3",4*row,  "FAIA", carpos[0],carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+(carpar[2]-feaRoof3[2]), 0,"ONLY");
-         gMC->Gspos("FRO3",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+(carpar[2]-feaRoof3[2]), 0,"ONLY");
-         gMC->Gspos("FRO3",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+(carpar[2]-feaRoof3[2]), 0,"ONLY");
-         gMC->Gspos("FRO3",4*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+(carpar[2]-feaRoof3[2]), 0,"ONLY");
-
-         gMC->Gspos("FRO4",4*row,  "FAIA", carpos[0],          carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-         gMC->Gspos("FRO4",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-         gMC->Gspos("FRO4",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-         gMC->Gspos("FRO4",4*row-3,"FAIA",-carpos[0],          carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-
-         gMC->Gspos("FBAR",4*row,  "FAIA", carpos[0],carpos[1]+carpar[1]-bar[1],carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-         gMC->Gspos("FBAR",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+-bar[1],carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-         gMC->Gspos("FBAR",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+-bar[1],carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-         gMC->Gspos("FBAR",4*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]-bar[1],carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
+         gMC->Gspos("FCA1", row, "FAIA", carpos[0], carpos[1], carpos[2], 0, "ONLY");
+         gMC->Gspos("FCA2", row, "FAIC", carpos[0], carpos[1], carpos[2], 0, "ONLY");
 
        }
        else {
          switch (sg) {
          case 1:
-           gMC->Gspos("FCA1",2*row,  "FAIA", carpos[0],carpos[1],carpos[2], 0,"ONLY");
-           gMC->Gspos("FCA1",2*row-1,"FAIA",-carpos[0],carpos[1],carpos[2], 0,"ONLY");
-           gMC->Gspos("FCA2", row,   "FAIA", 0., carpos[1], carpos[2], 0, "ONLY");
+           gMC->Gspos("FCA1", row, "FAIA", carpos[0], carpos[1], carpos[2], 0, "ONLY");
+           gMC->Gspos("FCA2", row, "FAIC", carpos[0], carpos[1], carpos[2], 0, "ONLY");
            break;
          case -1:
-           gMC->Gspos("FCA1",2*row,  "FAIA", carpos[0],carpos[1],carpos[2], idrotm[98],"ONLY");
-           gMC->Gspos("FCA1",2*row-1,"FAIA",-carpos[0],carpos[1],carpos[2], idrotm[98],"ONLY");
-           gMC->Gspos("FCA2", row,   "FAIA", 0., carpos[1], carpos[2], idrotm[98], "ONLY");
+           gMC->Gspos("FCA1", row, "FAIA", carpos[0], carpos[1], carpos[2], idrotm[0], "ONLY");
+           gMC->Gspos("FCA2", row, "FAIC", carpos[0], carpos[1], carpos[2], idrotm[0], "ONLY");
            break;
          }
 
-         //gMC->Gspos("FTUB", row, "FAIA", 0., ytub, carpos[2]-sg, idrotm[99], "ONLY");
-         gMC->Gspos("FTUB", row, "FAIA", 0., carpos[1]+carpar[1]-bar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-bar[1]), idrotm[99], "ONLY");
-         gMC->Gspos("FCAB", row, "FAIA", 0., ycab, carpos[2]-sg*1.1, idrotm[99], "ONLY");
-
-         gMC->Gspos("FRO1",4*row,  "FAIA", carpos[0],carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-         gMC->Gspos("FRO1",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-         gMC->Gspos("FRO1",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-         gMC->Gspos("FRO1",4*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-
-         gMC->Gspos("FRO2",4*row,  "FAIA", carpos[0],carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+sg*(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-         gMC->Gspos("FRO2",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+sg*(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-         gMC->Gspos("FRO2",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+sg*(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-         gMC->Gspos("FRO2",4*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+sg*(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-
-         gMC->Gspos("FRO3",4*row,  "FAIA", carpos[0],carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+sg*(carpar[2]-feaRoof3[2]), 0,"ONLY");
-         gMC->Gspos("FRO3",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+sg*(carpar[2]-feaRoof3[2]), 0,"ONLY");
-         gMC->Gspos("FRO3",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+sg*(carpar[2]-feaRoof3[2]), 0,"ONLY");
-         gMC->Gspos("FRO3",4*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+sg*(carpar[2]-feaRoof3[2]), 0,"ONLY");
-
-         gMC->Gspos("FRO4",4*row,  "FAIA", carpos[0],          carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+sg*(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-         gMC->Gspos("FRO4",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+sg*(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-         gMC->Gspos("FRO4",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+sg*(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-         gMC->Gspos("FRO4",4*row-3,"FAIA",-carpos[0],          carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+sg*(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-
-         gMC->Gspos("FBAR",4*row,  "FAIA", carpos[0],carpos[1]+carpar[1]-bar[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-         gMC->Gspos("FBAR",4*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+-bar[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-         gMC->Gspos("FBAR",4*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+-bar[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-         gMC->Gspos("FBAR",4*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]-bar[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-
        }
+
       }
     }
-    gMC->Gspos("FTLN", 5+4*sg, "FAIA", 0., -0.1, 369.9*sg, 0, "ONLY");
-    gMC->Gspos("FTLN", 5+3*sg, "FAIA", 0., -0.1, 366.9*sg, 0, "ONLY");
-    gMC->Gspos("FTLN", 5+2*sg, "FAIA", 0., -0.1, 198.8*sg, 0, "ONLY");
-    gMC->Gspos("FTLN",   5+sg, "FAIA", 0., -0.1, 56.82*sg, 0, "ONLY");
   }
-  gMC->Gspos("FCA1", 182, "FAIA", carpos[0],carpos[1],0., 0,"ONLY");
-  gMC->Gspos("FCA1", 181, "FAIA",-carpos[0],carpos[1],0., 0,"ONLY");
-  gMC->Gspos("FCA2",  91, "FAIA",  0., carpos[1], 0., 0, "ONLY");
-
-  //gMC->Gspos("FTUB",  91, "FAIA",  0., ytub, -1., idrotm[99], "ONLY");
-  gMC->Gspos("FTUB", 91, "FAIA", 0., carpos[1]+carpar[1]-bar[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-bar[1]), idrotm[99], "ONLY");
-  gMC->Gspos("FCAB", 91, "FAIA",  0., ycab, -1.1, idrotm[99], "ONLY");
-
-  gMC->Gspos("FRO1",364, "FAIA", carpos[0],carpos[1]+carpar[1]+feaRoof1[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-  gMC->Gspos("FRO1",363, "FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof1[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-  gMC->Gspos("FRO1",362, "FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof1[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-  gMC->Gspos("FRO1",361, "FAIA",-carpos[0],carpos[1]+carpar[1]+feaRoof1[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-
-  gMC->Gspos("FRO2",364, "FAIA", carpos[0],carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-  gMC->Gspos("FRO2",363, "FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-  gMC->Gspos("FRO2",362, "FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-  gMC->Gspos("FRO2",361, "FAIA",-carpos[0],carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-
-  gMC->Gspos("FRO3",364, "FAIA", carpos[0],carpos[1]+carpar[1]+feaRoof3[1],(carpar[2]-feaRoof3[2]), 0,"ONLY");
-  gMC->Gspos("FRO3",363, "FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof3[1],(carpar[2]-feaRoof3[2]), 0,"ONLY");
-  gMC->Gspos("FRO3",362, "FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof3[1],(carpar[2]-feaRoof3[2]), 0,"ONLY");
-  gMC->Gspos("FRO3",361, "FAIA",-carpos[0],carpos[1]+carpar[1]+feaRoof3[1],(carpar[2]-feaRoof3[2]), 0,"ONLY");
-
-  gMC->Gspos("FRO4",364, "FAIA", carpos[0],          carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-  gMC->Gspos("FRO4",363, "FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-  gMC->Gspos("FRO4",362, "FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-  gMC->Gspos("FRO4",361, "FAIA",-carpos[0],          carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-
-  gMC->Gspos("FBAR",364, "FAIA", carpos[0],carpos[1]+carpar[1]-bar[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-  gMC->Gspos("FBAR",363, "FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]+-bar[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-  gMC->Gspos("FBAR",362, "FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+-bar[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-  gMC->Gspos("FBAR",361, "FAIA",-carpos[0],carpos[1]+carpar[1]-bar[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-
-  gMC->Gspos("FLON",  2, "FAIA",-24., ytub+1.4, 0., 0, "MANY");
-  gMC->Gspos("FLON",  1, "FAIA", 24., ytub+1.4, 0., 0, "MANY");
-
 
   if (fTOFHoles) {
     row = 1;
     for (Int_t sg= -1; sg< 2; sg+= 2) {
-      carpos[2] = sg*zlenA*0.5;
+      carpos[2] = sg*zlenA*0.5 - 0.8;
       for (Int_t nb=0; nb<4; ++nb) {
         carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
         nrow = row + rowb[nb];
@@ -1060,121 +1267,617 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
 
          switch (sg) {
          case 1:
-           gMC->Gspos("FCA1",2*row,  "FAIB", carpos[0],carpos[1],carpos[2], 0,"ONLY");
-           gMC->Gspos("FCA1",2*row-1,"FAIB",-carpos[0],carpos[1],carpos[2], 0,"ONLY");
-           gMC->Gspos("FCA2", row,   "FAIB", 0., carpos[1], carpos[2], 0, "ONLY");
+           gMC->Gspos("FCA1", row, "FAIB", carpos[0], carpos[1], carpos[2], 0, "ONLY");
            break;
          case -1:
-           gMC->Gspos("FCA1",2*row,  "FAIB", carpos[0],carpos[1],carpos[2], idrotm[98],"ONLY");
-           gMC->Gspos("FCA1",2*row-1,"FAIB",-carpos[0],carpos[1],carpos[2], idrotm[98],"ONLY");
-           gMC->Gspos("FCA2", row,   "FAIB", 0., carpos[1], carpos[2], idrotm[98], "ONLY");
+           gMC->Gspos("FCA1", row, "FAIB", carpos[0], carpos[1], carpos[2], idrotm[0], "ONLY");
            break;
          }
+       }
+      }
+    }
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeFrontEndElectronics(Float_t xtof) const
+{
+  //
+  // Fill FCA1/2 volumes with FEA cards (FFEA volumes).
+  //
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  // FEA card volume definition
+  Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
+  gMC->Gsvolu("FFEA", "BOX ", idtmed[502], feaParam, 3); // G10
+
+  Float_t al1[3] = {fgkAl1parameters[0], fgkAl1parameters[1], fgkAl1parameters[2]};
+  Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
+  Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+
+  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
+                      feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
+                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+
+  // FEA card volume positioning
+  Float_t xCoor = xtof*0.5 - 25.;
+  Float_t yCoor =-carpar[1] + feaParam[1];
+  Float_t zCoor =-carpar[2] + (2.*feaRoof1[2] - 2.*al1[2] - feaParam[2]);
+  gMC->Gspos("FFEA", 1, "FCA1",-xCoor, yCoor, zCoor, 0, "ONLY");
+  gMC->Gspos("FFEA", 4, "FCA1", xCoor, yCoor, zCoor, 0, "ONLY");
+  gMC->Gspos("FFEA", 1, "FCA2",-xCoor, yCoor, zCoor, 0, "ONLY");
+  gMC->Gspos("FFEA", 4, "FCA2", xCoor, yCoor, zCoor, 0, "ONLY");
+  xCoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FFEA", 2, "FCA1",-xCoor, yCoor, zCoor, 0, "ONLY");
+  gMC->Gspos("FFEA", 3, "FCA1", xCoor, yCoor, zCoor, 0, "ONLY");
+  gMC->Gspos("FFEA", 2, "FCA2",-xCoor, yCoor, zCoor, 0, "ONLY");
+  gMC->Gspos("FFEA", 3, "FCA2", xCoor, yCoor, zCoor, 0, "ONLY");
 
-          //gMC->Gspos("FTUB", row, "FAIB", 0., ytub,carpos[2]-sg, idrotm[99], "ONLY");
-         gMC->Gspos("FTUB", row, "FAIB", 0., carpos[1]+carpar[1]-bar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-bar[1]), idrotm[99], "ONLY");
-          gMC->Gspos("FCAB", row, "FAIB", 0., ycab,carpos[2]-sg*1.1, idrotm[99], "ONLY");
+}
 
-         gMC->Gspos("FRO1",4*row,  "FAIB", carpos[0],carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-         gMC->Gspos("FRO1",4*row-1,"FAIB", (feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-         gMC->Gspos("FRO1",4*row-2,"FAIB",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
-         gMC->Gspos("FRO1",4*row-3,"FAIB",-carpos[0],carpos[1]+carpar[1]+feaRoof1[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+feaRoof1[2]), 0,"ONLY");
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeFEACooling(Float_t xtof) const
+{
+  //
+  // Make cooling system attached to each FEA card
+  // (FAL1, FRO1 and FBAR/1/2 volumes)
+  // in FCA1/2 volume containers.
+  //
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  // first FEA cooling element definition
+  Float_t al1[3] = {fgkAl1parameters[0], fgkAl1parameters[1], fgkAl1parameters[2]};
+  gMC->Gsvolu("FAL1", "BOX ", idtmed[504], al1, 3); // Al
+
+  // second FEA cooling element definition
+  Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
+  gMC->Gsvolu("FRO1", "BOX ", idtmed[504], feaRoof1, 3); // Al
+
+  Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+
+  // definition and positioning of a small air groove in the FRO1 volume
+  Float_t airHole[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1]*0.5, feaRoof1[2]};
+  gMC->Gsvolu("FREE", "BOX ", idtmed[500], airHole, 3); // Air
+  gMC->Gspos("FREE", 1, "FRO1", 0., feaRoof1[1]-airHole[1], 0., 0, "ONLY");
+  gGeoManager->GetVolume("FRO1")->VisibleDaughters(kFALSE);
+
+  // third FEA cooling element definition
+  Float_t bar[3] = {fgkBar[0], fgkBar[1], fgkBar[2]};
+  gMC->Gsvolu("FBAR", "BOX ", idtmed[504], bar, 3); // Al
+
+  Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
+
+  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
+                      feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
+                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+
+  // fourth FEA cooling element definition
+  Float_t bar1[3] = {fgkBar1[0], fgkBar1[1], fgkBar1[2]};
+  gMC->Gsvolu("FBA1", "BOX ", idtmed[504], bar1, 3); // Al
+
+  // fifth FEA cooling element definition
+  Float_t bar2[3] = {fgkBar2[0], fgkBar2[1], fgkBar2[2]};
+  gMC->Gsvolu("FBA2", "BOX ", idtmed[504], bar2, 3); // Al
+
+  // first FEA cooling element positioning
+  Float_t xcoor = xtof*0.5 - 25.;
+  Float_t ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - al1[1];
+  Float_t zcoor =-carpar[2] + 2.*feaRoof1[2] - al1[2];
+  gMC->Gspos("FAL1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FAL1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  // second FEA cooling element positioning
+  xcoor = xtof*0.5 - 25.;
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - feaRoof1[1];
+  zcoor =-carpar[2] + feaRoof1[2];
+  gMC->Gspos("FRO1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+  gMC->Gspos("FRO1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+  gMC->Gspos("FRO1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FRO1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FRO1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+  gMC->Gspos("FRO1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+  gMC->Gspos("FRO1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FRO1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  // third FEA cooling element positioning
+  xcoor = xtof*0.5 - 25.;
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - bar[1];
+  zcoor =-carpar[2] + bar[2];
+  gMC->Gspos("FBAR", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBAR", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBAR", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBAR", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FBAR", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBAR", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBAR", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBAR", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  // fourth FEA cooling element positioning
+  Float_t tubepar[3] = {0., 0.4, xtof*0.5 - fgkCBLw};
+  xcoor = xtof*0.5 - 25.;
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - bar[1];
+  zcoor =-carpar[2] + 2.*bar[2] + 2.*tubepar[1] + bar1[2];
+  gMC->Gspos("FBA1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FBA1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  // fifth FEA cooling element positioning
+  xcoor = xtof*0.5 - 25.;
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - bar2[1];
+  zcoor =-carpar[2] + 2.*bar[2] + bar2[2];
+  gMC->Gspos("FBA2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FBA2", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  xcoor = xtof*0.5 - 25.;
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - 2.*tubepar[1] - bar2[1];
+  zcoor =-carpar[2] + 2.*bar[2] + bar2[2];
+  gMC->Gspos("FBA2", 5, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 8, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 5, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 8, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FBA2", 6, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 7, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 6, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBA2", 7, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
 
-         gMC->Gspos("FRO2",4*row,  "FAIB", carpos[0],carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+sg*(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-         gMC->Gspos("FRO2",4*row-1,"FAIB", (feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+sg*(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-         gMC->Gspos("FRO2",4*row-2,"FAIB",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+sg*(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
-         gMC->Gspos("FRO2",4*row-3,"FAIB",-carpos[0],carpos[1]+carpar[1]+2.*feaRoof1[1]+feaRoof2[1],carpos[2]+sg*(carpar[2]-2.*feaRoof3[2]-feaRoof2[2]), 0,"ONLY");
+}
 
-         gMC->Gspos("FRO3",4*row,  "FAIB", carpos[0],carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+sg*(carpar[2]-feaRoof3[2]), 0,"ONLY");
-         gMC->Gspos("FRO3",4*row-1,"FAIB", (feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+sg*(carpar[2]-feaRoof3[2]), 0,"ONLY");
-         gMC->Gspos("FRO3",4*row-2,"FAIB",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+sg*(carpar[2]-feaRoof3[2]), 0,"ONLY");
-         gMC->Gspos("FRO3",4*row-3,"FAIB",-carpos[0],carpos[1]+carpar[1]+feaRoof3[1],carpos[2]+sg*(carpar[2]-feaRoof3[2]), 0,"ONLY");
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeNinoMask(Float_t xtof) const
+{
+  //
+  // Make cooling Nino mask
+  // for each FEA card (FAL2/3 and FRO2 volumes)
+  // in FCA1 volume container.
+  //
 
-         gMC->Gspos("FRO4",4*row,  "FAIB", carpos[0],          carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+sg*(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-         gMC->Gspos("FRO4",4*row-1,"FAIB", (feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+sg*(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-         gMC->Gspos("FRO4",4*row-2,"FAIB",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+sg*(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
-         gMC->Gspos("FRO4",4*row-3,"FAIB",-carpos[0],          carpos[1]+carpar[1]+2.*feaRoof1[1]-feaRoof4[1],carpos[2]+sg*(carpar[2]-2.*al3[2]-feaRoof4[2]), 0,"ONLY");
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  // first Nino ASIC mask volume definition
+  Float_t al2[3] = {fgkAl2parameters[0], fgkAl2parameters[1], fgkAl2parameters[2]};
+  gMC->Gsvolu("FAL2", "BOX ", idtmed[504], al2, 3); // Al
+
+  // second Nino ASIC mask volume definition
+  Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
+  gMC->Gsvolu("FAL3", "BOX ", idtmed[504], al3, 3); // Al
+
+  // third Nino ASIC mask volume definition
+  Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+  gMC->Gsvolu("FRO2", "BOX ", idtmed[504], feaRoof2, 3); // Al
+
+  Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
+  Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
+
+  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
+                      feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
+                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+
+  // first Nino ASIC mask volume positioning
+  Float_t xcoor = xtof*0.5 - 25.;
+  Float_t ycoor = carpar[1] - 2.*al3[1];
+  Float_t zcoor = carpar[2] - 2.*al3[2] - al2[2];
+  gMC->Gspos("FAL2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FAL2", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL2", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  // second Nino ASIC mask volume positioning
+  xcoor = xtof*0.5 - 25.;
+  ycoor = carpar[1] - al3[1];
+  zcoor = carpar[2] - al3[2];
+  gMC->Gspos("FAL3", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL3", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FAL3", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FAL3", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+
+  // third Nino ASIC mask volume positioning
+  xcoor = xtof*0.5 - 25.;
+  ycoor = carpar[1] - fgkRoof2parameters[1];
+  zcoor = carpar[2] - 2.*al3[2] - fgkRoof2parameters[2];
+  gMC->Gspos("FRO2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FRO2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
+  gMC->Gspos("FRO2", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FRO2", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
 
-         gMC->Gspos("FBAR",4*row,  "FAIB", carpos[0],carpos[1]+carpar[1]-bar[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-         gMC->Gspos("FBAR",4*row-1,"FAIB", (feaParam1[0]+0.25),carpos[1]+carpar[1]+-bar[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-         gMC->Gspos("FBAR",4*row-2,"FAIB",-(feaParam1[0]+0.25),carpos[1]+carpar[1]+-bar[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
-         gMC->Gspos("FBAR",4*row-3,"FAIB",-carpos[0],carpos[1]+carpar[1]-bar[1],carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[1]), 0,"ONLY");
+}
 
-        }
-      }
-      gMC->Gspos("FTLN", 5+4*sg, "FAIB", 0., -0.1, 369.9*sg, 0, "ONLY");
-      gMC->Gspos("FTLN", 5+3*sg, "FAIB", 0., -0.1, 366.9*sg, 0, "ONLY");
-      gMC->Gspos("FTLN", 5+2*sg, "FAIB", 0., -0.1, 198.8*sg, 0, "ONLY");
-      gMC->Gspos("FTLN",   5+sg, "FAIB", 0., -0.1, 56.82*sg, 0, "ONLY");
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeSuperModuleCooling(Float_t xtof, Float_t ytof, Float_t zlenA) const
+{
+  //
+  // Make cooling tubes (FTUB volume)
+  // and cooling bars (FTLN and FLO1/2/3 volumes)
+  // in FAIA/B/C volume containers.
+  //
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  Int_t idrotm[1];
+
+  // cooling tube volume definition
+  Float_t tubepar[3] = {0., 0.4, xtof*0.5 - fgkCBLw - fgkSawThickness};
+  gMC->Gsvolu("FTUB", "TUBE", idtmed[512], tubepar, 3); // Cu
+
+  // water cooling tube volume definition
+  Float_t tubeparW[3] = {0., 0.3, tubepar[2]};
+  gMC->Gsvolu("FITU", "TUBE", idtmed[509], tubeparW, 3); // H2O
+
+  // Positioning of the water tube into the steel one
+  gMC->Gspos("FITU", 1, "FTUB", 0., 0., 0., 0, "ONLY");
+
+  // definition of transverse components of SM cooling system
+  Float_t trapar[3] = {tubepar[2], 6.175/*6.15*/, 0.7};
+  gMC->Gsvolu("FTLN", "BOX ", idtmed[504], trapar, 3); // Al
+
+  // rotation matrix
+  AliMatrix(idrotm[0], 180., 90., 90., 90., 90., 0.);
+
+  Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
+  Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
+  Float_t bar[3] = {fgkBar[0], fgkBar[1], fgkBar[2]};
+  Float_t bar2[3] = {fgkBar2[0], fgkBar2[1], fgkBar2[2]};
+  Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+
+  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
+                      feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
+                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+
+  Float_t ytub =-(ytof*0.5 - fgkModuleCoverThickness)*0.5 + carpar[1] +
+    carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
+
+  // Positioning of tubes for the SM cooling system
+  Float_t ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
+  Float_t zcoor =-carpar[2] + 2.*bar[2] + tubepar[1];
+  gMC->Gspos("FTUB", 1, "FCA1", 0., ycoor, zcoor, idrotm[0], "ONLY");
+  gMC->Gspos("FTUB", 1, "FCA2", 0., ycoor, zcoor, idrotm[0], "ONLY");
+  gGeoManager->GetVolume("FTUB")->VisibleDaughters(kFALSE);
+
+  Float_t yFLTN = trapar[1] - (ytof*0.5 - fgkModuleCoverThickness)*0.5;
+  for (Int_t sg= -1; sg< 2; sg+= 2) {
+    // Positioning of transverse components for the SM cooling system
+    gMC->Gspos("FTLN", 5+4*sg, "FAIA", 0., yFLTN, 369.9*sg, 0, "MANY");
+    gMC->Gspos("FTLN", 5+3*sg, "FAIA", 0., yFLTN, 366.9*sg, 0, "MANY");
+    gMC->Gspos("FTLN", 5+2*sg, "FAIA", 0., yFLTN, 198.8*sg, 0, "MANY");
+    gMC->Gspos("FTLN",   5+sg, "FAIA", 0., yFLTN, 56.82*sg, 0, "MANY");
+    gMC->Gspos("FTLN", 5+4*sg, "FAIC", 0., yFLTN, 369.9*sg, 0, "MANY");
+    gMC->Gspos("FTLN", 5+3*sg, "FAIC", 0., yFLTN, 366.9*sg, 0, "MANY");
+    gMC->Gspos("FTLN", 5+2*sg, "FAIC", 0., yFLTN, 198.8*sg, 0, "MANY");
+    gMC->Gspos("FTLN",   5+sg, "FAIC", 0., yFLTN, 56.82*sg, 0, "MANY");
+  }
+
+  // definition of longitudinal components of SM cooling system
+  Float_t lonpar1[3] = {2., 0.5, 56.82 - trapar[2]};
+  Float_t lonpar2[3] = {lonpar1[0], lonpar1[1], (198.8 - 56.82)*0.5 - trapar[2]};
+  Float_t lonpar3[3] = {lonpar1[0], lonpar1[1], (366.9 - 198.8)*0.5 - trapar[2]};
+  gMC->Gsvolu("FLO1", "BOX ", idtmed[504], lonpar1, 3); // Al
+  gMC->Gsvolu("FLO2", "BOX ", idtmed[504], lonpar2, 3); // Al
+  gMC->Gsvolu("FLO3", "BOX ", idtmed[504], lonpar3, 3); // Al
+
+  // Positioning of longitudinal components for the SM cooling system
+  ycoor =  ytub + (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
+  gMC->Gspos("FLO1",  4, "FAIA",-24., ycoor, 0., 0, "MANY");
+  gMC->Gspos("FLO1",  2, "FAIA", 24., ycoor, 0., 0, "MANY");
+  gMC->Gspos("FLO1",  4, "FAIC",-24., ycoor, 0., 0, "MANY");
+  gMC->Gspos("FLO1",  2, "FAIC", 24., ycoor, 0., 0, "MANY");
+
+  zcoor = (198.8 + 56.82)*0.5;
+  gMC->Gspos("FLO2",  4, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  2, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  4, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  2, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  8, "FAIA",-24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  6, "FAIA", 24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  8, "FAIC",-24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  6, "FAIC", 24., ycoor, zcoor, 0, "MANY");
+
+  zcoor = (366.9 + 198.8)*0.5;
+  gMC->Gspos("FLO3",  4, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  2, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  4, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  2, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  8, "FAIA",-24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  6, "FAIA", 24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  8, "FAIC",-24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  6, "FAIC", 24., ycoor, zcoor, 0, "MANY");
+
+  ycoor =  ytub - (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
+  gMC->Gspos("FLO1",  3, "FAIA",-24., ycoor, 0., 0, "MANY");
+  gMC->Gspos("FLO1",  1, "FAIA", 24., ycoor, 0., 0, "MANY");
+  gMC->Gspos("FLO1",  3, "FAIC",-24., ycoor, 0., 0, "MANY");
+  gMC->Gspos("FLO1",  1, "FAIC", 24., ycoor, 0., 0, "MANY");
+
+  zcoor = (198.8 + 56.82)*0.5;
+  gMC->Gspos("FLO2",  3, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  1, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  3, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  1, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  7, "FAIA",-24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  5, "FAIA", 24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  7, "FAIC",-24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO2",  5, "FAIC", 24., ycoor, zcoor, 0, "MANY");
+
+  zcoor = (366.9 + 198.8)*0.5;
+  gMC->Gspos("FLO3",  3, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  1, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  3, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  1, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  7, "FAIA",-24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  5, "FAIA", 24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  7, "FAIC",-24., ycoor, zcoor, 0, "MANY");
+  gMC->Gspos("FLO3",  5, "FAIC", 24., ycoor, zcoor, 0, "MANY");
+
+
+  Float_t carpos[3] = {25. - xtof*0.5,
+                      (11.5 - (ytof*0.5 - fgkModuleCoverThickness))*0.5,
+                      0.};
+  if (fTOFHoles) {
+    for (Int_t sg= -1; sg< 2; sg+= 2) {
+      carpos[2] = sg*zlenA*0.5;
+      gMC->Gspos("FTLN", 5+4*sg, "FAIB", 0., yFLTN, 369.9*sg, 0, "MANY");
+      gMC->Gspos("FTLN", 5+3*sg, "FAIB", 0., yFLTN, 366.9*sg, 0, "MANY");
+      gMC->Gspos("FTLN", 5+2*sg, "FAIB", 0., yFLTN, 198.8*sg, 0, "MANY");
+      gMC->Gspos("FTLN",   5+sg, "FAIB", 0., yFLTN, 56.82*sg, 0, "MANY");
     }
-  gMC->Gspos("FLON", 2, "FAIB",-24., ytub+1.4, 0., 0, "MANY");
-  gMC->Gspos("FLON", 1, "FAIB", 24., ytub+1.4, 0., 0, "MANY");
+
+    ycoor =  ytub + (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
+    zcoor = (198.8 + 56.82)*0.5;
+    gMC->Gspos("FLO2", 2, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
+    gMC->Gspos("FLO2", 1, "FAIB",-24., ycoor, zcoor, 0, "MANY");
+    zcoor = (366.9 + 198.8)*0.5;
+    gMC->Gspos("FLO3", 2, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
+    gMC->Gspos("FLO3", 1, "FAIB",-24., ycoor, zcoor, 0, "MANY");
+    ycoor =  ytub - (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
+    zcoor = (198.8 + 56.82)*0.5;
+    gMC->Gspos("FLO2", 4, "FAIB", 24., ycoor,-zcoor, 0, "MANY");
+    gMC->Gspos("FLO2", 3, "FAIB", 24., ycoor, zcoor, 0, "MANY");
+    zcoor = (366.9 + 198.8)*0.5;
+    gMC->Gspos("FLO3", 4, "FAIB", 24., ycoor,-zcoor, 0, "MANY");
+    gMC->Gspos("FLO3", 3, "FAIB", 24., ycoor, zcoor, 0, "MANY");
+
   }
 
+  Float_t barS[3] = {fgkBarS[0], fgkBarS[1], fgkBarS[2]};
+  gMC->Gsvolu("FBAS", "BOX ", idtmed[504], barS, 3); // Al
+
+  Float_t barS1[3] = {fgkBarS1[0], fgkBarS1[1], fgkBarS1[2]};
+  gMC->Gsvolu("FBS1", "BOX ", idtmed[504], barS1, 3); // Al
+
+  Float_t barS2[3] = {fgkBarS2[0], fgkBarS2[1], fgkBarS2[2]};
+  gMC->Gsvolu("FBS2", "BOX ", idtmed[504], barS2, 3); // Al
+
+  Float_t ytubBis = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*barS2[1] - tubepar[1];
+  ycoor = ytubBis;
+  zcoor =-carpar[2] + barS[2];
+  gMC->Gspos("FBAS", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBAS", 2, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBAS", 1, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBAS", 2, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
+
+  zcoor =-carpar[2] + 2.*barS[2] + 2.*tubepar[1] + barS1[2];
+  gMC->Gspos("FBS1", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBS1", 2, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBS1", 1, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBS1", 2, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
+
+  ycoor = ytubBis + (tubepar[1] + barS2[1]);
+  zcoor =-carpar[2] + 2.*barS[2] + barS2[2];
+  gMC->Gspos("FBS2", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBS2", 2, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBS2", 1, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBS2", 2, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
+
+  ycoor = ytubBis - (tubepar[1] + barS2[1]);
+  //zcoor =-carpar[2] + 2.*barS[2] + barS2[2];
+  gMC->Gspos("FBS2", 3, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBS2", 4, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBS2", 3, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FBS2", 4, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeSuperModuleServices(Float_t xtof, Float_t ytof, Float_t zlenA) const
+{
+  //
+  // Make signal cables (FCAB/L and FCBL/B volumes),
+  // supemodule cover (FCOV volume) and wall (FSAW volume)
+  // in FAIA/B/C volume containers.
+  //
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  Int_t idrotm[3];
+
+  Float_t tubepar[3] = {0., 0.4, xtof*0.5 - fgkCBLw - fgkSawThickness};
+  Float_t al1[3] = {fgkAl1parameters[0], fgkAl1parameters[1], fgkAl1parameters[2]};
+  Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
+  Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+  Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
+
+  // FEA cables definition
+  Float_t cbpar[3] = {0., 0.5, (tubepar[2] - (fgkFEAwidth2 - fgkFEAwidth1/6.)*0.5)*0.5};
+  gMC->Gsvolu("FCAB", "TUBE", idtmed[510], cbpar, 3);    // copper+alu
+
+  Float_t cbparS[3] = {cbpar[0], cbpar[1], (tubepar[2] - (xtof*0.5 - 25. + (fgkFEAwidth1 - fgkFEAwidth1/6.)*0.5))*0.5};
+  gMC->Gsvolu("FCAL", "TUBE", idtmed[510], cbparS, 3);    // copper+alu
+
+  // rotation matrix
+  AliMatrix(idrotm[0], 180., 90., 90., 90., 90., 0.);
+
+  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
+                      feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
+                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+
+  Float_t bar2[3] = {fgkBar2[0], fgkBar2[1], fgkBar2[2]};
+  Float_t ytub =-(ytof*0.5 - fgkModuleCoverThickness)*0.5 + carpar[1] +
+    carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
+
+  // FEA cables positioning
+  Float_t xcoor = (tubepar[2] + (fgkFEAwidth2 - fgkFEAwidth1/6.)*0.5)*0.5;
+  Float_t ycoor = ytub - 3.;
+  Float_t zcoor =-carpar[2] + (2.*feaRoof1[2] - 2.*al1[2] - 2.*feaParam[2] - cbpar[1]);
+  gMC->Gspos("FCAB", 1, "FCA1",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  gMC->Gspos("FCAB", 2, "FCA1", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  gMC->Gspos("FCAB", 1, "FCA2",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  gMC->Gspos("FCAB", 2, "FCA2", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  xcoor = (tubepar[2] + (xtof*0.5 - 25. + (fgkFEAwidth1 - fgkFEAwidth1/6.)*0.5))*0.5;
+  ycoor -= 2.*cbpar[1];
+  gMC->Gspos("FCAL", 1, "FCA1",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  gMC->Gspos("FCAL", 2, "FCA1", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  gMC->Gspos("FCAL", 1, "FCA2",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  gMC->Gspos("FCAL", 2, "FCA2", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+
+
   // Cables and tubes on the side blocks
-  const Float_t kcbll   = zlenA*0.5; // length of block
-  const Float_t kcbllh  = zlenA*0.5 - kInterCentrModBorder2; // length  of block in case of hole
-  const Float_t kcblw   = 13.5;      // width of block
-  const Float_t kcblh1  = 2.;        // min. heigth of block
-  const Float_t kcblh2  = 12.3;      // max. heigth of block
-  // volume definition
+  // constants definition
+  const Float_t kCBLl   = zlenA*0.5; // length of block
+  const Float_t kCBLlh  = zlenA*0.5 - fgkInterCentrModBorder2; // length  of block in case of holes
+  //const Float_t fgkCBLw   = 13.5;      // width of block
+  //const Float_t fgkCBLh1  = 2.;        // min. height of block
+  //const Float_t fgkCBLh2  = 12.3;      // max. height of block
+  //const Float_t fgkSawThickness = 1.; // Al wall thickness
+
+  // lateral cable and tube volume definition
+  Float_t tgal =  (fgkCBLh2 - fgkCBLh1)/(2.*kCBLl);
   Float_t cblpar[11];
-  tgal =  (kcblh2 - kcblh1)/(2.*kcbll);
-  cblpar[0] = kcblw *0.5;
+  cblpar[0] = fgkCBLw *0.5;
   cblpar[1] = 0.;
   cblpar[2] = 0.;
-  cblpar[3] = kcbll *0.5;
-  cblpar[4] = kcblh1 *0.5;
-  cblpar[5] = kcblh2 *0.5;
+  cblpar[3] = kCBLl *0.5;
+  cblpar[4] = fgkCBLh1 *0.5;
+  cblpar[5] = fgkCBLh2 *0.5;
   cblpar[6] = TMath::ATan(tgal)*kRaddeg;
-  cblpar[7] = kcbll *0.5;
-  cblpar[8] = kcblh1 *0.5;
-  cblpar[9] = kcblh2 *0.5;
+  cblpar[7] = kCBLl *0.5;
+  cblpar[8] = fgkCBLh1 *0.5;
+  cblpar[9] = fgkCBLh2 *0.5;
   cblpar[10]= cblpar[6];
-  gMC->Gsvolu("FCBL", "TRAP", idtmed[512], cblpar, 11); // cables & tubes mix 
-  Float_t sawpar[3] = {0.5, kcblh2*0.5, kcbll};
-  gMC->Gsvolu("FSAW", "BOX ", idtmed[505], sawpar,  3); // Side Al walls
-  // volume positioning
-  AliMatrix(idrotm[7], 90., 90., 180., 0., 90., 180.);
-  AliMatrix(idrotm[8], 90., 90., 0., 0., 90., 0.);
-  xcoor = (xtof-kcblw)*0.5 - 2.*sawpar[0];
-  ycoor = (kcblh1+kcblh2)*0.25 - (ytof*0.5 - kHoneycombLayerThickness)*0.5;
-  zcoor = kcbll*0.5;
-  gMC->Gspos("FCBL", 1, "FAIA", -xcoor, ycoor, -zcoor, idrotm[7], "ONLY");
-  gMC->Gspos("FCBL", 2, "FAIA",  xcoor, ycoor, -zcoor, idrotm[7], "ONLY");
-  gMC->Gspos("FCBL", 3, "FAIA", -xcoor, ycoor,  zcoor, idrotm[8], "ONLY");
-  gMC->Gspos("FCBL", 4, "FAIA",  xcoor, ycoor,  zcoor, idrotm[8], "ONLY");
-  xcoor = xtof*0.5-sawpar[0];
-  ycoor = (kcblh2 - ytof*0.5 + kHoneycombLayerThickness)*0.5;
-  gMC->Gspos("FSAW", 1, "FAIA", -xcoor, ycoor, 0., 0, "ONLY");
-  gMC->Gspos("FSAW", 2, "FAIA",  xcoor, ycoor, 0., 0, "ONLY");
+  gMC->Gsvolu("FCBL", "TRAP", idtmed[511], cblpar, 11); // cables and tubes mix 
+
+  // Side Al Walls definition
+  Float_t sawpar[3] = {fgkSawThickness*0.5, fgkCBLh2*0.5, kCBLl};
+  gMC->Gsvolu("FSAW", "BOX ", idtmed[504], sawpar,  3); // Al
+
+  AliMatrix(idrotm[1], 90., 90., 180., 0., 90., 180.);
+  AliMatrix(idrotm[2], 90., 90., 0., 0., 90., 0.);
+
+  // lateral cable and tube volume positioning
+  xcoor = (xtof - fgkCBLw)*0.5 - 2.*sawpar[0];
+  ycoor = (fgkCBLh1 + fgkCBLh2)*0.25 - (ytof*0.5 - fgkModuleCoverThickness)*0.5;
+  zcoor = kCBLl*0.5;
+  gMC->Gspos("FCBL", 1, "FAIA", -xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+  gMC->Gspos("FCBL", 2, "FAIA",  xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+  gMC->Gspos("FCBL", 3, "FAIA", -xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+  gMC->Gspos("FCBL", 4, "FAIA",  xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+  gMC->Gspos("FCBL", 1, "FAIC", -xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+  gMC->Gspos("FCBL", 2, "FAIC",  xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+  gMC->Gspos("FCBL", 3, "FAIC", -xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+  gMC->Gspos("FCBL", 4, "FAIC",  xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+
   if (fTOFHoles) {
-    cblpar[3] = kcbllh *0.5;
-    cblpar[5] = kcblh1*0.5 + kcbllh*tgal;
-    cblpar[7] = kcbllh *0.5;
+    cblpar[3] = kCBLlh *0.5;
+    cblpar[5] = fgkCBLh1*0.5 + kCBLlh*tgal;
+    cblpar[7] = kCBLlh *0.5;
     cblpar[9] = cblpar[5];
-    gMC->Gsvolu("FCBB", "TRAP", idtmed[512], cblpar, 11); // cables & tubes mix
-    xcoor = (xtof - kcblw)*0.5 - 2.*sawpar[0];
-    ycoor = (kcblh1 + 2.*cblpar[5])*0.25 - (ytof*0.5 - kHoneycombLayerThickness)*0.5;
-    zcoor = kcbll-kcbllh*0.5;
-    gMC->Gspos("FCBB", 1, "FAIB", -xcoor, ycoor, -zcoor, idrotm[7], "ONLY");
-    gMC->Gspos("FCBB", 2, "FAIB",  xcoor, ycoor, -zcoor, idrotm[7], "ONLY");
-    gMC->Gspos("FCBB", 3, "FAIB", -xcoor, ycoor,  zcoor, idrotm[8], "ONLY");
-    gMC->Gspos("FCBB", 4, "FAIB",  xcoor, ycoor,  zcoor, idrotm[8], "ONLY");
+    gMC->Gsvolu("FCBB", "TRAP", idtmed[511], cblpar, 11); // cables and tubes mix
+
+    xcoor = (xtof - fgkCBLw)*0.5 - 2.*sawpar[0];
+    ycoor = (fgkCBLh1 + 2.*cblpar[5])*0.25 - (ytof*0.5 - fgkModuleCoverThickness)*0.5;
+    zcoor = kCBLl-kCBLlh*0.5;
+    gMC->Gspos("FCBB", 1, "FAIB", -xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+    gMC->Gspos("FCBB", 2, "FAIB",  xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+    gMC->Gspos("FCBB", 3, "FAIB", -xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+    gMC->Gspos("FCBB", 4, "FAIB",  xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+  }
+
+  // lateral cable and tube volume positioning
+  xcoor = xtof*0.5 - sawpar[0];
+  ycoor = (fgkCBLh2 - ytof*0.5 + fgkModuleCoverThickness)*0.5;
+  zcoor = 0.;
+  gMC->Gspos("FSAW", 1, "FAIA", -xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FSAW", 2, "FAIA",  xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FSAW", 1, "FAIC", -xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FSAW", 2, "FAIC",  xcoor, ycoor, zcoor, 0, "ONLY");
+
+  if (fTOFHoles) {
     xcoor = xtof*0.5 - sawpar[0];
-    ycoor = (kcblh2 - ytof*0.5 + kHoneycombLayerThickness)*0.5;
+    ycoor = (fgkCBLh2 - ytof*0.5 + fgkModuleCoverThickness)*0.5;
     gMC->Gspos("FSAW", 1, "FAIB", -xcoor, ycoor, 0., 0, "ONLY");
     gMC->Gspos("FSAW", 2, "FAIB",  xcoor, ycoor, 0., 0, "ONLY");
   }
 
   // TOF Supermodule cover definition and positioning
-  Float_t covpar[3] = {xtof*0.5, 0.1, zlenA*0.5};
-  gMC->Gsvolu("FCOV", "BOX ", idtmed[505], covpar, 3);    // Al cover
+  Float_t covpar[3] = {xtof*0.5, 0.075, zlenA*0.5};
+  gMC->Gsvolu("FCOV", "BOX ", idtmed[504], covpar, 3); // Al
+  if (fTOFHoles) {
+    covpar[2] = (zlenA*0.5 - fgkInterCentrModBorder2)*0.5;
+    gMC->Gsvolu("FCOB", "BOX ", idtmed[504], covpar, 3); // Al
+    covpar[2] = fgkInterCentrModBorder2;
+    gMC->Gsvolu("FCOP", "BOX ", idtmed[513], covpar, 3); // Plastic (CH2)
+  }
+
   xcoor = 0.;
-  ycoor = 12.5*0.5 - 0.1;
+  ycoor = (ytof*0.5 - fgkModuleCoverThickness)*0.5 - covpar[1];
   zcoor = 0.;
   gMC->Gspos("FCOV", 0, "FAIA", xcoor, ycoor, zcoor, 0, "ONLY");
-  if (fTOFHoles) gMC->Gspos("FCOV", 0, "FAIB", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FCOV", 0, "FAIC", xcoor, ycoor, zcoor, 0, "ONLY");
+  if (fTOFHoles) {
+    zcoor = (zlenA*0.5 + fgkInterCentrModBorder2)*0.5;
+    gMC->Gspos("FCOB", 1, "FAIB", xcoor, ycoor,  zcoor, 0, "ONLY");
+    gMC->Gspos("FCOB", 2, "FAIB", xcoor, ycoor, -zcoor, 0, "ONLY");
+    zcoor = 0.;
+    gMC->Gspos("FCOP", 0, "FAIB", xcoor, ycoor,  zcoor, 0, "ONLY");
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeReadoutCrates(Float_t ytof) const
+{
+  // Services Volumes
+
+  // Empty crate weight: 50 Kg, electronics cards + cables ~ 52 Kg.
+  // Per each side (A and C) the total weight is: 2x102 ~ 204 Kg.
+  // ... + weight of the connection pannel for the steel cooling system (Cr 18%, Ni 12%, Fe 70%)
+  // + other remaining elements + various supports
+
+  // Each FEA card weight + all supports
+  // (including all bolts and not including the cable connectors)
+  //  353.1 g.
+  // Per each strip there are 4 FEA cards, then
+  // the total weight of the front-end electonics section is: 353.1 g x 4 = 1412.4 g.
 
   // Services Volumes
 
@@ -1188,22 +1891,32 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
   //  353.1 g.
   // Per each strip there are 4 FEA cards, then
   // the total weight of the front-end electonics section is: 353.1 g x 4 = 1412.4 g.
+  //
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
 
+  Int_t idrotm[18];
+
+  // volume definition
   Float_t serpar[3] = {29.*0.5, 121.*0.5, 90.*0.5};
-  gMC->Gsvolu("FTOS", "BOX ", idtmed[515], serpar, 3); // Al + Cu + steel
+  gMC->Gsvolu("FTOS", "BOX ", idtmed[514], serpar, 3); // Al + Cu + steel
+
+  Float_t xcoor, ycoor, zcoor;
   zcoor = (118.-90.)*0.5;
   Float_t phi = -10.,  ra = fTOFGeometry->Rmin() + ytof*0.5;
   for (Int_t i = 0; i < fTOFGeometry->NSectors(); i++) {
     phi += 20.;
     xcoor = ra * TMath::Cos(phi * kDegrad);
     ycoor = ra * TMath::Sin(phi * kDegrad);
-    AliMatrix(idrotm[20+i], 90., phi, 90., phi + 270., 0., 0.);
-    gMC->Gspos("FTOS", i, "BFMO", xcoor, ycoor, zcoor, idrotm[20+i], "ONLY");      
+    AliMatrix(idrotm[i], 90., phi, 90., phi + 270., 0., 0.);
+    gMC->Gspos("FTOS", i, "BFMO", xcoor, ycoor, zcoor, idrotm[i], "ONLY");
   }
+
   zcoor = (90. - 223.)*0.5;
-  gMC->Gspos("FTOS", 1, "BBCE", ra, 0., zcoor, 0, "ONLY");
+  gMC->Gspos("FTOS", 1, "BBCE", ra, -3., zcoor, 0, "ONLY");
 
 }
+
 //_____________________________________________________________________________
 void AliTOFv6T0::DrawModule() const
 {
@@ -1314,11 +2027,12 @@ void AliTOFv6T0::DrawDetectorModules() const
 
   // Level 3 of B071, B075 and B074
   gMC->Gsatt("FAIA","seen",-1);  // all FAIA sub-levels skipped   -
+  gMC->Gsatt("FAIC","seen",-1);  // all FAIC sub-levels skipped   -
   if (fTOFHoles) gMC->Gsatt("FAIB","seen",-1);  // all FAIB sub-levels skipped   -
 
   // Level 3 of B071, B075 and B074
-  gMC->Gsatt("FPEA","seen",1);  // all FPEA sub-levels skipped   -
-  if (fTOFHoles) gMC->Gsatt("FPEB","seen",1);  // all FPEB sub-levels skipped   -
+  gMC->Gsatt("FPEA","seen",-2/*1*/);  // all FPEA sub-levels skipped   -
+  if (fTOFHoles) gMC->Gsatt("FPEB","seen",-2/*1*/);  // all FPEB sub-levels skipped   -
 
   gMC->Gdopt("hide","on");
   gMC->Gdopt("shad","on");
@@ -1390,10 +2104,11 @@ void AliTOFv6T0::DrawDetectorStrips() const
 
   // Level 5 of B071, B074 and B075
   gMC->Gsatt("FAIA","SEEN", 0);
+  gMC->Gsatt("FAIC","seen",-1);  // all FAIC sub-levels skipped   -
   if (fTOFHoles) gMC->Gsatt("FAIB","SEEN", 0);
 
-  gMC->Gsatt("FPEA","SEEN", 1);
-  if (fTOFHoles) gMC->Gsatt("FPEB","SEEN", 1);
+  gMC->Gsatt("FPEA","SEEN", -2/*1*/);
+  if (fTOFHoles) gMC->Gsatt("FPEB","SEEN", -2/*1*/);
 
   gMC->Gsatt("FSTR","SEEN",-2);  // all FSTR sub-levels skipped   -
 
@@ -1401,20 +2116,32 @@ void AliTOFv6T0::DrawDetectorStrips() const
   gMC->Gsatt("FWZ2","SEEN", 1);
   gMC->Gsatt("FWZ3","SEEN", 1);
   gMC->Gsatt("FWZ4","SEEN", 1);
-
+  if (fTOFHoles) {
+    gMC->Gsatt("FWZA","SEEN", 1);
+    gMC->Gsatt("FWZB","SEEN", 1);
+    gMC->Gsatt("FWZC","SEEN", 1);
+  }
 
   // Level 2 of FAIA
   // Level 2 of FAIB
+  // Level 2 of FAIC
   gMC->Gsatt("FCA1","SEEN", 0);
   gMC->Gsatt("FCA2","SEEN", 0);
   gMC->Gsatt("FCAB","SEEN", 0);
+  gMC->Gsatt("FCAL","SEEN", 0);
   gMC->Gsatt("FTUB","SEEN",-1);  // all FTUB sub-levels skipped   -
   gMC->Gsatt("FTLN","SEEN", 0);
-  gMC->Gsatt("FLTN","SEEN", 0);
+  gMC->Gsatt("FLO1","SEEN", 0);
+  gMC->Gsatt("FLO2","SEEN", 0);
+  gMC->Gsatt("FLO3","SEEN", 0);
   gMC->Gsatt("FCBL","SEEN", 0);
+  if (fTOFHoles) gMC->Gsatt("FCBB","SEEN", 0);
   gMC->Gsatt("FSAW","SEEN", 0);
   gMC->Gsatt("FCOV","SEEN", 0);
-  if (fTOFHoles) gMC->Gsatt("FCBB","SEEN", 0);
+  if (fTOFHoles) {
+    gMC->Gsatt("FCOB","SEEN", 0);
+    gMC->Gsatt("FCOP","SEEN", 0);
+  }
 
   // Level 2 of FTUB
   gMC->Gsatt("FITU","SEEN", 0);
@@ -1453,42 +2180,30 @@ void AliTOFv6T0::CreateMaterials()
 
   //AliTOF::CreateMaterials();
 
-  AliMagF *magneticField = (AliMagF*)gAlice->Field();
+  AliMagF *magneticField = (AliMagF*)((AliMagF*)TGeoGlobalMagField::Instance()->GetField());
 
   Int_t   isxfld = magneticField->Integ();
   Float_t sxmgmx = magneticField->Max();
 
-  Float_t we[7], na[7];
-
-  //--- Quartz (SiO2) to simulate float glass
-  //    density tuned to have correct float glass 
-  //    radiation length
-  Float_t   aq[2] = { 28.09,16. };
+  //--- Quartz (SiO2) ---
+  Float_t   aq[2] = { 28.0855,15.9994};
   Float_t   zq[2] = { 14.,8. };
   Float_t   wq[2] = { 1.,2. };
-  //Float_t   dq = 2.55; // std value: 2.2
-  Float_t   dq = 2.7;    // (+5.9%)
+  Float_t   dq = 2.7; // (+5.9%)
   Int_t nq = -2;
 
-  // --- Nomex
-  Float_t anox[4] = {12.01,1.01,16.00,14.01};
+  // --- Nomex (C14H22O2N2) ---
+  Float_t anox[4] = {12.011,1.00794,15.9994,14.00674};
   Float_t znox[4] = { 6.,  1.,  8.,  7.};
   Float_t wnox[4] = {14., 22., 2., 2.};
   //Float_t dnox  = 0.048; //old value
   Float_t dnox  = 0.22;    // (x 4.6)
   Int_t nnox   = -4;
 
-  // --- glass+freon { Si, O, C, F, H, S }
-  Float_t agfr[6]= {28.09,16.00,12.01,19.00,1.01,32.065};
-  Float_t zgfr[6]= {14.,  8.,  6.,  9.,  1.,  16.};
-  Float_t wgfr[6]= {0.465, 0.530, 0.000484, 0.00383, 4.0e-05, 0.000646};
-  Int_t ngfr  = 6;
-  AliDebug(1,Form("wgfr: %d  %d  %d  %d  %d %d", wgfr[0], wgfr[1], wgfr[2], wgfr[3], wgfr[4], wgfr[5]));
-  //Float_t dgfr = 1.35; // + FISHLINE (old value)
-  Float_t dgfr = 1.6;    // + FISHLINE(+18.5 %)
-
-  // --- G10  {Si, O, C, H, O}
-  Float_t ag10[5] = {28.09,16.00,12.01,1.01,16.00};
+  // --- G10  {Si, O, C, H, O} ---
+  Float_t we[7], na[7];
+
+  Float_t ag10[5] = {28.0855,15.9994,12.011,1.00794,15.9994};
   Float_t zg10[5] = {14., 8., 6., 1., 8.};
   Float_t wmatg10[5];
   Int_t nlmatg10 = 5;
@@ -1501,103 +2216,93 @@ void AliTOFv6T0::CreateMaterials()
   wmatg10[2]= we[2]*0.4;
   wmatg10[3]= we[3]*0.4;
   wmatg10[4]= we[4]*0.4;
-  AliDebug(1,Form("wg10  %d  %d  %d  %d  %d", wmatg10[0], wmatg10[1], wmatg10[2], wmatg10[3], wmatg10[4]));
-  //  Float_t densg10 = 1.7; //old value
+  AliDebug(1,Form("wg10  %f  %f  %f  %f  %f", wmatg10[0], wmatg10[1], wmatg10[2], wmatg10[3], wmatg10[4]));
+  //Float_t densg10 = 1.7; //old value
   Float_t densg10 = 2.0; // (+17.8%)
 
-  // -- Water
-  Float_t awa[2] = {  1., 16. };
+  // --- Water ---
+  Float_t awa[2] = {  1.00794, 15.9994 };
   Float_t zwa[2] = {  1.,  8. };
   Float_t wwa[2] = {  2.,  1. };
   Float_t dwa    = 1.0;
   Int_t nwa = -2;
 
-  // AIR
-  Float_t aAir[4]={12.0107,14.0067,15.9994,39.948};
+  // --- Air ---
+  Float_t aAir[4]={12.011,14.00674,15.9994,39.948};
   Float_t zAir[4]={6.,7.,8.,18.};
   Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
   Float_t dAir   = 1.20479E-3;
 
-  // --- fibre glass
-  Float_t afg[4] = {28.09,16.00,12.01,1.01};
+  // --- Fibre Glass ---
+  Float_t afg[4] = {28.0855,15.9994,12.011,1.00794};
   Float_t zfg[4] = {14., 8., 6., 1.};
   Float_t wfg[4] = {0.12906,0.29405,0.51502,0.06187};
   //Float_t dfg    = 1.111;
-  Float_t dfg    = 2.; // (+1.8%)
+  Float_t dfg    = 2.05; // (x1.845)
   Int_t nfg      = 4;
 
-  // --- Freon C2F4H2 + SF6
-  Float_t afre[4]= {12.01,1.01,19.00,32.07};
-  Float_t zfre[4]= { 6., 1., 9., 16.};
-  Float_t wfre[4]= {0.21250,0.01787,0.74827,0.021355};
-  Float_t densfre= 0.00375;
+  // --- Freon C2F4H2 + SF6 ---
+  Float_t afre[4] = {12.011,1.00794,18.9984032,32.0065};
+  Float_t zfre[4] = { 6., 1., 9., 16.};
+  Float_t wfre[4] = {0.21250,0.01787,0.74827,0.021355};
+  Float_t densfre = 0.00375;
   Int_t nfre     = 4;
 
-  // --- Al + Cu + G10  {Al, Cu, Si, O, C, H, O}
-  Float_t acar[10]= {26.98,
-                    /*63.55,*/
-                    ag10[0], ag10[1], ag10[2], ag10[3], ag10[4],
-                    aAir[0], aAir[1], aAir[2], aAir[3]};
-  Float_t zcar[10]= {13.,
-                    /*29.,*/
-                    zg10[0], zg10[1], zg10[2], zg10[3], zg10[4],
-                    zAir[0], zAir[1], zAir[2], zAir[3]};
-  Float_t wcar[10];
-  wcar[0]= 0.4732;//0.7;
-  //wcar[1]= 0.04;//0.05;
-  wcar[1]= 0.2854*wmatg10[0];//0.25*wmatg10[0];
-  wcar[2]= 0.2854*wmatg10[1];//0.25*wmatg10[1];
-  wcar[3]= 0.2854*wmatg10[2];//0.25*wmatg10[2];
-  wcar[4]= 0.2854*wmatg10[3];//0.25*wmatg10[3];
-  wcar[5]= 0.2854*wmatg10[4];//0.25*wmatg10[4];
-  wcar[6]= 0.2414*wAir[0];
-  wcar[7]= 0.2414*wAir[1];
-  wcar[8]= 0.2414*wAir[2];
-  wcar[9]= 0.2414*wAir[3];
-
-  AliDebug(1,Form("wcar  %f  %f  %f  %f  %f  %f  %f  %f  %f  %f", wcar[0], wcar[1], wcar[2], wcar[3], wcar[4],
-                 wcar[5], wcar[6], wcar[7], wcar[8], wcar[9]));
-  Float_t dcar = 1.85;//1.9;
-
-  // --- Cables, tubes {Al, Cu} ---
-  Float_t acbt[2]= {26.98,63.55};
-  Float_t zcbt[2]= {13., 29.};
-  //Float_t wcbt[2]= {0.541,0.459};
-  Float_t wcbt[2]= {0.407,0.593};
-  //Float_t decbt  = 0.95;
-  Float_t decbt  = 0.68;
-
-  // --- Cable {Al, Cu}
-  Float_t wcb[2] = {0.165,0.835};
-  Float_t decb   = 0.962;
-
-  // --- Honeycomb layer {Al, Cu}
-  Float_t whon[2]= {0.9,0.1};
-  //Float_t dhon   = 0.44;
-  Float_t dhon   = 1.095; // (x 2.56)
-
-  // --- Crates boxes {Al, Cu, Fe, Cr, Ni}
-  Float_t acra[5]= {26.98,63.55,55.845,52.00,58.69};
+  // --- Cables and tubes {Al, Cu} ---
+  Float_t acbt[2] = {26.981539,63.546};
+  Float_t zcbt[2] = {13., 29.};
+  Float_t wcbt[2] = {0.407,0.593};
+  Float_t decbt   = 0.68;
+
+  // --- Cable {CH2, Al, Cu} ---
+  Float_t asc[4] = {12.011, 1.00794, 26.981539,63.546};
+  Float_t zsc[4] = { 6., 1., 13., 29.};
+  Float_t wsc[4];
+  for (Int_t ii=0; ii<4; ii++) wsc[ii]=0.;
+
+  Float_t wDummy[4], nDummy[4];
+  for (Int_t ii=0; ii<4; ii++) wDummy[ii]=0.;
+  for (Int_t ii=0; ii<4; ii++) nDummy[ii]=0.;
+  nDummy[0] = 1.;
+  nDummy[1] = 2.;
+  MaterialMixer(wDummy,asc,nDummy,2);
+  wsc[0] = 0.4375*wDummy[0];
+  wsc[1] = 0.4375*wDummy[1];
+  wsc[2] = 0.3244;
+  wsc[3] = 0.2381;
+  Float_t dsc = 1.223;
+
+  // --- Crates boxes {Al, Cu, Fe, Cr, Ni} ---
+  Float_t acra[5]= {26.981539,63.546,55.845,51.9961,58.6934};
   Float_t zcra[5]= {13., 29., 26., 24., 28.};
   Float_t wcra[5]= {0.7,0.2,0.07,0.018,0.012};
   Float_t dcra   = 0.77;
 
+  // --- Polietilene CH2 ---
+  Float_t aPlastic[2] = {12.011, 1.00794};
+  Float_t zPlastic[2] = { 6., 1.};
+  Float_t wPlastic[2] = { 1., 2.};
+  //Float_t dPlastic = 0.92; // PDB value
+  Float_t dPlastic = 0.93; // (~+1.1%)
+  Int_t nwPlastic = -2;
+
   AliMixture ( 0, "Air$", aAir, zAir, dAir, 4, wAir);
   AliMixture ( 1, "Nomex$", anox, znox, dnox, nnox, wnox);
   AliMixture ( 2, "G10$", ag10, zg10, densg10, nlmatg10, wmatg10);
   AliMixture ( 3, "fibre glass$", afg, zfg, dfg, nfg, wfg);
-  AliMaterial( 4, "Al $", 26.98, 13., 2.7, 8.9, 37.2);
-  AliMixture ( 5, "Al+Cu honeycomb$", acbt, zcbt, dhon, 2, whon);
+  AliMaterial( 4, "Al $", 26.981539, 13., 2.7, -8.9, 999.);
+  Float_t factor = 0.4/1.5*2./3.;
+  AliMaterial( 5, "Al honeycomb$", 26.981539, 13., 2.7*factor, -8.9/factor, 999.);
   AliMixture ( 6, "Freon$", afre, zfre, densfre, nfre, wfre);
   AliMixture ( 7, "Glass$", aq, zq, dq, nq, wq);
-  AliMixture ( 8, "glass-freon$", agfr, zgfr, dgfr, ngfr, wgfr);
-  AliMixture ( 9, "Water$",  awa, zwa, dwa, nwa, wwa);
-  AliMixture (10, "Al+Cu$", acbt, zcbt, decbt, 2, wcbt);
-  AliMaterial(11, "Cu $", 63.54, 29., 8.96, 1.43, 10.);
-  AliMixture (12, "Al+Cu (cable)$", acbt, zcbt, decb, 2, wcb);
-  AliMixture (13, "Al+Cu+G10$", acar, zcar, dcar, 10/*7*/, wcar);
-  AliMixture (14, "Al+Cu+steel$", acra, zcra, dcra, 5, wcra);
-  AliMaterial(15, "Cu_sensitive$", 63.54, 29., 3.392, 1.43, 10.);
+  AliMixture ( 8, "Water$",  awa, zwa, dwa, nwa, wwa);
+  AliMixture ( 9, "cables+tubes$", acbt, zcbt, decbt, 2, wcbt);
+  AliMaterial(10, "Cu $", 63.546, 29., 8.96, -1.43, 999.);
+  AliMixture (11, "cable$", asc, zsc, dsc, 4, wsc);
+  AliMixture (12, "Al+Cu+steel$", acra, zcra, dcra, 5, wcra);
+  AliMixture (13, "plastic$", aPlastic, zPlastic, dPlastic, nwPlastic, wPlastic);
+  Float_t factorHoles = 1./36.5;
+  AliMaterial(14, "Al honey for holes$", 26.981539, 13., 2.7*factorHoles, -8.9/factorHoles, 999.);
 
   Float_t epsil, stmin, deemax, stemax;
 
@@ -1613,22 +2318,22 @@ void AliTOFv6T0::CreateMaterials()
   deemax = -.3;   // Maximum fractional energy loss, DLS
   stmin  = -.8;
 
-  AliMedium( 1, "Air$",         0, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium( 1,"Air$",          0, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
   AliMedium( 2,"Nomex$",        1, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
   AliMedium( 3,"G10$",          2, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
   AliMedium( 4,"fibre glass$",  3, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium( 5,"glass-freon$",  8, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium( 6,"Al Frame$",     4, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium( 7,"honeycomb$",    5, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium( 8,"Fre$",          6, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium( 9,"Cu-S$",        15, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium(10,"Glass$",        7, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium(11,"Water$",        9, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium(12,"Cable$",       12, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium(13,"Al+Cables$",   10, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium(14,"Copper$",      11, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium(15,"Cards$",       13, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
-  AliMedium(16,"Crates$",      14, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium( 5,"Al Frame$",     4, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium( 6,"honeycomb$",    5, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium( 7,"Fre$",          6, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium( 8,"Cu-S$",        10, 1, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium( 9,"Glass$",        7, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium(10,"Water$",        8, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium(11,"Cable$",       11, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium(12,"Cables+Tubes$", 9, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium(13,"Copper$",      10, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium(14,"Plastic$",     13, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium(15,"Crates$",      12, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
+  AliMedium(16,"honey_holes$", 14, 0, isxfld, sxmgmx, 10., stemax, deemax, epsil, stmin);
 
 }
 //_____________________________________________________________________________
@@ -1685,8 +2390,8 @@ void AliTOFv6T0::StepManager()
   if(
      gMC->IsTrackEntering()
      && gMC->TrackCharge()
-     //&& gMC->GetMedium()==idtmed[508]
-     && gMC->CurrentMedium()==idtmed[508]
+     //&& gMC->GetMedium()==idtmed[507]
+     && gMC->CurrentMedium()==idtmed[507]
      && gMC->CurrentVolID(copy)==fIdSens
      )
   {
@@ -1694,7 +2399,7 @@ void AliTOFv6T0::StepManager()
     AliMC *mcApplication = (AliMC*)gAlice->GetMCApp();
 
     AddTrackReference(mcApplication->GetCurrentTrackNumber(), AliTrackReference::kTOF);
-    //AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber());
+    //AddTrackReference(mcApplication->GetCurrentTrackNumber());
 
     // getting information about hit volumes
     
@@ -1798,7 +2503,8 @@ void AliTOFv6T0::StepManager()
   }
 }
 //-------------------------------------------------------------------
-void AliTOFv6T0::MaterialMixer(Float_t* p,Float_t* a,Float_t* m,Int_t n) const
+void AliTOFv6T0::MaterialMixer(Float_t * p, const Float_t * const a,
+                              const Float_t * const m, Int_t n) const
 {
   // a[] atomic weights vector      (in)
   //     (atoms present in more compound appear separately)