]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOFv6T0.cxx
Remove custom streamer, it was not active in the old Root versions with split level...
[u/mrichter/AliRoot.git] / TOF / AliTOFv6T0.cxx
index d1853ea6ba98f9f17c4c75193851fd6b5d3e1300..720e55fbb7394e8fcecea50e19edb09c916bd876 100644 (file)
@@ -89,16 +89,14 @@ Revision 0.1 2007 March G. Cara Romeo and A. De Caro
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "TDirectory.h"
-#include "TBRIK.h"
-#include "TGeometry.h"
-#include "TLorentzVector.h"
-#include "TNode.h"
-#include "TVirtualMC.h"
-#include "TGeoManager.h"
+#include <TDirectory.h>
+#include <TGeoGlobalMagField.h>
+#include <TGeoManager.h>
 #include <TGeoMatrix.h>
 #include <TGeoPhysicalNode.h>
 #include <TGeoVolume.h>
+#include <TLorentzVector.h>
+#include <TVirtualMC.h>
 
 #include "AliConst.h"
 #include "AliGeomManager.h"
@@ -111,11 +109,10 @@ Revision 0.1 2007 March G. Cara Romeo and A. De Caro
 #include "AliTOFGeometry.h"
 #include "AliTOFv6T0.h"
 
-extern TDirectory *gDirectory;
-extern TVirtualMC *gMC;
-extern TGeoManager *gGeoManager;
+// extern TVirtualMC *TVirtualMC::GetMC();
+// extern TGeoManager *gGeoManager;
 
-extern AliRun *gAlice;
+// extern AliRun *gAlice;
 
 ClassImp(AliTOFv6T0)
 
@@ -129,8 +126,10 @@ 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::fgkLengthInCeModBorder   =   7.2 ; // cm // it was 4.7 cm (AdC)
+const Float_t AliTOFv6T0::fgkLengthInCeModBorderU  =   5.0 ; // cm
+const Float_t AliTOFv6T0::fgkLengthInCeModBorderD  =   7.0 ; // cm
+const Float_t AliTOFv6T0::fgkLengthExInModBorder   =   5.0 ; // cm // it was 7.0 cm (AdC)
 const Float_t AliTOFv6T0::fgkModuleCoverThickness  =   2.0 ; // cm
 const Float_t AliTOFv6T0::fgkFEAwidth1    = 19.0; // cm
 const Float_t AliTOFv6T0::fgkFEAwidth2    = 39.5;//38.5; // cm
@@ -139,15 +138,15 @@ const Float_t AliTOFv6T0::fgkCBLw  = 13.5; // cm
 const Float_t AliTOFv6T0::fgkCBLh1 =  2.0; // cm
 const Float_t AliTOFv6T0::fgkCBLh2 = 12.3; // cm
 const Float_t AliTOFv6T0::fgkBetweenLandMask = 0.1; // cm
-const Float_t AliTOFv6T0::fgkAl1parameters[3] = {fgkFEAwidth1*0.5, 0.4, 0.2}; // cm
+const Float_t AliTOFv6T0::fgkAl1parameters[3] = {static_cast<Float_t>(fgkFEAwidth1*0.5), 0.4, 0.2}; // cm
 const Float_t AliTOFv6T0::fgkAl2parameters[3] = {7.25, 0.75, 0.25}; // cm
 const Float_t AliTOFv6T0::fgkAl3parameters[3] = {3., 4., 0.1}; // cm
 const Float_t AliTOFv6T0::fgkRoof1parameters[3] = {fgkAl1parameters[0], fgkAl1parameters[2], 1.45}; // cm
 const Float_t AliTOFv6T0::fgkRoof2parameters[3] = {fgkAl3parameters[0], 0.1, 1.15}; // cm
-const Float_t AliTOFv6T0::fgkFEAparameters[3] = {fgkFEAwidth1*0.5, 5.6, 0.1}; // cm
+const Float_t AliTOFv6T0::fgkFEAparameters[3] = {static_cast<Float_t>(fgkFEAwidth1*0.5), 5.6, 0.1}; // cm
 const Float_t AliTOFv6T0::fgkBar[3] = {8.575, 0.6, 0.25}; // cm
 const Float_t AliTOFv6T0::fgkBar1[3] = {fgkBar[0], fgkBar[1], 0.1}; // cm
-const Float_t AliTOFv6T0::fgkBar2[3] = {fgkBar[0], 0.1, fgkBar[1] - 2.*fgkBar1[2]}; // cm
+const Float_t AliTOFv6T0::fgkBar2[3] = {fgkBar[0], 0.1, static_cast<Float_t>(fgkBar[1] - 2.*fgkBar1[2])}; // cm
 const Float_t AliTOFv6T0::fgkBarS[3] = {2., fgkBar[1], fgkBar[2]}; // cm
 const Float_t AliTOFv6T0::fgkBarS1[3] = {fgkBarS[0], fgkBar1[1], fgkBar1[2]}; // cm
 const Float_t AliTOFv6T0::fgkBarS2[3] = {fgkBarS[0], fgkBar2[1], fgkBar2[2]}; // cm
@@ -216,7 +215,7 @@ AliTOFv6T0::AliTOFv6T0(const char *name, const char *title):
 
   // Save the geometry
   TDirectory* saveDir = gDirectory;
-  gAlice->GetRunLoader()->CdGAFile();
+  AliRunLoader::Instance()->CdGAFile();
   fTOFGeometry->Write("TOFgeometry");
   saveDir->cd();
 
@@ -350,86 +349,6 @@ void AliTOFv6T0::AddAlignableVolumes() const
 
   }
   
-}
-//____________________________________________________________________________
-void AliTOFv6T0::BuildGeometry()
-{
-  //
-  // Build TOF ROOT geometry for the ALICE event display
-  //
-  TNode *node, *top;
-  const int kColorTOF  = 27;
-  
-  TGeometry *globalGeometry = (TGeometry*)gAlice->GetGeometry();
-
-  // Find top TNODE
-  top = globalGeometry->GetNode("alice");
-  
-  // Position the different copies
-  const Float_t krTof  =(fTOFGeometry->Rmax()+fTOFGeometry->Rmin())/2.;
-  const Float_t khTof  = fTOFGeometry->Rmax()-fTOFGeometry->Rmin();
-  const Int_t   kNTof  = fTOFGeometry->NSectors();
-  const Float_t kangle = k2PI/kNTof;
-
-  Float_t ang;
-  
-  // define offset for nodes
-  Float_t zOffsetB = (fTOFGeometry->ZlenA()*0.5 + (fgkInterCentrModBorder1+fgkInterCentrModBorder2)*0.5)*0.5;
-  Float_t zOffsetA = 0.;
-
-  // Define TOF basic volume
-    char nodeName0[16], nodeName1[16], nodeName2[16];
-  char nodeName3[16], nodeName4[16], rotMatNum[16];
-
-  if (fTOFHoles) {
-    new TBRIK("S_TOF_B","TOF box","void",
-             fTOFGeometry->StripLength()*0.5, khTof*0.5, fTOFGeometry->ZlenB()*0.5);
-    new TBRIK("S_TOF_C","TOF box","void",
-             fTOFGeometry->StripLength()*0.5, khTof*0.5, fTOFGeometry->ZlenB()*0.5);
-  }
-  new TBRIK("S_TOF_A","TOF box","void",
-            fTOFGeometry->StripLength()*0.5, khTof*0.5, fTOFGeometry->ZlenA()*0.5);
-  
-  for (Int_t nodeNum=1;nodeNum<kNTof+1;nodeNum++){
-    
-    if (nodeNum<10) {
-      sprintf(rotMatNum,"rot50%i",nodeNum);
-      sprintf(nodeName0,"FTO00%i",nodeNum);
-      sprintf(nodeName1,"FTO10%i",nodeNum);
-      sprintf(nodeName2,"FTO20%i",nodeNum);
-      sprintf(nodeName3,"FTO30%i",nodeNum);
-      sprintf(nodeName4,"FTO40%i",nodeNum);
-    }
-    if (nodeNum>9) {
-      sprintf(rotMatNum,"rot5%i",nodeNum);
-      sprintf(nodeName0,"FTO0%i",nodeNum);
-      sprintf(nodeName1,"FTO1%i",nodeNum);
-      sprintf(nodeName2,"FTO2%i",nodeNum);
-      sprintf(nodeName3,"FTO3%i",nodeNum);
-      sprintf(nodeName4,"FTO4%i",nodeNum);
-    }
-    
-    new TRotMatrix(rotMatNum,rotMatNum,90,-20*nodeNum,90,90-20*nodeNum,0,0);
-    ang = (4.5-nodeNum) * kangle;
-
-    if (fTOFHoles) {   
-      top->cd();
-      node = new TNode(nodeName2,nodeName2,"S_TOF_B", krTof*TMath::Cos(ang), krTof*TMath::Sin(ang), zOffsetB,rotMatNum);
-      node->SetLineColor(kColorTOF);
-      fNodes->Add(node);
-      
-      top->cd();
-      node = new TNode(nodeName3,nodeName3,"S_TOF_C", krTof*TMath::Cos(ang), krTof*TMath::Sin(ang),-zOffsetB,rotMatNum);
-      node->SetLineColor(kColorTOF);
-      fNodes->Add(node);
-    }
-
-    top->cd();
-    node = new TNode(nodeName4,nodeName4,"S_TOF_A", krTof*TMath::Cos(ang), krTof*TMath::Sin(ang), zOffsetA,rotMatNum);
-    node->SetLineColor(kColorTOF);
-    fNodes->Add(node);
-  } // end loop on nodeNum
-
 }
 
 //_____________________________________________________________________________
@@ -458,10 +377,10 @@ void AliTOFv6T0::TOFpc(Float_t xtof, Float_t ytof, Float_t zlenA)
   //
 
   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));
+  AliDebug(1,Form(" xtof   %f",  xtof));
+  AliDebug(1,Form(" ytof   %f",  ytof));
+  AliDebug(1,Form(" zlenA   %f", zlenA));
+  AliDebug(2,Form(" zlenA*0.5 = %f", zlenA*0.5));
 
   Float_t xFLT, yFLT, zFLTA;
   xFLT  = xtof     - 2.*fgkModuleWallThickness;
@@ -501,21 +420,21 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
 
   Int_t *idtmed = fIdtmed->GetArray()-499;
 
-  Int_t idrotm[8];
+  Int_t idrotm[8]; for (Int_t ii=0; ii<8; ii++) idrotm[ii]=0;
 
   // Definition of the of fibre glass modules (FTOA, FTOB and FTOC)
   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
+  TVirtualMC::GetMC()->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 - fgkInterCentrModBorder1)*0.5;
-    gMC->Gsvolu("FTOB", "BOX ", idtmed[503], par, 3);  // Fibre glass
-    gMC->Gsvolu("FTOC", "BOX ", idtmed[503], par, 3);  // Fibre glass
+    TVirtualMC::GetMC()->Gsvolu("FTOB", "BOX ", idtmed[503], par, 3);  // Fibre glass
+    TVirtualMC::GetMC()->Gsvolu("FTOC", "BOX ", idtmed[503], par, 3);  // Fibre glass
   }
 
 
@@ -524,30 +443,31 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
   par[0] = xFLT*0.5;
   par[1] = yFLT*0.5;
   par[2] = zFLTA*0.5;
-  gMC->Gsvolu("FLTA", "BOX ", idtmed[506], par, 3); // Freon mix
+  TVirtualMC::GetMC()->Gsvolu("FLTA", "BOX ", idtmed[506], par, 3); // Freon mix
 
   Float_t xcoor, ycoor, zcoor;
   xcoor = 0.;
   ycoor = fgkModuleWallThickness*0.5;
   zcoor = 0.;
