]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TPC/AliTPCv3.cxx
Updated list of libraries
[u/mrichter/AliRoot.git] / TPC / AliTPCv3.cxx
index a6119da0fcbe1e07d3d690bfb0b38697a4d84ef6..d7f97e4ff48979aecc3f5dc6ce95dc6240a18922 100644 (file)
@@ -41,6 +41,7 @@
 
 #include "AliConst.h"
 #include "AliRun.h"
+#include "AliMathBase.h"
 #include "AliTPCDigitsArray.h"
 #include "AliTPCParam.h"
 #include "AliTPCParamSR.h"
 #include "AliMC.h"
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
+#include "TGeoCone.h"
 #include "TGeoPcon.h"
 #include "TGeoTube.h"
 #include "TGeoPgon.h"
 #include "TGeoTrd1.h"
 #include "TGeoCompositeShape.h"
 #include "TGeoPara.h"
+#include "TGeoPhysicalNode.h"
+#include "TGeoHalfSpace.h"
+#include "TTreeStream.h"
+#include "TGeoArb8.h"
 
+using std::ifstream;
+using std::ios_base;
 ClassImp(AliTPCv3)
 //_____________________________________________________________________________
 
@@ -113,33 +121,53 @@ void AliTPCv3::CreateGeometry()
   // here I define a volume TPC
   // retrive the medium name with "TPC_" as a leading string
   //
-  TGeoPcon *tpc = new TGeoPcon(0.,360.,18); //18 sections
-  tpc->DefineSection(0,-290.,77.,278.);
-  tpc->DefineSection(1,-259.6,70.,278.);
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,30); //30 sections
   //
-  tpc->DefineSection(2,-259.6,68.1,278.);
-  tpc->DefineSection(3,-253.6,68.1,278.);
+  tpc->DefineSection(0,-289.6,77.,278.);
+  tpc->DefineSection(1,-262.1,77.,278.);
   //
-  tpc->DefineSection(4,-253.6,68.,278.);
-  tpc->DefineSection(5,-74.0,60.8,278.);
+  tpc->DefineSection(2,-262.1,83.1,278.);
+  tpc->DefineSection(3,-260.,83.1,278.);
   //
-  tpc->DefineSection(6,-74.0,60.1,278.);
-  tpc->DefineSection(7,-73.3,60.1,278.);
+  tpc->DefineSection(4,-260.,70.,278.);    
+  tpc->DefineSection(5,-259.6,70.,278.);
   //
-  tpc->DefineSection(8,-73.3,56.9,278.); 
-  tpc->DefineSection(9,73.3,56.9,278.);
+  tpc->DefineSection(6,-259.6,68.1,278.);
+  tpc->DefineSection(7,-253.6,68.1,278.);
   //
-  tpc->DefineSection(10,73.3,60.1,278.);
-  tpc->DefineSection(11,74.0,60.1,278.);
+  tpc->DefineSection(8,-253.6,67.88,278.);//hs
+  tpc->DefineSection(9,-74.0,60.68,278.);// hs
   //
-  tpc->DefineSection(12,74.0,60.8,278.);
-  tpc->DefineSection(13,253.6,65.5,278.);
+  tpc->DefineSection(10,-74.0,60.1,278.);
+  tpc->DefineSection(11,-73.3,60.1,278.);
   //
-  tpc->DefineSection(14,253.6,65.6,278.);
-  tpc->DefineSection(15,259.6,65.6,278.);
+  tpc->DefineSection(12,-73.3,56.9,278.); 
+  tpc->DefineSection(13,-68.5,56.9,278.);
   //
-  tpc->DefineSection(16,259.6,70.0,278.);
-  tpc->DefineSection(17,290.,77.,278.);
+  tpc->DefineSection(14,-68.5,60.,278.);
+  tpc->DefineSection(15,-64.7,60.,278.);
+  //
+  tpc->DefineSection(16,-64.7,56.9,278.); 
+  tpc->DefineSection(17,73.3,56.9,278.);
+  //
+  tpc->DefineSection(18,73.3,60.1,278.);
+  tpc->DefineSection(19,74.0,60.1,278.);
+  //
+  tpc->DefineSection(20,74.0,60.68,278.);// hs
+  tpc->DefineSection(21,253.6,65.38,278.);// hs
+  //
+  tpc->DefineSection(22,253.6,65.6,278.);
+  tpc->DefineSection(23,259.6,65.6,278.);
+  //
+  tpc->DefineSection(24,259.6,70.0,278.);
+  tpc->DefineSection(25,260.,70.0,278.);
+  //
+  tpc->DefineSection(26,260.,83.1,278.);
+  tpc->DefineSection(27,262.1,83.1,278.);
+  //
+  tpc->DefineSection(28,262.1,77.,278);
+  tpc->DefineSection(29,289.6,77.,278.);
+
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
   TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);
@@ -157,7 +185,7 @@ void AliTPCv3::CreateGeometry()
   dvol->DefineSection(4,253.6,74.5,264.4);
   dvol->DefineSection(5,260.,74.5,264.4);
   //
-  TGeoMedium *m5 = gGeoManager->GetMedium("TPC_Ne-CO2-N-2");
+  TGeoMedium *m5 = gGeoManager->GetMedium("TPC_DriftGas2");
   TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
   //
   v1->AddNode(v9,1);
@@ -208,7 +236,9 @@ void AliTPCv3::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);
-
+  //
+  TGeoMedium *mhs = gGeoManager->GetMedium("TPC_Steel");
+  TGeoMedium *m12 =  gGeoManager->GetMedium("TPC_Water");
   //-------------------------------------------------------
   //  Tpc Outer Field Cage
   //  daughters - composite (sandwich)
@@ -297,6 +327,16 @@ void AliTPCv3::CreateGeometry()
   tcms->DefineSection(9,-71.3,56.9,58.8);
   //
   TGeoVolume *v7 = new TGeoVolume("TPC_ICVM",tcms,m3);
+  //------------------------------------------------
+  //  Heat screen muon side
+  //------------------------------------------------
+  TGeoCone *thsm = new TGeoCone(89.8,67.88,68.1,60.68,60.9);
+  TGeoCone *thsmw = new TGeoCone(89.8,67.94,68.04,60.74,60.84);
+  TGeoVolume *hvsm = new TGeoVolume("TPC_HSM",thsm,mhs); //steel
+  TGeoVolume *hvsmw = new TGeoVolume("TPC_HSMW",thsmw,m12); //water 
+  // assembly heat screen muon
+  hvsm->AddNode(hvsmw,1);
   //-----------------------------------------------
   // inner containment vessel - shaft side
   //-----------------------------------------------
@@ -318,6 +358,15 @@ void AliTPCv3::CreateGeometry()
   tcss->DefineSection(9,258.1,65.6,74.2);
   //
   TGeoVolume *v8 = new TGeoVolume("TPC_ICVS",tcss,m3);
+  //-------------------------------------------------
+  //  Heat screen shaft side
+  //--------------------------------------------------
+  TGeoCone *thss = new TGeoCone(89.8,60.68,60.9,65.38,65.6);       
+  TGeoCone *thssw = new TGeoCone(89.8,60.74,60.84,65.44,65.54);     
+  TGeoVolume *hvss = new TGeoVolume("TPC_HSS",thss,mhs); //steel
+  TGeoVolume *hvssw = new TGeoVolume("TPC_HSSW",thssw,m12); //water 
+  //assembly heat screen shaft
+  hvss->AddNode(hvssw,1);
   //-----------------------------------------------
   //  Inner field cage
   //  define 4 parts and make an assembly
