]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TPC/AliTPCv2.cxx
more secure string operations
[u/mrichter/AliRoot.git] / TPC / AliTPCv2.cxx
index ef9e9f73f649be7d84838cbbcea93e0d48137dc9..d28c80aab7a39824ac0882090dc52492b245213d 100644 (file)
@@ -50,6 +50,7 @@
 #include "TGeoPara.h"
 #include "TGeoPhysicalNode.h"
 #include "TGeoHalfSpace.h"
+#include "TTreeStream.h"
 
 ClassImp(AliTPCv2)
  
@@ -102,7 +103,7 @@ void AliTPCv2::CreateGeometry()
   // here I define a volume TPC
   // retrive the medium name with "TPC_" as a leading string
   //
-  TGeoPcon *tpc = new TGeoPcon(0.,360.,20); //20 sections
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,24); //24 sections
   //
   tpc->DefineSection(0,-291.,77.,278.);
   tpc->DefineSection(1,-270,77.,278.);
@@ -120,19 +121,25 @@ void AliTPCv2::CreateGeometry()
   tpc->DefineSection(9,-73.3,60.1,278.);
   //
   tpc->DefineSection(10,-73.3,56.9,278.); 
-  tpc->DefineSection(11,73.3,56.9,278.);
+  tpc->DefineSection(11,-68.5,56.9,278.);
   //
-  tpc->DefineSection(12,73.3,60.1,278.);
-  tpc->DefineSection(13,74.0,60.1,278.);
+  tpc->DefineSection(12,-68.5,60.,278.);
+  tpc->DefineSection(13,-65.,60.,278.);
   //
-  tpc->DefineSection(14,74.0,60.8,278.);
-  tpc->DefineSection(15,253.6,65.5,278.);
+  tpc->DefineSection(14,-65.,56.9,278.); 
+  tpc->DefineSection(15,73.3,56.9,278.);
   //
-  tpc->DefineSection(16,253.6,65.6,278.);
-  tpc->DefineSection(17,259.6,65.6,278.);
+  tpc->DefineSection(16,73.3,60.1,278.);
+  tpc->DefineSection(17,74.0,60.1,278.);
   //
-  tpc->DefineSection(18,259.6,70.0,278.);
-  tpc->DefineSection(19,291.,77.,278.);
+  tpc->DefineSection(18,74.0,60.8,278.);
+  tpc->DefineSection(19,253.6,65.5,278.);
+  //
+  tpc->DefineSection(20,253.6,65.6,278.);
+  tpc->DefineSection(21,259.6,65.6,278.);
+  //
+  tpc->DefineSection(22,259.6,70.0,278.);
+  tpc->DefineSection(23,291.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
   TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);
@@ -171,6 +178,8 @@ void AliTPCv2::CreateGeometry()
   TGeoMedium *m2 = gGeoManager->GetMedium("TPC_CO2");
   TGeoVolume *v2 = new TGeoVolume("TPC_OI",tpco,m2);
   //
+  TGeoRotation *segrot;//segment rotations
+  //
   // outer containment vessel
   //
   TGeoPcon *tocv = new TGeoPcon(0.,360.,6);  // containment vessel
@@ -187,10 +196,11 @@ void AliTPCv2::CreateGeometry()
   TGeoMedium *m3 = gGeoManager->GetMedium("TPC_Al");
   TGeoVolume *v3 = new TGeoVolume("TPC_OCV",tocv,m3); 
   //
-  TGeoTube *to1 = new TGeoTube(274.8174,277.995,252.1); //epoxy
-  TGeoTube *to2 = new TGeoTube(274.8274,277.985,252.1); //tedlar
-  TGeoTube *to3 = new TGeoTube(274.8312,277.9812,252.1);//prepreg2
-  TGeoTube *to4 = new TGeoTube(274.9062,277.9062,252.1);//nomex
+  TGeoTubeSeg *to1 = new TGeoTubeSeg(274.8174,277.995,252.1,0.,59.9); //epoxy
+  TGeoTubeSeg *to2 = new TGeoTubeSeg(274.8274,277.985,252.1,0.,59.9); //tedlar
+  TGeoTubeSeg *to3 = new TGeoTubeSeg(274.8312,277.9812,252.1,0.,59.9);//prepreg2
+  TGeoTubeSeg *to4 = new TGeoTubeSeg(274.9062,277.9062,252.1,0.,59.9);//nomex
+  TGeoTubeSeg *tog5 = new TGeoTubeSeg(274.8174,277.995,252.1,59.9,60.);//epoxy
   //
   TGeoMedium *sm1 = gGeoManager->GetMedium("TPC_Epoxy");
   TGeoMedium *sm2 = gGeoManager->GetMedium("TPC_Tedlar");
@@ -201,7 +211,8 @@ void AliTPCv2::CreateGeometry()
   TGeoVolume *tov2 = new TGeoVolume("TPC_OCV2",to2,sm2);
   TGeoVolume *tov3 = new TGeoVolume("TPC_OCV3",to3,sm3);
   TGeoVolume *tov4 = new TGeoVolume("TPC_OCV4",to4,sm4);
- //-------------------------------------------------------
+  TGeoVolume *togv5 = new TGeoVolume("TPC_OCVG5",tog5,sm1);
+  //-------------------------------------------------------
   //  Tpc Outer Field Cage
   //  daughters - composite (sandwich)
   //-------------------------------------------------------
@@ -219,23 +230,59 @@ void AliTPCv2::CreateGeometry()
   //
   TGeoVolume *v4 = new TGeoVolume("TPC_TOFC",tofc,m3); 
   //sandwich
