]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOF.cxx
Added protections against using the wrong version of FRAME
[u/mrichter/AliRoot.git] / TOF / AliTOF.cxx
index 82e2a76d28fc83a049b583ec95c8109ee78741e9..97f8081bfa58b6f5f9c7806c20c301146d10e24a 100644 (file)
@@ -1,16 +1,50 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/*
+$Log$
+Revision 1.9  1999/10/15 15:35:19  fca
+New version for frame1099 with and without holes
+
+Revision 1.9  1999/09/29 09:24:33  fca
+Introduction of the Copyright and cvs Log
+
+*/
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
-//  Time Of Flight                                                           //
+//  Time Of Flight                               FCA                         //
 //  This class contains the basic functions for the Time Of Flight           //
 //  detector. Functions specific to one particular geometry are              //
 //  contained in the derived classes                                         //
-//                                                                           //
-//Begin_Html
+//
+//  VERSIONE WITH 5 SYMMETRIC MODULES ALONG Z AXIS
+//  ==============================================
+//  
+//  VERSION WITH HOLES FOR PHOS AND TRD IN SPACEFRAME WITH HOLES
+//
+//  Volume sensibile : FPAD
+//
+//
+//
+// Begin_Html
 /*
-<img src="gif/AliTOFClass.gif">
+<img src="picts/AliTOFClass.gif">
 */
 //End_Html
-//                                                                           //
+//             
+//
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -71,398 +105,521 @@ void AliTOF::BuildGeometry()
   Top=gAlice->GetGeometry()->GetNode("alice");
   //
   // Define rotation matrixes
-  new TRotMatrix("rot501","rot501",90,-18.94737,90,71.05263,0,0);
-  new TRotMatrix("rot502","rot502",90,-37.89474,90,52.10526,0,0);
-  new TRotMatrix("rot503","rot503",90,-56.84211,90,33.15789,0,0);
-  new TRotMatrix("rot504","rot504",90,-75.78947,90,14.21053,0,0);
-  new TRotMatrix("rot505","rot505",90,-94.73685,90,-4.736847,0,0);
-  new TRotMatrix("rot506","rot506",90,-113.6842,90,-23.68421,0,0);
-  new TRotMatrix("rot507","rot507",90,-132.6316,90,-42.63158,0,0);
-  new TRotMatrix("rot508","rot508",90,-151.5789,90,-61.57895,0,0);
-  new TRotMatrix("rot509","rot509",90,-170.5263,90,-80.52632,0,0);
-  new TRotMatrix("rot510","rot510",90,-189.4737,90,-99.47369,0,0);
-  new TRotMatrix("rot511","rot511",90,-208.4211,90,-118.4211,0,0);
-  new TRotMatrix("rot512","rot512",90,-227.3684,90,-137.3684,0,0);
-  new TRotMatrix("rot513","rot513",90,-246.3158,90,-156.3158,0,0);
-  new TRotMatrix("rot514","rot514",90,-265.2632,90,-175.2632,0,0);
-  new TRotMatrix("rot515","rot515",90,-284.2105,90,-194.2105,0,0);
-  new TRotMatrix("rot516","rot516",90,-303.1579,90,-213.1579,0,0);
-  new TRotMatrix("rot517","rot517",90,-322.1053,90,-232.1053,0,0);
-  new TRotMatrix("rot518","rot518",90,-341.0526,90,-251.0526,0,0);
-  new TRotMatrix("rot519","rot519",90,-360,90,-270,0,0);
+  new TRotMatrix("rot501","rot501",90,-20,90,90-20,0,0);
+  new TRotMatrix("rot502","rot502",90,-40,90,90-40,0,0);
+  new TRotMatrix("rot503","rot503",90,-60,90,90-60,0,0);
+  new TRotMatrix("rot504","rot504",90,-80,90,90-80,0,0);
+  new TRotMatrix("rot505","rot505",90,-100,90,90-100,0,0);
+  new TRotMatrix("rot506","rot506",90,-120,90,90-120,0,0);
+  new TRotMatrix("rot507","rot507",90,-140,90,90-140,0,0);
+  new TRotMatrix("rot508","rot508",90,-160,90,90-160,0,0);
+  new TRotMatrix("rot509","rot509",90,-180,90,90-180,0,0);
+  new TRotMatrix("rot510","rot510",90,-200,90,90-200,0,0);
+  new TRotMatrix("rot511","rot511",90,-220,90,90-220,0,0);
+  new TRotMatrix("rot512","rot512",90,-240,90,90-240,0,0);
+  new TRotMatrix("rot513","rot513",90,-260,90,90-260,0,0);
+  new TRotMatrix("rot514","rot514",90,-280,90,90-280,0,0);
+  new TRotMatrix("rot515","rot515",90,-300,90,90-300,0,0);
+  new TRotMatrix("rot516","rot516",90,-320,90,90-320,0,0);
+  new TRotMatrix("rot517","rot517",90,-340,90,90-340,0,0);
+  new TRotMatrix("rot518","rot518",90,-360,90,90-360,0,0);
   //
   // Position the different copies