@@ -377,6 +426,8 @@ void AliTPCv3::CreateGeometry()
   v5->AddNode(v6,1, new TGeoTranslation(0.,0.,-252.1));
   v5->AddNode(v6,2, new TGeoTranslation(0.,0.,252.1));
   v1->AddNode(v5,1); v1->AddNode(v7,1); v1->AddNode(v8,1); 
+  v1->AddNode(hvsm,1,new TGeoTranslation(0.,0.,-163.8)); 
+  v1->AddNode(hvss,1,new TGeoTranslation(0.,0.,163.8)); 
   v9->AddNode(tv100,1);
   //
   // central drum 
@@ -409,8 +460,8 @@ void AliTPCv3::CreateGeometry()
   TGeoTube *cs = new TGeoTube(56.9,61.2,0.1);
   TGeoMedium *sm7 = gGeoManager->GetMedium("TPC_Mylar");
   TGeoVolume *csv = new TGeoVolume("TPC_CDRS",cs,sm7);
-  v1->AddNode(csv,1,new TGeoTranslation(0.,0.,-71.));
-  v1->AddNode(csv,2,new TGeoTranslation(0.,0.,71.));
+  v1->AddNode(csv,1,new TGeoTranslation(0.,0.,-71.2));
+  v1->AddNode(csv,2,new TGeoTranslation(0.,0.,71.2));
   //
   // seal collars 
   TGeoPcon *se = new TGeoPcon(0.,360.,6);
@@ -434,8 +485,8 @@ void AliTPCv3::CreateGeometry()
   //
   cd1v->AddNode(cd2v,1); cd2v->AddNode(cd3v,1); cflv->AddNode(cd1v,1);
   //
-  v1->AddNode(siv,1,new TGeoTranslation(0.,0.,-70.1));
-  v1->AddNode(siv,2,new TGeoTranslation(0.,0.,70.1));
+  v1->AddNode(siv,1,new TGeoTranslation(0.,0.,-69.9));
+  v1->AddNode(siv,2,new TGeoTranslation(0.,0.,69.9));
   v1->AddNode(sev,1); v1->AddNode(sev,2,ref); v1->AddNode(cflv,1);
   //
   // central membrane - 2 rings and a mylar membrane - assembly
@@ -692,7 +743,8 @@ void AliTPCv3::CreateGeometry()
    // 
    // now iroc and oroc are placed into a sector...
    //
-   TGeoVolumeAssembly *sect = new TGeoVolumeAssembly("TPC_SECT");
+   TGeoVolumeAssembly *secta = new TGeoVolumeAssembly("TPC_SECT"); // a-side
+   TGeoVolumeAssembly *sectc = new TGeoVolumeAssembly("TPC_SECT"); // c-side
    TGeoRotation rot1("rot1",90.,90.,0.);
    TGeoRotation rot2("rot2");
    rot2.RotateY(10.);
@@ -702,31 +754,42 @@ void AliTPCv3::CreateGeometry()
    Double_t x0,y0;
    x0=110.2*TMath::Cos(openingAngle);
    y0=110.2*TMath::Sin(openingAngle);
-   TGeoCombiTrans *combi1 = new TGeoCombiTrans("combi1",x0,y0,1.09,rot);
+   TGeoCombiTrans *combi1a = new TGeoCombiTrans("combi1",x0,y0,1.09+0.195,rot); //a-side 
+   TGeoCombiTrans *combi1c = new TGeoCombiTrans("combi1",x0,y0,1.09+0.222,rot); //c-side
    x0=188.45*TMath::Cos(openingAngle);
    y0=188.45*TMath::Sin(openingAngle);
-   TGeoCombiTrans *combi2 = new TGeoCombiTrans("combi2",x0,y0,0.99,rot);
+   TGeoCombiTrans *combi2a = new TGeoCombiTrans("combi2",x0,y0,0.99+0.195,rot); //a-side
+   TGeoCombiTrans *combi2c = new TGeoCombiTrans("combi2",x0,y0,0.99+0.222,rot); //c-side
+   //
+   // A-side
    //
-   sect->AddNode(ch,1);
-   sect->AddNode(iroc,1,combi1);
-   sect->AddNode(oroc,1,combi2);
+   secta->AddNode(ch,1);
+   secta->AddNode(iroc,1,combi1a);
+   secta->AddNode(oroc,1,combi2a);
    //
-   // segment is ready...
-   // now I try to make a wheel...
+   // C-side
    //
-   TGeoVolumeAssembly *wheel = new TGeoVolumeAssembly("TPC_ENDCAP");
+   sectc->AddNode(ch,1);
+   sectc->AddNode(iroc,1,combi1c);
+   sectc->AddNode(oroc,1,combi2c);
+   //
+   // now I try to make  wheels...
+   //
+   TGeoVolumeAssembly *wheela = new TGeoVolumeAssembly("TPC_ENDCAP");
+   TGeoVolumeAssembly *wheelc = new TGeoVolumeAssembly("TPC_ENDCAP");
    //
    for(Int_t i =0;i<18;i++){
      Double_t phi = (20.*i);
      TGeoRotation *r = new TGeoRotation();
      r->RotateZ(phi);
-     wheel->AddNode(sect,i+1,r);
+     wheela->AddNode(secta,i+1,r);
+     wheelc->AddNode(sectc,i+1,r);
     
    }
    // wheels in the drift volume!
    TGeoCombiTrans *combi3 = new TGeoCombiTrans("combi3",0.,0.,256.6,ref);
-   v9->AddNode(wheel,1,combi3);
-   v9->AddNode(wheel,2,new TGeoTranslation(0.,0.,-256.6));
+   v9->AddNode(wheela,1,combi3);
+   v9->AddNode(wheelc,2,new TGeoTranslation(0.,0.,-256.6));
    
    //_____________________________________________________________
    // service support wheel
@@ -795,47 +858,922 @@ void AliTPCv3::CreateGeometry()
   //----------------------------------------------------------
   TGeoMedium *m6=gGeoManager->GetMedium("TPC_Makrolon");
   TGeoMedium *m7=gGeoManager->GetMedium("TPC_Cu");
-  // upper and lower rods differ in length!
-  Double_t *upar;
-  upar=NULL;
-  gGeoManager->Volume("TPC_Rod","TUBE",m6->GetId(),upar);
-  upar=new Double_t [3];
-  upar[0]=1.8;
-  upar[1]=2.2;
-  
+  TGeoMedium *m10 =  gGeoManager->GetMedium("TPC_Alumina");
+  TGeoMedium *m11 =  gGeoManager->GetMedium("TPC_Peek");
+  TGeoMedium *m13 = gGeoManager->GetMedium("TPC_Brass");
+  // 
+  // tpc rod is an assembly of 10 long parts and 2 short parts
+  // connected with alu rings and plagged on both sides.
+  //
   //