-  TGeoTube *tf1 = new TGeoTube(258.0,260.0676,252.1); //tedlar
-  TGeoTube *tf2 = new TGeoTube(258.0038,260.0638,252.1); //prepreg3
-  TGeoTube *tf3 = new TGeoTube(258.0338,260.0338,252.1);//nomex
+  TGeoTubeSeg *tf1 = new TGeoTubeSeg(258.0,260.0676,252.1,0.,59.9); //tedlar
+  TGeoTubeSeg *tf2 = new TGeoTubeSeg(258.0038,260.0638,252.1,0.,59.9); //prepreg3
+  TGeoTubeSeg *tf3 = new TGeoTubeSeg(258.0338,260.0338,252.1,0.,59.9);//nomex
+  TGeoTubeSeg *tfg4 = new TGeoTubeSeg(258.0,260.0676,252.1,59.9,60.); //epoxy glue
   //
   TGeoMedium *sm5 = gGeoManager->GetMedium("TPC_Prepreg3");
   //
   TGeoVolume *tf1v = new TGeoVolume("TPC_OFC1",tf1,sm2);
   TGeoVolume *tf2v = new TGeoVolume("TPC_OFC2",tf2,sm5);
   TGeoVolume *tf3v = new TGeoVolume("TPC_OFC3",tf3,sm4);
+  TGeoVolume *tfg4v = new TGeoVolume("TPC_OFCG4",tfg4,sm1);
   //
   // outer part - positioning
   //
-  tov1->AddNode(tov2,1); tov2->AddNode(tov3,1); tov3->AddNode(tov4,1);
-  //
-  tf1v->AddNode(tf2v,1); tf2v->AddNode(tf3v,1);
-  //
-  v3->AddNode(tov1,1,new TGeoTranslation(0.,0.,-1.5)); v4->AddNode(tf1v,1);
+  tov1->AddNode(tov2,1); tov2->AddNode(tov3,1); tov3->AddNode(tov4,1);//ocv
+  //
+  tf1v->AddNode(tf2v,1); tf2v->AddNode(tf3v,1);//ofc
+  //
+  TGeoVolumeAssembly *t200 = new TGeoVolumeAssembly("TPC_OCVSEG");
+  TGeoVolumeAssembly *t300 = new TGeoVolumeAssembly("TPC_OFCSEG");
+  //
+  // assembly OCV and OFC
+  //
+  // 1st - no rotation
+  t200->AddNode(tov1,1); t200->AddNode(togv5,1);
+  t300->AddNode(tf1v,1); t300->AddNode(tfg4v,1);
+  // 2nd - rotation 60 deg
+  segrot = new TGeoRotation();
+  segrot->RotateZ(60.);
+  t200->AddNode(tov1,2,segrot); t200->AddNode(togv5,2,segrot);
+  t300->AddNode(tf1v,2,segrot); t300->AddNode(tfg4v,2,segrot);
+  // 3rd rotation 120 deg
+  segrot = new TGeoRotation();
+  segrot->RotateZ(120.);
+  t200->AddNode(tov1,3,segrot); t200->AddNode(togv5,3,segrot);
+  t300->AddNode(tf1v,3,segrot); t300->AddNode(tfg4v,3,segrot);
+  //4th rotation 180 deg
+  segrot = new TGeoRotation();
+  segrot->RotateZ(180.);
+  t200->AddNode(tov1,4,segrot); t200->AddNode(togv5,4,segrot);
+  t300->AddNode(tf1v,4,segrot); t300->AddNode(tfg4v,4,segrot);
+  //5th rotation 240 deg
+  segrot = new TGeoRotation();
+  segrot->RotateZ(240.);
+  t200->AddNode(tov1,5,segrot); t200->AddNode(togv5,5,segrot);
+  t300->AddNode(tf1v,5,segrot); t300->AddNode(tfg4v,5,segrot);
+  //6th rotation 300 deg
+  segrot = new TGeoRotation();
+  segrot->RotateZ(300.);
+  t200->AddNode(tov1,6,segrot); t200->AddNode(togv5,6,segrot);
+  t300->AddNode(tf1v,6,segrot); t300->AddNode(tfg4v,6,segrot);
+  //
+  v3->AddNode(t200,1,new TGeoTranslation(0.,0.,-1.5)); v4->AddNode(t300,1);
   //
   v2->AddNode(v3,1); v2->AddNode(v4,1); 
   //
@@ -311,51 +358,141 @@ void AliTPCv2::CreateGeometry()
   TGeoTube *t1 = new TGeoTube(76.6774,78.845,0.75);
   TGeoVolume *tv1 = new TGeoVolume("TPC_IFC2",t1,m3);
   // sandwich - outermost parts - 2 copies
-  TGeoTube *t2 = new TGeoTube(76.6774,78.845,74.175); // tedlar 38 microns
-  TGeoTube *t3 = new TGeoTube(76.6812,78.8412,74.175); // prepreg2 500 microns
-  TGeoTube *t4 = new TGeoTube(76.7312,78.7912,74.175); // prepreg3 300 microns
-  TGeoTube *t5 = new TGeoTube(76.7612,78.7612,74.175); // nomex 2 cm
   //
+  // segment outermost
+  //
+  TGeoTubeSeg *t2 = new TGeoTubeSeg(76.6774,78.845,74.175,350.,109.4); // tedlar 38 microns
+  TGeoTubeSeg *t3 = new TGeoTubeSeg(76.6812,78.8412,74.175,350.,109.4); // prepreg2 500 microns
+  TGeoTubeSeg *t4 = new TGeoTubeSeg(76.7312,78.7912,74.175,350.,109.4); // prepreg3 300 microns
+  TGeoTubeSeg *t5 = new TGeoTubeSeg(76.7612,78.7612,74.175,350.,109.4); // nomex 2 cm
+  TGeoTubeSeg *tepox1 = new TGeoTubeSeg(76.6774,78.845,74.175,109.4,110.);//epoxy
+  TGeoTubeSeg *tpr1 = new TGeoTubeSeg(78.845,78.885,74.175,109.,111.);
+  
+  // volumes for the outer part  
   TGeoVolume *tv2 = new TGeoVolume("TPC_IFC3",t2,sm2);
   TGeoVolume *tv3 = new TGeoVolume("TPC_IFC4",t3,sm3);
   TGeoVolume *tv4 = new TGeoVolume("TPC_IFC5",t4,sm5);
   TGeoVolume *tv5 = new TGeoVolume("TPC_IFC6",t5,sm4);
+  TGeoVolume *tvep1 = new TGeoVolume("TPC_IFEPOX1",tepox1,sm1); 
+  TGeoVolume *tvpr1 = new TGeoVolume("TPC_PRSTR1",tpr1,sm2); 
   //
   // middle parts - 2 copies