-  gMC->Gspos ("FLTA", 0, "FTOA", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos ("FLTA", 0, "FTOA", xcoor, ycoor, zcoor, 0, "ONLY");
 
   if (fTOFHoles) {
     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
+    TVirtualMC::GetMC()->Gsvolu("FLTB", "BOX ", idtmed[506], par, 3); // Freon mix
+    TVirtualMC::GetMC()->Gsvolu("FLTC", "BOX ", idtmed[506], par, 3); // Freon mix
 
     //xcoor = 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");
+    TVirtualMC::GetMC()->Gspos ("FLTB", 0, "FTOB", xcoor, ycoor, zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos ("FLTC", 0, "FTOC", xcoor, ycoor,-zcoor, 0, "ONLY");
   }
 
   // Definition and positioning
   // of the fibre glass walls between central and intermediate modules (FWZ1 and FWZ2)
   Float_t alpha, tgal, beta, tgbe, trpa[11];
-  tgal  = (yFLT - 2.*fgkLengthInCeModBorder)/(fgkInterCentrModBorder2 - fgkInterCentrModBorder1);
+  //tgal  = (yFLT - 2.*fgkLengthInCeModBorder)/(fgkInterCentrModBorder2 - fgkInterCentrModBorder1);
+  tgal  = (yFLT - fgkLengthInCeModBorderU - fgkLengthInCeModBorderD)/(fgkInterCentrModBorder2 - fgkInterCentrModBorder1);
   alpha = TMath::ATan(tgal);
   beta  = (kPi*0.5 - alpha)*0.5;
   tgbe  = TMath::Tan(beta);
@@ -555,28 +475,34 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
   trpa[1]  = 0.;
   trpa[2]  = 0.;
   trpa[3]  = 2.*fgkModuleWallThickness;
-  trpa[4]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
-  trpa[5]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[4]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[5]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[4]  = (fgkLengthInCeModBorderD - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[5]  = (fgkLengthInCeModBorderD + 2.*fgkModuleWallThickness*tgbe)*0.5;
   trpa[6]  = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
   trpa[7]  = 2.*fgkModuleWallThickness;
-  trpa[8]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
-  trpa[9]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[8]  = (fgkLengthInCeModBorderD - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[9]  = (fgkLengthInCeModBorderD + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[8]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[9]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
   trpa[10] = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
-  gMC->Gsvolu("FWZ1", "TRAP", idtmed[503], trpa, 11); // Fibre glass
+  TVirtualMC::GetMC()->Gsvolu("FWZ1D", "TRAP", idtmed[503], trpa, 11); // Fibre glass
 
   AliMatrix (idrotm[0],90., 90.,180.,0.,90.,180.);
   AliMatrix (idrotm[1],90., 90.,  0.,0.,90.,  0.);
 
   //xcoor = 0.;
-  ycoor = -(yFLT - fgkLengthInCeModBorder)*0.5;
+  //ycoor = -(yFLT - fgkLengthInCeModBorder)*0.5;
+  ycoor = -(yFLT - fgkLengthInCeModBorderD)*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");
+  TVirtualMC::GetMC()->Gspos("FWZ1D", 1, "FLTA", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FWZ1D", 2, "FLTA", xcoor, ycoor,-zcoor, idrotm[1], "ONLY");
 
   Float_t y0B, ycoorB, zcoorB;
 
   if (fTOFHoles) {
-    y0B = fgkLengthInCeModBorder - fgkModuleWallThickness*tgbe;
+    //y0B = fgkLengthInCeModBorder - fgkModuleWallThickness*tgbe;
+    y0B = fgkLengthInCeModBorderD - fgkModuleWallThickness*tgbe;
     trpa[0]  = xFLT*0.5;
     trpa[1]  = 0.;
     trpa[2]  = 0.;
@@ -591,22 +517,48 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
     //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");
+    TVirtualMC::GetMC()->Gsvolu("FWZAD", "TRAP", idtmed[503], trpa, 11); // Fibre glass
+    TVirtualMC::GetMC()->Gspos("FWZAD", 1, "FLTB", xcoor, ycoorB, zcoorB, idrotm[1], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FWZAD", 2, "FLTC", xcoor, ycoorB,-zcoorB, idrotm[0], "ONLY");
   }
 
+
+
+  tgal  = (yFLT - fgkLengthInCeModBorderU - fgkLengthInCeModBorderD)/(fgkInterCentrModBorder2 - fgkInterCentrModBorder1);
+  alpha = TMath::ATan(tgal);
+  beta  = (kPi*0.5 - alpha)*0.5;
+  tgbe  = TMath::Tan(beta);
+  trpa[0]  = xFLT*0.5;
+  trpa[1]  = 0.;
+  trpa[2]  = 0.;
+  trpa[3]  = 2.*fgkModuleWallThickness;
+  //trpa[4]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[5]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[4]  = (fgkLengthInCeModBorderU - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[5]  = (fgkLengthInCeModBorderU + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[6]  = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
+  trpa[7]  = 2.*fgkModuleWallThickness;
+  trpa[8]  = (fgkLengthInCeModBorderU - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[9]  = (fgkLengthInCeModBorderU + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[8]  = (fgkLengthInCeModBorder - 2.*fgkModuleWallThickness*tgbe)*0.5;
+  //trpa[9]  = (fgkLengthInCeModBorder + 2.*fgkModuleWallThickness*tgbe)*0.5;
+  trpa[10] = TMath::ATan(tgbe*0.5)*kRaddeg; //TMath::ATan((trpa[5] - trpa[4])/(2.*trpa[3]))*kRaddeg;
+  TVirtualMC::GetMC()->Gsvolu("FWZ1U", "TRAP", idtmed[503], trpa, 11); // Fibre glass
+
+
   AliMatrix (idrotm[2],90.,270.,  0.,0.,90.,180.);
   AliMatrix (idrotm[3],90.,270.,180.,0.,90.,  0.);
 
   //xcoor = 0.;
-  ycoor = (yFLT - fgkLengthInCeModBorder)*0.5;
+  //ycoor = (yFLT - fgkLengthInCeModBorder)*0.5;
+  ycoor = (yFLT - fgkLengthInCeModBorderU)*0.5;
   zcoor = fgkInterCentrModBorder2;
-  gMC->Gspos("FWZ1", 3, "FLTA", xcoor, ycoor, zcoor,idrotm[2], "ONLY");
-  gMC->Gspos("FWZ1", 4, "FLTA", xcoor, ycoor,-zcoor,idrotm[3], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FWZ1U", 1, "FLTA", xcoor, ycoor, zcoor,idrotm[2], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FWZ1U", 2, "FLTA", xcoor, ycoor,-zcoor,idrotm[3], "ONLY");
 
   if (fTOFHoles) {
-    y0B = fgkLengthInCeModBorder + fgkModuleWallThickness*tgbe;
+    //y0B = fgkLengthInCeModBorder + fgkModuleWallThickness*tgbe;
+    y0B = fgkLengthInCeModBorderU + fgkModuleWallThickness*tgbe;
     trpa[0]  = xFLT*0.5;
     trpa[1]  = 0.;
     trpa[2]  = 0.;
@@ -618,13 +570,13 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
     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
+    TVirtualMC::GetMC()->Gsvolu("FWZBU", "TRAP", idtmed[503], trpa, 11); // Fibre glass
     //xcoor = 0.;
     ycoorB = ycoor - fgkModuleWallThickness*0.5*tgbe;
     zcoorB = (zlenA*0.5 - 2.*fgkModuleWallThickness - fgkInterCentrModBorder1)*0.5 -
       (fgkInterCentrModBorder2 - fgkInterCentrModBorder1) - 2.*fgkModuleWallThickness;
-    gMC->Gspos("FWZB", 1, "FLTB", xcoor, ycoorB, zcoorB, idrotm[3], "ONLY");
-    gMC->Gspos("FWZB", 2, "FLTC", xcoor, ycoorB,-zcoorB, idrotm[2], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FWZBU", 1, "FLTB", xcoor, ycoorB, zcoorB, idrotm[3], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FWZBU", 2, "FLTC", xcoor, ycoorB,-zcoorB, idrotm[2], "ONLY");
   }
 
   trpa[0] = 0.5*(fgkInterCentrModBorder2 - fgkInterCentrModBorder1)/TMath::Cos(alpha);
@@ -633,16 +585,17 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
   trpa[3] = -beta*kRaddeg;
   trpa[4] = 0.;
   trpa[5] = 0.;
-  gMC->Gsvolu("FWZ2", "PARA", idtmed[503], trpa, 6); // Fibre glass
+  TVirtualMC::GetMC()->Gsvolu("FWZ2", "PARA", idtmed[503], trpa, 6); // Fibre glass
 
   AliMatrix (idrotm[4],     alpha*kRaddeg,90.,90.+alpha*kRaddeg,90.,90.,180.);
   AliMatrix (idrotm[5],180.-alpha*kRaddeg,90.,90.-alpha*kRaddeg,90.,90.,  0.);
 
   //xcoor = 0.;
-  ycoor = 0.;
+  //ycoor = 0.;
+  ycoor = (fgkLengthInCeModBorderD - fgkLengthInCeModBorderU)*0.5;
   zcoor = (fgkInterCentrModBorder2 + fgkInterCentrModBorder1)*0.5;
-  gMC->Gspos("FWZ2", 1, "FLTA", xcoor, ycoor, zcoor, idrotm[4], "ONLY");
-  gMC->Gspos("FWZ2", 2, "FLTA", xcoor, ycoor,-zcoor, idrotm[5], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FWZ2", 1, "FLTA", xcoor, ycoor, zcoor, idrotm[4], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FWZ2", 2, "FLTA", xcoor, ycoor,-zcoor, idrotm[5], "ONLY");
 
   if (fTOFHoles) {
     trpa[0] = 0.5*(fgkInterCentrModBorder2 - fgkInterCentrModBorder1)/TMath::Cos(alpha);
@@ -651,13 +604,13 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
     trpa[3] = -beta*kRaddeg;
     trpa[4] = 0.;
     trpa[5] = 0.;
-    gMC->Gsvolu("FWZC", "PARA", idtmed[503], trpa, 6); // Fibre glass
+    TVirtualMC::GetMC()->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");
+    TVirtualMC::GetMC()->Gspos("FWZC", 1, "FLTB", xcoor, ycoorB, zcoorB, idrotm[5], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FWZC", 2, "FLTC", xcoor, ycoorB,-zcoorB, idrotm[4], "ONLY");
   }
 
 
@@ -678,34 +631,34 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
   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
+  TVirtualMC::GetMC()->Gsvolu("FWZ3", "TRAP", idtmed[503], trpa, 11); // Fibre glass
 
   //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");
+  TVirtualMC::GetMC()->Gspos("FWZ3", 1, "FLTA", xcoor, ycoor, zcoor,idrotm[3], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FWZ3", 2, "FLTA", xcoor, ycoor,-zcoor,idrotm[2], "ONLY");
 
   if (fTOFHoles) {
     //xcoor = 0.;
     //ycoor = (yFLT - fgkLengthExInModBorder)*0.5;
     zcoor = -fgkExterInterModBorder1 + (zlenA*0.5 + fgkInterCentrModBorder1 - 2.*fgkModuleWallThickness)*0.5;
-    gMC->Gspos("FWZ3", 5, "FLTB", xcoor, ycoor, zcoor, idrotm[2], "ONLY");
-    gMC->Gspos("FWZ3", 6, "FLTC", xcoor, ycoor,-zcoor, idrotm[3], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FWZ3", 5, "FLTB", xcoor, ycoor, zcoor, idrotm[2], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FWZ3", 6, "FLTC", xcoor, ycoor,-zcoor, idrotm[3], "ONLY");
   }
 
   //xcoor = 0.;
   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");
+  TVirtualMC::GetMC()->Gspos("FWZ3", 3, "FLTA", xcoor, ycoor, zcoor, idrotm[1], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FWZ3", 4, "FLTA", xcoor, ycoor,-zcoor, idrotm[0], "ONLY");
 
   if (fTOFHoles) {
     //xcoor = 0.;
     //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");
+    TVirtualMC::GetMC()->Gspos("FWZ3", 7, "FLTB", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FWZ3", 8, "FLTC", xcoor, ycoor,-zcoor, idrotm[1], "ONLY");
   }
 
   trpa[0] = 0.5*(fgkExterInterModBorder2 - fgkExterInterModBorder1)/TMath::Cos(alpha);
@@ -714,7 +667,7 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
   trpa[3] = -beta*kRaddeg;
   trpa[4] = 0.;
   trpa[5] = 0.;
-  gMC->Gsvolu("FWZ4", "PARA", idtmed[503], trpa, 6); // Fibre glass
+  TVirtualMC::GetMC()->Gsvolu("FWZ4", "PARA", idtmed[503], trpa, 6); // Fibre glass
 
   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.);
@@ -722,16 +675,16 @@ void AliTOFv6T0::CreateModules(Float_t xtof,  Float_t ytof, Float_t zlenA,
   //xcoor = 0.;
   ycoor = 0.;
   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");
+  TVirtualMC::GetMC()->Gspos("FWZ4", 1, "FLTA", xcoor, ycoor, zcoor, idrotm[7], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FWZ4", 2, "FLTA", xcoor, ycoor,-zcoor, idrotm[6], "ONLY");
 
   if (fTOFHoles) {
     //xcoor = 0.;
     //ycoor = 0.;
     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");
+    TVirtualMC::GetMC()->Gspos("FWZ4", 3, "FLTB", xcoor, ycoor, zcoor, idrotm[6], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FWZ4", 4, "FLTC", xcoor, ycoor,-zcoor, idrotm[7], "ONLY");
   }
 
 }
@@ -755,8 +708,8 @@ void AliTOFv6T0::CreateModuleCovers(Float_t xtof, Float_t zlenA) const
   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
+  TVirtualMC::GetMC()->Gsvolu("FPEA", "BOX ", idtmed[500], par, 3); // Air
+  if (fTOFHoles) TVirtualMC::GetMC()->Gsvolu("FPEB", "BOX ", idtmed[500], par, 3); // Air
 
   const Float_t kAlCoverThickness = 1.5;
   const Float_t kInterfaceCardThickness = 0.16;
@@ -765,107 +718,107 @@ void AliTOFv6T0::CreateModuleCovers(Float_t xtof, Float_t zlenA) const
   //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
+  TVirtualMC::GetMC()->Gsvolu("FALT", "BOX ", idtmed[504], par, 3); // Al
+  if (fTOFHoles) TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FALT", 0, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  if (fTOFHoles) TVirtualMC::GetMC()->Gspos("FALB", 0, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
 
   par[0] = xtof*0.5;
   //par[1] = kAlCoverThickness*0.5;
   par[2] = fgkInterCentrModBorder2 - 2.;
-  gMC->Gsvolu("FPE1", "BOX ", idtmed[505], par, 3); // Al honeycomb
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FPE1", 0, "FALT", xcoor, ycoor, zcoor, 0, "ONLY");
 
   if (fTOFHoles) {
     //par[0] = xtof*0.5;
     par[1] = kAlCoverThickness*0.5 - kAlSkinThickness;
     //par[2] = fgkInterCentrModBorder2 - 2.;
-    gMC->Gsvolu("FPE4", "BOX ", idtmed[515], par, 3); // Al honeycomb for holes
+    TVirtualMC::GetMC()->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");
+    TVirtualMC::GetMC()->Gspos("FPE4", 0, "FALB", xcoor, ycoor, zcoor, 0, "ONLY");
   }
 
   //par[0] = xtof*0.5;
   //par[1] = kAlCoverThickness*0.5;
   par[2] = (fgkExterInterModBorder1 - fgkInterCentrModBorder2)*0.5 - 2.;
-  gMC->Gsvolu("FPE2", "BOX ", idtmed[505], par, 3); // Al honeycomb
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FPE2", 1, "FALT", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FPE2", 2, "FALT", xcoor, ycoor,-zcoor, 0, "ONLY");
 
   if (fTOFHoles) {
     //xcoor = 0.;
     //ycoor = 0.;
     //zcoor = (fgkExterInterModBorder1 + fgkInterCentrModBorder2)*0.5;
-    gMC->Gspos("FPE2", 1, "FALB", xcoor, ycoor, zcoor, 0, "ONLY");
-    gMC->Gspos("FPE2", 2, "FALB", xcoor, ycoor,-zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FPE2", 1, "FALB", xcoor, ycoor, zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FPE2", 2, "FALB", xcoor, ycoor,-zcoor, 0, "ONLY");
   }
 
   //par[0] = xtof*0.5;
   //par[1] = kAlCoverThickness*0.5;
   par[2] = (zlenA*0.5 + 2. - fgkExterInterModBorder1)*0.5 - 2.;
-  gMC->Gsvolu("FPE3", "BOX ", idtmed[505], par, 3); // Al honeycomb
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FPE3", 1, "FALT", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FPE3", 2, "FALT", xcoor, ycoor,-zcoor, 0, "ONLY");
 
   if (fTOFHoles) {
     //xcoor = 0.;
     //ycoor = 0.;
     zcoor = (zlenA*0.5 + 2. + fgkExterInterModBorder1)*0.5;
-    gMC->Gspos("FPE3", 1, "FALB", xcoor, ycoor, zcoor, 0, "ONLY");
-    gMC->Gspos("FPE3", 2, "FALB", xcoor, ycoor,-zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FPE3", 1, "FALB", xcoor, ycoor, zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FPE3", 2, "FALB", xcoor, ycoor,-zcoor, 0, "ONLY");
   }
 
   // volumes for Interface cards
   par[0] = xtof*0.5;
   par[1] = kInterfaceCardThickness*0.5;
   par[2] = fgkInterCentrModBorder2 - 2.;
-  gMC->Gsvolu("FIF1", "BOX ", idtmed[502], par, 3); // G10
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FIF1", 0, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
 
   //par[0] = xtof*0.5;
   //par[1] = kInterfaceCardThickness*0.5;
   par[2] = (fgkExterInterModBorder1 - fgkInterCentrModBorder2)*0.5 - 2.;
-  gMC->Gsvolu("FIF2", "BOX ", idtmed[502], par, 3); // G10
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FIF2", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->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");
+    TVirtualMC::GetMC()->Gspos("FIF2", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FIF2", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
   }
 
   //par[0] = xtof*0.5;
   //par[1] = kInterfaceCardThickness*0.5;
   par[2] = (zlenA*0.5 + 2. - fgkExterInterModBorder1)*0.5 - 2.;
-  gMC->Gsvolu("FIF3", "BOX ", idtmed[502], par, 3); // G10
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FIF3", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->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");
+    TVirtualMC::GetMC()->Gspos("FIF3", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FIF3", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
   }
 
   // volumes for flat cables
@@ -874,38 +827,38 @@ void AliTOFv6T0::CreateModuleCovers(Float_t xtof, Float_t zlenA) const
   par[0] = xtof*0.5;
   par[1] = kPlasticFlatCableThickness*0.5;
   par[2] = fgkInterCentrModBorder2 - 2.;
-  gMC->Gsvolu("FFC1", "BOX ", idtmed[513], par, 3); // Plastic (CH2)
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FFC1", 0, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
 
   //par[0] = xtof*0.5;
   //par[1] = kPlasticFlatCableThickness*0.5;
   par[2] = (fgkExterInterModBorder1 - fgkInterCentrModBorder2)*0.5 - 2.;
-  gMC->Gsvolu("FFC2", "BOX ", idtmed[513], par, 3); // Plastic (CH2)
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FFC2", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->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");
+    TVirtualMC::GetMC()->Gspos("FFC2", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FFC2", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
   }
 
   //par[0] = xtof*0.5;
   //par[1] = kPlasticFlatCableThickness*0.5;
   par[2] = (zlenA*0.5 + 2. - fgkExterInterModBorder1)*0.5 - 2.;
-  gMC->Gsvolu("FFC3", "BOX ", idtmed[513], par, 3); // Plastic (CH2)
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FFC3", 1, "FPEA", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->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");
+    TVirtualMC::GetMC()->Gspos("FFC3", 1, "FPEB", xcoor, ycoor, zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FFC3", 2, "FPEB", xcoor, ycoor,-zcoor, 0, "ONLY");
   }
 
   // Cu
@@ -913,20 +866,20 @@ void AliTOFv6T0::CreateModuleCovers(Float_t xtof, Float_t zlenA) const
   par[0] = xtof*0.5;
   par[1] = kCopperFlatCableThickness*0.5;
   par[2] = fgkInterCentrModBorder2 - 2.;
-  gMC->Gsvolu("FCC1", "BOX ", idtmed[512], par, 3); // Cu
-  gMC->Gspos("FCC1", 0, "FFC1", 0., 0., 0., 0, "ONLY");
+  TVirtualMC::GetMC()->Gsvolu("FCC1", "BOX ", idtmed[512], par, 3); // Cu
+  TVirtualMC::GetMC()->Gspos("FCC1", 0, "FFC1", 0., 0., 0., 0, "ONLY");
 
   //par[0] = xtof*0.5;
   //par[1] = kCopperFlatCableThickness*0.5;
   par[2] = (fgkExterInterModBorder1 - fgkInterCentrModBorder2)*0.5 - 2.;
-  gMC->Gsvolu("FCC2", "BOX ", idtmed[512], par, 3); // Cu
-  gMC->Gspos("FCC2", 0, "FFC2", 0., 0., 0., 0, "ONLY");
+  TVirtualMC::GetMC()->Gsvolu("FCC2", "BOX ", idtmed[512], par, 3); // Cu
+  TVirtualMC::GetMC()->Gspos("FCC2", 0, "FFC2", 0., 0., 0., 0, "ONLY");
 
   //par[0] = xtof*0.5;
   //par[1] = kCopperFlatCableThickness*0.5;
   par[2] = (zlenA*0.5 + 2. - fgkExterInterModBorder1)*0.5 - 2.;
-  gMC->Gsvolu("FCC3", "BOX ", idtmed[512], par, 3); // Cu
-  gMC->Gspos("FCC3", 0, "FFC3", 0., 0., 0., 0, "ONLY");
+  TVirtualMC::GetMC()->Gsvolu("FCC3", "BOX ", idtmed[512], par, 3); // Cu
+  TVirtualMC::GetMC()->Gspos("FCC3", 0, "FFC3", 0., 0., 0., 0, "ONLY");
 
 }
 
@@ -940,7 +893,9 @@ void AliTOFv6T0::MakeModulesInBTOFvolumes(Float_t ytof, Float_t zlenA) const
   // are filled with volumes: FTOB and FTOC (MRPC containers),
   //
 
-  Int_t idrotm[1];
+  const Int_t kSize=16;
+
+  Int_t idrotm[1]={0};
 
   //AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,-90.);
   AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,270.);
@@ -951,20 +906,21 @@ void AliTOFv6T0::MakeModulesInBTOFvolumes(Float_t ytof, Float_t zlenA) const
   // 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);
+
+    char name[kSize];
+    snprintf(name, kSize, "BTOF%d",isec);
     if (fTOFHoles && (isec==13 || isec==14 || isec==15)) {
       //xcoor = 0.;
       ycoor = (zlenA*0.5 + fgkInterCentrModBorder1)*0.5;
       zcoor = -ytof * 0.25;
-      gMC->Gspos("FTOB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-      gMC->Gspos("FTOC", 0, name, xcoor,-ycoor, zcoor, idrotm[0], "ONLY");
+      TVirtualMC::GetMC()->Gspos("FTOB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+      TVirtualMC::GetMC()->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");
+      TVirtualMC::GetMC()->Gspos("FTOA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
     }
   }
 
@@ -981,7 +937,9 @@ void AliTOFv6T0::MakeCoversInBTOFvolumes() const
   // (to separate MRPC strips from FEA cards)
   //
 
-  Int_t idrotm[1];
+  const Int_t kSize=16;
+
+  Int_t idrotm[1]={0};
 
   //AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,-90.);
   AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,270.);
@@ -991,16 +949,16 @@ void AliTOFv6T0::MakeCoversInBTOFvolumes() const
   ycoor = 0.;
   zcoor = fgkModuleCoverThickness*0.5;
 
-  char name[16];
+  char name[kSize];
 
   // 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);
+    snprintf(name, kSize, "BTOF%d",isec);
     if (fTOFHoles && (isec==13 || isec==14 || isec==15))
-      gMC->Gspos("FPEB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+      TVirtualMC::GetMC()->Gspos("FPEB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
     else
-      gMC->Gspos("FPEA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+      TVirtualMC::GetMC()->Gspos("FPEA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
   }
 
 }
@@ -1015,7 +973,9 @@ void AliTOFv6T0::MakeBackInBTOFvolumes(Float_t ytof) const
   // filled with volumes FAIB (FEA cards and services container).
   //
 
-  Int_t idrotm[1];
+  const Int_t kSize=16;
+
+  Int_t idrotm[1]={0};
 
   //AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,-90.);
   AliMatrix(idrotm[0], 90.,  0., 0., 0., 90.,270.);
@@ -1025,19 +985,19 @@ void AliTOFv6T0::MakeBackInBTOFvolumes(Float_t ytof) const
   ycoor = 0.;
   zcoor = fgkModuleCoverThickness + (ytof*0.5 - fgkModuleCoverThickness)*0.5;
 
-  char name[16];
+  char name[kSize];
 
   // Positioning of FEA cards and services containers (FAIA, FAIC and FAIB)
   for(Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++) {
     if(fTOFSectors[isec]==-1)continue;
-    sprintf(name, "BTOF%d",isec);
+    snprintf(name, kSize, "BTOF%d",isec);
     if (fgkFEAwithMasks[isec])
-      gMC->Gspos("FAIA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+      TVirtualMC::GetMC()->Gspos("FAIA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
     else {
       if (fTOFHoles && (isec==13 || isec==14 || isec==15))
-       gMC->Gspos("FAIB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+       TVirtualMC::GetMC()->Gspos("FAIB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
       else
-       gMC->Gspos("FAIC", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+       TVirtualMC::GetMC()->Gspos("FAIC", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
     }
   }
 
@@ -1095,8 +1055,8 @@ void AliTOFv6T0::MakeStripsInModules(Float_t ytof, Float_t zlenA) const
 
 
   // 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 parfp[3]={static_cast<Float_t>(klstripx*0.5), static_cast<Float_t>(khstripy*0.5), static_cast<Float_t>(kwstripz*0.5)};
+  TVirtualMC::GetMC()->Gsvolu("FSTR", "BOX", idtmed[506], parfp, 3); // Freon mix
 
   Float_t posfp[3]={0.,0.,0.};
 
@@ -1104,79 +1064,79 @@ void AliTOFv6T0::MakeStripsInModules(Float_t ytof, Float_t zlenA) const
   //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)
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FHON", 1, "FSTR", 0., posfp[1], 0., 0, "ONLY");
+  TVirtualMC::GetMC()->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
+  TVirtualMC::GetMC()->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
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FPC1", 1, "FSTR", 0.,-posfp[1], 0., 0, "ONLY");
+  TVirtualMC::GetMC()->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
+  TVirtualMC::GetMC()->Gsvolu("FPCB", "BOX", idtmed[502], parfp, 3); // G10
   gGeoManager->GetVolume("FPCB")->VisibleDaughters(kFALSE);
   // positioning the central PCB layer
-  gMC->Gspos("FPCB", 1, "FSTR", 0., 0., 0., 0, "ONLY");
+  TVirtualMC::GetMC()->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
+  Float_t parfs[3] = {static_cast<Float_t>(klsensmx*0.5), static_cast<Float_t>(khsensmy*0.5), static_cast<Float_t>(kwsensmz*0.5)};
+  TVirtualMC::GetMC()->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);
+  TVirtualMC::GetMC()->Gsdvn("FSEZ", "FSEN", knz, 3);
+  TVirtualMC::GetMC()->Gsdvn("FPAD", "FSEZ", knx, 1);
   // positioning sensitive layer inside FPCB
-  gMC->Gspos("FSEN", 1, "FPCB", 0., 0., 0., 0, "ONLY");
+  TVirtualMC::GetMC()->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
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FRGL", 1, "FSTR", 0., posfp[1], 0., 0, "ONLY");
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FRGL", 2, "FSTR", 0.,-posfp[1], 0., 0, "ONLY");
+  TVirtualMC::GetMC()->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
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FGLF", 1, "FSTR", 0.,-posfp[1], 0., 0, "ONLY");
+  TVirtualMC::GetMC()->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(),
@@ -1185,7 +1145,7 @@ void AliTOFv6T0::MakeStripsInModules(Float_t ytof, Float_t zlenA) const
                              fTOFGeometry->NStripB(),
                              fTOFGeometry->NStripC()};
 
-  Int_t idrotm[91];
+  Int_t idrotm[91]; for (Int_t ii=0; ii<91; ii++) idrotm[ii]=0;
 
   Int_t totalStrip = 0;
   Float_t xpos, zpos, ypos, ang;
@@ -1203,13 +1163,13 @@ void AliTOFv6T0::MakeStripsInModules(Float_t ytof, Float_t zlenA) const
       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");
+      TVirtualMC::GetMC()->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");
+         TVirtualMC::GetMC()->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");
+         TVirtualMC::GetMC()->Gspos("FSTR", istrip+totalStrip+1, "FLTB", xpos, ypos,-zpos+(zlenA*0.5 - 2.*fgkModuleWallThickness + fgkInterCentrModBorder1)*0.5, idrotm[istrip+totalStrip], "ONLY");
       }
     }
   }
@@ -1230,7 +1190,7 @@ void AliTOFv6T0::CreateBackZone(Float_t xtof, Float_t ytof, Float_t zlenA) const
 
   Int_t *idtmed = fIdtmed->GetArray()-499;
 
-  Int_t idrotm[1];
+  Int_t idrotm[1]={0};
 
   // Definition of the air card containers (FAIA, FAIC and FAIB)
 
@@ -1238,21 +1198,21 @@ void AliTOFv6T0::CreateBackZone(Float_t xtof, Float_t ytof, Float_t zlenA) const
   par[0] = xtof*0.5;
   par[1] = (ytof*0.5 - fgkModuleCoverThickness)*0.5;
   par[2] = zlenA*0.5;
-  gMC->Gsvolu("FAIA", "BOX ", idtmed[500], par, 3); // Air
-  if (fTOFHoles) gMC->Gsvolu("FAIB", "BOX ", idtmed[500], par, 3); // Air
-  gMC->Gsvolu("FAIC", "BOX ", idtmed[500], par, 3); // Air
+  TVirtualMC::GetMC()->Gsvolu("FAIA", "BOX ", idtmed[500], par, 3); // Air
+  if (fTOFHoles) TVirtualMC::GetMC()->Gsvolu("FAIB", "BOX ", idtmed[500], par, 3); // Air
+  TVirtualMC::GetMC()->Gsvolu("FAIC", "BOX ", idtmed[500], par, 3); // Air
 
   Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
   Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
   Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
-  Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
 
   // FEA card mother-volume definition
-  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
-                      feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
-                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
-  gMC->Gsvolu("FCA1", "BOX ", idtmed[500], carpar, 3); // Air
-  gMC->Gsvolu("FCA2", "BOX ", idtmed[500], carpar, 3); // Air
+  Float_t carpar[3] = {static_cast<Float_t>(xtof*0.5 - fgkCBLw - fgkSawThickness),
+                      static_cast<Float_t>(feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5),
+                      static_cast<Float_t>(feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2])};
+  TVirtualMC::GetMC()->Gsvolu("FCA1", "BOX ", idtmed[500], carpar, 3); // Air
+  TVirtualMC::GetMC()->Gsvolu("FCA2", "BOX ", idtmed[500], carpar, 3); // Air
 
   // rotation matrix
   AliMatrix(idrotm[0],  90.,180., 90., 90.,180., 0.);
@@ -1262,10 +1222,10 @@ void AliTOFv6T0::CreateBackZone(Float_t xtof, Float_t ytof, Float_t zlenA) const
   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] = {0.,
-                      -(ytof*0.5 - fgkModuleCoverThickness)*0.5 + carpar[1],
+                      static_cast<Float_t>(-(ytof*0.5 - fgkModuleCoverThickness)*0.5 + carpar[1]),
                       -0.8};
-  gMC->Gspos("FCA1", 91, "FAIA", carpos[0], carpos[1], carpos[2], 0, "MANY");
-  gMC->Gspos("FCA2", 91, "FAIC", carpos[0], carpos[1], carpos[2], 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FCA1", 91, "FAIA", carpos[0], carpos[1], carpos[2], 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FCA2", 91, "FAIC", carpos[0], carpos[1], carpos[2], 0, "MANY");
 
   Int_t row = 1;
   Int_t nrow = 0;
@@ -1279,19 +1239,19 @@ void AliTOFv6T0::CreateBackZone(Float_t xtof, Float_t ytof, Float_t zlenA) const
         carpos[2] -= sg*rowstep;
 
        if (nb==4) {
-         gMC->Gspos("FCA1", row, "FAIA", carpos[0], carpos[1], carpos[2], 0, "ONLY");
-         gMC->Gspos("FCA2", row, "FAIC", carpos[0], carpos[1], carpos[2], 0, "ONLY");
+         TVirtualMC::GetMC()->Gspos("FCA1", row, "FAIA", carpos[0], carpos[1], carpos[2], 0, "ONLY");
+         TVirtualMC::GetMC()->Gspos("FCA2", row, "FAIC", carpos[0], carpos[1], carpos[2], 0, "ONLY");
 
        }
        else {
          switch (sg) {
          case 1:
-           gMC->Gspos("FCA1", row, "FAIA", carpos[0], carpos[1], carpos[2], 0, "ONLY");
-           gMC->Gspos("FCA2", row, "FAIC", carpos[0], carpos[1], carpos[2], 0, "ONLY");
+           TVirtualMC::GetMC()->Gspos("FCA1", row, "FAIA", carpos[0], carpos[1], carpos[2], 0, "ONLY");
+           TVirtualMC::GetMC()->Gspos("FCA2", row, "FAIC", carpos[0], carpos[1], carpos[2], 0, "ONLY");
            break;
          case -1:
-           gMC->Gspos("FCA1", row, "FAIA", carpos[0], carpos[1], carpos[2], idrotm[0], "ONLY");
-           gMC->Gspos("FCA2", row, "FAIC", carpos[0], carpos[1], carpos[2], idrotm[0], "ONLY");
+           TVirtualMC::GetMC()->Gspos("FCA1", row, "FAIA", carpos[0], carpos[1], carpos[2], idrotm[0], "ONLY");
+           TVirtualMC::GetMC()->Gspos("FCA2", row, "FAIC", carpos[0], carpos[1], carpos[2], idrotm[0], "ONLY");
            break;
          }
 
@@ -1313,10 +1273,10 @@ void AliTOFv6T0::CreateBackZone(Float_t xtof, Float_t ytof, Float_t zlenA) const
 
          switch (sg) {
          case 1:
-           gMC->Gspos("FCA1", row, "FAIB", carpos[0], carpos[1], carpos[2], 0, "ONLY");
+           TVirtualMC::GetMC()->Gspos("FCA1", row, "FAIB", carpos[0], carpos[1], carpos[2], 0, "ONLY");
            break;
          case -1:
-           gMC->Gspos("FCA1", row, "FAIB", carpos[0], carpos[1], carpos[2], idrotm[0], "ONLY");
+           TVirtualMC::GetMC()->Gspos("FCA1", row, "FAIB", carpos[0], carpos[1], carpos[2], idrotm[0], "ONLY");
            break;
          }
        }
@@ -1337,30 +1297,30 @@ void AliTOFv6T0::MakeFrontEndElectronics(Float_t xtof) const
 
   // FEA card volume definition
   Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
-  gMC->Gsvolu("FFEA", "BOX ", idtmed[502], feaParam, 3); // G10
+  TVirtualMC::GetMC()->Gsvolu("FFEA", "BOX ", idtmed[502], feaParam, 3); // G10
 
   Float_t al1[3] = {fgkAl1parameters[0], fgkAl1parameters[1], fgkAl1parameters[2]};
   Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
   Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
-  Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
 
-  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
-                      feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
-                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+  Float_t carpar[3] = {static_cast<Float_t>(xtof*0.5 - fgkCBLw - fgkSawThickness),
+                      static_cast<Float_t>(feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5),
+                      static_cast<Float_t>(feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2])};
 
   // FEA card volume positioning
   Float_t xCoor = xtof*0.5 - 25.;
   Float_t yCoor =-carpar[1] + feaParam[1];
   Float_t zCoor =-carpar[2] + (2.*feaRoof1[2] - 2.*al1[2] - feaParam[2]);
-  gMC->Gspos("FFEA", 1, "FCA1",-xCoor, yCoor, zCoor, 0, "ONLY");
-  gMC->Gspos("FFEA", 4, "FCA1", xCoor, yCoor, zCoor, 0, "ONLY");
-  gMC->Gspos("FFEA", 1, "FCA2",-xCoor, yCoor, zCoor, 0, "ONLY");
-  gMC->Gspos("FFEA", 4, "FCA2", xCoor, yCoor, zCoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FFEA", 1, "FCA1",-xCoor, yCoor, zCoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FFEA", 4, "FCA1", xCoor, yCoor, zCoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FFEA", 1, "FCA2",-xCoor, yCoor, zCoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FFEA", 4, "FCA2", xCoor, yCoor, zCoor, 0, "ONLY");
   xCoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FFEA", 2, "FCA1",-xCoor, yCoor, zCoor, 0, "ONLY");
-  gMC->Gspos("FFEA", 3, "FCA1", xCoor, yCoor, zCoor, 0, "ONLY");
-  gMC->Gspos("FFEA", 2, "FCA2",-xCoor, yCoor, zCoor, 0, "ONLY");
-  gMC->Gspos("FFEA", 3, "FCA2", xCoor, yCoor, zCoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FFEA", 2, "FCA1",-xCoor, yCoor, zCoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FFEA", 3, "FCA1", xCoor, yCoor, zCoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FFEA", 2, "FCA2",-xCoor, yCoor, zCoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FFEA", 3, "FCA2", xCoor, yCoor, zCoor, 0, "ONLY");
 
 }
 
@@ -1377,122 +1337,122 @@ void AliTOFv6T0::MakeFEACooling(Float_t xtof) const
 
   // first FEA cooling element definition
   Float_t al1[3] = {fgkAl1parameters[0], fgkAl1parameters[1], fgkAl1parameters[2]};
-  gMC->Gsvolu("FAL1", "BOX ", idtmed[504], al1, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FAL1", "BOX ", idtmed[504], al1, 3); // Al
 
   // second FEA cooling element definition
   Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
-  gMC->Gsvolu("FRO1", "BOX ", idtmed[504], feaRoof1, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FRO1", "BOX ", idtmed[504], feaRoof1, 3); // Al
 
   Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
-  Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
 
   // definition and positioning of a small air groove in the FRO1 volume
-  Float_t airHole[3] = {feaRoof2[0], feaRoof2[1]*0.5, feaRoof1[2]};
-  gMC->Gsvolu("FREE", "BOX ", idtmed[500], airHole, 3); // Air
-  gMC->Gspos("FREE", 1, "FRO1", 0., feaRoof1[1]-airHole[1], 0., 0, "ONLY");
+  Float_t airHole[3] = {fgkRoof2parameters[0], static_cast<Float_t>(fgkRoof2parameters[1]*0.5), feaRoof1[2]};
+  TVirtualMC::GetMC()->Gsvolu("FREE", "BOX ", idtmed[500], airHole, 3); // Air
+  TVirtualMC::GetMC()->Gspos("FREE", 1, "FRO1", 0., feaRoof1[1]-airHole[1], 0., 0, "ONLY");
   gGeoManager->GetVolume("FRO1")->VisibleDaughters(kFALSE);
 
   // third FEA cooling element definition
   Float_t bar[3] = {fgkBar[0], fgkBar[1], fgkBar[2]};
-  gMC->Gsvolu("FBAR", "BOX ", idtmed[504], bar, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FBAR", "BOX ", idtmed[504], bar, 3); // Al
 
   Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
 
-  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
-                      feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
-                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+  Float_t carpar[3] = {static_cast<Float_t>(xtof*0.5 - fgkCBLw - fgkSawThickness),
+                      static_cast<Float_t>(feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5),
+                      static_cast<Float_t>(feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2])};
 
   // fourth FEA cooling element definition
   Float_t bar1[3] = {fgkBar1[0], fgkBar1[1], fgkBar1[2]};
-  gMC->Gsvolu("FBA1", "BOX ", idtmed[504], bar1, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FBA1", "BOX ", idtmed[504], bar1, 3); // Al
 
   // fifth FEA cooling element definition
   Float_t bar2[3] = {fgkBar2[0], fgkBar2[1], fgkBar2[2]};
-  gMC->Gsvolu("FBA2", "BOX ", idtmed[504], bar2, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FBA2", "BOX ", idtmed[504], bar2, 3); // Al
 
   // first FEA cooling element positioning
   Float_t xcoor = xtof*0.5 - 25.;
-  Float_t ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - al1[1];
+  Float_t ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - al1[1];
   Float_t zcoor =-carpar[2] + 2.*feaRoof1[2] - al1[2];
-  gMC->Gspos("FAL1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
   xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FAL1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
 
   // second FEA cooling element positioning
   xcoor = xtof*0.5 - 25.;
-  ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - feaRoof1[1];
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - feaRoof1[1];
   zcoor =-carpar[2] + feaRoof1[2];
-  gMC->Gspos("FRO1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FRO1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FRO1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FRO1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FRO1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+  TVirtualMC::GetMC()->Gspos("FRO1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+  TVirtualMC::GetMC()->Gspos("FRO1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FRO1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
   xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FRO1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FRO1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FRO1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FRO1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FRO1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+  TVirtualMC::GetMC()->Gspos("FRO1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+  TVirtualMC::GetMC()->Gspos("FRO1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FRO1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
 
   // third FEA cooling element positioning
   xcoor = xtof*0.5 - 25.;
-  ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - bar[1];
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - bar[1];
   zcoor =-carpar[2] + bar[2];
-  gMC->Gspos("FBAR", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBAR", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBAR", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBAR", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAR", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAR", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAR", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAR", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
   xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FBAR", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBAR", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBAR", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBAR", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAR", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAR", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAR", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAR", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
 
   // fourth FEA cooling element positioning
-  Float_t tubepar[3] = {0., 0.4, xtof*0.5 - fgkCBLw};
+  Float_t tubepar[3] = {0., 0.4, static_cast<Float_t>(xtof*0.5 - fgkCBLw)};
   xcoor = xtof*0.5 - 25.;
-  ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - bar[1];
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - bar[1];
   zcoor =-carpar[2] + 2.*bar[2] + 2.*tubepar[1] + bar1[2];
-  gMC->Gspos("FBA1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
   xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FBA1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
 
   // fifth FEA cooling element positioning
   xcoor = xtof*0.5 - 25.;
-  ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - bar2[1];
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - bar2[1];
   zcoor =-carpar[2] + 2.*bar[2] + bar2[2];
-  gMC->Gspos("FBA2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
   xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FBA2", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
 
   xcoor = xtof*0.5 - 25.;
-  ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - 2.*tubepar[1] - bar2[1];
+  ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - 2.*tubepar[1] - bar2[1];
   zcoor =-carpar[2] + 2.*bar[2] + bar2[2];
-  gMC->Gspos("FBA2", 5, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 8, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 5, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 8, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 5, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 8, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 5, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 8, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
   xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FBA2", 6, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 7, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 6, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBA2", 7, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 6, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 7, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 6, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBA2", 7, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
 
 }
 
@@ -1509,52 +1469,52 @@ void AliTOFv6T0::MakeNinoMask(Float_t xtof) const
 
   // first Nino ASIC mask volume definition
   Float_t al2[3] = {fgkAl2parameters[0], fgkAl2parameters[1], fgkAl2parameters[2]};
-  gMC->Gsvolu("FAL2", "BOX ", idtmed[504], al2, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FAL2", "BOX ", idtmed[504], al2, 3); // Al
 
   // second Nino ASIC mask volume definition
   Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
-  gMC->Gsvolu("FAL3", "BOX ", idtmed[504], al3, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FAL3", "BOX ", idtmed[504], al3, 3); // Al
 
   // third Nino ASIC mask volume definition
   Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
-  gMC->Gsvolu("FRO2", "BOX ", idtmed[504], feaRoof2, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FRO2", "BOX ", idtmed[504], feaRoof2, 3); // Al
 
   Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
   Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
 
-  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
-                      feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
-                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+  Float_t carpar[3] = {static_cast<Float_t>(xtof*0.5 - fgkCBLw - fgkSawThickness),
+                      static_cast<Float_t>(feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5),
+                      static_cast<Float_t>(feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2])};
 
   // first Nino ASIC mask volume positioning
   Float_t xcoor = xtof*0.5 - 25.;
   Float_t ycoor = carpar[1] - 2.*al3[1];
   Float_t zcoor = carpar[2] - 2.*al3[2] - al2[2];
-  gMC->Gspos("FAL2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
   xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FAL2", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL2", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL2", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL2", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
 
   // second Nino ASIC mask volume positioning
   xcoor = xtof*0.5 - 25.;
   ycoor = carpar[1] - al3[1];
   zcoor = carpar[2] - al3[2];
-  gMC->Gspos("FAL3", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL3", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL3", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL3", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
   xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FAL3", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FAL3", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL3", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FAL3", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
 
   // third Nino ASIC mask volume positioning
   xcoor = xtof*0.5 - 25.;
-  ycoor = carpar[1] - feaRoof2[1];
-  zcoor = carpar[2] - 2.*al3[2] - feaRoof2[2];
-  gMC->Gspos("FRO2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FRO2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  ycoor = carpar[1] - fgkRoof2parameters[1];
+  zcoor = carpar[2] - 2.*al3[2] - fgkRoof2parameters[2];
+  TVirtualMC::GetMC()->Gspos("FRO2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FRO2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
   xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
-  gMC->Gspos("FRO2", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FRO2", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FRO2", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FRO2", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
 
 }
 
@@ -1569,22 +1529,22 @@ void AliTOFv6T0::MakeSuperModuleCooling(Float_t xtof, Float_t ytof, Float_t zlen
 
   Int_t *idtmed = fIdtmed->GetArray()-499;
 
-  Int_t idrotm[1];
+  Int_t idrotm[1]={0};
 
   // 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
+  Float_t tubepar[3] = {0., 0.4, static_cast<Float_t>(xtof*0.5 - fgkCBLw - fgkSawThickness)};
+  TVirtualMC::GetMC()->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
+  TVirtualMC::GetMC()->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");
+  TVirtualMC::GetMC()->Gspos("FITU", 1, "FTUB", 0., 0., 0., 0, "ONLY");
 
   // definition of transverse components of SM cooling system
   Float_t trapar[3] = {tubepar[2], 6.175/*6.15*/, 0.7};
-  gMC->Gsvolu("FTLN", "BOX ", idtmed[504], trapar, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FTLN", "BOX ", idtmed[504], trapar, 3); // Al
 
   // rotation matrix
   AliMatrix(idrotm[0], 180., 90., 90., 90., 90., 0.);
@@ -1594,162 +1554,162 @@ void AliTOFv6T0::MakeSuperModuleCooling(Float_t xtof, Float_t ytof, Float_t zlen
   Float_t bar[3] = {fgkBar[0], fgkBar[1], fgkBar[2]};
   Float_t bar2[3] = {fgkBar2[0], fgkBar2[1], fgkBar2[2]};
   Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
-  Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
 
-  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
-                      feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
-                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+  Float_t carpar[3] = {static_cast<Float_t>(xtof*0.5 - fgkCBLw - fgkSawThickness),
+                      static_cast<Float_t>(feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5),
+                      static_cast<Float_t>(feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2])};
 
   Float_t ytub =-(ytof*0.5 - fgkModuleCoverThickness)*0.5 + carpar[1] +
-    carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
+    carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
 
   // Positioning of tubes for the SM cooling system
-  Float_t ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
+  Float_t ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
   Float_t zcoor =-carpar[2] + 2.*bar[2] + tubepar[1];
-  gMC->Gspos("FTUB", 1, "FCA1", 0., ycoor, zcoor, idrotm[0], "ONLY");
-  gMC->Gspos("FTUB", 1, "FCA2", 0., ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FTUB", 1, "FCA1", 0., ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FTUB", 1, "FCA2", 0., ycoor, zcoor, idrotm[0], "ONLY");
   gGeoManager->GetVolume("FTUB")->VisibleDaughters(kFALSE);
 
   Float_t yFLTN = trapar[1] - (ytof*0.5 - fgkModuleCoverThickness)*0.5;
   for (Int_t sg= -1; sg< 2; sg+= 2) {
     // Positioning of transverse components for the SM cooling system
-    gMC->Gspos("FTLN", 5+4*sg, "FAIA", 0., yFLTN, 369.9*sg, 0, "MANY");
-    gMC->Gspos("FTLN", 5+3*sg, "FAIA", 0., yFLTN, 366.9*sg, 0, "MANY");
-    gMC->Gspos("FTLN", 5+2*sg, "FAIA", 0., yFLTN, 198.8*sg, 0, "MANY");
-    gMC->Gspos("FTLN",   5+sg, "FAIA", 0., yFLTN, 56.82*sg, 0, "MANY");
-    gMC->Gspos("FTLN", 5+4*sg, "FAIC", 0., yFLTN, 369.9*sg, 0, "MANY");
-    gMC->Gspos("FTLN", 5+3*sg, "FAIC", 0., yFLTN, 366.9*sg, 0, "MANY");
-    gMC->Gspos("FTLN", 5+2*sg, "FAIC", 0., yFLTN, 198.8*sg, 0, "MANY");
-    gMC->Gspos("FTLN",   5+sg, "FAIC", 0., yFLTN, 56.82*sg, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FTLN", 5+4*sg, "FAIA", 0., yFLTN, 369.9*sg, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FTLN", 5+3*sg, "FAIA", 0., yFLTN, 366.9*sg, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FTLN", 5+2*sg, "FAIA", 0., yFLTN, 198.8*sg, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FTLN",   5+sg, "FAIA", 0., yFLTN, 56.82*sg, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FTLN", 5+4*sg, "FAIC", 0., yFLTN, 369.9*sg, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FTLN", 5+3*sg, "FAIC", 0., yFLTN, 366.9*sg, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FTLN", 5+2*sg, "FAIC", 0., yFLTN, 198.8*sg, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FTLN",   5+sg, "FAIC", 0., yFLTN, 56.82*sg, 0, "MANY");
   }
 
   // definition of longitudinal components of SM cooling system
-  Float_t lonpar1[3] = {2., 0.5, 56.82 - trapar[2]};
-  Float_t lonpar2[3] = {lonpar1[0], lonpar1[1], (198.8 - 56.82)*0.5 - trapar[2]};
-  Float_t lonpar3[3] = {lonpar1[0], lonpar1[1], (366.9 - 198.8)*0.5 - trapar[2]};
-  gMC->Gsvolu("FLO1", "BOX ", idtmed[504], lonpar1, 3); // Al
-  gMC->Gsvolu("FLO2", "BOX ", idtmed[504], lonpar2, 3); // Al
-  gMC->Gsvolu("FLO3", "BOX ", idtmed[504], lonpar3, 3); // Al
+  Float_t lonpar1[3] = {2., 0.5, static_cast<Float_t>(56.82 - trapar[2])};
+  Float_t lonpar2[3] = {lonpar1[0], lonpar1[1], static_cast<Float_t>((198.8 - 56.82)*0.5 - trapar[2])};
+  Float_t lonpar3[3] = {lonpar1[0], lonpar1[1], static_cast<Float_t>((366.9 - 198.8)*0.5 - trapar[2])};
+  TVirtualMC::GetMC()->Gsvolu("FLO1", "BOX ", idtmed[504], lonpar1, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FLO2", "BOX ", idtmed[504], lonpar2, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FLO3", "BOX ", idtmed[504], lonpar3, 3); // Al
 
   // Positioning of longitudinal components for the SM cooling system
   ycoor =  ytub + (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
-  gMC->Gspos("FLO1",  4, "FAIA",-24., ycoor, 0., 0, "MANY");
-  gMC->Gspos("FLO1",  2, "FAIA", 24., ycoor, 0., 0, "MANY");
-  gMC->Gspos("FLO1",  4, "FAIC",-24., ycoor, 0., 0, "MANY");
-  gMC->Gspos("FLO1",  2, "FAIC", 24., ycoor, 0., 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO1",  4, "FAIA",-24., ycoor, 0., 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO1",  2, "FAIA", 24., ycoor, 0., 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO1",  4, "FAIC",-24., ycoor, 0., 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO1",  2, "FAIC", 24., ycoor, 0., 0, "MANY");
 
   zcoor = (198.8 + 56.82)*0.5;
-  gMC->Gspos("FLO2",  4, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  2, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  4, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  2, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  8, "FAIA",-24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  6, "FAIA", 24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  8, "FAIC",-24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  6, "FAIC", 24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  4, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  2, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  4, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  2, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  8, "FAIA",-24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  6, "FAIA", 24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  8, "FAIC",-24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  6, "FAIC", 24., ycoor, zcoor, 0, "MANY");
 
   zcoor = (366.9 + 198.8)*0.5;
-  gMC->Gspos("FLO3",  4, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  2, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  4, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  2, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  8, "FAIA",-24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  6, "FAIA", 24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  8, "FAIC",-24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  6, "FAIC", 24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  4, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  2, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  4, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  2, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  8, "FAIA",-24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  6, "FAIA", 24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  8, "FAIC",-24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  6, "FAIC", 24., ycoor, zcoor, 0, "MANY");
 
   ycoor =  ytub - (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
-  gMC->Gspos("FLO1",  3, "FAIA",-24., ycoor, 0., 0, "MANY");
-  gMC->Gspos("FLO1",  1, "FAIA", 24., ycoor, 0., 0, "MANY");
-  gMC->Gspos("FLO1",  3, "FAIC",-24., ycoor, 0., 0, "MANY");
-  gMC->Gspos("FLO1",  1, "FAIC", 24., ycoor, 0., 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO1",  3, "FAIA",-24., ycoor, 0., 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO1",  1, "FAIA", 24., ycoor, 0., 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO1",  3, "FAIC",-24., ycoor, 0., 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO1",  1, "FAIC", 24., ycoor, 0., 0, "MANY");
 
   zcoor = (198.8 + 56.82)*0.5;
-  gMC->Gspos("FLO2",  3, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  1, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  3, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  1, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  7, "FAIA",-24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  5, "FAIA", 24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  7, "FAIC",-24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO2",  5, "FAIC", 24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  3, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  1, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  3, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  1, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  7, "FAIA",-24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  5, "FAIA", 24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  7, "FAIC",-24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO2",  5, "FAIC", 24., ycoor, zcoor, 0, "MANY");
 
   zcoor = (366.9 + 198.8)*0.5;
-  gMC->Gspos("FLO3",  3, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  1, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  3, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  1, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  7, "FAIA",-24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  5, "FAIA", 24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  7, "FAIC",-24., ycoor, zcoor, 0, "MANY");
-  gMC->Gspos("FLO3",  5, "FAIC", 24., ycoor, zcoor, 0, "MANY");
-
-
-  Float_t carpos[3] = {25. - xtof*0.5,
-                      (11.5 - (ytof*0.5 - fgkModuleCoverThickness))*0.5,
+  TVirtualMC::GetMC()->Gspos("FLO3",  3, "FAIA",-24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  1, "FAIA", 24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  3, "FAIC",-24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  1, "FAIC", 24., ycoor,-zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  7, "FAIA",-24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  5, "FAIA", 24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  7, "FAIC",-24., ycoor, zcoor, 0, "MANY");
+  TVirtualMC::GetMC()->Gspos("FLO3",  5, "FAIC", 24., ycoor, zcoor, 0, "MANY");
+
+
+  Float_t carpos[3] = {static_cast<Float_t>(25. - xtof*0.5),
+                      static_cast<Float_t>((11.5 - (ytof*0.5 - fgkModuleCoverThickness))*0.5),
                       0.};
   if (fTOFHoles) {
     for (Int_t sg= -1; sg< 2; sg+= 2) {
       carpos[2] = sg*zlenA*0.5;
-      gMC->Gspos("FTLN", 5+4*sg, "FAIB", 0., yFLTN, 369.9*sg, 0, "MANY");
-      gMC->Gspos("FTLN", 5+3*sg, "FAIB", 0., yFLTN, 366.9*sg, 0, "MANY");
-      gMC->Gspos("FTLN", 5+2*sg, "FAIB", 0., yFLTN, 198.8*sg, 0, "MANY");
-      gMC->Gspos("FTLN",   5+sg, "FAIB", 0., yFLTN, 56.82*sg, 0, "MANY");
+      TVirtualMC::GetMC()->Gspos("FTLN", 5+4*sg, "FAIB", 0., yFLTN, 369.9*sg, 0, "MANY");
+      TVirtualMC::GetMC()->Gspos("FTLN", 5+3*sg, "FAIB", 0., yFLTN, 366.9*sg, 0, "MANY");
+      TVirtualMC::GetMC()->Gspos("FTLN", 5+2*sg, "FAIB", 0., yFLTN, 198.8*sg, 0, "MANY");
+      TVirtualMC::GetMC()->Gspos("FTLN",   5+sg, "FAIB", 0., yFLTN, 56.82*sg, 0, "MANY");
     }
 
     ycoor =  ytub + (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
     zcoor = (198.8 + 56.82)*0.5;
-    gMC->Gspos("FLO2", 2, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
-    gMC->Gspos("FLO2", 1, "FAIB",-24., ycoor, zcoor, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FLO2", 2, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FLO2", 1, "FAIB",-24., ycoor, zcoor, 0, "MANY");
     zcoor = (366.9 + 198.8)*0.5;
-    gMC->Gspos("FLO3", 2, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
-    gMC->Gspos("FLO3", 1, "FAIB",-24., ycoor, zcoor, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FLO3", 2, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FLO3", 1, "FAIB",-24., ycoor, zcoor, 0, "MANY");
     ycoor =  ytub - (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
     zcoor = (198.8 + 56.82)*0.5;
-    gMC->Gspos("FLO2", 4, "FAIB", 24., ycoor,-zcoor, 0, "MANY");
-    gMC->Gspos("FLO2", 3, "FAIB", 24., ycoor, zcoor, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FLO2", 4, "FAIB", 24., ycoor,-zcoor, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FLO2", 3, "FAIB", 24., ycoor, zcoor, 0, "MANY");
     zcoor = (366.9 + 198.8)*0.5;
-    gMC->Gspos("FLO3", 4, "FAIB", 24., ycoor,-zcoor, 0, "MANY");
-    gMC->Gspos("FLO3", 3, "FAIB", 24., ycoor, zcoor, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FLO3", 4, "FAIB", 24., ycoor,-zcoor, 0, "MANY");
+    TVirtualMC::GetMC()->Gspos("FLO3", 3, "FAIB", 24., ycoor, zcoor, 0, "MANY");
 
   }
 
   Float_t barS[3] = {fgkBarS[0], fgkBarS[1], fgkBarS[2]};
-  gMC->Gsvolu("FBAS", "BOX ", idtmed[504], barS, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FBAS", "BOX ", idtmed[504], barS, 3); // Al
 
   Float_t barS1[3] = {fgkBarS1[0], fgkBarS1[1], fgkBarS1[2]};
-  gMC->Gsvolu("FBS1", "BOX ", idtmed[504], barS1, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FBS1", "BOX ", idtmed[504], barS1, 3); // Al
 
   Float_t barS2[3] = {fgkBarS2[0], fgkBarS2[1], fgkBarS2[2]};
-  gMC->Gsvolu("FBS2", "BOX ", idtmed[504], barS2, 3); // Al
+  TVirtualMC::GetMC()->Gsvolu("FBS2", "BOX ", idtmed[504], barS2, 3); // Al
 
-  Float_t ytubBis = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*barS2[1] - tubepar[1];
+  Float_t ytubBis = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*barS2[1] - tubepar[1];
   ycoor = ytubBis;
   zcoor =-carpar[2] + barS[2];
-  gMC->Gspos("FBAS", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBAS", 2, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBAS", 1, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBAS", 2, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAS", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAS", 2, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAS", 1, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBAS", 2, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
 
   zcoor =-carpar[2] + 2.*barS[2] + 2.*tubepar[1] + barS1[2];
-  gMC->Gspos("FBS1", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBS1", 2, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBS1", 1, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBS1", 2, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS1", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS1", 2, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS1", 1, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS1", 2, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
 
   ycoor = ytubBis + (tubepar[1] + barS2[1]);
   zcoor =-carpar[2] + 2.*barS[2] + barS2[2];
-  gMC->Gspos("FBS2", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBS2", 2, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBS2", 1, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBS2", 2, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS2", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS2", 2, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS2", 1, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS2", 2, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
 
   ycoor = ytubBis - (tubepar[1] + barS2[1]);
   //zcoor =-carpar[2] + 2.*barS[2] + barS2[2];
-  gMC->Gspos("FBS2", 3, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBS2", 4, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBS2", 3, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FBS2", 4, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS2", 3, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS2", 4, "FCA1", 24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS2", 3, "FCA2",-24., ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FBS2", 4, "FCA2", 24., ycoor, zcoor, 0, "ONLY");
 
 }
 
@@ -1764,47 +1724,47 @@ void AliTOFv6T0::MakeSuperModuleServices(Float_t xtof, Float_t ytof, Float_t zle
 
   Int_t *idtmed = fIdtmed->GetArray()-499;
 
-  Int_t idrotm[3];
+  Int_t idrotm[3]={0,0,0};
 
-  Float_t tubepar[3] = {0., 0.4, xtof*0.5 - fgkCBLw - fgkSawThickness};
+  Float_t tubepar[3] = {0., 0.4, static_cast<Float_t>(xtof*0.5 - fgkCBLw - fgkSawThickness)};
   Float_t al1[3] = {fgkAl1parameters[0], fgkAl1parameters[1], fgkAl1parameters[2]};
   Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
   Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
-  Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+  //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
   Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
 
   // FEA cables definition
-  Float_t cbpar[3] = {0., 0.5, (tubepar[2] - (fgkFEAwidth2 - fgkFEAwidth1/6.)*0.5)*0.5};
-  gMC->Gsvolu("FCAB", "TUBE", idtmed[510], cbpar, 3);    // copper+alu
+  Float_t cbpar[3] = {0., 0.5, static_cast<Float_t>((tubepar[2] - (fgkFEAwidth2 - fgkFEAwidth1/6.)*0.5)*0.5)};
+  TVirtualMC::GetMC()->Gsvolu("FCAB", "TUBE", idtmed[510], cbpar, 3);    // copper+alu
 
-  Float_t cbparS[3] = {cbpar[0], cbpar[1], (tubepar[2] - (xtof*0.5 - 25. + (fgkFEAwidth1 - fgkFEAwidth1/6.)*0.5))*0.5};
-  gMC->Gsvolu("FCAL", "TUBE", idtmed[510], cbparS, 3);    // copper+alu
+  Float_t cbparS[3] = {cbpar[0], cbpar[1], static_cast<Float_t>((tubepar[2] - (xtof*0.5 - 25. + (fgkFEAwidth1 - fgkFEAwidth1/6.)*0.5))*0.5)};
+  TVirtualMC::GetMC()->Gsvolu("FCAL", "TUBE", idtmed[510], cbparS, 3);    // copper+alu
 
   // rotation matrix
   AliMatrix(idrotm[0], 180., 90., 90., 90., 90., 0.);
 
-  Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
-                      feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
-                      feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
+  Float_t carpar[3] = {static_cast<Float_t>(xtof*0.5 - fgkCBLw - fgkSawThickness),
+                      static_cast<Float_t>(feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5),
+                      static_cast<Float_t>(feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2])};
 
   Float_t bar2[3] = {fgkBar2[0], fgkBar2[1], fgkBar2[2]};
   Float_t ytub =-(ytof*0.5 - fgkModuleCoverThickness)*0.5 + carpar[1] +
-    carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
+    carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
 
   // FEA cables positioning
   Float_t xcoor = (tubepar[2] + (fgkFEAwidth2 - fgkFEAwidth1/6.)*0.5)*0.5;
   Float_t ycoor = ytub - 3.;
   Float_t zcoor =-carpar[2] + (2.*feaRoof1[2] - 2.*al1[2] - 2.*feaParam[2] - cbpar[1]);
-  gMC->Gspos("FCAB", 1, "FCA1",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-  gMC->Gspos("FCAB", 2, "FCA1", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-  gMC->Gspos("FCAB", 1, "FCA2",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-  gMC->Gspos("FCAB", 2, "FCA2", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCAB", 1, "FCA1",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCAB", 2, "FCA1", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCAB", 1, "FCA2",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCAB", 2, "FCA2", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
   xcoor = (tubepar[2] + (xtof*0.5 - 25. + (fgkFEAwidth1 - fgkFEAwidth1/6.)*0.5))*0.5;
   ycoor -= 2.*cbpar[1];
-  gMC->Gspos("FCAL", 1, "FCA1",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-  gMC->Gspos("FCAL", 2, "FCA1", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-  gMC->Gspos("FCAL", 1, "FCA2",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
-  gMC->Gspos("FCAL", 2, "FCA2", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCAL", 1, "FCA1",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCAL", 2, "FCA1", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCAL", 1, "FCA2",-xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCAL", 2, "FCA2", xcoor, ycoor, zcoor, idrotm[0], "ONLY");
 
 
   // Cables and tubes on the side blocks
@@ -1830,11 +1790,11 @@ void AliTOFv6T0::MakeSuperModuleServices(Float_t xtof, Float_t ytof, Float_t zle
   cblpar[8] = fgkCBLh1 *0.5;
   cblpar[9] = fgkCBLh2 *0.5;
   cblpar[10]= cblpar[6];
-  gMC->Gsvolu("FCBL", "TRAP", idtmed[511], cblpar, 11); // cables and tubes mix 
+  TVirtualMC::GetMC()->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
+  Float_t sawpar[3] = {static_cast<Float_t>(fgkSawThickness*0.5), static_cast<Float_t>(fgkCBLh2*0.5), kCBLl};
+  TVirtualMC::GetMC()->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.);
@@ -1843,68 +1803,68 @@ void AliTOFv6T0::MakeSuperModuleServices(Float_t xtof, Float_t ytof, Float_t zle
   xcoor = (xtof - fgkCBLw)*0.5 - 2.*sawpar[0];
   ycoor = (fgkCBLh1 + fgkCBLh2)*0.25 - (ytof*0.5 - fgkModuleCoverThickness)*0.5;
   zcoor = kCBLl*0.5;
-  gMC->Gspos("FCBL", 1, "FAIA", -xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
-  gMC->Gspos("FCBL", 2, "FAIA",  xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
-  gMC->Gspos("FCBL", 3, "FAIA", -xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
-  gMC->Gspos("FCBL", 4, "FAIA",  xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
-  gMC->Gspos("FCBL", 1, "FAIC", -xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
-  gMC->Gspos("FCBL", 2, "FAIC",  xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
-  gMC->Gspos("FCBL", 3, "FAIC", -xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
-  gMC->Gspos("FCBL", 4, "FAIC",  xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCBL", 1, "FAIA", -xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCBL", 2, "FAIA",  xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCBL", 3, "FAIA", -xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCBL", 4, "FAIA",  xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCBL", 1, "FAIC", -xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCBL", 2, "FAIC",  xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCBL", 3, "FAIC", -xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCBL", 4, "FAIC",  xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
 
   if (fTOFHoles) {
     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[511], cblpar, 11); // cables and tubes mix
+    TVirtualMC::GetMC()->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");
+    TVirtualMC::GetMC()->Gspos("FCBB", 1, "FAIB", -xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FCBB", 2, "FAIB",  xcoor, ycoor, -zcoor, idrotm[1], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FCBB", 3, "FAIB", -xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
+    TVirtualMC::GetMC()->Gspos("FCBB", 4, "FAIB",  xcoor, ycoor,  zcoor, idrotm[2], "ONLY");
   }
 
   // lateral cable and tube volume positioning
   xcoor = xtof*0.5 - sawpar[0];
   ycoor = (fgkCBLh2 - ytof*0.5 + fgkModuleCoverThickness)*0.5;
   zcoor = 0.;
-  gMC->Gspos("FSAW", 1, "FAIA", -xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FSAW", 2, "FAIA",  xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FSAW", 1, "FAIC", -xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FSAW", 2, "FAIC",  xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FSAW", 1, "FAIA", -xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FSAW", 2, "FAIA",  xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FSAW", 1, "FAIC", -xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FSAW", 2, "FAIC",  xcoor, ycoor, zcoor, 0, "ONLY");
 
   if (fTOFHoles) {
     xcoor = xtof*0.5 - sawpar[0];
     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");
+    TVirtualMC::GetMC()->Gspos("FSAW", 1, "FAIB", -xcoor, ycoor, 0., 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FSAW", 2, "FAIB",  xcoor, ycoor, 0., 0, "ONLY");
   }
 
   // TOF Supermodule cover definition and positioning
-  Float_t covpar[3] = {xtof*0.5, 0.075, zlenA*0.5};
-  gMC->Gsvolu("FCOV", "BOX ", idtmed[504], covpar, 3); // Al
+  Float_t covpar[3] = {static_cast<Float_t>(xtof*0.5), 0.075, static_cast<Float_t>(zlenA*0.5)};
+  TVirtualMC::GetMC()->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
+    TVirtualMC::GetMC()->Gsvolu("FCOB", "BOX ", idtmed[504], covpar, 3); // Al
     covpar[2] = fgkInterCentrModBorder2;
-    gMC->Gsvolu("FCOP", "BOX ", idtmed[513], covpar, 3); // Plastic (CH2)
+    TVirtualMC::GetMC()->Gsvolu("FCOP", "BOX ", idtmed[513], covpar, 3); // Plastic (CH2)
   }
 
   xcoor = 0.;
   ycoor = (ytof*0.5 - fgkModuleCoverThickness)*0.5 - covpar[1];
   zcoor = 0.;
-  gMC->Gspos("FCOV", 0, "FAIA", xcoor, ycoor, zcoor, 0, "ONLY");
-  gMC->Gspos("FCOV", 0, "FAIC", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCOV", 0, "FAIA", xcoor, ycoor, zcoor, 0, "ONLY");
+  TVirtualMC::GetMC()->Gspos("FCOV", 0, "FAIC", xcoor, ycoor, zcoor, 0, "ONLY");
   if (fTOFHoles) {
     zcoor = (zlenA*0.5 + fgkInterCentrModBorder2)*0.5;
-    gMC->Gspos("FCOB", 1, "FAIB", xcoor, ycoor,  zcoor, 0, "ONLY");
-    gMC->Gspos("FCOB", 2, "FAIB", xcoor, ycoor, -zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FCOB", 1, "FAIB", xcoor, ycoor,  zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FCOB", 2, "FAIB", xcoor, ycoor, -zcoor, 0, "ONLY");
     zcoor = 0.;
-    gMC->Gspos("FCOP", 0, "FAIB", xcoor, ycoor,  zcoor, 0, "ONLY");
+    TVirtualMC::GetMC()->Gspos("FCOP", 0, "FAIB", xcoor, ycoor,  zcoor, 0, "ONLY");
   }
 
 }
@@ -1941,11 +1901,11 @@ void AliTOFv6T0::MakeReadoutCrates(Float_t ytof) const
 
   Int_t *idtmed = fIdtmed->GetArray()-499;
 
-  Int_t idrotm[18];
+  Int_t idrotm[18]; for (Int_t ii=0; ii<18; ii++) idrotm[ii]=0;
 
   // volume definition
   Float_t serpar[3] = {29.*0.5, 121.*0.5, 90.*0.5};
-  gMC->Gsvolu("FTOS", "BOX ", idtmed[514], serpar, 3); // Al + Cu + steel
+  TVirtualMC::GetMC()->Gsvolu("FTOS", "BOX ", idtmed[514], serpar, 3); // Al + Cu + steel
 
   Float_t xcoor, ycoor, zcoor;
   zcoor = (118.-90.)*0.5;
@@ -1955,266 +1915,12 @@ void AliTOFv6T0::MakeReadoutCrates(Float_t ytof) const
     xcoor = ra * TMath::Cos(phi * kDegrad);
     ycoor = ra * TMath::Sin(phi * kDegrad);
     AliMatrix(idrotm[i], 90., phi, 90., phi + 270., 0., 0.);
-    gMC->Gspos("FTOS", i, "BFMO", xcoor, ycoor, zcoor, idrotm[i], "ONLY");
+    TVirtualMC::GetMC()->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
-{
-  //
-  // Draw a shaded view of the Time Of Flight version 5
-  //
-
-  // Set everything unseen
-  gMC->Gsatt("*", "seen", -1);
-
-  //
-  //Set volumes visible
-  // 
-
-  //Set ALIC mother transparent
-  gMC->Gsatt("ALIC","SEEN", 0);
-
-//=====> Level 1
-  // Level 1 for TOF volumes
-  gMC->Gsatt("B077","seen", 0);
-
-//=====> Level 2
-  // Level 2 for TOF volumes
-  gMC->Gsatt("B071","seen", 0);
-  gMC->Gsatt("B074","seen", 0);
-  gMC->Gsatt("B075","seen", 0);
-  gMC->Gsatt("B076","seen",-1); // all B076 sub-levels skipped -
-  gMC->Gsatt("B080","seen", 0);  // B080 does not has sub-level                
-
-  // Level 2 of B071
-  gMC->Gsatt("B056","seen", 0);  // B056 does not has sub-levels  -
-  gMC->Gsatt("B063","seen",-1); // all B063 sub-levels skipped   -
-  gMC->Gsatt("B065","seen",-1); // all B065 sub-levels skipped   -
-  gMC->Gsatt("B067","seen",-1); // all B067 sub-levels skipped   -
-  gMC->Gsatt("B072","seen",-1); // all B072 sub-levels skipped   -
-
-  char name[16];
-  for (Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++) {
-    sprintf(name, "BREF%d",isec);
-    gMC->Gsatt(name,"seen", 0);  // all BREF%d sub-levels skipped   -
-    sprintf(name, "BTRD%d",isec);
-    gMC->Gsatt(name,"seen", 0);  // all BTRD%d sub-levels skipped   -
-    sprintf(name, "BTOF%d",isec);
-    gMC->Gsatt(name,"seen",-2);  // all BTOF%d sub-levels skipped   -
-  }
-
-  gMC->Gdopt("hide", "on");
-  gMC->Gdopt("shad", "on");
-  gMC->Gsatt("*", "fill", 7);
-  gMC->SetClipBox(".");
-  gMC->SetClipBox("*", 100, 1000, 100, 1000, 100, 1000);
-  gMC->DefaultRange();
-  gMC->Gdraw("alic", 40, 30, 0, 10, 9.5, .018, .018);
-  gMC->Gdhead(1111, "Time Of Flight");
-  gMC->Gdman(18, 3, "MAN");
-  gMC->Gdopt("hide","off");
-}
-//_____________________________________________________________________________
-void AliTOFv6T0::DrawDetectorModules() const
-{
-  //
-  // Draw a shaded view of the TOF detector SuperModules version 5
-  //
-  // Set everything unseen
-  gMC->Gsatt("*", "seen", -1);
-
-  //
-  //Set volumes visible
-  // 
-
-  //Set ALIC mother transparent
-  gMC->Gsatt("ALIC","SEEN", 0);
-
-//=====> Level 1
-  // Level 1 for TOF volumes
-  gMC->Gsatt("B077","seen", 0);
-
-//=====> Level 2
-  // Level 2 for TOF volumes
-  gMC->Gsatt("B071","seen", 0);
-  gMC->Gsatt("B074","seen", 0);
-  gMC->Gsatt("B075","seen", 0);
-  gMC->Gsatt("B076","seen",-1); // all B076 sub-levels skipped -
-  gMC->Gsatt("B080","seen", 0);  // B080 does not has sub-level                
-
-  // Level 2 of B071
-  gMC->Gsatt("B056","seen", 0);  // B056 does not has sub-levels  -
-  gMC->Gsatt("B063","seen",-1); // all B063 sub-levels skipped   -
-  gMC->Gsatt("B065","seen",-1); // all B065 sub-levels skipped   -
-  gMC->Gsatt("B067","seen",-1); // all B067 sub-levels skipped   -
-  gMC->Gsatt("B072","seen",-1); // all B072 sub-levels skipped   -
-
-  char name[16];
-  for (Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++) {
-    sprintf(name, "BREF%d",isec);
-    gMC->Gsatt(name,"seen", 0);  // all BREF%d sub-levels skipped   -
-    sprintf(name, "BTRD%d",isec);
-    gMC->Gsatt(name,"seen", 0);  // all BTRD%d sub-levels skipped   -
-    sprintf(name, "BTOF%d",isec);
-    gMC->Gsatt(name,"seen", 0);  // all BTOF%d sub-levels skipped   -
-  }
-
-  // Level 3 of B071, B075 and B074
-  gMC->Gsatt("FTOA","seen",-2);  // all FTOA sub-levels skipped   -
-  if (fTOFHoles) gMC->Gsatt("FTOB","seen",-2);  // all FTOB sub-levels skipped   -
-  if (fTOFHoles) gMC->Gsatt("FTOC","seen",-2);  // all FTOC sub-levels skipped   -
-
-  // Level 3 of B071, B075 and B074
-  gMC->Gsatt("FAIA","seen",-1);  // all FAIA sub-levels skipped   -
-  gMC->Gsatt("FAIC","seen",-1);  // all FAIC sub-levels skipped   -
-  if (fTOFHoles) gMC->Gsatt("FAIB","seen",-1);  // all FAIB sub-levels skipped   -
-
-  // Level 3 of B071, B075 and B074
-  gMC->Gsatt("FPEA","seen",-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");
-  gMC->Gsatt("*", "fill", 5);
-  gMC->SetClipBox(".");
-  gMC->SetClipBox("*", 100, 1000, 100, 1000, 0, 1000);
-  gMC->DefaultRange();
-  gMC->Gdraw("alic", 40, 30, 0, 10, 9.5, .018, .018);
-  gMC->Gdhead(1111,"TOF detector");
-  gMC->Gdman(18, 3, "MAN");
-  gMC->Gdopt("hide","off");
-}                                 
-
-//_____________________________________________________________________________
-void AliTOFv6T0::DrawDetectorStrips() const
-{
-  //
-  // Draw a shaded view of the TOF strips for version 5
-  //
-
-  // Set everything unseen
-  gMC->Gsatt("*", "seen", -1);
-
-  //
-  //Set volumes visible
-  // 
-  
-  //Set ALIC mother transparent
-  gMC->Gsatt("ALIC","SEEN", 0);
-  
-//=====> Level 1
-  // Level 1 for TOF volumes
-  gMC->Gsatt("B077","seen", 0);
-
-//=====> Level 2
-  // Level 2 for TOF volumes
-  gMC->Gsatt("B071","seen", 0);
-  gMC->Gsatt("B074","seen", 0);
-  gMC->Gsatt("B075","seen", 0);
-  gMC->Gsatt("B076","seen",-1); // all B076 sub-levels skipped -
-  gMC->Gsatt("B080","seen", 0);  // B080 does not has sub-level                
-
-  // Level 2 of B071
-  gMC->Gsatt("B063","seen",-1); // all B063 sub-levels skipped   -
-  gMC->Gsatt("B065","seen",-1); // all B065 sub-levels skipped   -
-  gMC->Gsatt("B067","seen",-1); // all B067 sub-levels skipped   -
-  gMC->Gsatt("B056","seen", 0);  // B056 does not has sub-levels  -
-  gMC->Gsatt("B072","seen",-1); // all B072 sub-levels skipped   -
-
-  char name[16];
-  for (Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++) {
-    sprintf(name, "BREF%d",isec);
-    gMC->Gsatt(name,"seen", 0);  // all BREF%d sub-levels skipped   -
-    sprintf(name, "BTRD%d",isec);
-    gMC->Gsatt(name,"seen", 0);  // all BTRD%d sub-levels skipped   -
-    sprintf(name, "BTOF%d",isec);
-    gMC->Gsatt(name,"seen", 0);  // all BTOF%d sub-levels skipped   -
-  }
-
-  // Level 3 of B071, B074 and B075
-  gMC->Gsatt("FTOA","SEEN", 0);
-  if (fTOFHoles) gMC->Gsatt("FTOB","SEEN", 0);
-  if (fTOFHoles) gMC->Gsatt("FTOC","SEEN", 0);
-
-  // Level 4 of B071, B074 and B075
-  gMC->Gsatt("FLTA","SEEN", 0);
-  if (fTOFHoles) gMC->Gsatt("FLTB","SEEN", 0);
-  if (fTOFHoles) gMC->Gsatt("FLTC","SEEN", 0);
-
-  // Level 5 of B071, B074 and B075
-  gMC->Gsatt("FAIA","SEEN", 0);
-  gMC->Gsatt("FAIC","seen",-1);  // all FAIC sub-levels skipped   -
-  if (fTOFHoles) gMC->Gsatt("FAIB","SEEN", 0);
-
-  gMC->Gsatt("FPEA","SEEN", -2/*1*/);
-  if (fTOFHoles) gMC->Gsatt("FPEB","SEEN", -2/*1*/);
-
-  gMC->Gsatt("FSTR","SEEN",-2);  // all FSTR sub-levels skipped   -
-
-  gMC->Gsatt("FWZ1","SEEN", 1);
-  gMC->Gsatt("FWZ2","SEEN", 1);
-  gMC->Gsatt("FWZ3","SEEN", 1);
-  gMC->Gsatt("FWZ4","SEEN", 1);
-  if (fTOFHoles) {
-    gMC->Gsatt("FWZA","SEEN", 1);
-    gMC->Gsatt("FWZB","SEEN", 1);
-    gMC->Gsatt("FWZC","SEEN", 1);
-  }
-
-  // Level 2 of FAIA
-  // Level 2 of FAIB
-  // Level 2 of FAIC
-  gMC->Gsatt("FCA1","SEEN", 0);
-  gMC->Gsatt("FCA2","SEEN", 0);
-  gMC->Gsatt("FCAB","SEEN", 0);
-  gMC->Gsatt("FCAL","SEEN", 0);
-  gMC->Gsatt("FTUB","SEEN",-1);  // all FTUB sub-levels skipped   -
-  gMC->Gsatt("FTLN","SEEN", 0);
-  gMC->Gsatt("FLO1","SEEN", 0);
-  gMC->Gsatt("FLO2","SEEN", 0);
-  gMC->Gsatt("FLO3","SEEN", 0);
-  gMC->Gsatt("FCBL","SEEN", 0);
-  if (fTOFHoles) gMC->Gsatt("FCBB","SEEN", 0);
-  gMC->Gsatt("FSAW","SEEN", 0);
-  gMC->Gsatt("FCOV","SEEN", 0);
-  if (fTOFHoles) {
-    gMC->Gsatt("FCOB","SEEN", 0);
-    gMC->Gsatt("FCOP","SEEN", 0);
-  }
+  TVirtualMC::GetMC()->Gspos("FTOS", 1, "BBCE", ra, -3., zcoor, 0, "ONLY");
 
-  // Level 2 of FTUB
-  gMC->Gsatt("FITU","SEEN", 0);
-
-  // Level 2 of FSTR
-  gMC->Gsatt("FHON","SEEN", 1);
-  gMC->Gsatt("FPC1","SEEN", 1);
-  gMC->Gsatt("FPC2","SEEN", 1);
-  gMC->Gsatt("FPCB","SEEN", 1);
-  gMC->Gsatt("FRGL","SEEN", 1);
-  gMC->Gsatt("FGLF","SEEN", 1);
-
-  // Level 2 of FPCB => Level 3 of FSTR
-  gMC->Gsatt("FSEN","SEEN", 0);
-  gMC->Gsatt("FSEZ","SEEN", 0);
-  gMC->Gsatt("FPAD","SEEN", 1);
-
-  gMC->Gdopt("hide","on");
-  gMC->Gdopt("shad","on");
-  gMC->Gsatt("*", "fill", 5);
-  gMC->SetClipBox(".");
-  gMC->SetClipBox("*", 0, 1000, 0, 1000, 0, 1000);
-  gMC->DefaultRange();
-  gMC->Gdraw("alic", 40, 30, 0, 10, 9.5, .018, .018);
-  gMC->Gdhead(1111,"TOF Strips");
-  gMC->Gdman(18, 3, "MAN");
-  gMC->Gdopt("hide","off");
 }
 
 //_____________________________________________________________________________
@@ -2226,7 +1932,7 @@ void AliTOFv6T0::CreateMaterials()
 
   //AliTOF::CreateMaterials();
 
-  AliMagF *magneticField = (AliMagF*)gAlice->Field();
+  AliMagF *magneticField = (AliMagF*)((AliMagF*)TGeoGlobalMagField::Instance()->GetField());
 
   Int_t   isxfld = magneticField->Integ();
   Float_t sxmgmx = magneticField->Max();
@@ -2262,7 +1968,7 @@ void AliTOFv6T0::CreateMaterials()
   wmatg10[2]= we[2]*0.4;
   wmatg10[3]= we[3]*0.4;
   wmatg10[4]= we[4]*0.4;
-  AliDebug(1,Form("wg10  %d  %d  %d  %d  %d", wmatg10[0], wmatg10[1], wmatg10[2], wmatg10[3], wmatg10[4]));
+  AliDebug(1,Form("wg10  %f  %f  %f  %f  %f", wmatg10[0], wmatg10[1], wmatg10[2], wmatg10[3], wmatg10[4]));
   //Float_t densg10 = 1.7; //old value
   Float_t densg10 = 2.0; // (+17.8%)
 
@@ -2396,15 +2102,15 @@ void AliTOFv6T0::Init()
   
   AliTOF::Init();
   
-  fIdFTOA = gMC->VolId("FTOA");
+  fIdFTOA = TVirtualMC::GetMC()->VolId("FTOA");
   if (fTOFHoles) {
-    fIdFTOB = gMC->VolId("FTOB");
-    fIdFTOC = gMC->VolId("FTOC");
+    fIdFTOB = TVirtualMC::GetMC()->VolId("FTOB");
+    fIdFTOC = TVirtualMC::GetMC()->VolId("FTOC");
   }
-  fIdFLTA = gMC->VolId("FLTA");
+  fIdFLTA = TVirtualMC::GetMC()->VolId("FLTA");
   if (fTOFHoles) {
-    fIdFLTB = gMC->VolId("FLTB");
-    fIdFLTC = gMC->VolId("FLTC");
+    fIdFLTB = TVirtualMC::GetMC()->VolId("FLTB");
+    fIdFLTC = TVirtualMC::GetMC()->VolId("FLTC");
   }
 
   AliDebug(1, "**************************************"
@@ -2434,11 +2140,11 @@ void AliTOFv6T0::StepManager()
   Int_t index = 0;
 
   if(
-     gMC->IsTrackEntering()
-     && gMC->TrackCharge()
-     //&& gMC->GetMedium()==idtmed[507]
-     && gMC->CurrentMedium()==idtmed[507]
-     && gMC->CurrentVolID(copy)==fIdSens
+     TVirtualMC::GetMC()->IsTrackEntering()
+     && TVirtualMC::GetMC()->TrackCharge()
+     //&& TVirtualMC::GetMC()->GetMedium()==idtmed[507]
+     && TVirtualMC::GetMC()->CurrentMedium()==idtmed[507]
+     && TVirtualMC::GetMC()->CurrentVolID(copy)==fIdSens
      )
   {
 
@@ -2449,20 +2155,20 @@ void AliTOFv6T0::StepManager()
 
     // getting information about hit volumes
     
-    padzid=gMC->CurrentVolOffID(1,copy);
+    padzid=TVirtualMC::GetMC()->CurrentVolOffID(1,copy);
     padz=copy;
     padz--;
 
-    padxid=gMC->CurrentVolOffID(0,copy);
+    padxid=TVirtualMC::GetMC()->CurrentVolOffID(0,copy);
     padx=copy; 
     padx--;
     
-    stripid=gMC->CurrentVolOffID(4,copy);
+    stripid=TVirtualMC::GetMC()->CurrentVolOffID(4,copy);
     strip=copy; 
     strip--;
 
-    gMC->TrackPosition(pos);
-    gMC->TrackMomentum(mom);
+    TVirtualMC::GetMC()->TrackPosition(pos);
+    TVirtualMC::GetMC()->TrackMomentum(mom);
 
     Double_t normMom=1./mom.Rho();
 
@@ -2476,8 +2182,8 @@ void AliTOFv6T0::StepManager()
     pm[1] = (Float_t)mom.Y()*normMom;
     pm[2] = (Float_t)mom.Z()*normMom;
  
-    gMC->Gmtod(xm,xpad,1); // from MRS to DRS: coordinates convertion
-    gMC->Gmtod(pm,ppad,2); // from MRS to DRS: direction cosinus convertion
+    TVirtualMC::GetMC()->Gmtod(xm,xpad,1); // from MRS to DRS: coordinates convertion
+    TVirtualMC::GetMC()->Gmtod(pm,ppad,2); // from MRS to DRS: direction cosinus convertion
 
 
     if (TMath::Abs(ppad[1])>1) {
@@ -2511,7 +2217,7 @@ void AliTOFv6T0::StepManager()
       strip = strip - fTOFGeometry->NStripC() - fTOFGeometry->NStripB() - fTOFGeometry->NStripA() - fTOFGeometry->NStripB();
     }
 
-    volpath=gMC->CurrentVolOffName(7);
+    volpath=TVirtualMC::GetMC()->CurrentVolOffName(7);
     index=atoi(&volpath[4]);
     sector=-1;
     sector=index;
@@ -2535,8 +2241,8 @@ void AliTOFv6T0::StepManager()
     hits[9] = xpad[1];
     hits[10]= xpad[2];
     hits[11]= incidenceAngle;
-    hits[12]= gMC->Edep();
-    hits[13]= gMC->TrackLength();
+    hits[12]= TVirtualMC::GetMC()->Edep();
+    hits[13]= TVirtualMC::GetMC()->TrackLength();
     
     vol[0]= sector;
     vol[1]= plate;
@@ -2549,7 +2255,8 @@ void AliTOFv6T0::StepManager()
   }
 }
 //-------------------------------------------------------------------
-void AliTOFv6T0::MaterialMixer(Float_t* p,Float_t* a,Float_t* m,Int_t n) const
+void AliTOFv6T0::MaterialMixer(Float_t * p, const Float_t * const a,
+                              const Float_t * const m, Int_t n) const
 {
   // a[] atomic weights vector      (in)
   //     (atoms present in more compound appear separately)