-  //HV rods - makrolon + 0.58cm (diameter) Cu
-  TGeoTube *hvr = new TGeoTube(0.,2.2,126.64);
-  TGeoTube *hvc = new TGeoTube(0.,0.29,126.64);
+// tpc rod long
+//
+  TGeoPcon *rod = new TGeoPcon("rod",0.,360.,6);
+ rod->DefineSection(0,-10.43,1.92,2.08);
+ rod->DefineSection(1,-9.75,1.92,2.08);
+
+ rod->DefineSection(2,-9.75,1.8,2.2);
+ rod->DefineSection(3,9.75,1.8,2.2);
+
+ rod->DefineSection(4,9.75,1.92,2.08);
+ rod->DefineSection(5,10.43,1.92,2.08);
+ //
+ TGeoVolume *mrodl = new TGeoVolume("TPC_mrodl",rod,m6);
+ //
+ // tpc rod short 
+ //
+ TGeoPcon *rod1 = new TGeoPcon("rod1",0.,360.,6);
+ rod1->DefineSection(0,-8.93,1.92,2.08);
+ rod1->DefineSection(1,-8.25,1.92,2.08);
+
+ rod1->DefineSection(2,-8.25,1.8,2.2);
+ rod1->DefineSection(3,8.25,1.8,2.2);
+
+ rod1->DefineSection(4,8.25,1.92,2.08);
+ rod1->DefineSection(5,8.93,1.92,2.08);
+ //
+ TGeoVolume *mrods = new TGeoVolume("TPC_mrods",rod1,m6);
+ //
+ // below is for the resistor rod
+ //
+ // hole for the brass connectors
+ //
+
+ new TGeoTube("hhole",0.,0.3,0.3);
+ //
+ //transformations for holes - initialy they
+ // are placed at x=0 and negative y
+ //
+  TGeoRotation *rhole = new TGeoRotation();
+  rhole->RotateX(90.);
+  TGeoCombiTrans *transf[13];
+  Char_t name[30];
+  for(Int_t i=0;i<13;i++){
+    //sprintf(name,"transf%d",i);
+    snprintf(name,30,"transf%d",i);
+    transf[i]= new TGeoCombiTrans(name,0.,-2.,-9.+i*1.5,rhole);
+    transf[i]->RegisterYourself();
+  }
+  // union expression for holes
+  TString operl("hhole:transf0");
+  for (Int_t i=1;i<13;i++){
+    //sprintf(name,"+hhole:transf%d",i);
+    snprintf(name,30,"+hhole:transf%d",i);
+    operl.Append(name);   
+  }
+  //
+ TString opers("hhole:transf1");
+  for (Int_t i=2;i<12;i++){
+    //sprintf(name,"+hhole:transf%d",i);
+    snprintf(name,30,"+hhole:transf%d",i); 
+    opers.Append(name);   
+  }
+  //union of holes
+  new TGeoCompositeShape("hlv",operl.Data());
+  new TGeoCompositeShape("hsv",opers.Data());
+  //
+  TGeoCompositeShape *rodl = new TGeoCompositeShape("rodl","rod-hlv");
+  TGeoCompositeShape *rods = new TGeoCompositeShape("rods","rod1-hsv");
+ //rods - volumes - makrolon rods with holes
+  TGeoVolume *rodlv = new TGeoVolume("TPC_rodl",rodl,m6);
+  TGeoVolume *rodsv = new TGeoVolume("TPC_rods",rods,m6);
+  //brass connectors
+ //connectors
+  TGeoTube *bcon = new TGeoTube(0.,0.3,0.3);//connectors
+  TGeoVolume *bconv = new TGeoVolume("TPC_bcon",bcon,m13);
+ //
+ // hooks holding strips
+ //
+ new TGeoBBox("hk1",0.625,0.015,0.75);
+ new TGeoBBox("hk2",0.625,0.015,0.15);
+ TGeoTranslation *tr21 = new TGeoTranslation("tr21",0.,-0.03,-0.6);
+ TGeoTranslation *tr12 = new TGeoTranslation("tr12",0.,-0.03,0.6);
+ tr21->RegisterYourself();
+ tr12->RegisterYourself();
+ TGeoCompositeShape *hook = new TGeoCompositeShape("hook","hk1+hk2:tr21+hk2:tr12");
+ TGeoVolume *hookv = new TGeoVolume("TPC_hook",hook,m13);
+ //
+ // assembly of the short rod with connectors and hooks
+ //
+ //
+ // short rod
+ //
+  TGeoVolumeAssembly *spart = new TGeoVolumeAssembly("TPC_spart");
+  //
+  spart->AddNode( rodsv,1);
+  for(Int_t i=1;i<12;i++){
+  spart->AddNode(bconv,i,transf[i]);
+  }
+  for(Int_t i =0;i<11;i++){
+    spart->AddNode(hookv,i+1,new TGeoTranslation(0.,-2.315,-7.5+i*1.5));
+  } 
+ //
+ // long rod
+ //
+  TGeoVolumeAssembly *lpart = new TGeoVolumeAssembly("TPC_lpart");
+  //
+  lpart->AddNode( rodlv,1);
+  for(Int_t i=0;i<13;i++){
+  lpart->AddNode(bconv,i+12,transf[i]);
+  }
+  for(Int_t i =0;i<13;i++){
+    lpart->AddNode(hookv,i+12,new TGeoTranslation(0.,-2.315,-9.+i*1.5));
+  }   
+  //
+  // alu ring
+  //
+  new TGeoTube("ring1",2.1075,2.235,0.53);
+  new TGeoTube("ring2",1.7925,1.89,0.43);
+  new TGeoTube("ring3",1.89,2.1075,0.05);
+  TGeoCompositeShape *ring = new TGeoCompositeShape("ring","ring1+ring2+ring3");
+  TGeoVolume *ringv = new TGeoVolume("TPC_ring",ring,m3);
+  //
+  // rod assembly
+  //
+  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++){
+    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++){
+    tpcrrod->AddNode(lpart,i+1,new TGeoTranslation(0.,0.,-94.5+i*21));//resistor rod
+    tpcmrod->AddNode(mrodl,i+1,new TGeoTranslation(0.,0.,-94.5+i*21));//makrolon rod       
+  }
+  //
+  // right plug - identical for all rods
+  //
+  TGeoPcon *tpcrp = new TGeoPcon(0.,360.,6);
+  //
+  tpcrp->DefineSection(0,123.05,1.89,2.1075);
+  tpcrp->DefineSection(1,123.59,1.89,2.1075);
+  //
+  tpcrp->DefineSection(2,123.59,1.8,2.2);
+  tpcrp->DefineSection(3,127.,1.8,2.2);
+  //
+  tpcrp->DefineSection(4,127.,0.,2.2);
+  tpcrp->DefineSection(5,127.5,0.,2.2);
+  //
+  TGeoVolume *tpcrpv = new TGeoVolume("TPC_RP",tpcrp,m6);
+  //
+  // adding short pieces and right plug
+  //
+  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.));
+  tpcrrod->AddNode(tpcrpv,1);
+  //
+  tpcmrod->AddNode(mrods,1,new TGeoTranslation(0.,0.,-114.));
+  tpcmrod->AddNode(mrods,2,new TGeoTranslation(0.,0.,114.)); 
+  tpcmrod->AddNode(ringv,25,new TGeoTranslation(0.,0.,-123.));
+  tpcmrod->AddNode(ringv,26,new TGeoTranslation(0.,0.,123.));
+  tpcmrod->AddNode(tpcrpv,2);
+  //
+  // from the ringv position to the CM is 3.0 cm!
+  //----------------------------------------
+  //
+  //
+  //HV rods - makrolon + 0.58cm (diameter) Cu ->check the length
+  TGeoTube *hvr = new TGeoTube(0.,1.465,123.);
+  TGeoTube *hvc = new TGeoTube(0.,0.29,123.);
   //
   TGeoVolume *hvrv = new TGeoVolume("TPC_HV_Rod",hvr,m6);
   TGeoVolume *hvcv = new TGeoVolume("TPC_HV_Cable",hvc,m7);
   hvrv->AddNode(hvcv,1);