-  TGeoTube *t6 = new TGeoTube(76.6774,78.795,5.); // tedlar 38 microns
-  TGeoTube *t7 = new TGeoTube(76.6812,78.7912,5.); // prepreg2 250 microns
-  TGeoTube *t8 = new TGeoTube(76.7062,78.7662,5.); // prepreg3 300 microns
-  TGeoTube *t9 = new TGeoTube(76.7362,78.7362,5.); // nomex 2 cm
   //
+  // segment middle
+  //
+  TGeoTubeSeg *t6 = new TGeoTubeSeg(76.6774,78.795,5.,350.,109.4); // tedlar 38 microns
+  TGeoTubeSeg *t7 = new TGeoTubeSeg(76.6812,78.7912,5.,350.,109.4); // prepreg2 250 microns
+  TGeoTubeSeg *t8 = new TGeoTubeSeg(76.7062,78.7662,5.,350.,109.4); // prepreg3 300 microns
+  TGeoTubeSeg *t9 = new TGeoTubeSeg(76.7362,78.7362,5.,350.,109.4); // nomex 2 cm
+  TGeoTubeSeg *tepox2 = new TGeoTubeSeg(76.6774,78.795,5.,109.4,110.);//epoxy
+  TGeoTubeSeg *tpr2 = new TGeoTubeSeg(78.795,78.835,5.,109.,111.);
+  // volumes for the middle part
   TGeoVolume *tv6 = new TGeoVolume("TPC_IFC7",t6,sm2);
   TGeoVolume *tv7 = new TGeoVolume("TPC_IFC8",t7,sm3);
   TGeoVolume *tv8 = new TGeoVolume("TPC_IFC9",t8,sm5);
   TGeoVolume *tv9 = new TGeoVolume("TPC_IFC10",t9,sm4);
+  TGeoVolume *tvep2 = new TGeoVolume("TPC_IFEPOX2",tepox2,sm1);
+  TGeoVolume *tvpr2 = new TGeoVolume("TPC_PRSTR2",tpr2,sm2);
   // central part - 1 copy
-  TGeoTube *t10 = new TGeoTube(76.6774,78.745,93.75); // tedlar 38 microns 
-  TGeoTube *t11 = new TGeoTube(76.6812,78.7412,93.75); // prepreg3 300 microns
-  TGeoTube *t12 = new TGeoTube(76.7112,78.7112,93.75); // nomex 2 cm
-  //
+  // 
+  // segment central part
+  //
+  TGeoTubeSeg *t10 = new TGeoTubeSeg(76.6774,78.785,93.75,350.,109.4); // tedlar 38 microns 
+  TGeoTubeSeg *t11 = new TGeoTubeSeg(76.6812,78.7812,93.75,350.,109.4); // prepreg3 500 microns
+  TGeoTubeSeg *t12 = new TGeoTubeSeg(76.7312,78.7312,93.75,350.,109.4); // nomex 2 cm 
+  TGeoTubeSeg *tepox3 = new TGeoTubeSeg(76.6774,78.785,93.75,109.4,110.);//epoxy
+  TGeoTubeSeg *tpr3 = new TGeoTubeSeg(78.785,78.825,93.75,109.,111.);
+  // volumes for the central part
   TGeoVolume *tv10 = new TGeoVolume("TPC_IFC11",t10,sm2);
   TGeoVolume *tv11 = new TGeoVolume("TPC_IFC12",t11,sm5);
   TGeoVolume *tv12 = new TGeoVolume("TPC_IFC13",t12,sm4);
+  TGeoVolume *tvep3 = new TGeoVolume("TPC_IFEPOX3",tepox3,sm1);
+  TGeoVolume *tvpr3 = new TGeoVolume("TPC_PRSTR3",tpr3,sm2);  
   //
-  // inner part - positioning
+  // creating a sandwich for the outer par,t tv2 is the mother
   //
-  // creating a sandwich
   tv2->AddNode(tv3,1); tv3->AddNode(tv4,1); tv4->AddNode(tv5,1);
   //
+  // creating a sandwich for the middle part, tv6 is the mother
+  //
   tv6->AddNode(tv7,1); tv7->AddNode(tv8,1); tv8->AddNode(tv9,1);
   //
+  // creating a sandwich for the central part, tv10 is the mother
+  //
   tv10->AddNode(tv11,1); tv11->AddNode(tv12,1);
   //
-  TGeoVolumeAssembly *tv100 = new TGeoVolumeAssembly("TPC_IFC");
+  TGeoVolumeAssembly *tv100 = new TGeoVolumeAssembly("TPC_IFC"); // ifc itself - 3 segments
+
   //
-  tv100->AddNode(tv10,1);
-  tv100->AddNode(tv6,1,new TGeoTranslation(0.,0.,-98.75));
-  tv100->AddNode(tv6,2,new TGeoTranslation(0.,0.,98.75));
-  tv100->AddNode(tv2,1,new TGeoTranslation(0.,0.,-177.925));
+  // first segment - no rotation
+  //
+  // central
+  tv100->AddNode(tv10,1); //sandwich
+  tv100->AddNode(tvep3,1);//epoxy
+  tv100->AddNode(tvpr3,1);//prepreg strip                                   
+  // middle
+  tv100->AddNode(tv6,1,new TGeoTranslation(0.,0.,-98.75)); //sandwich1
+  tv100->AddNode(tv6,2,new TGeoTranslation(0.,0.,98.75)); // sandwich2
+  tv100->AddNode(tvep2,1,new TGeoTranslation(0.,0.,-98.75)); //epoxy
+  tv100->AddNode(tvep2,2,new TGeoTranslation(0.,0.,98.75)); //epoxy
+  tv100->AddNode(tvpr2,1,new TGeoTranslation(0.,0.,-98.75));//prepreg strip
+  tv100->AddNode(tvpr2,2,new TGeoTranslation(0.,0.,98.75));
+  // outer
+  tv100->AddNode(tv2,1,new TGeoTranslation(0.,0.,-177.925)); //sandwich
   tv100->AddNode(tv2,2,new TGeoTranslation(0.,0.,177.925));
