]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
TOF materials and volumes description: update
authordecaro <decaro@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 7 Oct 2007 19:36:29 +0000 (19:36 +0000)
committerdecaro <decaro@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 7 Oct 2007 19:36:29 +0000 (19:36 +0000)
TOF/AliTOFv6T0.cxx
TOF/AliTOFv6T0.h

index 6b335f4a64812b64cf8f16a50ae617f8368abca0..79be25d5d869b050119a8f727f9d38f9b4917022 100644 (file)
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+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)
 
@@ -105,6 +108,21 @@ extern AliRun *gAlice;
 
 ClassImp(AliTOFv6T0)
 
+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   =   4.7 ; // cm
+const Float_t AliTOFv6T0::fgkLengthExInModBorder   =   7.0 ; // cm
+const Float_t AliTOFv6T0::fgkModuleCoverThickness  =   2.0 ; // cm
+const Float_t AliTOFv6T0::fgkFEAwidth1    = 19.0; // cm
+const Float_t AliTOFv6T0::fgkFEAwidth2    = 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
+
 //_____________________________________________________________________________
   AliTOFv6T0::AliTOFv6T0():
   fIdFTOA(-1),
@@ -315,13 +333,13 @@ void AliTOFv6T0::BuildGeometry()
   const Int_t   kNTof  = fTOFGeometry->NSectors();
   const Float_t kangle = k2PI/kNTof;
 
-  const Float_t kInterCentrModBorder1 = 49.5;
-  const Float_t kInterCentrModBorder2 = 57.5;
+  //const Float_t fgkInterCentrModBorder1 = 49.5;
+  //const Float_t fgkInterCentrModBorder2 = 57.5;
 
   Float_t ang;
   
   // define offset for nodes
-  Float_t zOffsetB = (fTOFGeometry->ZlenA()*0.5 + (kInterCentrModBorder1+kInterCentrModBorder2)*0.5)*0.5;
+  Float_t zOffsetB = (fTOFGeometry->ZlenA()*0.5 + (fgkInterCentrModBorder1+fgkInterCentrModBorder2)*0.5)*0.5;
   Float_t zOffsetA = 0.;
   // Define TOF basic volume
   
@@ -404,520 +422,1222 @@ 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();
-
-  const Float_t kInterCentrModBorder1 = 49.5;
-  const Float_t kInterCentrModBorder2 = 57.5;
-  const Float_t kExterInterModBorder1 = 196.0;
-  const Float_t kExterInterModBorder2 = 203.5;
-
-  const Float_t kLengthExInModBorder  = 4.7;
-  const Float_t kLengthInCeModBorder  = 7.0;
-
   // module wall thickness (cm)
-  const Float_t kModuleWallThickness = 0.33;
-
-  // honeycomb layer between strips and cards (cm)
-  const Float_t kHoneycombLayerThickness = 2.;
+  //const Float_t fgkModuleWallThickness = 0.33;
 
   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));
-  
+
+  Float_t xFLT, yFLT, zFLTA;
+  xFLT  = xtof     - 2.*fgkModuleWallThickness;
+  yFLT  = ytof*0.5 -    fgkModuleWallThickness;
+  zFLTA = zlenA    - 2.*fgkModuleWallThickness;
+
+  CreateModules(xtof, ytof, zlenA, xFLT, yFLT, zFLTA);
+  MakeStripsInModules(ytof, zlenA);
+
+  CreateModuleCovers(xtof, zlenA);
+
+  CreateBackZone(xtof, ytof, zlenA);
+  MakeFrontEndElectronics();
+  MakeFEACooling(xtof, ytof, zlenA);
+  MakeNinoMask(xtof, ytof, zlenA);
+  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();
+
+  //const Float_t fgkInterCentrModBorder1 = 49.5;
+  //const Float_t fgkInterCentrModBorder2 = 57.5;
+  //const Float_t fgkExterInterModBorder1 = 196.0;
+  //const Float_t fgkExterInterModBorder2 = 203.5;
+
+  //const Float_t fgkLengthExInModBorder  = 4.7;
+  //const Float_t fgkLengthInCeModBorder  = 7.0;
+
+  // module wall thickness (cm)
+  //const Float_t fgkModuleWallThickness = 0.33;
+
   // 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];
 
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  Int_t idrotm[8];
+
+  Float_t  par[3];
   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);
   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[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]  = (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("FWZ1","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 - 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");
+  //xcoor = 0.;
+  ycoor = -(yFLT - fgkLengthInCeModBorder)*0.5;
+  zcoor = fgkInterCentrModBorder1;
+  gMC->Gspos("FWZ1", 1,"FLTA", xcoor, ycoor, zcoor,idrotm[0],"ONLY");
+  gMC->Gspos("FWZ1", 2,"FLTA", xcoor, ycoor,-zcoor,idrotm[1],"ONLY");
+
+  Float_t y0B, ycoorB, zcoorB;
+
+  if (fTOFHoles) {
+    y0B = fgkLengthInCeModBorder - 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("FWZA","TRAP", idtmed[503], trpa, 11); // Fibre glass
+    gMC->Gspos("FWZA", 1,"FLTB", xcoor, ycoorB, zcoorB,idrotm[1],"ONLY");
+    gMC->Gspos("FWZA", 2,"FLTC", xcoor, ycoorB,-zcoorB,idrotm[0],"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;
+  //xcoor = 0.;
+  ycoor = (yFLT - fgkLengthInCeModBorder)*0.5;
+  zcoor = fgkInterCentrModBorder2;
   gMC->Gspos("FWZ1", 3,"FLTA", xcoor, ycoor, zcoor,idrotm[2],"ONLY");
-  gMC->Gspos("FWZ1", 4,"FLTA", xcoor, ycoor,-zcoor,idrotm[5],"ONLY");
+  gMC->Gspos("FWZ1", 4,"FLTA", xcoor, ycoor,-zcoor,idrotm[3],"ONLY");
+
+  if (fTOFHoles) {
+    y0B = fgkLengthInCeModBorder + 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("FWZB","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("FWZB", 1,"FLTB", xcoor, ycoorB, zcoorB,idrotm[3],"ONLY");
+    gMC->Gspos("FWZB", 2,"FLTC", xcoor, ycoorB,-zcoorB,idrotm[2],"ONLY");
+  }
 
-  trpa[0] = 0.5*(kInterCentrModBorder2 - kInterCentrModBorder1)/TMath::Cos(alpha);
-  trpa[1] = kModuleWallThickness;
+  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.;
+  //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");
+  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");
+  }
+
 
   // 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");
+  //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;
+    //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[5],"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");
   }
 
+}
 
-  ///////////////// Detector itself //////////////////////
-
-  const Int_t    knx   = fTOFGeometry->NpadX();  // number of pads along x
-  const Int_t    knz   = fTOFGeometry->NpadZ();  // number of pads along z
-  const Float_t  kPadX = fTOFGeometry->XPad();   // pad length along x
-  const Float_t  kPadZ = fTOFGeometry->ZPad();   // pad length along z
-
-  // 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
-  const Float_t klsensmx = knx*kPadX; // length of Sensitive Layer
-  const Float_t khsensmy = 0.05;      // heigth of Sensitive Layer
-  const Float_t kwsensmz = knz*kPadZ; // width of Sensitive Layer
+//_____________________________________________________________________________
+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 CORNICE 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.
+  //
 
-  // heigth of the FSTR Volume (the strip volume)
-  const Float_t khstripy = 2.*khhony+2.*khpcby+4.*khrgly+2.*khglfy+khcpcby;
+  // module cover between strips and cards (cm)
+  //const Float_t fgkModuleCoverThickness = 2.;
 
-  // 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.};
+  //const Float_t fgkInterCentrModBorder2 = 57.5;
+  //const Float_t fgkExterInterModBorder1 = 196.0;
 
-  // FSTR volume definition-filling this volume with non sensitive Gas Mixture
-  gMC->Gsvolu("FSTR","BOX",idtmed[507],parfp,3); // Freon mix
+  Int_t  *idtmed = fIdtmed->GetArray()-499;
 
-  //-- HONY 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
-  //posfp[0] = 0.;
-  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");
-  
-  //-- 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
-  //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
-  //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");
+  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");
 
-  //-- 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
-  // positioning the central PCB layer
-  gMC->Gspos("FPCB",1,"FSTR",0.,0.,0.,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");
 
-  //      Sensitive volume
-  Float_t parfs[3] = {klsensmx*0.5, khsensmy*0.5, kwsensmz*0.5};
-  gMC->Gsvolu("FSEN","BOX",idtmed[508],parfs,3); // 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");
+  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");
+  }
 
-  //-- 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
-  //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");
-  //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");
+  //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");
 
-  //-- GLASS+FISHLINE Layer definition
-  //parfp[0] = klstripx*0.5;
-  parfp[1] = khglfy*0.5;
-  parfp[2] = kwglfz*0.5;
-  gMC->Gsvolu("FGLF","BOX",idtmed[504],parfp,3);
+  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");
+  }
 