+  //
+  //resistor rod
+  //
+  TGeoTube *cr = new TGeoTube(0.,0.45,123.);   
+  TGeoTube *cw = new TGeoTube(0.,0.15,123.);  
+  TGeoVolume *crv = new TGeoVolume("TPC_CR",cr,m10);
+  TGeoVolume *cwv = new TGeoVolume("TPC_W",cw,m12);   
+  //
+  // ceramic rod with water
+  //
+  crv->AddNode(cwv,1);
+  //
+  //peek rod
+  //
+  TGeoTube *pr =new TGeoTube(0.2,0.35,123.);  
+  TGeoVolume *prv = new TGeoVolume("TPC_PR",pr,m11); 
+  //
+  // copper plates with connectors
+  //
+  new TGeoTube("tub",0.,1.7,0.025);
+  //
+  // half space - points on the plane and a normal vector
+  //
+  Double_t n[3],p[3];
+  Double_t slope = TMath::Tan(22.*TMath::DegToRad());
+  Double_t intp = 1.245;
+  //
+  Double_t b = slope*slope+1.;
+  p[0]=intp*slope/b;
+  p[1]=-intp/b;
+  p[2]=0.;
+  //
+  n[0]=-p[0];
+  n[1]=-p[1];
+  n[2]=0.;
+  Double_t norm;
+  norm=TMath::Sqrt(n[0]*n[0]+n[1]*n[1]);
+  n[0] /= norm;
+  n[1] /=norm;
+  //
+  new TGeoHalfSpace("sp1",p,n);
+  //
+  slope = -slope; 
+  //
+  p[0]=intp*slope/b;
+  p[1]=-intp/b;
+  //
+  n[0]=-p[0];
+  n[1]=-p[1];
+  norm=TMath::Sqrt(n[0]*n[0]+n[1]*n[1]);
+  n[0] /= norm;
+  n[1] /=norm;
+  //
+  new TGeoHalfSpace("sp2",p,n);
+  // holes for rods
+ //holes
+ new TGeoTube("h1",0.,0.5,0.025);
+ new TGeoTube("h2",0.,0.35,0.025);
+ //translations:
+ TGeoTranslation *ttr11 = new TGeoTranslation("ttr11",-0.866,0.5,0.);
+ TGeoTranslation *ttr22 = new TGeoTranslation("ttr22",0.866,0.5,0.);
+ ttr11->RegisterYourself();
+ ttr22->RegisterYourself();
+ // elastic connector
+ new TGeoBBox("elcon",0.72,0.005,0.3);
+ TGeoRotation *crr1 = new TGeoRotation();
+ crr1->RotateZ(-22.);
+TGeoCombiTrans *ctr1 = new TGeoCombiTrans("ctr1",-0.36011, -1.09951,-0.325,crr1);
+ctr1->RegisterYourself();
+ TGeoCompositeShape *cs1 = new TGeoCompositeShape("cs1",
+"(((((tub-h1:ttr11)-h1:ttr22)-sp1)-sp2)-h2)+elcon:ctr1");
+ //
+ TGeoVolume *csvv = new TGeoVolume("TPC_RR_CU",cs1,m7);
+ //
+ // resistor rod assembly 2 ceramic rods, peak rod, Cu plates
+ // and resistors
+ //
+ TGeoVolumeAssembly *rrod = new TGeoVolumeAssembly("TPC_RRIN");
+ // rods
+ rrod->AddNode(crv,1,ttr11);
+ rrod->AddNode(crv,2,ttr22); 
+ rrod->AddNode(prv,1);
+ //Cu plates
+ for(Int_t i=0;i<165;i++){
+   rrod->AddNode(csvv,i+1,new TGeoTranslation(0.,0.,-122.675+i*1.5));
+ }
+ //resistors
+ TGeoTube *res = new TGeoTube(0.,0.15,0.5);
+ TGeoVolume *resv = new TGeoVolume("TPC_RES",res,m10);
+ TGeoVolumeAssembly *ress = new TGeoVolumeAssembly("TPC_RES_CH");
+ ress->AddNode(resv,1,new TGeoTranslation(0.2,0.,0.));
+ ress->AddNode(resv,2,new TGeoTranslation(-0.2,0.,0.));
+ //
+ TGeoRotation *crr2 = new TGeoRotation();
+ crr2->RotateY(30.);
+ TGeoRotation *crr3 = new TGeoRotation();
+ crr3->RotateY(-30.); 
+ //
+ for(Int_t i=0;i<164;i+=2){
+   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));
+ }
+
+ tpcrrod->AddNode(rrod,1,new TGeoCombiTrans(0.,0.,0.5,crr1));
+ //
+ // rod left head with holders - inner
+ //
+ // first element - support for inner holder  TPC_IHS
+ Double_t shift1[3] = {0.0,-0.175,0.0};
+
+new TGeoBBox("tpcihs1", 4.7, 0.66, 2.35);               
+new TGeoBBox("tpcihs2", 4.7, 0.485, 1.0, shift1);
+new TGeoBBox("tpcihs3", 1.5, 0.485, 2.35, shift1);
+new TGeoTube("tpcihs4", 0.0, 2.38, 0.1);
+//
+Double_t pointstrap[16];    
+pointstrap[0]= 0.0;
+pointstrap[1]= 0.0;
+pointstrap[2]= 0.0;
+pointstrap[3]= 1.08;
+pointstrap[4]= 2.3;
+pointstrap[5]= 1.08;
+pointstrap[6]= 3.38;
+pointstrap[7]= 0.0;
+pointstrap[8]= 0.0;
+pointstrap[9]= 0.0;
+pointstrap[10]= 0.0;
+pointstrap[11]= 1.08;
+pointstrap[12]= 2.3;
+pointstrap[13]= 1.08;
+pointstrap[14]= 3.38;
+pointstrap[15]= 0.0;
+//
+TGeoArb8 *tpcihs5 = new TGeoArb8("tpcihs5", 0.6, pointstrap);
+//
+//  half space - cutting "legs"
+// 
+ p[0]=0.0;
+ p[1]=0.105;
+ p[2]=0.0;
+ //       
+n[0] = 0.0;
+n[1] = 1.0;
+n[2] = 0.0;
+
+new TGeoHalfSpace("cutil1", p, n);
+
+//
+// transformations
+//
+TGeoTranslation *trans2 = new TGeoTranslation("trans2", 0.0, 2.84, 2.25);
+trans2->RegisterYourself();
+TGeoTranslation*trans3= new TGeoTranslation("trans3", 0.0, 2.84, -2.25);
+trans3->RegisterYourself();
+//support - composite volume
+//
+TGeoCompositeShape *tpcihs6 = new TGeoCompositeShape("tpcihs6", "tpcihs1-(tpcihs2+tpcihs3)-(tpcihs4:trans2)-(tpcihs4:trans3)-cutil1");
+//
+// volumes - all makrolon
+//  
+ TGeoVolume *tpcihss = new TGeoVolume("TPC_IHSS", tpcihs6, m6); //support
+ TGeoVolume *tpcihst = new TGeoVolume("TPC_IHSTR",tpcihs5 , m6); //trapesoid
+ //now assembly
+TGeoRotation *rot111 = new TGeoRotation(); 
+rot111->RotateY(180.0);
+//
+TGeoVolumeAssembly *tpcihs = new TGeoVolumeAssembly("TPC_IHS");    // assembly of the support
+tpcihs->AddNode(tpcihss, 1);
+tpcihs->AddNode(tpcihst, 1, new TGeoTranslation(-4.7, 0.66, 0.0));
+tpcihs->AddNode(tpcihst, 2, new TGeoCombiTrans(4.7, 0.66, 0.0, rot111));
+//
+// two rod holders (TPC_IRH) assembled with the support
+//
+new TGeoBBox("tpcirh1", 4.7, 1.33, 0.5);
+ shift1[0]=-3.65;
+ shift1[1]=0.53;
+ shift1[2]=0.;
+new TGeoBBox("tpcirh2", 1.05, 0.8, 0.5, shift1);
+ shift1[0]=3.65;
+ shift1[1]=0.53;
+ shift1[2]=0.;
+new TGeoBBox("tpcirh3", 1.05, 0.8, 0.5, shift1);
+ shift1[0]=0.0;
+ shift1[1]=1.08;
+ shift1[2]=0.;
+new TGeoBBox("tpcirh4", 1.9, 0.25, 0.5, shift1);
+new TGeoTube("tpcirh5", 0, 1.9, 5);
+//
+TGeoTranslation *trans4 = new TGeoTranslation("trans4", 0, 0.83, 0.0); 
+trans4->RegisterYourself();
+//
+TGeoCompositeShape *tpcirh6 = new TGeoCompositeShape("tpcirh6", "tpcirh1-tpcirh2-tpcirh3-(tpcirh5:trans4)-tpcirh4");
+//
+// now volume
+//
+TGeoVolume *tpcirh = new TGeoVolume("TPC_IRH", tpcirh6, m6);   
+//
+// and all together...
+//
+TGeoVolume *tpciclamp = new TGeoVolumeAssembly("TPC_ICLP");
+tpciclamp->AddNode(tpcihs, 1);
+tpciclamp->AddNode(tpcirh, 1, new TGeoTranslation(0, 1.99, 1.1));
+tpciclamp->AddNode(tpcirh, 2, new TGeoTranslation(0, 1.99, -1.1));
+//
+// and now left inner "head"
+//
+TGeoPcon *inplug = new TGeoPcon("inplug", 0.0, 360.0, 14); 
+
+inplug->DefineSection(0, 0.3, 0.0, 2.2);
+inplug->DefineSection(1, 0.6, 0.0, 2.2);
+
+inplug->DefineSection(2, 0.6, 0.0, 1.75);
+inplug->DefineSection(3, 0.7, 0.0, 1.75);
+
+inplug->DefineSection(4, 0.7, 1.55, 1.75);
+inplug->DefineSection(5, 1.6, 1.55, 1.75);
+
+inplug->DefineSection(6, 1.6, 1.55, 2.2);
+inplug->DefineSection(7, 1.875, 1.55, 2.2);
+
+inplug->DefineSection(8, 1.875, 1.55, 2.2);
+inplug->DefineSection(9, 2.47, 1.75, 2.2);
+
+inplug->DefineSection(10, 2.47, 1.75, 2.08);
+inplug->DefineSection(11, 2.57, 1.8, 2.08);
+
+inplug->DefineSection(12, 2.57, 1.92, 2.08);
+inplug->DefineSection(13, 2.95, 1.92, 2.08);
+//
+ shift1[0]=0.0;
+ shift1[1]=-2.09;
+ shift1[2]=1.075;
+ //
+new TGeoBBox("pcuti", 1.5, 0.11, 1.075, shift1);
+//
+TGeoCompositeShape *inplleft = new TGeoCompositeShape("inplleft", "inplug-pcuti");
+TGeoVolume *tpcinlplug = new TGeoVolume("TPC_INPLL", inplleft, m6);   
+//
+//  holder + plugs
+//
+ TGeoVolume *tpcihpl = new TGeoVolumeAssembly("TPC_IHPL"); //holder+2 plugs (reflected)
+ tpcihpl->AddNode(tpcinlplug, 1);
+ tpcihpl->AddNode(tpcinlplug, 2,ref);
+ tpcihpl->AddNode(tpciclamp,1,new TGeoTranslation(0.0, -2.765, 0.0)); 
+ //
+ // outer holders and clamps
+ //
+
+ // outer membrane holder (between rods)  
+pointstrap[0]= 0.0;
+pointstrap[1]= 0.0;
+pointstrap[2]= 0.0;
+pointstrap[3]= 2.8;
+pointstrap[4]= 3.1;
+pointstrap[5]= 2.8-3.1*TMath::Tan(15.*TMath::DegToRad());
+pointstrap[6]= 3.1;
+pointstrap[7]= 0.0;
+pointstrap[8]= 0.0;
+pointstrap[9]= 0.0;
+pointstrap[10]= 0.0;
+pointstrap[11]= 2.8;
+pointstrap[12]= 3.1;
+pointstrap[13]= 2.8-3.1*TMath::Tan(15.*TMath::DegToRad());
+pointstrap[14]= 3.1;
+pointstrap[15]= 0.0;
+//
+TGeoArb8 *tpcomh1 = new TGeoArb8("tpcomh1", 1.05, pointstrap);   
+TGeoBBox *tpcomh2 = new TGeoBBox("tpcomh2", 0.8, 1.4, 6);
+//
+TGeoVolume *tpcomh1v = new TGeoVolume("TPC_OMH1", tpcomh1, m7);    
+TGeoVolume *tpcomh2v = new TGeoVolume("TPC_OMH2", tpcomh2, m7);
+//
+TGeoVolume *tpcomh3v = new TGeoVolumeAssembly("TPC_OMH3");    // assembly1
+tpcomh3v->AddNode(tpcomh1v, 1, new TGeoTranslation(0.8, -1.4, 4.95));
+ tpcomh3v->AddNode(tpcomh1v, 2, new TGeoTranslation(0.8, -1.4, -4.95));
+tpcomh3v->AddNode(tpcomh2v, 1);
+//
+shift1[0] = 0.9;
+shift1[1] = -1.85;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcomh3", 1.65, 1.15, 3.4);
+TGeoBBox *tpcomh4 = new TGeoBBox("tpcomh4", 0.75, 0.7, 3.4, shift1);
+//
+// halfspace 1
+//
+p[0] = 0.0;
+p[1] = -1.05;   
+p[2] = -3.4;
+//
+n[0] = 0.0;
+n[1] = -1.0*TMath::Tan(30.*TMath::DegToRad());
+n[2] = 1.0;
+//
+new TGeoHalfSpace("cutomh1", p, n); 
+//
+// halfspace 2
+//
+p[0] = 0.0;
+p[1] = -1.05;   
+p[2] = 3.4;
+//
+n[0] = 0.0;
+n[1] = -1.0*TMath::Tan(30.*TMath::DegToRad());
+n[2] = -1.0;
+//
+new TGeoHalfSpace("cutomh2", p, n);
+//
+// halfspace 3
+//
+p[0] = -1.65;
+p[1] = 0.0;     
+p[2] = -0.9;
+//
+n[0] = 1.0*TMath::Tan(75.*TMath::DegToRad());
+n[1] = 0.0;
+n[2] = 1.0;
+//
+new TGeoHalfSpace("cutomh3", p, n);   
+//
+// halfspace 4
+//
+p[0] = -1.65;
+p[1] = 0.0;      
+p[2] = 0.9;
+//
+n[0] = 1.0*TMath::Tan(75*TMath::DegToRad());
+n[1] = 0.0;
+n[2] = -1.0;
+//
+new TGeoHalfSpace("cutomh4", p, n); 
+//
+// halsfspace 5
+//
+p[0] = 1.65;
+p[1] = -1.05;      
+p[2] = 0.0;  
+//
+n[0] = -1.0;
+n[1] = -1.0*TMath::Tan(20.*TMath::DegToRad());
+n[2] = 0.0;
+//
+new TGeoHalfSpace("cutomh5", p, n); 
+//  
+TGeoCompositeShape *tpcomh5 = new TGeoCompositeShape("tpcomh5", "tpcomh3-cutomh1-cutomh2-cutomh3-cutomh4-cutomh5"); 
+//
+ TGeoVolume *tpcomh5v = new TGeoVolume("TPC_OMH5",tpcomh5,m6);
+ TGeoVolume *tpcomh4v = new TGeoVolume("TPC_OMH6",tpcomh4,m6);
+ //
+ TGeoVolumeAssembly *tpcomh7v = new TGeoVolumeAssembly("TPC_OMH7");
+ tpcomh7v->AddNode(tpcomh5v,1);
+ tpcomh7v->AddNode(tpcomh4v,1);
+ //
+ // full membrane holder - tpcomh3v + tpcomh7v
+ //
+ TGeoVolumeAssembly *tpcomh = new TGeoVolumeAssembly("TPC_OMH");
+ tpcomh->AddNode(tpcomh3v,1,new TGeoTranslation(1.5,0.,0.));
+ tpcomh->AddNode(tpcomh3v,2,new TGeoCombiTrans(-1.5,0.,0.,rot111));
+ tpcomh->AddNode(tpcomh7v,1,new TGeoTranslation(0.65+1.5, 2.55, 0.0));
+ tpcomh->AddNode(tpcomh7v,2,new TGeoCombiTrans(-0.65-1.5, 2.55, 0.0,rot111)); 
+ //
+ //  outer rod holder support
+ //
+new TGeoBBox("tpcohs1", 3.8, 0.675, 2.35); 
+//
+shift1[0] = 0.0;
+shift1[1] = 0.175;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcohs2", 1.5, 0.5, 2.35, shift1);
+new TGeoBBox("tpcohs3", 3.8, 0.5, 0.85, shift1);
+//
+shift1[0] = 0.0;
+shift1[1] = -1.175;
+shift1[2] = 0.0;
+//
+TGeoBBox *tpcohs4 = new TGeoBBox("tpsohs4", 3.1, 0.5, 0.7, shift1);
+//
+TGeoVolume *tpcohs4v = new TGeoVolume("TPC_OHS4", tpcohs4, m6);
+//
+p[0] = 0.0;
+p[1] = -0.186;   
+p[2] = 0.0;
+//
+n[0] = 0.0;
+n[1] = -1.0;
+n[2] = 0.0;
+//
+new TGeoHalfSpace("cutohs1", p, n);
+//
+TGeoCompositeShape *tpcohs5 = new TGeoCompositeShape("tpcohs5", "tpcohs1-tpcohs2-tpcohs3-cutohs1"); 
+TGeoVolume *tpcohs5v = new TGeoVolume("TPC_OHS5", tpcohs5, m6); 
+//
+TGeoVolumeAssembly *tpcohs = new TGeoVolumeAssembly("TPC_OHS");    
+tpcohs->AddNode(tpcohs5v, 1);
+tpcohs->AddNode(tpcohs4v, 1); 
+//
+// outer rod holder itself
+//
+shift1[0] = 0.0;
+shift1[1] = 1.325;
+shift1[2] = 0.0;
+ new TGeoBBox("tpcorh1", 3.1, 1.825, 0.55); //from this box we cut pieces...
+ //
+shift1[0] = -3.1;      
+shift1[1] = -0.5;      
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcorh2", 0.5, 2.75, 1.1, shift1);
+//
+shift1[0] = 3.1;       
+shift1[1] = -0.5;      
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcorh3", 0.5, 2.75, 1.1, shift1);
+//
+shift1[0] = 0.0;
+shift1[1] = -0.5;      
+shift1[2] = -0.95;
+//
+new TGeoBBox("tpcorh4", 3.9, 2.75, 0.5, shift1);
+//
+shift1[0] = 0.0;
+shift1[1] = -0.5;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcorh5", 1.95, 0.5, 1.1, shift1);
+//
+shift1[0] = 0.0;
+shift1[1] = -0.5;
+shift1[2] = 0.55;
+//
+new TGeoBBox("tpcorh6", 2.4, 0.5, 0.6, shift1);
+//
+new TGeoTube("tpcorh7", 0, 1.95, 0.85);
+new TGeoTube("tpcorh8", 0, 2.4, 0.6);
+//
+TGeoTranslation *trans33 = new TGeoTranslation("trans33", 0.0, 0.0, 0.55); 
+trans33->RegisterYourself();
+//
+TGeoCompositeShape *tpcorh9 = new TGeoCompositeShape("tpcorh9", "tpcorh1-tpcorh2-tpcorh3-tpcorh4-tpcorh5-tpcorh6-(tpcorh8:trans33)-tpcorh7");
+//
+ TGeoVolume *tpcorh9v = new TGeoVolume("TPC_ORH",tpcorh9,m6); //outer rod holder 
+ //
+ // now 2 holders together
+ //
+ TGeoVolumeAssembly *tpcorh = new TGeoVolumeAssembly("TPC_ORH2");
+ //
+ tpcorh->AddNode(tpcorh9v,1,new TGeoTranslation(0.0, 0.0, 1.25));
+ tpcorh->AddNode(tpcorh9v,2,new TGeoCombiTrans(0.0, 0.0, -1.25,rot111));
+//
+// outer rod plug left
+//
+TGeoPcon *outplug = new TGeoPcon("outplug", 0.0, 360.0, 14); 
+
+outplug->DefineSection(0, 0.5, 0.0, 2.2);
+outplug->DefineSection(1, 0.7, 0.0, 2.2);
+
+outplug->DefineSection(2, 0.7, 1.55, 2.2);
+outplug->DefineSection(3, 0.8, 1.55, 2.2);
+
+outplug->DefineSection(4, 0.8, 1.55, 1.75);
+outplug->DefineSection(5, 1.2, 1.55, 1.75);
+
+outplug->DefineSection(6, 1.2, 1.55, 2.2);
+outplug->DefineSection(7, 1.875, 1.55, 2.2);
+
+outplug->DefineSection(8, 1.875, 1.55, 2.2);
+outplug->DefineSection(9, 2.47, 1.75, 2.2);
+
+outplug->DefineSection(10, 2.47, 1.75, 2.08);
+outplug->DefineSection(11, 2.57, 1.8, 2.08);
+
+outplug->DefineSection(12, 2.57, 1.92, 2.08);
+outplug->DefineSection(13, 2.95, 1.92, 2.08);
+//
+shift1[0] = 0.0;
+shift1[1] = 2.09;
+shift1[2] = 1.01;
+
+new TGeoBBox("cutout", 2.5, 0.11, 1.01, shift1);
+//
+
+TGeoCompositeShape *outplleft = new TGeoCompositeShape("outplleft", "outplug-cutout");    
+TGeoVolume *outplleftv = new TGeoVolume("TPC_OPLL", outplleft, m6); 
+//
+//  support + holder + plug
+//
+
+ TGeoVolumeAssembly *tpcohpl = new TGeoVolumeAssembly("TPC_OHPL"); 
+ //
+ tpcohpl->AddNode(outplleftv,1); //plug
+ tpcohpl->AddNode(outplleftv,2,ref); //plug reflected
+ tpcohpl->AddNode(tpcorh,1); //rod holder
+ tpcohpl->AddNode(tpcohs,1,new TGeoTranslation(0.0, 3.925, 0)); // support
+ //
+
+ //
+ // main membrane holder
+ //          
+pointstrap[0]= 0.0;
+pointstrap[1]= 0.0;
+pointstrap[2]= 0.0;
+pointstrap[3]= 2.8;
+pointstrap[4]= 3.1;
+pointstrap[5]= 1.96;
+pointstrap[6]= 3.1;
+pointstrap[7]= 0.0;
+pointstrap[8]= 0.0;
+pointstrap[9]= 0.0;
+pointstrap[10]= 0.0;
+pointstrap[11]= 2.8;
+pointstrap[12]= 3.1;
+pointstrap[13]= 1.96;
+pointstrap[14]= 3.1;
+pointstrap[15]= 0.0; 
+//
+TGeoArb8 *tpcmmh1 = new TGeoArb8("tpcmmh1", 1.75, pointstrap);
+TGeoBBox *tpcmmh2 = new TGeoBBox("tpcmmh2", 0.8, 1.4, 12.5); 
+//
+TGeoVolume *tpcmmh1v = new TGeoVolume("TPC_MMH1", tpcmmh1, m6);   
+TGeoVolume *tpcmmh2v = new TGeoVolume("TPC_MMH2", tpcmmh2, m6);
+//
+ TGeoVolumeAssembly *tpcmmhs = new TGeoVolumeAssembly("TPC_MMHS");
+ tpcmmhs->AddNode(tpcmmh1v,1,new TGeoTranslation(0.8, -1.4, 10.75));
+ tpcmmhs->AddNode(tpcmmh1v,2,new TGeoTranslation(0.8, -1.4, -10.75));
+ tpcmmhs->AddNode(tpcmmh2v,1);
+ //
+ // main membrahe holder clamp
+ //
+shift1[0] = -0.75;
+shift1[1] = -1.15;
+shift1[2] = 0.0;
+//
+new TGeoBBox("tpcmmhc1", 1.65, 1.85, 8.9); 
+new TGeoBBox("tpcmmhc2", 0.9, 0.7, 8.9, shift1);
+//
+// half spaces  - cuts
+//
+p[0] = -1.65;
+p[1] = 0.0;   
+p[2] = -0.9;
+//
+n[0] = 8.0;
+n[1] = 0.0;
+n[2] = 8.0*TMath::Tan(13.*TMath::DegToRad());
+//
+new TGeoHalfSpace("cutmmh1", p, n);
+//
+p[0] = -1.65;
+p[1] = 0.0;   
+p[2] = 0.9;
+//
+n[0] = 8.0;
+n[1] = 0.0;
+n[2] = -8.0*TMath::Tan(13.*TMath::DegToRad());
+//
+new TGeoHalfSpace("cutmmh2", p, n);
+//
+p[0] = 0.0;
+p[1] = 1.85;   
+p[2] = -2.8;
+//
+n[0] = 0.0;
+n[1] = -6.1;
+n[2] = 6.1*TMath::Tan(20.*TMath::DegToRad());
+//
+new TGeoHalfSpace("cutmmh3", p, n);
+//
+p[0] = 0.0;
+p[1] = 1.85;      
+p[2] = 2.8;
+//
+n[0] = 0.0;
+n[1] = -6.1;
+n[2] = -6.1*TMath::Tan(20*TMath::DegToRad());
+//
+new TGeoHalfSpace("cutmmh4", p, n);
+//
+p[0] = 0.75;
+p[1] = 0.0; 
+p[2] = -8.9;
+//
+n[0] = 2.4*TMath::Tan(30*TMath::DegToRad());
+n[1] = 0.0;
+n[2] = 2.4;
+//
+ new TGeoHalfSpace("cutmmh5", p, n);
+//
+p[0] = 0.75;
+p[1] = 0.0;
+p[2] = 8.9;
+//
+n[0] = 2.4*TMath::Tan(30*TMath::DegToRad());
+n[1] = 0.0;
+n[2] = -2.4;
+//
+new TGeoHalfSpace("cutmmh6", p, n);
+
+TGeoCompositeShape *tpcmmhc = new TGeoCompositeShape("TPC_MMHC", "tpcmmhc1-tpcmmhc2-cutmmh1-cutmmh2-cutmmh3-cutmmh4-cutmmh5-cutmmh6"); 
+
+ TGeoVolume *tpcmmhcv = new TGeoVolume("TPC_MMHC",tpcmmhc,m6);
+ //
+TGeoVolume *tpcmmh = new TGeoVolumeAssembly("TPC_MMH");
+//
+ tpcmmh->AddNode(tpcmmhcv,1,new TGeoTranslation(0.65+1.5, 1.85, 0.0));
+ tpcmmh->AddNode(tpcmmhcv,2,new TGeoCombiTrans(-0.65-1.5, 1.85, 0.0,rot111));
+ tpcmmh->AddNode(tpcmmhs,1,new TGeoTranslation(1.5, 0.0, 0.0));
+ tpcmmh->AddNode(tpcmmhs,2,new TGeoCombiTrans(-1.5, 0.0, 0.0,rot111));
+ //
+ //
+
+//--------------------------------------------
+ //
+ // 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[2]; 
+ //
+ TGeoRotation *rotrod1[2]; 
+
+  
+ //v9 - drift gas
+
+    TGeoRotation rot102("rot102");
+    rot102.RotateY(-90.);
+
   for(Int_t i=0;i<18;i++){
     Double_t angle,x,y;
     Double_t z,r; 
     angle=TMath::DegToRad()*20.*(Double_t)i;
+    //inner rods
     r=81.5;
     x=r * TMath::Cos(angle);
     y=r * TMath::Sin(angle);
-    upar[2]=126.64; //lower
-    z= 126.96;
-    if(i==15){
-      v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z));
-      v9->AddNode(hvrv,2,new TGeoTranslation(x,y,-z));
-    }
-    else{
-     gGeoManager->Node("TPC_Rod",i+1,"TPC_Drift",x,y,z,0,kTRUE,upar,3);//shaft
-     gGeoManager->Node("TPC_Rod",i+18,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);//muon
+    z = 126.;
+    TGeoRotation *rot12 = new TGeoRotation();
+    rot12->RotateZ(-90.0+i*20.);
+    v9->AddNode(tpcihpl,i+1,new TGeoCombiTrans(x, y, 0., rot12));
+    //
+    if(i==11){//resistor rod inner
+       rotrod.RotateZ(-90.+angle);
+       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
+      v9->AddNode(tpcmrod,i+19,new TGeoCombiTrans(x,y,-z,ref));//muon
     }
+    // outer rods
     r=254.25;
     x=r * TMath::Cos(angle);
     y=r * TMath::Sin(angle);
-    upar[2]=126.54; //upper
-    z=127.06;
-    gGeoManager->Node("TPC_Rod",i+36,"TPC_Drift",x,y,z,0,kTRUE,upar,3);
-    gGeoManager->Node("TPC_Rod",i+54,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
-  }
+    z=126.;
+    //
+    // outer rod holder + outer left plug
+    //
+    TGeoRotation *rot33 = new TGeoRotation();
+    rot33->RotateZ(-90+i*20.);
+    //
+    v9->AddNode(tpcohpl,i+1,new TGeoCombiTrans(x, y, 0., rot33));
+    //
+    Double_t xxx = 256.297*TMath::Cos((i*20.+10.)*TMath::DegToRad());
+    Double_t yyy = 256.297*TMath::Sin((i*20.+10.)*TMath::DegToRad());
+    //
+    TGeoRotation rot101("rot101");
+    rot101.RotateZ(90.+i*20.+10.);
+    TGeoRotation *rot103 = new TGeoRotation("rot103");
+    *rot103 = rot101*rot102;
+    //
+    TGeoCombiTrans *trh100 = new TGeoCombiTrans(xxx,yyy,0.,rot103);
+    //
+    if(i==2) {
+      //main membrane holder
+      v9->AddNode(tpcmmh,1,trh100);
+    }
+    else{
+      // "normal" membrane holder
+      v9->AddNode(tpcomh,i+1,trh100);      
+    }
+
+    //
+    if(i==3){//resistor rod outer
+      rotrod.RotateZ(90.+angle);
+      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+0.7)); //hv->A-side only      
+
+
+    }
+  } //end of rods positioning
+
 
   TGeoVolume *alice = gGeoManager->GetVolume("ALIC");
   alice->AddNode(v1,1);