-  //  const Float_t rtof=366;
-  // changed by Federico Carminati. TOF people should really look at this
-  const Float_t rtof=381;
-  const Int_t ntof=19;
-  const Float_t angle=2*kPI/ntof;
+  const Float_t rtof=(399+370)/2;
+  const Int_t ntof=18;
+  const Float_t kPi = TMath::Pi();
+  const Float_t angle=2*kPi/ntof;
   Float_t ang;
-  const Float_t xtof = rtof*TMath::Sin(kPI/ntof);
   //
   // Define TOF basic volume
-  new TBRIK("S_TOF1","TOF box","void",xtof,6.,175.);
+  
+  Float_t zlen1 = 152.5;
+  Float_t zlen2 = 147.0;
+  Float_t zlen3 = 117.0;
+  
+  new TBRIK("S_TOF1","TOF box","void",130/2,29/2,zlen1/2);
+  //
+  // Position it
   //
   Top->cd();
-  ang=2.75*angle;
-  Node = new TNode("FTO11","FTO11","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot502");
+  ang=3.5*angle;
+  Node = new TNode("FTO001","FTO001","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot501");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO111","FTO111","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot502");
+  Node = new TNode("FTO101","FTO101","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot501");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  ang=2.5*angle;
+  Node = new TNode("FTO002","FTO002","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot502");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=1.75*angle;
-  Node = new TNode("FTO12","FTO12","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot503");
+  Node = new TNode("FTO102","FTO102","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot502");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO112","FTO112","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot503");
+  ang=1.5*angle;
+  Node = new TNode("FTO003","FTO003","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot503");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  Node = new TNode("FTO103","FTO103","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot503");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();  
-  ang=0.75*angle;
-  Node = new TNode("FTO13","FTO13","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot504");
+  ang=0.5*angle;
+  Node = new TNode("FTO004","FTO004","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot504");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node);
   //
   Top->cd();