+  tv100->AddNode(tvep1,1,new TGeoTranslation(0.,0.,-177.925)); //epoxy
+  tv100->AddNode(tvep1,2,new TGeoTranslation(0.,0.,177.925));
+  tv100->AddNode(tvpr1,1,new TGeoTranslation(0.,0.,-177.925));//prepreg strip
+  tv100->AddNode(tvpr1,2,new TGeoTranslation(0.,0.,-177.925));
+  //
+  // second segment - rotation 120 deg.
+  //
+  segrot = new TGeoRotation();
+  segrot->RotateZ(120.);
+  //
+  // central   
+  tv100->AddNode(tv10,2,segrot); //sandwich
+  tv100->AddNode(tvep3,2,segrot);//epoxy
+  tv100->AddNode(tvpr3,2,segrot);//prepreg strip
+  // middle
+  tv100->AddNode(tv6,3,new TGeoCombiTrans(0.,0.,-98.75,segrot)); //sandwich1
+  tv100->AddNode(tv6,4,new TGeoCombiTrans(0.,0.,98.75,segrot)); // sandwich2
+  tv100->AddNode(tvep2,3,new TGeoCombiTrans(0.,0.,-98.75,segrot)); //epoxy
+  tv100->AddNode(tvep2,4,new TGeoCombiTrans(0.,0.,98.75,segrot)); //epoxy
+  tv100->AddNode(tvpr2,3,new TGeoCombiTrans(0.,0.,-98.75,segrot));//prepreg strip
+  tv100->AddNode(tvpr2,4,new TGeoCombiTrans(0.,0.,98.75,segrot));
+  //outer
+  tv100->AddNode(tv2,3,new TGeoCombiTrans(0.,0.,-177.925,segrot));//sandwich
+  tv100->AddNode(tv2,4,new TGeoCombiTrans(0.,0.,177.925,segrot));
+  tv100->AddNode(tvep1,3,new TGeoCombiTrans(0.,0.,-177.925,segrot));//epoxy
+  tv100->AddNode(tvep1,4,new TGeoCombiTrans(0.,0.,177.925,segrot));
+  tv100->AddNode(tvpr1,3,new TGeoCombiTrans(0.,0.,-177.925,segrot));//prepreg strip
+  tv100->AddNode(tvpr1,4,new TGeoCombiTrans(0.,0.,177.925,segrot));
+  //
+  //  third segment - rotation 240 deg.
+  //
+  segrot = new TGeoRotation();
+  segrot->RotateZ(240.);
+  //
+  // central   
+  tv100->AddNode(tv10,3,segrot); //sandwich
+  tv100->AddNode(tvep3,3,segrot);//epoxy
+  tv100->AddNode(tvpr3,3,segrot);//prepreg strip
+  // middle
+  tv100->AddNode(tv6,5,new TGeoCombiTrans(0.,0.,-98.75,segrot)); //sandwich1
+  tv100->AddNode(tv6,6,new TGeoCombiTrans(0.,0.,98.75,segrot)); // sandwich2
+  tv100->AddNode(tvep2,5,new TGeoCombiTrans(0.,0.,-98.75,segrot)); //epoxy
+  tv100->AddNode(tvep2,6,new TGeoCombiTrans(0.,0.,98.75,segrot)); //epoxy
+  tv100->AddNode(tvpr2,5,new TGeoCombiTrans(0.,0.,-98.75,segrot));//prepreg strip
+  tv100->AddNode(tvpr2,6,new TGeoCombiTrans(0.,0.,98.75,segrot));
+  //outer
+  tv100->AddNode(tv2,5,new TGeoCombiTrans(0.,0.,-177.925,segrot));//sandwich
+  tv100->AddNode(tv2,6,new TGeoCombiTrans(0.,0.,177.925,segrot));
+  tv100->AddNode(tvep1,5,new TGeoCombiTrans(0.,0.,-177.925,segrot));//epoxy
+  tv100->AddNode(tvep1,6,new TGeoCombiTrans(0.,0.,177.925,segrot));
+  tv100->AddNode(tvpr1,5,new TGeoCombiTrans(0.,0.,-177.925,segrot));//prepreg strip
+  tv100->AddNode(tvpr1,6,new TGeoCombiTrans(0.,0.,177.925,segrot));
+  // Al parts - rings
   tv100->AddNode(tv1,1,new TGeoTranslation(0.,0.,-252.85));
   tv100->AddNode(tv1,2,new TGeoTranslation(0.,0.,252.85));
   //
@@ -372,22 +509,32 @@ void AliTPCv2::CreateGeometry()
   cfl->DefineSection(0,-71.1,59.7,61.2);
   cfl->DefineSection(1,-68.6,59.7,61.2);
   //
-  cfl->DefineSection(2,-68.6,60.6324,61.2);
-  cfl->DefineSection(3,68.6,60.6324,61.2); 
+  cfl->DefineSection(2,-68.6,60.6124,61.2);
+  cfl->DefineSection(3,68.6,60.6124,61.2); 
   //
   cfl->DefineSection(4,68.6,59.7,61.2);
   cfl->DefineSection(5,71.1,59.7,61.2);  
   //
   TGeoVolume *cflv = new TGeoVolume("TPC_CDR",cfl,m3);
   // sandwich
-  TGeoTube *cd1 = new TGeoTube(60.6424,61.19,71.1);
-  TGeoTube *cd2 = new TGeoTube(60.6462,61.1862,71.1);
-  TGeoTube *cd3 = new TGeoTube(60.6662,61.1662,71.1);  
+  TGeoTubeSeg *cd1 = new TGeoTubeSeg(60.6224,61.19,71.1,0.1,119.9);
+  TGeoTubeSeg *cd2 = new TGeoTubeSeg(60.6262,61.1862,71.1,0.1,119.9);
+  TGeoTubeSeg *cd3 = new TGeoTubeSeg(60.6462,61.1662,71.1,0.1,119.9);
+  TGeoTubeSeg *cd4 = new TGeoTubeSeg(60.6562,61.1562,71.1,0.1,119.9);
+  TGeoTubeSeg *tepox4 = new TGeoTubeSeg(60.6224,61.19,71.1,359.9,0.1);
+  //  TGeoTube *cd1 = new TGeoTube(60.6224,61.19,71.1);
+  //  TGeoTube *cd2 = new TGeoTube(60.6262,61.1862,71.1);
+  //  TGeoTube *cd3 = new TGeoTube(60.6462,61.1662,71.1);  
+  //  TGeoTube *cd4 = new TGeoTube(60.6562,61.1562,71.1);  
   //
   TGeoMedium *sm6 = gGeoManager->GetMedium("TPC_Prepreg1");