@@ -844,111 +1782,7 @@ void AliTPCv3::CreateGeometry()
  
 } // end of function
  
-//_____________________________________________________________________________
-void AliTPCv3::DrawDetector()
-{
-  //
-  // Draw a shaded view of the Time Projection Chamber version 3
-  //
-
-
-  // Set everything unseen
-  gMC->Gsatt("*", "seen", -1);
-  // 
-  // Set ALIC mother transparent
-  gMC->Gsatt("ALIC","SEEN",0);
-  //
-  // Set the volumes visible
-  //
-
-  gMC->Gsatt("TPC ","SEEN",0);
-  gMC->Gsatt("TOIN","SEEN",1);
-  gMC->Gsatt("TOIN","COLO",7);
-  gMC->Gsatt("TOCV","SEEN",1);
-  gMC->Gsatt("TOCV","COLO",4);
-  gMC->Gsatt("TSA1","SEEN",0);
-  gMC->Gsatt("TSA2","SEEN",0);
-  gMC->Gsatt("TSA3","SEEN",0);
-  gMC->Gsatt("TSA4","SEEN",0);  
-  gMC->Gsatt("TSA5","SEEN",0);
-  gMC->Gsatt("TOFC","SEEN",1);
-  gMC->Gsatt("TOFC","COLO",4);
-  gMC->Gsatt("TSA6","SEEN",0);
-  gMC->Gsatt("TSA7","SEEN",0);
-  gMC->Gsatt("TSA8","SEEN",0);    
-  gMC->Gsatt("TIIN","SEEN",1);
-  gMC->Gsatt("TIIN","COLO",7);
-  gMC->Gsatt("TII1","SEEN",0);
-  gMC->Gsatt("TIFC","SEEN",1);
-  gMC->Gsatt("TIFC","COLO",4);
-  gMC->Gsatt("TSA9","SEEN",0); 
-  gMC->Gsatt("TS10","SEEN",0);
-  gMC->Gsatt("TS11","SEEN",0);
-  gMC->Gsatt("TS12","SEEN",0);
-  gMC->Gsatt("TS13","SEEN",0);
-  gMC->Gsatt("TS14","SEEN",0);
-  gMC->Gsatt("TICC","SEEN",0);
-  gMC->Gsatt("TICM","SEEN",0);
-  gMC->Gsatt("TS15","SEEN",0);
-  gMC->Gsatt("TS16","SEEN",0);
-  gMC->Gsatt("TS17","SEEN",0);
-  gMC->Gsatt("TS18","SEEN",0);  
-  gMC->Gsatt("TS19","SEEN",0); 
-  gMC->Gsatt("TPJ1","SEEN",0);
-  gMC->Gsatt("TPJ2","SEEN",0);
-  gMC->Gsatt("TICS","SEEN",0);
-  gMC->Gsatt("TDGS","SEEN",0); 
-  gMC->Gsatt("TIRC","SEEN",0);
-  gMC->Gsatt("TIC1","SEEN",1);
-  gMC->Gsatt("TIPP","SEEN",0);
-  gMC->Gsatt("TIC3","SEEN",0);
-  gMC->Gsatt("TRCE","SEEN",0);
-  gMC->Gsatt("TPSC","SEEN",0);
-  gMC->Gsatt("TPCC","SEEN",0); 
-  gMC->Gsatt("TORC","SEEN",0);
-  gMC->Gsatt("TOPP","SEEN",0);
-  gMC->Gsatt("TOC3","SEEN",0);
-  gMC->Gsatt("TOC1","SEEN",1);
-  gMC->Gsatt("TSSW","SEEN",1);
-  gMC->Gsatt("TSWC","SEEN",1);
-  gMC->Gsatt("TSSW","COLO",3);
-  gMC->Gsatt("TSWC","COLO",3);
-  gMC->Gsatt("TSCE","COLO",6);
-  gMC->Gsatt("TSCE","SEEN",1);
-  gMC->Gsatt("TWES","SEEN",0);
-  gMC->Gsatt("TSWB","SEEN",0);
-  gMC->Gsatt("TPEL","SEEN",0);
-  gMC->Gsatt("TPMW","SEEN",1);
-  gMC->Gsatt("TESR","SEEN",1);
-  gMC->Gsatt("TPMW","COLO",12);
-  gMC->Gsatt("TIC1","COLO",5);
-  gMC->Gsatt("TOC1","COLO",5);
-  gMC->Gsatt("TESB","SEEN",0);
-  gMC->Gsatt("THVM","SEEN",1);
-  gMC->Gsatt("THVM","COLO",11);
-  gMC->Gsatt("THVH","SEEN",0);
-  gMC->Gsatt("TPSR","SEEN",0); 
-  gMC->Gsatt("THVL","SEEN",0);
-  gMC->Gsatt("THVC","SEEN",0);  
-  gMC->Gsatt("THVE","SEEN",0);
-  gMC->Gsatt("THVR","SEEN",0);
-
-  //
-  gMC->Gdopt("hide", "on");
-  gMC->Gdopt("shad", "on");
-  gMC->Gsatt("*", "fill", 7);
-  gMC->SetClipBox(".");
-  gMC->SetClipBox("TPMW",-300,300,-300,300,254.,270.);
-  gMC->SetClipBox("TESR",-300,300,-300,300,254.,270.);
-  gMC->SetClipBox("TSSW",-300,300,-300,300,283.,284.);
-  gMC->SetClipBox("TSWC",-300,300,-300,300,283.,284.);
-  gMC->SetClipBox("*", 0, 300, -300, 300, -290, 290);
-  gMC->DefaultRange();
-  gMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .025, .025);
-  gMC->Gdhead(1111, "Time Projection Chamber");
-  gMC->Gdman(18, 4, "MAN");
-  gMC->Gdopt("hide","off");
-}
 
 //_____________________________________________________________________________
 void AliTPCv3::CreateMaterials()