-  // positioning 2 GLASS+FISHLINE Layers on 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");
+  //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");
 
-  //  Positioning the Strips (FSTR volumes) in the FLT volumes
-  Int_t maxStripNumbers [5] ={fTOFGeometry->NStripC(),
-                             fTOFGeometry->NStripB(),
-                             fTOFGeometry->NStripA(),
-                             fTOFGeometry->NStripB(),
-                             fTOFGeometry->NStripC()};
+  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");
+  }
 
-  Int_t totalStrip = 0;
-  Float_t xpos, zpos, ypos, ang;
-  for(Int_t iplate = 0; iplate < fTOFGeometry->NPlates(); iplate++){
-    if (iplate>0) totalStrip += maxStripNumbers[iplate-1];
-    for(Int_t istrip = 0; istrip < maxStripNumbers[iplate]; istrip++){
+  // 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");
 
-      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.);
+  //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");
+  }
 
-      xpos = 0.;
-      zpos = fTOFGeometry->GetDistances(iplate,istrip);
-      ypos = fTOFGeometry->GetHeights(iplate,istrip) + yFLT*0.5;
+  //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");
+  }
 
-      gMC->Gspos("FSTR",istrip+totalStrip+1,"FLTA", xpos, ypos,-zpos,idrotm[istrip+totalStrip+1],  "ONLY");
+  // volumes for flat cables
+  // plastic
+  const Float_t kPlasticFlatCableThickness = 0.24;
+  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");
 
-      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");
-       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");
-      }
-    }
+  //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");
   }
 
-  // Definition of the cards, cooling tubes and layer for thermal dispersion
-  // (3 volumes)
+  //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");
+  }
 