+  TGeoMedium *sm8 = gGeoManager->GetMedium("TPC_Epoxyfm");
   TGeoVolume *cd1v = new TGeoVolume("TPC_CDR1",cd1,sm2); //tedlar
   TGeoVolume *cd2v = new TGeoVolume("TPC_CDR2",cd2,sm6);// prepreg1
-  TGeoVolume *cd3v = new TGeoVolume("TPC_CDR3",cd3,sm4); //nomex
+  TGeoVolume *cd3v = new TGeoVolume("TPC_CDR3",cd3,sm8); //epoxy film
+  TGeoVolume *cd4v = new TGeoVolume("TPC_CDR4",cd4,sm4); //nomex
+  TGeoVolume *tvep4 = new TGeoVolume("TPC_IFEPOX4",tepox4,sm1);
+
   //
   // seals for central drum 2 copies
   //
@@ -417,7 +564,17 @@ void AliTPCv2::CreateGeometry()
   //
   TGeoRotation *ref = new TGeoRotation("ref",90.,0.,90.,90.,180.,0.);
   //
-  cd1v->AddNode(cd2v,1); cd2v->AddNode(cd3v,1); cflv->AddNode(cd1v,1);
+  cd1v->AddNode(cd2v,1); cd2v->AddNode(cd3v,1); cd3v->AddNode(cd4v,1); //sandwich
+  // first segment  
+  cflv->AddNode(cd1v,1); cflv->AddNode(tvep4,1);
+  // second segment
+  segrot = new TGeoRotation();
+  segrot->RotateZ(120.);
+  cflv->AddNode(cd1v,2,segrot); cflv->AddNode(tvep4,2,segrot);
+  // third segment
+  segrot = new TGeoRotation();
+  segrot->RotateZ(240.);
+  cflv->AddNode(cd1v,3,segrot); cflv->AddNode(tvep4,3,segrot);
   //
   v1->AddNode(siv,1,new TGeoTranslation(0.,0.,-69.9));
   v1->AddNode(siv,2,new TGeoTranslation(0.,0.,69.9));
@@ -425,17 +582,23 @@ void AliTPCv2::CreateGeometry()
   //
   // central membrane - 2 rings and a mylar membrane - assembly
   //
-  TGeoTube *ih = new TGeoTube(80.1,84.1,0.2);
-  TGeoTube *oh = new TGeoTube(250.,265.,0.2);
-  TGeoTube *mem = new TGeoTube(84.05,250,0.01);
+  TGeoTube *ih = new TGeoTube(81.05,84.05,0.3);
+  TGeoTube *oh = new TGeoTube(250.,256.,0.5);
+  TGeoTube *mem = new TGeoTube(84.05,250.,0.00115);
+
+  //
+  TGeoMedium *m4 = gGeoManager->GetMedium("TPC_G10");
+  //
   TGeoVolume *ihv = new TGeoVolume("TPC_IHVH",ih,m3);
   TGeoVolume *ohv = new TGeoVolume("TPC_OHVH",oh,m3);
+  
   TGeoVolume *memv = new TGeoVolume("TPC_HV",mem,sm7);
   //
   TGeoVolumeAssembly *cm = new TGeoVolumeAssembly("TPC_HVMEM");
   cm->AddNode(ihv,1);
   cm->AddNode(ohv,1);
   cm->AddNode(memv,1);
   v9->AddNode(cm,1);
   //
   // end caps - they are make as an assembly of single segments
@@ -509,15 +672,15 @@ void AliTPCv2::CreateGeometry()
    fileName += "/TPC/conn_iroc.dat";
    ifstream in;
    in.open(fileName.Data(), ios_base::in); // asci file
+   TGeoRotation *rrr[86];
    for(Int_t i =0;i<86;i++){
       Double_t y = 3.99;
       Double_t x,z,ang;
       in>>x>>z>>ang;
       z-=26.5;
-      TGeoRotation *rrr = new TGeoRotation();
-      rrr->RotateY(ang);
-      TGeoCombiTrans *trans = new TGeoCombiTrans("trans",x,y,z,rrr);
-      ibdv->AddNode(connv,i+1,trans);
+      rrr[i]= new TGeoRotation();
+      rrr[i]->RotateY(ang);
+      ibdv->AddNode(connv,i+1,new TGeoCombiTrans(x,y,z,rrr[i]));
    }
    in.close();
    // "cap"
@@ -532,7 +695,6 @@ void AliTPCv2::CreateGeometry()
    // pad plane and wire fixations
    //
    TGeoTrd1 *pp = new TGeoTrd1(14.5974,23.3521,0.3,24.825); //pad+iso
-   TGeoMedium *m4 = gGeoManager->GetMedium("TPC_G10");
    TGeoVolume *ppv = new TGeoVolume("TPC_IRPP",pp,m4);
    TGeoPara *f1 = new TGeoPara(.6,.5,24.825,0.,-10.,0.);
    TGeoVolume *f1v = new TGeoVolume("TPC_IRF1",f1,m4);
@@ -627,6 +789,7 @@ void AliTPCv2::CreateGeometry()
    fileName = gSystem->Getenv("ALICE_ROOT");
    fileName += "/TPC/conn_oroc.dat";
    in.open(fileName.Data(), ios_base::in); // asci file