@@ -968,15 +1802,15 @@ void AliTPCv3::Init()
   //
   // Initialises version 3 of the TPC after that it has been built
   //
-  Int_t *idtmed = fIdtmed->GetArray();
+  //Int_t *idtmed = fIdtmed->GetArray();
 
   AliTPC::Init();
 
    fIdSens=gMC->VolId("TPC_Drift"); // drift gas as a sensitive volume
 
-  gMC->SetMaxNStep(30000); // max. number of steps increased
+  gMC->SetMaxNStep(-30000); // max. number of steps increased
 
-  gMC->Gstpar(idtmed[2],"LOSS",5);
+  // specific energy loss is now set in galice.cuts
 
   printf("%s: *** TPC version 3 initialized***\n",ClassName());
 
@@ -1078,7 +1912,7 @@ void AliTPCv3::StepManager()
   else
     {
       betaGamma = TMath::Max(betaGamma,(Float_t)7.e-3); 
-      pp=kprim*BetheBloch(betaGamma);    
+      pp=kprim*AliMathBase::BetheBlochAleph(betaGamma);    
       if(TMath::Abs(charge) > 1.) pp *= (charge*charge);
     }
   
@@ -1087,27 +1921,3 @@ void AliTPCv3::StepManager()
   gMC->SetMaxStep(-TMath::Log(rnd)/pp);
   
 }
-
-//_____________________________________________________________________________
-Float_t AliTPCv3::BetheBloch(Float_t bg)
-{
-  //
-  // Bethe-Bloch energy loss formula
-  //
-  const Double_t kp1=0.76176e-1;
-  const Double_t kp2=10.632;
-  const Double_t kp3=0.13279e-4;
-  const Double_t kp4=1.8631;
-  const Double_t kp5=1.9479;
-
-  Double_t dbg = (Double_t) bg;
-
-  Double_t beta = dbg/TMath::Sqrt(1.+dbg*dbg);
-
-  Double_t aa = TMath::Power(beta,kp4);
-  Double_t bb = TMath::Power(1./dbg,kp5);
-
-  bb=TMath::Log(kp3+bb);
-  
-  return ((Float_t)((kp2-aa-bb)*kp1/aa));
-}