-  // 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
+  // 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
+  //xcoor = 0.;
+  ycoor = -kAlCoverThickness*0.5 - kPlasticFlatCableThickness - kCopperFlatCableThickness*0.5;
+  zcoor = 0.;
+  gMC->Gspos("FCC1", 0, "FPEA", xcoor, ycoor, zcoor, 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
+  //xcoor = 0.;
+  //ycoor = -kAlCoverThickness*0.5 - kPlasticFlatCableThickness - kCopperFlatCableThickness*0.5;
+  zcoor = (fgkExterInterModBorder1 + fgkInterCentrModBorder2)*0.5;
+  gMC->Gspos("FCC2", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FCC2", 2, "FPEA", xcoor, ycoor,-zcoor, 0, "ONLY");
+  if (fTOFHoles) {
+    gMC->Gspos("FCC2", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    gMC->Gspos("FCC2", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
+  }
 
-  Float_t feaParam1[3] = {9.5, 5.6, 0.1};
-  gMC->Gsvolu("FFEA", "BOX ", idtmed[502], feaParam1, 3);   // G10
+  //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
+  //xcoor = 0.;
+  //ycoor = -kAlCoverThickness*0.5 - kPlasticFlatCableThickness - kCopperFlatCableThickness*0.5;
+  zcoor = (zlenA*0.5 + 2. + fgkExterInterModBorder1)*0.5;
+  gMC->Gspos("FCC3", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  gMC->Gspos("FCC3", 2, "FPEA", xcoor, ycoor,-zcoor, 0, "ONLY");
+  if (fTOFHoles) {
+    gMC->Gspos("FCC3", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    gMC->Gspos("FCC3", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
+  }
 
-  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");
+//_____________________________________________________________________________
+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, two sectors (i.e. 11th and 12th)
+  // are filled with volumes: FTOB and FTOC (MRPC containers),
+  //
+
+  //const Float_t fgkInterCentrModBorder1 = 49.5;
+
+  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==11||isec==12)) {
+    //if (fTOFHoles && (isec==16||isec==17)) { \\Old 6h convention
+      //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, two sectors (i.e. 11th and 12th)
+  // are filled with FPEB volumes
+  // (to separate MRPC strips from FEA cards)
+  //
+
+  // module cover between strips and cards (cm)
+  //const Float_t fgkModuleCoverThickness = 2.;
+
+  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==16||isec==17)) \\Old 6h convention
+    if (fTOFHoles && (isec==11||isec==12))
+      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 FAIA (FEA cards and services container)
+  // In case of TOF holes, two sectors (i.e. 11th and 12th)
+  // are filled with volumes FAIB (FEA cards and services container).
+  //
+
+  // module cover between strips and cards (cm)
+  //const Float_t fgkModuleCoverThickness = 2.;
+
+  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 and FAIB)
+
+  for(Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++) {
+    if(fTOFSectors[isec]==-1)continue;
+    sprintf(name, "BTOF%d",isec);
+    //if (fTOFHoles && (isec==16||isec==17)) \\Old 6h convention
+    if (fTOFHoles && (isec==11||isec==12))
+      gMC->Gspos("FAIB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+    else
+      gMC->Gspos("FAIA", 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
+  //
+
+  // module wall thickness (cm)
+  //const Float_t fgkModuleWallThickness = 0.33;
+
+  //const Float_t fgkInterCentrModBorder1 = 49.5;
+
+  Float_t yFLT  = ytof*0.5 - fgkModuleWallThickness;
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  ///////////////// Detector itself //////////////////////
+
+  const Int_t    knx   = fTOFGeometry->NpadX();  // number of pads along x
+  const Int_t    knz   = fTOFGeometry->NpadZ();  // number of pads along z
+  const Float_t  kPadX = fTOFGeometry->XPad();   // pad length along x
+  const Float_t  kPadZ = fTOFGeometry->ZPad();   // pad length along z
+
+  // new description for strip volume -double stack strip-
+  // -- all constants are expressed in cm
+  // 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.0105;    // height of Sensitive Layer
+  const Float_t kwsensmz = knz*kPadZ; // width of Sensitive Layer
+
+  // 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();
+
+
+  // FSTR volume definition-filling this volume with non sensitive Gas Mixture
+  Float_t parfp[3]={klstripx*0.5, khstripy*0.5, kwstripz*0.5};
+  gMC->Gsvolu("FSTR","BOX",idtmed[506],parfp,3); // Freon mix
+
+  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); // Nomex (Honeycomb)
+  // positioning 2 NOMEX Layers on FSTR volume
+  //posfp[0] = 0.;
+  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");
+  
+  // 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
+
+  // 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 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");
+
+  // 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
+  // positioning the central PCB layer
+  gMC->Gspos("FPCB",1,"FSTR",0.,0.,0.,0,"ONLY");
+
+  // Sensitive volume definition
+  Float_t parfs[3] = {klsensmx*0.5, khsensmy*0.5, kwsensmz*0.5};
+  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 sensitive layer inside FPCB
+  gMC->Gspos("FSEN",1,"FPCB",0.,0.,0.,0,"ONLY");
+
+  // RED GLASS Layer definition
+  //parfp[0] = klstripx*0.5;
+  parfp[1] = khrgly*0.5;
+  parfp[2] = kwrglz*0.5;
+  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");
+  //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");
+
+  // GLASS Layer definition
+  //parfp[0] = klstripx*0.5;
+  parfp[1] = khglassy;
+  parfp[2] = kwglfz*0.5;
+  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");
+
+  // 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++){
+    if (iplate>0) totalStrip += maxStripNumbers[iplate-1];
+    for(Int_t istrip = 0; istrip < maxStripNumbers[iplate]; istrip++){
+
+      ang = fTOFGeometry->GetAngles(iplate,istrip);
+      AliDebug(1, Form(" iplate = %1i, istrip = %2i ---> ang = %f", iplate, istrip, ang));
+      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.;
+      ypos = fTOFGeometry->GetHeights(iplate,istrip) + yFLT*0.5;
+      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 - 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 - 2.*fgkModuleWallThickness + fgkInterCentrModBorder1)*0.5,idrotm[istrip+totalStrip],"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),
+  //        - containers for FEA cards and some cooling
+  //          elements for a FEA (volumes called FCA1/2).
+  //
+
+  // module cover between strips and cards (cm)
+  //const Float_t fgkModuleCoverThickness = 2.;
+
+  //const Float_t fgkFEAwidth1 = 19.;
+  //const Float_t fgkFEAwidth2 = 38.5;
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  Int_t idrotm[1];
+
+  // Definition of the air card containers (FAIA 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
+
+  // FEA card mother-volume definition
+  Float_t carpar[3] = {fgkFEAwidth1*0.5, 5.6, 0.45};
+  gMC->Gsvolu("FCA1", "BOX ", idtmed[500], carpar, 3); // Air
+  carpar[0] = fgkFEAwidth2*0.5;
+  //carpar[1] =  5.6;
+  //carpar[2] =  0.45;
+  gMC->Gsvolu("FCA2", "BOX ", idtmed[500], carpar, 3); // Air
+
+  // rotation matrix
+  AliMatrix(idrotm[0],  90.,180., 90., 90.,180., 0.);
+
+  // 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 rowb[5] = {6, 7, 6, 19, 7};
+  Float_t carpos[3] = {25. - xtof*0.5,
+                      (11.5 - (ytof*0.5 - fgkModuleCoverThickness))*0.5,
+                      0.};
+  Int_t row = 1;
+  Int_t nrow = 0;
+  for (Int_t sg= -1; sg< 2; sg+= 2) {
+    carpos[2] = sg*zlenA*0.5;
+    for (Int_t nb=0; nb<5; ++nb) {
+      carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
+      nrow = row + rowb[nb];
+      for ( ; row < nrow ; ++row) {
+
+        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");
+
+       }
+       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");
+           break;
+         case -1:
+           gMC->Gspos("FCA1",2*row,  "FAIA", carpos[0],carpos[1],carpos[2], idrotm[0],"ONLY");
+           gMC->Gspos("FCA1",2*row-1,"FAIA",-carpos[0],carpos[1],carpos[2], idrotm[0],"ONLY");
+           gMC->Gspos("FCA2",  row,  "FAIA",        0.,carpos[1],carpos[2], idrotm[0],"ONLY");
+           break;
+         }
+
+       }
+      }
+    }
+  }
+
+  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");
+
+  if (fTOFHoles) {
+    row = 1;
+    for (Int_t sg= -1; sg< 2; sg+= 2) {
+      carpos[2] = sg*zlenA*0.5;
+      for (Int_t nb=0; nb<4; ++nb) {
+        carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
+        nrow = row + rowb[nb];
+        for ( ; row < nrow ; ++row) {
+          carpos[2] -= sg*rowstep;
+
+         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");
+           break;
+         case -1:
+           gMC->Gspos("FCA1",2*row,  "FAIB", carpos[0],carpos[1],carpos[2], idrotm[0],"ONLY");
+           gMC->Gspos("FCA1",2*row-1,"FAIB",-carpos[0],carpos[1],carpos[2], idrotm[0],"ONLY");
+           gMC->Gspos("FCA2",  row,  "FAIB",        0.,carpos[1],carpos[2], idrotm[0],"ONLY");
+           break;
+         }
+       }
+      }
+    }
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeFrontEndElectronics() const
+{
+  //
+  // Fill FCA1/2 volumes with FEA cards (FFEA volumes).
+  //
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  //const Float_t fgkFEAwidth1 = 19.;
+
+  // FEA card volume definition
+  Float_t feaParam1[3] = {fgkFEAwidth1*0.5, 5.6, 0.1};
+  gMC->Gsvolu("FFEA", "BOX ", idtmed[502], feaParam1, 3); // G10
+
+  // FEA card volume positioning
+  Float_t carpar[3] = {fgkFEAwidth1*0.5, 5.6, 0.45};
+  gMC->Gspos("FFEA", 1, "FCA1", 0., 0., -carpar[2]+feaParam1[2], 0, "ONLY");
+  gMC->Gspos("FFEA", 2, "FCA2", -(feaParam1[0]+0.25), 0., -carpar[2]+feaParam1[2], 0, "ONLY");
+  gMC->Gspos("FFEA", 3, "FCA2",  (feaParam1[0]+0.25), 0., -carpar[2]+feaParam1[2], 0, "ONLY");
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeFEACooling(Float_t xtof, Float_t ytof, Float_t zlenA) const
+{
+  //
+  // Make cooling system attached to each FEA card
+  // (FAL1, FRO1 and FBAR/1/2 volumes)
+  // in FAIA/B and FCA1/2 volume containers.
+  //
+
+  // honeycomb layer between strips and cards (cm)
+  //const Float_t fgkModuleCoverThickness = 2.;
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  //const Float_t fgkFEAwidth1 = 19.;
+
+  Float_t feaParam1[3] = {fgkFEAwidth1*0.5, 5.6, 0.1};
+
+  // first FEA cooling element definition
+  Float_t al1[3] = {fgkFEAwidth1*0.5, 0.4, 0.2};
+  gMC->Gsvolu("FAL1", "BOX ", idtmed[504], al1, 3); // Al
+  // first FEA cooling element positioning
+  Float_t carpar[3] = {fgkFEAwidth1*0.5, 5.6, 0.45};
   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("FAL1", 2, "FCA2", -(feaParam1[0]+0.25), carpar[1]-al1[1], -carpar[2]+2.*feaParam1[2]+al1[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");
+
+  // second FEA cooling element difinition
+  //Float_t feaRoof1[3] = {9.5, 0.2, 1.45};
+  Float_t feaRoof1[3] = {al1[0], al1[2], 1.45};
+  gMC->Gsvolu("FRO1", "BOX ", idtmed[504], feaRoof1, 3); // Al
+
+  // third FEA cooling element difinition
+  Float_t bar[3] = {8.575, 0.6, 0.25};
+  gMC->Gsvolu("FBAR", "BOX ", idtmed[504], bar, 3); // Al
+
+  // fourth FEA cooling element difinition
+  //Float_t bar1[3] = {8.575, 0.6, 0.1};
+  Float_t bar1[3] = {bar[0], bar[1], 0.1};
+  gMC->Gsvolu("FBA1", "BOX ", idtmed[504], bar1, 3); // Al
+
+  // fifth FEA cooling element difinition
+  //Float_t bar2[3] = {8.575, 0.1, 0.4};
+  Float_t bar2[3] = {bar[0], 0.1, bar[1]-2.*bar[2]};
+  gMC->Gsvolu("FBA2", "BOX ", idtmed[504], bar2, 3); // Al
+
+  //const Float_t fgkCBLw   = 13.5; // width of lateral cables and tubes block
+
+  Float_t tubepar[3] = {0., 0.4, xtof*0.5 - fgkCBLw};
+
+  // FEA cooling components positioning
+  Float_t rowstep = 6.66;
+  Float_t rowgap[5] = {13.5, 22.9, 16.94, 23.8, 20.4};
+  Int_t rowb[5] = {6, 7, 6, 19, 7};
+  Float_t carpos[3] = {25. - xtof*0.5,
+                      (11.5 - (ytof*0.5 - fgkModuleCoverThickness))*0.5,
+                      0.};
+  Int_t row = 1;
+  Int_t nrow = 0;
+  for (Int_t sg= -1; sg< 2; sg+= 2) {
+    carpos[2] = sg*zlenA*0.5;
+    for (Int_t nb=0; nb<5; ++nb) {
+      carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
+      nrow = row + rowb[nb];
+      for ( ; row < nrow ; ++row) {
+
+        carpos[2] -= sg*rowstep;
+
+       if (nb==4) {
+
+         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]-bar[2]), 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]-bar[2]), 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]-bar[2]), 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]-bar[2]), 0,"ONLY");
+
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+
+         gMC->Gspos("FBA2",8*row,  "FAIA", carpos[0],carpos[1]+carpar[1]-bar2[1], carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]-bar2[1], carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]-bar2[1], carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]-bar2[1], carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+
+         gMC->Gspos("FBA2",8*row-4,"FAIA", carpos[0],carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-5,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-6,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-7,"FAIA",-carpos[0],carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "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");
+
+       }
+       else {
+
+         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]-bar[2]), 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]-bar[2]), 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]-bar[2]), 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]-bar[2]), 0,"ONLY");
+
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+
+         gMC->Gspos("FBA2",8*row,  "FAIA", carpos[0],carpos[1]+carpar[1]-bar2[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-1,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]-bar2[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-2,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]-bar2[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-3,"FAIA",-carpos[0],carpos[1]+carpar[1]-bar2[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+
+         gMC->Gspos("FBA2",8*row-4,"FAIA", carpos[0],carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-5,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-6,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-7,"FAIA",-carpos[0],carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "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("FBAR",364, "FAIA", carpos[0],carpos[1]+carpar[1]-bar[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-bar[2]), 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]-bar[2]), 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]-bar[2]), 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]-bar[2]), 0,"ONLY");
+
+  gMC->Gspos("FBA1",364, "FAIA", carpos[0],carpos[1]+carpar[1]-bar[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+  gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+  gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+  gMC->Gspos("FBA1",361, "FAIA",-carpos[0],carpos[1]+carpar[1]-bar[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+
+  gMC->Gspos("FBA2",728, "FAIA", carpos[0],carpos[1]+carpar[1]-bar2[1], -(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+  gMC->Gspos("FBA2",727, "FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]-bar2[1], -(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+  gMC->Gspos("FBA2",726, "FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]-bar2[1], -(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+  gMC->Gspos("FBA2",725, "FAIA",-carpos[0],carpos[1]+carpar[1]-bar2[1], -(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+
+  gMC->Gspos("FBA2",724,"FAIA", carpos[0],carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], -(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+  gMC->Gspos("FBA2",723,"FAIA", (feaParam1[0]+0.25),carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], -(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+  gMC->Gspos("FBA2",722,"FAIA",-(feaParam1[0]+0.25),carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], -(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+  gMC->Gspos("FBA2",721,"FAIA",-carpos[0],carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], -(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "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");
+
+
+  if (fTOFHoles) {
+    row = 1;
+    for (Int_t sg= -1; sg< 2; sg+= 2) {
+      carpos[2] = sg*zlenA*0.5;
+      for (Int_t nb=0; nb<4; ++nb) {
+        carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
+        nrow = row + rowb[nb];
+        for ( ; row < nrow ; ++row) {
+          carpos[2] -= sg*rowstep;
+
+         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]-bar[2]), 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]-bar[2]), 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]-bar[2]), 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]-bar[2]), 0,"ONLY");
+
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+         gMC->Gspos("FBA1",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[2]-2.*tubepar[1]-bar1[2]), 0,"ONLY");
+
+         gMC->Gspos("FBA2",8*row,  "FAIB", carpos[0],carpos[1]+carpar[1]-bar2[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-1,"FAIB", (feaParam1[0]+0.25),carpos[1]+carpar[1]-bar2[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-2,"FAIB",-(feaParam1[0]+0.25),carpos[1]+carpar[1]-bar2[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-3,"FAIB",-carpos[0],carpos[1]+carpar[1]-bar2[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+
+         gMC->Gspos("FBA2",8*row-4,"FAIB", carpos[0],carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-5,"FAIB", (feaParam1[0]+0.25),carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-6,"FAIB",-(feaParam1[0]+0.25),carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "ONLY");
+         gMC->Gspos("FBA2",8*row-7,"FAIB",-carpos[0],carpos[1]+carpar[1]-3.*bar2[1]-2.*tubepar[1], carpos[2]-sg*(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), 0, "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");
 
+        }
+      }
+    }
+  }
 
-  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");
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeNinoMask(Float_t xtof, Float_t ytof, Float_t zlenA) const
+{
+  //
+  // Make cooling Nino mask
+  // for each FEA card (FAL2/3 and FRO2/3/4 volumes)
+  // in FAIA/B and FCA1/2 volume containers.
+  //
+
+  // honeycomb layer between strips and cards (cm)
+  //const Float_t fgkModuleCoverThickness = 2.;
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  //const Float_t fgkFEAwidth1 = 19.;
+
+  // first Nino ASIC mask volume definition
+  Float_t al2[3] = {7.25, 0.75, 0.25};
+  gMC->Gsvolu("FAL2", "BOX ", idtmed[504], al2, 3); // Al
+
+  // second Nino ASIC mask volume definition
+  Float_t al3[3] = {3., 3.75, 0.1};
+  gMC->Gsvolu("FAL3", "BOX ", idtmed[504], al3, 3); // Al
+
+  // first Nino ASIC mask volume positioning
+  Float_t feaParam1[3] = {fgkFEAwidth1*0.5, 5.6, 0.1};
+  Float_t carpar[3] = {fgkFEAwidth1*0.5, 5.6, 0.45};
+  gMC->Gspos("FAL2", 1, "FCA1", 0., carpar[1]-2.*al3[1]+0.25,  carpar[2]-2.*al3[2]-al2[2], 0, "ONLY");
+  gMC->Gspos("FAL2", 2, "FCA2", -(feaParam1[0]+0.25), carpar[1]-2.*al3[1]+0.25,  carpar[2]-2.*al3[2]-al2[2], 0, "ONLY");
+  gMC->Gspos("FAL2", 3, "FCA2",  (feaParam1[0]+0.25), carpar[1]-2.*al3[1]+0.25,  carpar[2]-2.*al3[2]-al2[2], 0, "ONLY");
+
+  // second Nino ASIC mask volume positioning
+  gMC->Gspos("FAL3", 1, "FCA1", 0., carpar[1]-al3[1],  carpar[2]-al3[2], 0, "ONLY");
+  gMC->Gspos("FAL3", 2, "FCA2", -(feaParam1[0]+0.25), carpar[1]-al3[1],  carpar[2]-al3[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");
 
-  // cable
-  Float_t cbpar[3] = {0., 0.5, tubepar[2]};
-  gMC->Gsvolu("FCAB", "TUBE", idtmed[511], cbpar, 3);    // copper+alu
+  //Float_t feaRoof1[3] = {9.5, 0.2, 1.45};
+  Float_t feaRoof1[3] = {fgkFEAwidth1*0.5, 0.2, 1.45};
 
-  // 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
+  // third Nino ASIC mask volume definition
+  //Float_t feaRoof2[3] = {3.35, 0.05, 1.05};
+  Float_t feaRoof2[3] = {al3[0], 0.05, 1.05};
+  gMC->Gsvolu("FRO2", "BOX ", idtmed[504], feaRoof2, 3); // Al
 
-  // rotation matrix
-  AliMatrix(idrotm[99], 180., 90., 90., 90., 90., 0.);
-  AliMatrix(idrotm[98],  90.,180., 90., 90.,180., 0.);
+  // fourth Nino ASIC mask volume definition
+  //Float_t feaRoof3[3] = {3.35, feaRoof1[1]+feaRoof2[1], 0.1};
+  Float_t feaRoof3[3] = {al3[0], feaRoof1[1]+feaRoof2[1], 0.1};
+  gMC->Gsvolu("FRO3", "BOX ", idtmed[504], feaRoof3, 3); // Al
 
-  // cards, tubes, cables  positioning
-  Float_t carpos[3], rowstep = 6.66, ytub= 3.65, ycab= ytub-3.;
+  // fifth Nino ASIC mask volume definition
+  Float_t feaRoof4[3] = {al3[0], 0.05, carpar[2]-feaParam1[2]-feaRoof1[1]-al3[2]};
+  gMC->Gsvolu("FRO4", "BOX ", idtmed[504], feaRoof4, 3); // Al
+
+  // other Nino ASIC mask volumes 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] = {25. - xtof*0.5,
+                      (11.5 - (ytof*0.5 - fgkModuleCoverThickness))*0.5,
+                      0.};
+  Int_t row = 1;
+  Int_t nrow = 0;
   for (Int_t sg= -1; sg< 2; sg+= 2) {
     carpos[2] = sg*zlenA*0.5;
     for (Int_t nb=0; nb<5; ++nb) {
@@ -928,18 +1648,6 @@ 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");
@@ -956,34 +1664,8 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
          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");
-
        }
        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");
-           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");
-           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");
@@ -1000,31 +1682,10 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
          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");
@@ -1041,14 +1702,6 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
   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;
@@ -1060,28 +1713,6 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
         for ( ; row < nrow ; ++row) {
           carpos[2] -= sg*rowstep;
 
-         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");
-           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");
-           break;
-         }
-
-          //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");
-
          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");
@@ -1097,86 +1728,342 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
          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");
 
-         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");
+        }
+      }
+    }
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeSuperModuleCooling(Float_t xtof, Float_t ytof, Float_t zlenA) const
+{
+  //
+  // Make cooling tubes (FTUB volume)
+  // and cooling bars (FTLN and FLTN volumes)
+  // in FAIA/B volume containers.
+  //
+
+  //const Float_t fgkInterCentrModBorder2 = 57.5;
+
+  // honeycomb layer between strips and cards (cm)
+  //const Float_t fgkModuleCoverThickness = 2.;
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  Int_t idrotm[1];
+
+  //const Float_t fgkFEAwidth1 = 19.;
+
+  //const Float_t fgkCBLw   = 13.5; // width of lateral cables and tubes block
+  //const Float_t fgkSawThickness = 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 lonpar[3] = {tubepar[2], 6.15, 0.7};
+  gMC->Gsvolu("FTLN", "BOX ", idtmed[504], lonpar, 3); // Al
+  lonpar[0] = 2.;
+  lonpar[1] = 1.;
+  lonpar[2] = zlenA*0.5;
+  // definition of longitudinal components of SM cooling system
+  gMC->Gsvolu("FLON", "BOX ", idtmed[504], lonpar, 3); // Al
+  if (fTOFHoles) {
+    lonpar[2] = (zlenA*0.5 - fgkInterCentrModBorder2)*0.5;
+    gMC->Gsvolu("FLOB", "BOX ", idtmed[504], lonpar, 3); // Al
+  }
+
+  // rotation matrix
+  AliMatrix(idrotm[0], 180., 90., 90., 90., 90., 0.);
+
+  // Positioning of cooling tubes and transverse components of SM
+  // cooling system
+  Float_t carpar[3] = {fgkFEAwidth1*0.5, 5.6, 0.45};
+  Float_t feaParam1[3] = {fgkFEAwidth1*0.5, 5.6, 0.1};
+  Float_t al1[3] = {fgkFEAwidth1*0.5, 0.4, 0.2};
+  Float_t feaRoof1[3] = {al1[0], al1[2], 1.45};
+  Float_t bar[3] = {8.575, 0.6, 0.25};
+  Float_t rowstep = 6.66;
+  Float_t ytub= 3.65;
+  Float_t rowgap[5] = {13.5, 22.9, 16.94, 23.8, 20.4};
+  Int_t rowb[5] = {6, 7, 6, 19, 7};
+  Float_t carpos[3] = {25. - xtof*0.5,
+                      (11.5 - (ytof*0.5 - fgkModuleCoverThickness))*0.5,
+                      0.};
+  Int_t row = 1;
+  Int_t nrow = 0;
+  for (Int_t sg= -1; sg< 2; sg+= 2) {
+    carpos[2] = sg*zlenA*0.5;
+    for (Int_t nb=0; nb<5; ++nb) {
+      carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
+      nrow = row + rowb[nb];
+      for ( ; row < nrow ; ++row) {
+
+        carpos[2] -= sg*rowstep;
+
+       if (nb==4)
+         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]-2.*bar[2]-tubepar[1]), idrotm[0], "ONLY");
+       else
+         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]-2.*bar[2]-tubepar[1]), idrotm[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("FTUB", 91, "FAIA", 0., carpos[1]+carpar[1]-bar[1],-(carpar[2]-2.*feaParam1[2]-2.*al1[2]+2.*feaRoof1[2]-2.*bar[2]-tubepar[1]), idrotm[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;
+      for (Int_t nb=0; nb<4; ++nb) {
+        carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
+        nrow = row + rowb[nb];
+        for ( ; row < nrow ; ++row) {
+          carpos[2] -= sg*rowstep;
+         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]-2.*bar[2]-tubepar[1]), idrotm[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");
     }
-  gMC->Gspos("FLON", 2, "FAIB",-24., ytub+1.4, 0., 0, "MANY");
-  gMC->Gspos("FLON", 1, "FAIB", 24., ytub+1.4, 0., 0, "MANY");
+
+    gMC->Gspos("FLOB", 4, "FAIB",-24., ytub+1.4,  (zlenA*0.5 + fgkInterCentrModBorder2)*0.5, 0, "MANY");
+    gMC->Gspos("FLOB", 3, "FAIB", 24., ytub+1.4,  (zlenA*0.5 + fgkInterCentrModBorder2)*0.5, 0, "MANY");
+    gMC->Gspos("FLOB", 2, "FAIB",-24., ytub+1.4, -(zlenA*0.5 + fgkInterCentrModBorder2)*0.5, 0, "MANY");
+    gMC->Gspos("FLOB", 1, "FAIB", 24., ytub+1.4, -(zlenA*0.5 + fgkInterCentrModBorder2)*0.5, 0, "MANY");
+
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTOFv6T0::MakeSuperModuleServices(Float_t xtof, Float_t ytof, Float_t zlenA) const
+{
+  //
+  // Make signal cables (FCAB and FCBL/B volumes),
+  // supemodule cover (FCOV volume) and wall (FSAW volume)
+  // in FAIA/B volume containers.
+  //
+
+  //const Float_t fgkInterCentrModBorder2 = 57.5;
+
+  // honeycomb layer between strips and cards (cm)
+  //const Float_t fgkModuleCoverThickness = 2.;
+
+  Int_t *idtmed = fIdtmed->GetArray()-499;
+
+  Int_t idrotm[3];
+
+  //const Float_t fgkCBLw   = 13.5; // width of lateral cables and tubes block
+  //const Float_t fgkSawThickness = 1.;
+  //const Float_t fgkFEAwidth1 = 19.;
+  //const Float_t fgkFEAwidth2 = 38.5;
+
+  Float_t tubepar[3] = {0., 0.4, xtof*0.5 - fgkCBLw - fgkSawThickness};
+
+  // FEA cables definition
+  Float_t cbpar[3] = {0., 0.5, (tubepar[2] - fgkFEAwidth2*0.5)*0.5};
+  gMC->Gsvolu("FCAB", "TUBE", idtmed[510], cbpar, 3);    // copper+alu
+  cbpar[2] = (xtof*0.5 - fgkCBLw - fgkSawThickness - (xtof*0.5 - 25. + fgkFEAwidth1*0.5))*0.5;
+  gMC->Gsvolu("FCAL", "TUBE", idtmed[510], cbpar, 3);    // copper+alu
+
+  // rotation matrix
+  AliMatrix(idrotm[0], 180., 90., 90., 90., 90., 0.);
+
+  // FEA cables positioning
+  Float_t rowstep = 6.66;
+  Float_t ytub= 3.65;
+  Float_t ycab= ytub-3.;
+  Float_t rowgap[5] = {13.5, 22.9, 16.94, 23.8, 20.4};
+  Int_t rowb[5] = {6, 7, 6, 19, 7};
+  Float_t carpos[3] = {25. - xtof*0.5,
+                      (11.5 - (ytof*0.5 - fgkModuleCoverThickness))*0.5,
+                      0.};
+  Int_t row = 1;
+  Int_t nrow = 0;
+  Float_t xCable = (xtof*0.5 - fgkCBLw - fgkSawThickness + fgkFEAwidth2*0.5)*0.5;
+  Float_t xCableL = (xtof*0.5 - fgkCBLw - fgkSawThickness + (xtof*0.5 - 25. + fgkFEAwidth1*0.5))*0.5;
+  for (Int_t sg= -1; sg< 2; sg+= 2) {
+    carpos[2] = sg*zlenA*0.5;
+    for (Int_t nb=0; nb<5; ++nb) {
+      carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
+      nrow = row + rowb[nb];
+      for ( ; row < nrow ; ++row) {
+
+        carpos[2] -= sg*rowstep;
+
+       if (nb==4)
+         {
+         gMC->Gspos("FCAB", 2*row,   "FAIA", xCable,  ycab,             carpos[2]-1.1, idrotm[0], "ONLY");
+         gMC->Gspos("FCAB", 2*row-1, "FAIA",-xCable,  ycab,             carpos[2]-1.1, idrotm[0], "ONLY");
+         gMC->Gspos("FCAL", 2*row,   "FAIA", xCableL, ycab-2.*cbpar[1], carpos[2]-1.1, idrotm[0], "ONLY");
+         gMC->Gspos("FCAL", 2*row-1, "FAIA",-xCableL, ycab-2.*cbpar[1], carpos[2]-1.1, idrotm[0], "ONLY");
+         }
+       else
+         {
+         gMC->Gspos("FCAB", 2*row,   "FAIA", xCable, ycab,              carpos[2]-sg*1.1, idrotm[0], "ONLY");
+         gMC->Gspos("FCAB", 2*row-1, "FAIA",-xCable, ycab,              carpos[2]-sg*1.1, idrotm[0], "ONLY");
+         gMC->Gspos("FCAL", 2*row,   "FAIA", xCableL, ycab-2.*cbpar[1], carpos[2]-sg*1.1, idrotm[0], "ONLY");
+         gMC->Gspos("FCAL", 2*row-1, "FAIA",-xCableL, ycab-2.*cbpar[1], carpos[2]-sg*1.1, idrotm[0], "ONLY");
+         }
+      }
+    }
+  }
+
+  gMC->Gspos("FCAB", 182, "FAIA", xCable,  ycab,             -1.1, idrotm[0], "ONLY");
+  gMC->Gspos("FCAB", 181, "FAIA",-xCable,  ycab,             -1.1, idrotm[0], "ONLY");
+  gMC->Gspos("FCAL", 182, "FAIA", xCableL, ycab-2.*cbpar[1], -1.1, idrotm[0], "ONLY");
+  gMC->Gspos("FCAL", 181, "FAIA",-xCableL, ycab-2.*cbpar[1], -1.1, idrotm[0], "ONLY");
+
+  if (fTOFHoles) {
+    row = 1;
+    for (Int_t sg= -1; sg< 2; sg+= 2) {
+      carpos[2] = sg*zlenA*0.5;
+      for (Int_t nb=0; nb<4; ++nb) {
+        carpos[2] = carpos[2] - sg*(rowgap[nb] - rowstep);
+        nrow = row + rowb[nb];
+        for ( ; row < nrow ; ++row) {
+          carpos[2] -= sg*rowstep;
+          gMC->Gspos("FCAB", 2*row,   "FAIB", xCable,  ycab,             carpos[2]-sg*1.1, idrotm[0], "ONLY");
+          gMC->Gspos("FCAB", 2*row-1, "FAIB",-xCable,  ycab,             carpos[2]-sg*1.1, idrotm[0], "ONLY");
+         gMC->Gspos("FCAL", 2*row,   "FAIB", xCableL, ycab-2.*cbpar[1], carpos[2]-sg*1.1, idrotm[0], "ONLY");
+         gMC->Gspos("FCAL", 2*row-1, "FAIB",-xCableL, ycab-2.*cbpar[1], carpos[2]-sg*1.1, 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
+  Float_t xcoor, ycoor, zcoor;
+  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");
+
   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");
+
+  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 = 12.5*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");
+  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
 
@@ -1190,22 +2077,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");
 
 }
+
 //_____________________________________________________________________________
 void AliTOFv6T0::DrawModule() const
 {
@@ -1319,8 +2216,8 @@ void AliTOFv6T0::DrawDetectorModules() const
   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");
@@ -1394,8 +2291,8 @@ void AliTOFv6T0::DrawDetectorStrips() const
   gMC->Gsatt("FAIA","SEEN", 0);
   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   -
 
@@ -1403,20 +2300,29 @@ 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
   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("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);
@@ -1460,37 +2366,25 @@ void AliTOFv6T0::CreateMaterials()
   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;
@@ -1504,102 +2398,92 @@ void AliTOFv6T0::CreateMaterials()
   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
+  //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;
 
@@ -1615,22 +2499,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);
 
 }
 //_____________________________________________________________________________
@@ -1687,16 +2571,16 @@ 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
      )
   {
 
     AliMC *mcApplication = (AliMC*)gAlice->GetMCApp();
 
-    AddTrackReference(mcApplication->GetCurrentTrackNumber(), AliTrackReference::kTOF);
-    //AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber());
+    //AddTrackReference(mcApplication->GetCurrentTrackNumber(), AliTrackReference::kTOF);
+    AddTrackReference(mcApplication->GetCurrentTrackNumber());
 
     // getting information about hit volumes
     
index 176e12f6872c1549fcb7ab759658a29f3ce8217e..5333ff126b75735ef95a573751befd40d4b8d3aa 100644 (file)
@@ -40,6 +40,22 @@ public:
   void MaterialMixer(Float_t* p,Float_t* a,Float_t* m,Int_t n) const;
 
 private:
+
+  void CreateModules(Float_t xtof, Float_t ytof, Float_t zlenA,
+                    Float_t xFLT, Float_t yFLT, Float_t zFLTA) const;
+  void MakeStripsInModules(Float_t ytof, Float_t zlenA) const;
+  void CreateModuleCovers(Float_t xtof, Float_t zlenA) const;
+  void CreateBackZone(Float_t xtof, Float_t ytof, Float_t zlenA) const;
+  void MakeFrontEndElectronics() const;
+  void MakeFEACooling(Float_t xtof, Float_t ytof, Float_t zlenA) const;
+  void MakeNinoMask(Float_t xtof, Float_t ytof, Float_t zlenA) const;
+  void MakeSuperModuleCooling(Float_t xtof, Float_t ytof, Float_t zlenA) const;
+  void MakeSuperModuleServices(Float_t xtof, Float_t ytof, Float_t zlenA) const;
+  void MakeModulesInBTOFvolumes(Float_t ytof, Float_t zlenA) const;
+  void MakeCoversInBTOFvolumes() const;
+  void MakeBackInBTOFvolumes(Float_t ytof) const;
+  void MakeReadoutCrates(Float_t ytof) const;
+
   Int_t fIdFTOA; // FTOA volume identifier (outer plate A)
   Int_t fIdFTOB; // FTOB volume identifier (outer plate B)
   Int_t fIdFTOC; // FTOC volume identifier (outer plate C)
@@ -48,6 +64,62 @@ private:
   Int_t fIdFLTC; // FLTC volume identifier (inner plate C)
   Bool_t fTOFHoles; // Selecting Geometry with and w/o holes
  
+  //private:
+
+  static const Float_t fgkModuleWallThickness;  // wall thickness (cm)
+  static const Float_t fgkInterCentrModBorder1; // 1st distance of
+                                               // border between
+                                               // central and
+                                               // intermediate
+                                               // modules respect to
+                                               // the central module
+                                               // centre (cm)
+  static const Float_t fgkInterCentrModBorder2; // 2nd distance of
+                                               // border between the
+                                               // central and
+                                               // intermediate
+                                               // modules respect to
+                                               // the central module
+                                               // centre (cm)
+  static const Float_t fgkExterInterModBorder1; // 1st distance of
+                                               // border between the
+                                               // intermediate and
+                                               // external modules
+                                               // respect to the
+                                               // central module
+                                               // centre (cm)
+  static const Float_t fgkExterInterModBorder2; // 2nd distance of
+                                               // border between the
+                                               // intermediate and
+                                               // external
+                                               // modules respect to
+                                               // the central module
+                                               // centre (cm)
+  static const Float_t fgkLengthInCeModBorder;  // height of border
+                                               // between the central
+                                               // and intermediate
+                                               // modules (cm)
+  static const Float_t fgkLengthExInModBorder;  // height of border
+                                               // between the
+                                               // intermediate and
+                                               // external modules
+                                               // (cm)
+  static const Float_t fgkModuleCoverThickness; // thickness of cover
+                                               // modules zone (cm)
+  static const Float_t fgkFEAwidth1; // mother volume width of each of
+                                    // two external FEA in a
+                                    // supermodule (cm)
+  static const Float_t fgkFEAwidth2; // mother volume width of two
+                                    // internal FEA in a supermodule
+                                    // (cm)
+  static const Float_t fgkSawThickness; // services alluminium wall
+                                       // thickness (cm)
+  static const Float_t fgkCBLw;  // cables&tubes block width (cm)
+  static const Float_t fgkCBLh1; // min. height of cables&tubes block
+                                // (cm)
+  static const Float_t fgkCBLh2; // max. height of cables&tubes block
+                                // (cm)
+
   ClassDef(AliTOFv6T0,0)  //Time Of Flight version 6
 };