+   TGeoRotation *rr[78];
    for(Int_t i =0;i<78;i++){
       Double_t y =3.89;
       Double_t x,z,ang;
@@ -637,14 +800,13 @@ void AliTPCv2::CreateGeometry()
       //
       x1=xr+x; x2=-xr+x; z1=zr+z; z2 = -zr+z;      
       //
-      TGeoRotation *rr = new TGeoRotation();
-      rr->RotateY(ang); 
+      rr[i]= new TGeoRotation();
+      rr[i]->RotateY(ang); 
       z1-=54.95;
       z2-=54.95;
-      TGeoCombiTrans *trans1 = new TGeoCombiTrans("trans1",x1,y,z1,rr);
-      TGeoCombiTrans *trans2 = new TGeoCombiTrans("trans2",x2,y,z2,rr);
-      obdv->AddNode(connv,i+1,trans1);
-      obdv->AddNode(connv,i+79,trans2);
+      //
+      obdv->AddNode(connv,i+1,new TGeoCombiTrans(x1,y,z1,rr[i]));
+      obdv->AddNode(connv,i+79,new TGeoCombiTrans(x2,y,z2,rr[i]));
    }
    in.close();
    // cap
@@ -713,12 +875,13 @@ void AliTPCv2::CreateGeometry()
    TGeoVolumeAssembly *wheela = new TGeoVolumeAssembly("TPC_ENDCAP");
    TGeoVolumeAssembly *wheelc = new TGeoVolumeAssembly("TPC_ENDCAP");
    //
+   TGeoRotation *rwh[18]; 
    for(Int_t i =0;i<18;i++){
      Double_t phi = (20.*i);
-     TGeoRotation *r = new TGeoRotation();
-     r->RotateZ(phi);
-     wheela->AddNode(secta,i+1,r);
-     wheelc->AddNode(sectc,i+1,r); 
+     rwh[i]=new TGeoRotation();
+     rwh[i]->RotateZ(phi);
+     wheela->AddNode(secta,i+1,rwh[i]);
+     wheelc->AddNode(sectc,i+1,rwh[i]); 
     
    }
    // wheels in the drift volume!   
@@ -779,12 +942,13 @@ void AliTPCv2::CreateGeometry()
   //
   // SSW as an Assembly of sectors
   //
- TGeoVolumeAssembly *swheel = new TGeoVolumeAssembly("TPC_SSWHEEL");
+  TGeoRotation *rsw[18];
+  TGeoVolumeAssembly *swheel = new TGeoVolumeAssembly("TPC_SSWHEEL");
    for(Int_t i =0;i<18;i++){
      Double_t phi = (20.*i);
-     TGeoRotation *r = new TGeoRotation();
-     r->RotateZ(phi);
-     swheel->AddNode(swhs,i+1,r);   
+     rsw[i] = new TGeoRotation();
+     rsw[i]->RotateZ(phi);
+     swheel->AddNode(swhs,i+1,rsw[i]);   
    }
    v1->AddNode(swheel,1,new TGeoTranslation(0.,0.,-284.6));
    v1->AddNode(swheel,2,new TGeoTranslation(0.,0.,284.6));
@@ -955,7 +1119,7 @@ void AliTPCv2::CreateGeometry()
   spart->AddNode(bconv,i,transf[i]);
   }
   for(Int_t i =0;i<11;i++){
-    spart->AddNode(hookv,i+1,new TGeoTranslation(0.,-2.3,-7.5+i*1.5));
+    spart->AddNode(hookv,i+1,new TGeoTranslation(0.,-2.315,-7.5+i*1.5));
   } 
  //
  // long rod
@@ -964,10 +1128,10 @@ void AliTPCv2::CreateGeometry()
   //
   lpart->AddNode( rodlv,1);
   for(Int_t i=0;i<13;i++){
-  lpart->AddNode(bconv,i,transf[i]);
+  lpart->AddNode(bconv,i+12,transf[i]);
   }
   for(Int_t i =0;i<13;i++){
-    lpart->AddNode(hookv,i+1,new TGeoTranslation(0.,-2.3,-9.+i*1.5));
+    lpart->AddNode(hookv,i+12,new TGeoTranslation(0.,-2.315,-9.+i*1.5));
   }   
   //
   // alu ring
@@ -980,24 +1144,24 @@ void AliTPCv2::CreateGeometry()
   //
   // rod assembly
   //
-  TGeoVolumeAssembly *tpcrod = new TGeoVolumeAssembly("TPC_rod");//rrod
+  TGeoVolumeAssembly *tpcrrod = new TGeoVolumeAssembly("TPC_rrod");//rrod
   TGeoVolumeAssembly *tpcmrod = new TGeoVolumeAssembly("TPC_mrod");//makrolon rod  
   //long pieces
   for(Int_t i=0;i<11;i++){
-    tpcrod->AddNode(ringv,i+1,new TGeoTranslation(0.,0.,-105.+i*21));
+    tpcrrod->AddNode(ringv,i+1,new TGeoTranslation(0.,0.,-105.+i*21));
     tpcmrod->AddNode(ringv,i+12,new TGeoTranslation(0.,0.,-105.+i*21));
   }
   for(Int_t i=0;i<10;i++){
-    tpcrod->AddNode(lpart,i+1,new TGeoTranslation(0.,0.,-94.5+i*21));
+    tpcrrod->AddNode(lpart,i+1,new TGeoTranslation(0.,0.,-94.5+i*21));
     tpcmrod->AddNode(mrodl,i+1,new TGeoTranslation(0.,0.,-94.5+i*21));     
   }
   //
   // short pieces
   //
-  tpcrod->AddNode(spart,1,new TGeoTranslation(0.,0.,-114.));
-  tpcrod->AddNode(spart,2,new TGeoTranslation(0.,0.,114.)); 
-  tpcrod->AddNode(ringv,23,new TGeoTranslation(0.,0.,-123.));
-  tpcrod->AddNode(ringv,24,new TGeoTranslation(0.,0.,123.));
+  tpcrrod->AddNode(spart,1,new TGeoTranslation(0.,0.,-114.));
+  tpcrrod->AddNode(spart,2,new TGeoTranslation(0.,0.,114.)); 
+  tpcrrod->AddNode(ringv,23,new TGeoTranslation(0.,0.,-123.));
+  tpcrrod->AddNode(ringv,24,new TGeoTranslation(0.,0.,123.));
   //
   tpcmrod->AddNode(mrods,1,new TGeoTranslation(0.,0.,-114.));
   tpcmrod->AddNode(mrods,2,new TGeoTranslation(0.,0.,114.)); 