-  Node = new TNode("FTO113","FTO113","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot504");
+  Node = new TNode("FTO104","FTO104","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot504");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=-0.5*angle;
+  Node = new TNode("FTO005","FTO005","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot505");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO105","FTO105","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot505");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=-1.5*angle;
+  Node = new TNode("FTO006","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot506");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  Node = new TNode("FTO106","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot506");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=-0.25*angle;
-  Node = new TNode("FTO14","FTO14","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot505");
+  ang=-2.5*angle;
+  Node = new TNode("FTO007","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot507");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO114","FTO114","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot505");
+  Node = new TNode("FTO107","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot507");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  ang=-3.5*angle;
+  Node = new TNode("FTO008","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot508");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=-1.25*angle;
-  Node = new TNode("FTO15","FTO15","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot506");
+  Node = new TNode("FTO108","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot508");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO115","FTO115","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot506");
+  ang=-4.5*angle;
+  Node = new TNode("FTO009","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot509");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  Node = new TNode("FTO109","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot509");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=-5.5*angle;
+  Node = new TNode("FTO010","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot510");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO110","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot510");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=-6.5*angle;
+  Node = new TNode("FTO011","FTO006","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot511");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO111","FTO106","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot511");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();  
-  ang=kPI+1.25*angle;
-  Node = new TNode("FTO16","FTO16","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot513");
+  ang=-7.5*angle;
+  Node = new TNode("FTO012","FTO012","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot512");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO116","FTO116","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot513");
+  Node = new TNode("FTO112","FTO112","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot512");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  ang=-8.5*angle;
+  Node = new TNode("FTO013","FTO013","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot513");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=kPI+0.25*angle;
-  Node = new TNode("FTO17","FTO17","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot514");
+  Node = new TNode("FTO113","FTO113","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot513");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO117","FTO117","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot514");
+  ang=kPI-0.5*angle;
+  Node = new TNode("FTO014","FTO04","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot514");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  Node = new TNode("FTO114","FTO114","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot514");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=kPI-0.75*angle;
-  Node = new TNode("FTO18","FTO18","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot515");
+  ang=kPI-1.5*angle;
+  Node = new TNode("FTO015","FTO015","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot515");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO118","FTO118","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot515");
+  Node = new TNode("FTO115","FTO115","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot515");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  ang=kPI-2.5*angle;
+  Node = new TNode("FTO016","FTO016","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot516");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=kPI-1.75*angle;
-  Node = new TNode("FTO19","FTO19","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot516");
+  Node = new TNode("FTO116","FTO116","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot516");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO119","FTO119","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot516");
+  ang=kPi-3.5*angle;
+  Node = new TNode("FTO017","FTO017","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot517");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  Node = new TNode("FTO117","FTO117","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot517");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=kPI-2.75*angle;
-  Node = new TNode("FTO110","FTO110","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),175,"rot517");
+  ang=kPi/2;
+  Node = new TNode("FTO018","FTO018","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),299.15,"rot518");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO120","FTO120","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-175,"rot517");
+  Node = new TNode("FTO118","FTO118","S_TOF1",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-299.15,"rot518");
   Node->SetLineColor(kColorTOF);
-  fNodes->Add(Node);
+  fNodes->Add(Node); 
+  //
   //
   // Define second TOF volume
-  new TBRIK("S_TOF2","TOF box","void",xtof,6.,100.);
+  new TBRIK("S_TOF2","TOF box","void",130/2,29/2,zlen2/2);
   //
   // Position the volume
+  //
+  Top->cd();
+  ang=2.5*angle;
+  Node = new TNode("FTO202","FTO202","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot502");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO402","FTO402","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot502");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=1.5*angle;
+  Node = new TNode("FTO203","FTO203","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot503");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO403","FTO403","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot503");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=0.5*angle;
+  Node = new TNode("FTO204","FTO204","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot504");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO404","FTO404","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot504");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=-0.5*angle;
+  Node = new TNode("FTO205","FTO205","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot505");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO405","FTO405","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot505");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=-1.5*angle;
+  Node = new TNode("FTO206","FTO206","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot506");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO406","FTO406","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot506");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=-2.5*angle;
+  Node = new TNode("FTO207","FTO207","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot507");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
   Top->cd();
-  ang=-2.25*angle;
-  Node = new TNode("FTO21","FTO21","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot507");
+  Node = new TNode("FTO407","FTO407","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot507");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  //
   Top->cd();
-  Node = new TNode("FTO27","FTO27","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot507");
+  ang=-3.5*angle;
+  Node = new TNode("FTO208","FTO208","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot508");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  Node = new TNode("FTO408","FTO408","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot508");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=-3.25*angle;
-  Node = new TNode("FTO22","FTO22","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot508");
+  ang=-kPi/2;
+  Node = new TNode("FTO209","FTO209","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot509");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO28","FTO28","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot508");
+  Node = new TNode("FTO409","FTO409","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot509");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  ang=-kPi/2-angle;
+  Node = new TNode("FTO210","FTO210","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot510");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=-4.25*angle;
-  Node = new TNode("FTO23","FTO23","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot509");
+  Node = new TNode("FTO410","FTO410","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot510");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO29","FTO29","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot509");
+  ang=-kPi/2-2*angle;
+  Node = new TNode("FTO211","FTO211","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot511");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  Node = new TNode("FTO411","FTO411","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot511");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=kPI+4.25*angle;
-  Node = new TNode("FTO24","FTO24","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot510");
+  ang=-kPi/2-3*angle;
+  Node = new TNode("FTO212","FTO212","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot512");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO210","FTO210","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot510");
+  Node = new TNode("FTO412","FTO412","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot512");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   //
   Top->cd();
-  ang=kPI+3.25*angle;
-  Node = new TNode("FTO25","FTO25","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot511");
+  ang=-kPi/2-4*angle;
+  Node = new TNode("FTO213","FTO213","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot513");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO211","FTO211","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot511");
+  Node = new TNode("FTO413","FTO413","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot513");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  ang=kPi-0.5*angle;
+  Node = new TNode("FTO214","FTO214","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot514");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO414","FTO414","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot514");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=kPI+2.25*angle;
-  Node = new TNode("FTO26","FTO26","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),250,"rot512");
+  ang=kPi-1.5*angle;
+  Node = new TNode("FTO215","FTO215","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot515");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO212","FTO212","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-250,"rot512");
+  Node = new TNode("FTO415","FTO415","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot515");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  ang=kPi-2.5*angle;
+  Node = new TNode("FTO216","FTO216","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),146.45,"rot516");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  Node = new TNode("FTO416","FTO416","S_TOF2",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-146.45,"rot516");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+
   // Define third TOF volume
-  new TBRIK("S_TOF3","TOF box","void",xtof,6.,75.);
+  new TBRIK("S_TOF3","TOF box","void",130/2.,29/2,zlen3/2.);
   //
   // Position it
+  //
   Top->cd();
-  ang=3.75*angle;
-  Node = new TNode("FTO31","FTO31","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),275,"rot501");
+  ang=2.5*angle;
+  Node = new TNode("FTO302","FTO302","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot502");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO34","FTO34","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-275.,"rot501");
+  ang=1.5*angle;
+  Node = new TNode("FTO303","FTO303","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot503");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
+  Top->cd();
+  ang=0.5*angle;
+  Node = new TNode("FTO304","FTO304","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot504");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
   //
   Top->cd();
-  ang=kPI-3.75*angle;
-  Node = new TNode("FTO32","FTO32","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),275,"rot518");
+  ang=-0.5*angle;
+  Node = new TNode("FTO305","FTO305","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot505");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO35","FTO35","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-275,"rot518");
+  ang=-1.5*angle;
+  Node = new TNode("FTO306","FTO306","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot506");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   //
   Top->cd();
-  ang=kPI/2;
-  Node = new TNode("FTO33","FTO33","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),275.,"rot519");
+  ang=kPi+1.5*angle;
+  Node = new TNode("FTO312","FTO312","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot512");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
   //
   Top->cd();
-  Node = new TNode("FTO36","FTO36","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),-275.,"rot519");
+  ang=kPi+0.5*angle;
+  Node = new TNode("FTO313","FTO313","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot513");
   Node->SetLineColor(kColorTOF);
   fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=kPi-0.5*angle;
+  Node = new TNode("FTO314","FTO314","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot514");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=kPi-1.5*angle;
+  Node = new TNode("FTO315","FTO315","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot515");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+  //
+  Top->cd();
+  ang=kPi-2.5*angle;
+  Node = new TNode("FTO316","FTO316","S_TOF3",rtof*TMath::Cos(ang),rtof*TMath::Sin(ang),0.,"rot516");
+  Node->SetLineColor(kColorTOF);
+  fNodes->Add(Node); 
+
 }
 
 //_____________________________________________________________________________
 void AliTOF::CreateGeometry()
 {
   //
-  // Common geometry code for version 2 and version 3 of the TOF
+  // Common geometry code 
   //
   //Begin_Html
   /*
-    <img src="gif/AliTOFv23.gif">
+    <img src="picts/AliTOFv23.gif">
   */
   //End_Html
   //
 
-  AliMC* pMC = AliMC::GetMC();
-  
   const Double_t kPi=TMath::Pi();
   const Double_t kDegrad=kPi/180;
-  const Double_t kRaddeg=180/kPi;
-  //
-  Float_t fil_rich;
-  Int_t lmax;
-  Float_t xtof, ytof, fil_step, phos_phi, phos_min, phos_max;
-  Int_t lmax1;
-  Float_t zcor1, zcor2, zcor3;
-  Float_t ztof0, ztof1, ztof2, xcor2, ycor2;
-  Int_t i;
-  Float_t dx, dz, zl, xm, ym, phos_r;
-  Int_t idrotm[101];
-  Float_t phos_x;
-  Float_t rp2, zm0, zm1, zm2;
-  Float_t par[10], fil_min, fil_max;
-  Float_t fil1;
-  //
-  Int_t *idtmed = gAlice->Idtmed();
-  //
-  phos_x = 214.6;
-  phos_r = 467.;
-  //phos_z = 260.;
-  //rich_z = 472.5;
-  xtof = 120.;
-  ytof = 12.;
-  ztof0 = 350.;
-  ztof1 = 200.;
-  ztof2 = 150.;
-  //
-  // frame thick along Z axis
-  dz = 0.;
-  //
-  // frame thick along X axis
-  dx = 0.;
-  //
-  // barrel length along Z axis
-  zl = 720.;
-  //
-  // PHOS openings 
-  fil_rich = 30.;
-  phos_phi = TMath::ATan(phos_x / (phos_r * 2.));
-  phos_min = (kPi - phos_phi * 4.) * kRaddeg;
-  phos_max = (phos_phi * 4. + kPi) * kRaddeg;
-  //
-  // barrel radius in module contact point 
-  par[0] = 370;
-  par[1] = 390;
-  par[2] = zl / 2.;
-  pMC->Gsvolu("FBAR", "TUBE", idtmed[500], par, 3);
-  //
-  // --- Set module unseen ---
-  pMC->Gspos("FBAR", 1, "ALIC", 0., 0., 0., 0, "ONLY");
-  pMC->Gsatt("FBAR", "SEEN", 0);
-  //
-  // Number of TOF-block 
-  lmax = 19;
-  //
-  // New size YTOF
-  par[0] = xtof / 2.;
-  par[1] = ytof / 2.;
-  par[2] = ztof0 / 2.;
-  pMC->Gsvolu("FTO1", "BOX ", idtmed[506], par, 3);
-  pMC->Gsatt("FTO1", "SEEN", -2);
-  par[2] = ztof1 / 2.;
-  pMC->Gsvolu("FTO2", "BOX ", idtmed[506], par, 3);
-  pMC->Gsatt("FTO2", "SEEN", -2);
-  par[2] = ztof2 / 2.;
-  pMC->Gsvolu("FTO3", "BOX ", idtmed[506], par, 3);
-  pMC->Gsatt("FTO3", "SEEN", -2);
-  //
-  // Subtraction of TOF module boundaries 
-  xm = xtof - dx * 2.;
-  ym = ytof;
-  zm0 = ztof0 - dz * 2.;
-  zm1 = ztof1 - dz * 2.;
-  zm2 = ztof2 - dz * 2.;
-  //  
-  // TOF module internal definitions
-  //  
-  TOFpc(xm, ym, zm0, zm1, zm2);
-  //
-  //rp1 = 382.;
-  rp2 = 381;
-  fil_step = 360. / lmax;
-  fil_min = phos_min - fil_step * .5;
-  fil_max = phos_max + fil_step * .5;
-  zcor1 = 175.;
-  zcor2 = ztof0 - ztof1 / 2.;
-  zcor3 = ztof0 - ztof2 / 2.;
-  for (i = 1; i <= lmax; ++i) {
-    fil1 = fil_step * i;
-    //xcor1 = rp1 * TMath::Sin(fil1 * kDegrad) + dx * TMath::Cos(fil1 * kDegrad);
-    //ycor1 = rp1 * TMath::Cos(fil1 * kDegrad) - dx * TMath::Sin(fil1 * kDegrad);
-    xcor2 = rp2 * TMath::Sin(fil1 * kDegrad);
-    ycor2 = rp2 * TMath::Cos(fil1 * kDegrad);
-    lmax1 = i + lmax;
-    AliMatrix(idrotm[i], 90., -fil1, 90., 90. - fil1, 0., 0.);
-    if (fil1 >= fil_min  && fil1 <= fil_max) {
-      pMC->Gspos("FTO2", i, "FBAR", xcor2, ycor2, zcor2, idrotm[i], "ONLY");
-      pMC->Gspos("FTO2", lmax1, "FBAR", xcor2, ycor2, -zcor2, idrotm[i], "ONLY");
-    } else if (fil1 <= fil_rich || fil1 >= 360. - fil_rich) {
-      par[2] = ztof2 / 2.;
-      pMC->Gspos("FTO3", i, "FBAR", xcor2, ycor2, zcor3, idrotm[i], "ONLY");
-      pMC->Gspos("FTO3", lmax1, "FBAR", xcor2, ycor2, -zcor3, idrotm[i], "ONLY");
-    } else {
-      par[2] = ztof0 / 2.;
-      pMC->Gspos("FTO1", i, "FBAR", xcor2, ycor2, zcor1, idrotm[i], "ONLY");
-      pMC->Gspos("FTO1", lmax1, "FBAR", xcor2, ycor2, -zcor1, idrotm[i], "ONLY");
-    }
-  }
+  //
+  Float_t xtof, ytof;
+  Float_t ztof0;
+  Float_t rmin, rmax, dwall;
+
+  // barrel iner radius 
+  rmin = 370.;//cm
+  // barrel outer radius 
+  rmax = rmin+29;
+  
+  // frame inbetween TOF modules
+  dwall = 4.;//cm
+  // Sizes of TOF module with its support etc..
+  xtof = 2.*(rmin*TMath::Tan(10*kDegrad)-dwall/2-.5);
+  ytof = rmax-rmin;
+  ztof0 = 375.5;//cm
+
+// TOF size  (CO2)
+
+  Float_t zlen1 = 159.5;//cm
+  Float_t zlen2 = 154.0;//cm
+  Float_t zlen3 = 124.0;//cm
+
+//  TOF module internal definitions 
+  TOFpc(xtof, ytof, zlen1, zlen2, zlen3, ztof0);
 }
 
 //_____________________________________________________________________________
@@ -470,33 +627,37 @@ void AliTOF::DrawModule()
 {
   //
   // Draw a shaded view of the common part of the TOF geometry
-  // for versions 2 and 3
   //
 
-  AliMC* pMC = AliMC::GetMC();
-  
+   cout << " Drawing of AliTOF"<< endl; 
   // Set everything unseen
-  pMC->Gsatt("*", "seen", -1);
+  gMC->Gsatt("*", "seen", -1);
   // 
   // Set ALIC mother transparent
-  pMC->Gsatt("ALIC","SEEN",0);
+  gMC->Gsatt("ALIC","SEEN",0);
   //
   // Set the volumes visible
-  pMC->Gsatt("FBAR","SEEN",0);
-  pMC->Gsatt("FTO1","SEEN",1);
-  pMC->Gsatt("FTO2","SEEN",1);
-  pMC->Gsatt("FTO3","SEEN",1);
-  //
-  pMC->Gdopt("hide", "on");
-  pMC->Gdopt("shad", "on");
-  pMC->Gsatt("*", "fill", 7);
-  pMC->SetClipBox(".");
-  pMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
-  pMC->DefaultRange();
-  pMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .02, .02);
-  pMC->Gdhead(1111, "Time Of Flight");
-  pMC->Gdman(18, 4, "MAN");
-  pMC->Gdopt("hide","off");
+  gMC->Gsatt("FBAR","SEEN",0);
+  gMC->Gsatt("FTO1","SEEN",1);
+  gMC->Gsatt("FTO2","SEEN",1);
+  gMC->Gsatt("FTO3","SEEN",1);
+  gMC->Gsatt("FBT1","SEEN",1);
+  gMC->Gsatt("FBT2","SEEN",1);
+  gMC->Gsatt("FBT3","SEEN",1);
+  gMC->Gsatt("FLT1","SEEN",1);
+  gMC->Gsatt("FLT2","SEEN",1);
+  gMC->Gsatt("FLT3","SEEN",1);
+  //
+  gMC->Gdopt("hide", "on");
+  gMC->Gdopt("shad", "on");
+  gMC->Gsatt("*", "fill", 7);
+  gMC->SetClipBox(".");
+  gMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
+  gMC->DefaultRange();
+  gMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .02, .02);
+  gMC->Gdhead(1111, "Time Of Flight");
+  gMC->Gdman(18, 4, "MAN");
+  gMC->Gdopt("hide","off");
 }
 
 //_____________________________________________________________________________
@@ -509,43 +670,78 @@ void AliTOF::CreateMaterials()
   Int_t   ISXFLD = gAlice->Field()->Integ();
   Float_t SXMGMX = gAlice->Field()->Max();
   //
+  //--- Quartz (SiO2) 
+  Float_t   aq[2] = { 28.0855,15.9994 };
+  Float_t   zq[2] = { 14.,8. };
+  Float_t   wq[2] = { 1.,2. };
+  Float_t   dq = 2.20;
+  Int_t nq = -2;
+  // --- Freon
+  Float_t afre[2]  = { 12.011,18.9984032 };
+  Float_t zfre[2]  = { 6.,9. };
+  Float_t wfre[2]  = { 5.,12. };
+  Float_t densfre  = 1.5;
+  Int_t nfre = -2;
+  // --- CO2 
   Float_t ac[2]   = { 12.,16. };
   Float_t zc[2]   = { 6.,8. };
   Float_t wc[2]   = { 1.,2. };
+  Float_t dc = .001977;
+  Int_t nc = -2;
+   // For mylar (C5H4O2) 
+  Float_t amy[3] = { 12., 1., 16. };
+  Float_t zmy[3] = {  6., 1.,  8. };
+  Float_t wmy[3] = {  5., 4.,  2. };
+  Float_t dmy    = 1.39;
+  Int_t nmy = -3;
+ // For polyethilene (CH2) for honeycomb!!!!
+  Float_t ape[2] = { 12., 1. };
+  Float_t zpe[2] = {  6., 1. };
+  Float_t wpe[2] = {  1., 2. };
+  Float_t dpe    = 0.935*0.479; //To have 1%X0 for 1cm as for honeycomb
+  Int_t npe = -2;
+  // --- G10 
   Float_t ag10[4] = { 12.,1.,16.,28. };
   Float_t zg10[4] = { 6.,1.,8.,14. };
   Float_t wmatg10[4] = { .259,.288,.248,.205 };
+  Float_t densg10  = 1.7;
+  Int_t nlmatg10 = -4;
+  // --- DME 
   Float_t adme[5] = { 12.,1.,16.,19.,79. };
   Float_t zdme[5] = { 6.,1.,8.,9.,35. };
   Float_t wmatdme[5] = { .4056,.0961,.2562,.1014,.1407 };
+  Float_t densdme  = .00205;
+  Int_t nlmatdme = 5;
+  // ---- ALUMINA (AL203) 
   Float_t aal[2] = { 27.,16. };
   Float_t zal[2] = { 13.,8. };
   Float_t wmatal[2] = { 2.,3. };
-  //
-  Int_t nlmatdme;
-  Float_t epsil, stmin, dc, densg10, densal, deemax, stemax;
-  Float_t densdme;
-  Int_t nlmatg10, nlmatal;
-  //
-  // --- Vacuum
-  AliMaterial(0, "Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
-  // --- Air
+  Float_t densal  = 2.3;
+  Int_t nlmatal = -2;
+  // -- Water
+  Float_t awa[2] = {  1., 16. };
+  Float_t zwa[2] = {  1.,  8. };
+  Float_t wwa[2] = {  2.,  1. };
+  Float_t dwa    = 1.0;
+  Int_t nwa = -2;
+  //
+  //AliMaterial(0, "Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
   AliMaterial(1, "Air$",14.61,7.3,0.001205,30423.24,67500.);
-  // --- CO2 
-  dc = .001977;
-  AliMixture(7, "CO2$", ac, zc, dc, -2, wc);
-  // --- G10 
-  densg10  = 1.7;
-  nlmatg10 = -4;
+  AliMaterial(2, "Cu $",  63.54, 29.0, 8.96, 1.43, 14.8);
+  AliMaterial(3, "C  $",  12.01,  6.0, 2.265,18.8, 74.4);
+  AliMixture(4, "Polyethilene$", ape, zpe, dpe, npe, wpe);
   AliMixture(5, "G10$", ag10, zg10, densg10, nlmatg10, wmatg10);
-  // --- DME 
-  densdme  = .00205;
-  nlmatdme = 5;
   AliMixture(6, "DME ", adme, zdme, densdme, nlmatdme, wmatdme);
-  // ---- ALUMINA (AL203) 
-  densal  = 2.3;
-  nlmatal = -2;
+  AliMixture(7, "CO2$", ac, zc, dc, nc, wc);
   AliMixture(8, "ALUMINA$", aal, zal, densal, nlmatal, wmatal);
+  AliMaterial(9, "Al $", 26.98, 13., 2.7, 8.9, 37.2);
+  AliMaterial(10, "C-TRD$", 12.01, 6., 2.265*18.8/69.282*15./100, 18.8, 74.4); // for 15%
+  AliMixture(11, "Mylar$",  amy, zmy, dmy, nmy, wmy);
+  AliMixture(12, "Freon$",  afre, zfre, densfre, nfre, wfre);
+  AliMixture(13, "Quartz$", aq, zq, dq, nq, wq);
+  AliMixture(14, "Water$",  awa, zwa, dwa, nwa, wwa);
+
+  Float_t epsil, stmin, deemax, stemax;
   //       Previous data 
   //       EPSIL  =  0.1   ! Tracking precision, 
   //       STEMAX = 0.1      ! Maximum displacement for multiple scattering
@@ -556,13 +752,23 @@ void AliTOF::CreateMaterials()
   stemax = -1.;
   deemax = -.3;
   stmin  = -.8;
-  AliMedium(500, "Vacuum  $", 0, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(501, "Air $", 0, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(505, "G10$", 5, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(506, "DME$", 6, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(507, "CO2$", 7, 0, ISXFLD, SXMGMX, 10., -.01, -.1, .01, -.01);
-  AliMedium(508, "ALUMINA$", 8, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
-  AliMedium(510, "DME$", 6, 1, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+
+  AliMedium(1, "Air$", 1, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(2, "Cu $", 2, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(3, "C  $", 3, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(4, "Pol$", 4, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(5, "G10$", 5, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(6, "DME$", 6, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(7, "CO2$", 7, 0, ISXFLD, SXMGMX, 10., -.01, -.1, .01, -.01);
+  AliMedium(8, "ALUMINA$", 8, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(9, "Al Frame$", 9, 0, ISXFLD, SXMGMX, 10, stemax, deemax, epsil, stmin);
+  AliMedium(10, "DME-S$", 6, 1, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(11, "C-TRD$", 10, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(12, "Myl$", 11, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(13, "Fre$", 12, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(14, "Fre-S$", 12, 1, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(15, "Glass$", 13, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
+  AliMedium(16, "Water$", 14, 0, ISXFLD, SXMGMX, 10., stemax, deemax, epsil, stmin);
 }
 
 //_____________________________________________________________________________
@@ -580,20 +786,10 @@ void AliTOF::Init()
   //
   // Initialise TOF detector after it has been built
   //
-  Int_t i;
-  AliMC *pMC=AliMC::GetMC();
-  //
-  printf("\n");
-  for(i=0;i<35;i++) printf("*");
-  printf(" TOF_INIT ");
-  for(i=0;i<35;i++) printf("*");
-  printf("\n");
   //
   // Set id of TOF sensitive volume
-  fIdSens=pMC->VolId("FPG2");
+  if (IsVersion() !=0) fIdSens=gMC->VolId("FPAD");
   //
-  for(i=0;i<80;i++) printf("*");
-  printf("\n");
 }
 
  
@@ -623,5 +819,4 @@ AliTOFhit::AliTOFhit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits):
   // Time Of Flight
   fTof=hits[7];
 }
+