@@ -1022,20 +1186,20 @@ void AliTPCv2::CreateGeometry()
   //
   lpv2->AddNode(lrv,1,new TGeoTranslation(0.,0.,-125.3));
   //
-  tpcrod->AddNode(lpv2,1); 
+  tpcrrod->AddNode(lpv2,1); 
   tpcmrod->AddNode(lpv1,1);
   //
   //  right plaque
   //
-  TGeoTube *rp = new TGeoTube(1.92,2.08,2.25);
+  TGeoTube *rp = new TGeoTube(1.92,2.08,2.025);
   TGeoVolume *rpv = new TGeoVolume("TPC_rpv",rp,m6);
-  tpcrod->AddNode(rpv,1, new TGeoTranslation(0.,0.,125.35)); 
-  tpcmrod->AddNode(rpv,2,new TGeoTranslation(0.,0.,125.35));
+  tpcrrod->AddNode(rpv,1, new TGeoTranslation(0.,0.,125.125)); 
+  tpcmrod->AddNode(rpv,2,new TGeoTranslation(0.,0.,125.125));
   //
   //
   //HV rods - makrolon + 0.58cm (diameter) Cu
-  TGeoTube *hvr = new TGeoTube(0.,1.465,126.7);
-  TGeoTube *hvc = new TGeoTube(0.,0.29,126.7);
+  TGeoTube *hvr = new TGeoTube(0.,1.465,126.5);
+  TGeoTube *hvc = new TGeoTube(0.,0.29,126.5);
   //
   TGeoVolume *hvrv = new TGeoVolume("TPC_HV_Rod",hvr,m6);
   TGeoVolume *hvcv = new TGeoVolume("TPC_HV_Cable",hvc,m7);
@@ -1043,10 +1207,10 @@ void AliTPCv2::CreateGeometry()
   //
   //resistor rod
   //
-  TGeoTube *cr = new TGeoTube(0.,0.45,126.7);   
-  TGeoTube *cw = new TGeoTube(0.,0.15,126.7);  
+  TGeoTube *cr = new TGeoTube(0.,0.45,126.2);   
+  TGeoTube *cw = new TGeoTube(0.,0.15,126.2);  
   TGeoVolume *crv = new TGeoVolume("TPC_CR",cr,m10);
-  TGeoVolume *cwv = new TGeoVolume("TPC_W",cw,m11);   
+  TGeoVolume *cwv = new TGeoVolume("TPC_W",cw,m12);   
   //
   // ceramic rod with water
   //
@@ -1054,8 +1218,8 @@ void AliTPCv2::CreateGeometry()
   //
   //peek rod
   //
-  TGeoTube *pr =new TGeoTube(0.2,0.35,126.7);  
-  TGeoVolume *prv = new TGeoVolume("TPC_PR",pr,m12); 
+  TGeoTube *pr =new TGeoTube(0.2,0.35,126.2);  
+  TGeoVolume *prv = new TGeoVolume("TPC_PR",pr,m11); 
   //
   // copper plates with connectors
   //
@@ -1117,7 +1281,7 @@ ctr1->RegisterYourself();
  // resistor rod assembly 2 ceramic rods, peak rod, Cu plates
  // and resistors
  //
- TGeoVolumeAssembly *rrod = new TGeoVolumeAssembly("TPC_RROD");
+ TGeoVolumeAssembly *rrod = new TGeoVolumeAssembly("TPC_RRIN");
  // rods
  rrod->AddNode(crv,1,ttr11);
  rrod->AddNode(crv,2,ttr22); 
@@ -1142,14 +1306,43 @@ ctr1->RegisterYourself();
    rrod->AddNode(ress,i+1, new TGeoCombiTrans(0.,1.2,-121.925+i*1.5,crr2));
    rrod->AddNode(ress,i+2, new TGeoCombiTrans(0.,1.2,-121.925+(i+1)*1.5,crr3));
  }
- rrod->AddNode(tpcrod,1,new TGeoCombiTrans(0.,0.,0.9,crr1));
 
+ tpcrrod->AddNode(rrod,1,new TGeoCombiTrans(0.,0.,0.5,crr1));
+ //
+ // guard ring resistor chain
+ //
+
+ TGeoTube *gres1 = new TGeoTube(0.,0.375,125.);// inside ifc
+ //
+ TGeoVolume *vgres1 = new TGeoVolume("TPC_GRES1",gres1,m10);
+
+ //
+ Double_t xrc,yrc;
+ //
+ xrc=79.3*TMath::Cos(350.*TMath::DegToRad());
+ yrc=79.3*TMath::Sin(350.*TMath::DegToRad());
+ //
+ v9->AddNode(vgres1,1,new TGeoTranslation(xrc,yrc,126.9));
+ v9->AddNode(vgres1,2,new TGeoTranslation(xrc,yrc,-126.9));
+ //
+ xrc=79.3*TMath::Cos(190.*TMath::DegToRad());
+ yrc=79.3*TMath::Sin(190.*TMath::DegToRad()); 
+ //
+ v9->AddNode(vgres1,3,new TGeoTranslation(xrc,yrc,126.9));
+ v9->AddNode(vgres1,4,new TGeoTranslation(xrc,yrc,-126.9));
  //------------------------------------------------------------------
  TGeoRotation refl("refl",90.,0.,90.,90.,180.,0.);
  TGeoRotation rotrod("rotrod");
- TGeoRotation *rotpos = new TGeoRotation("rotpos");
  //
- TGeoRotation *rotrod1 = new TGeoRotation("rotrod1");
+ TGeoRotation *rotpos[2]; 
+ //
+ TGeoRotation *rotrod1[2]; 
+ TGeoTubeSeg *irh = new TGeoTubeSeg(78.825,79.25,1.5,358.5,1.5);
+ TGeoTubeSeg *orh = new TGeoTubeSeg(256.5,257.95,1.5,359.5,0.5);
+ TGeoTubeSeg *ohh = new TGeoTubeSeg(256.5,257.95,1.5,9.5,10.5);
+  TGeoVolume *irhv = new TGeoVolume("TPC_IRHH",irh,m4);
+  TGeoVolume *orhv = new TGeoVolume("TPC_ORHH",orh,m4);
+  TGeoVolume *ohhv = new TGeoVolume("TPC_OHVHH",ohh,m4);
   
  //v9 - drift gas
 
@@ -1157,18 +1350,27 @@ ctr1->RegisterYourself();
     Double_t angle,x,y;
     Double_t z,r; 
     angle=TMath::DegToRad()*20.*(Double_t)i;
+    TGeoRotation *roth = new TGeoRotation(); //rotation for rod holders
+    roth->RotateZ(angle);
     //inner rods
     r=81.5;
     x=r * TMath::Cos(angle);
     y=r * TMath::Sin(angle);
-    z = 126.;
+    z = 126.1;
+    //
+    v9->AddNode(irhv,i+1,roth);
+    v9->AddNode(orhv,i+1,roth);
+    v9->AddNode(ohhv,i+1,roth);
     //
     if(i==11){//resistor rod inner
        rotrod.RotateZ(-90.+angle);
-       rotrod1->RotateZ(-90.+angle);
-       *rotpos = refl*rotrod; //rotation+reflection
-       v9->AddNode(rrod,1,new TGeoCombiTrans(x,y, z, rotrod1)); //A
-       v9->AddNode(rrod,2,new TGeoCombiTrans(x,y,-z, rotpos)); //C      
+       rotrod1[0]= new TGeoRotation();
+       rotpos[0]= new TGeoRotation();
+       //
+       rotrod1[0]->RotateZ(-90.+angle);
+       *rotpos[0] = refl*rotrod; //rotation+reflection
+       v9->AddNode(tpcrrod,1,new TGeoCombiTrans(x,y, z, rotrod1[0])); //A
+       v9->AddNode(tpcrrod,2,new TGeoCombiTrans(x,y,-z, rotpos[0])); //C      
     } 
     else { 
       v9->AddNode(tpcmrod,i+1,new TGeoTranslation(x,y,z));//shaft
@@ -1178,24 +1380,23 @@ ctr1->RegisterYourself();
     r=254.25;
     x=r * TMath::Cos(angle);
     y=r * TMath::Sin(angle);
-    z=126.;
-    rotrod.RotateZ(90.+angle);
-    rotrod1->RotateZ(90.+angle);
-    *rotpos = refl*rotrod;//rotation+reflection
+    z=126.3;
     //
     if(i==3){//resistor rod outer
       rotrod.RotateZ(90.+angle);
-      rotrod1->RotateZ(90.+angle);
-      *rotpos = refl*rotrod;//rotation+reflection
-      v9->AddNode(rrod,3,new TGeoCombiTrans(x,y, z, rotrod1)); //A 
-      v9->AddNode(rrod,4,new TGeoCombiTrans(x,y, -z, rotpos)); //C
+      rotrod1[1]= new TGeoRotation();
+      rotpos[1]= new TGeoRotation();
+      rotrod1[1]->RotateZ(90.+angle);
+      *rotpos[1] = refl*rotrod;//rotation+reflection
+      v9->AddNode(tpcrrod,3,new TGeoCombiTrans(x,y, z, rotrod1[1])); //A 
+      v9->AddNode(tpcrrod,4,new TGeoCombiTrans(x,y, -z, rotpos[1])); //C
     }
     else {
       v9->AddNode(tpcmrod,i+37,new TGeoTranslation(x,y,z));//shaft
       v9->AddNode(tpcmrod,i+55,new TGeoCombiTrans(x,y,-z,ref));//muon      
     }
     if(i==15){
-      v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z)); //hv->A-side only      
+      v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z+0.7)); //hv->A-side only      
     }
   } //end of rods positioning
 
@@ -1448,14 +1649,14 @@ void AliTPCv2::Init()
   gMC->SetMaxNStep(-30000); // max. number of steps increased
 
   if (fPrimaryIonisation) {
+    // for FLUKA
       gMC->Gstpar(idtmed[2],"PRIMIO_E", 20.77); // 1st ionisation potential
  
       gMC->Gstpar(idtmed[2],"PRIMIO_N", 14.35);
       gMC->Gstpar(idtmed[2],"LOSS", 14); // specific energy loss
       gMC->Gstpar(idtmed[2],"STRA",4);
-  } else {
-      gMC->Gstpar(idtmed[2],"LOSS", 5); // specific energy loss
-  }
+  } 
+  // specific energy loss for geant3 is now defined in galice.cuts
 
 
   AliDebug(1,"*** TPC version 2 initialized ***");
@@ -1489,7 +1690,7 @@ void AliTPCv2::StepManager()
   
   vol[1]=0; // preset row number to 0
   //
-  if (fPrimaryIonisation) gMC->SetMaxStep(kbig);
+  if (!fPrimaryIonisation) gMC->SetMaxStep(kbig);
   
   if(!gMC->IsTrackAlive()) return; // particle has disappeared
   
@@ -1620,7 +1821,27 @@ void AliTPCv2::StepManager()
     hits[4]=gMC->TrackTime();
  
     AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits);
-
+    if (fDebugStreamer){   
+      // You can dump here what you need
+      // function  CreateDebugStremer() to be called in the Config.C  macro
+      // if you want to enable it
+      // By default debug streaemer is OFF
+      Float_t edep = gMC->Edep();
+      Float_t tstep = gMC->TrackStep();
+      Int_t pid=gMC->TrackPid();
+      (*fDebugStreamer)<<"hit"<<      
+       "x="<<hits[0]<<  // hit position
+       "y="<<hits[1]<<
+       "z="<<hits[2]<<
+       "nel="<<hits[3]<<  // number of electorns
+       "tof="<<hits[4]<<  // hit TOF
+       "edep="<<edep<<    // energy deposit
+       "pid="<<pid<<      // pid
+       "step="<<tstep<<
+       "p.="<<&p<<
+       "\n";
+    }
+    
   } // step>0 
   } //within sector's limits
   // Stemax calculation for the next step