]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TPC/AliTPCv3.cxx
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
par file fix
[u/mrichter/AliRoot.git] / TPC / AliTPCv3.cxx
diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx
index 2edeaea1ad3ef97b4129d5790d2ec6770fae89ca..f96612d5a2ce31194dc8bccef80bd2ea6e66195c 100644 (file)
--- a/TPC/AliTPCv3.cxx
+++ b/TPC/AliTPCv3.cxx
@@ -50,6 +50,7 @@
 #include "AliMC.h"
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
+#include "TGeoCone.h"
 #include "TGeoPcon.h"
 #include "TGeoTube.h"
 #include "TGeoPgon.h"
@@ -114,37 +115,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.,20); //20 sections
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,30); //30 sections
   //
-  tpc->DefineSection(0,-291.,77.,278.);
-  tpc->DefineSection(1,-270,77.,278.);
+  tpc->DefineSection(0,-289.6,77.,278.);
+  tpc->DefineSection(1,-262.1,77.,278.);
   //
-  tpc->DefineSection(2,-270.,77.,278.);
-  tpc->DefineSection(3,-259.6,70.,278.);
+  tpc->DefineSection(2,-262.1,83.1,278.);
+  tpc->DefineSection(3,-260.,83.1,278.);
   //
-  tpc->DefineSection(4,-259.6,68.1,278.);
-  tpc->DefineSection(5,-253.6,68.1,278.);
+  tpc->DefineSection(4,-260.,70.,278.);    
+  tpc->DefineSection(5,-259.6,70.,278.);
   //
-  tpc->DefineSection(6,-253.6,68.,278.);
-  tpc->DefineSection(7,-74.0,60.8,278.);
+  tpc->DefineSection(6,-259.6,68.1,278.);
+  tpc->DefineSection(7,-253.6,68.1,278.);
   //
-  tpc->DefineSection(8,-74.0,60.1,278.);
-  tpc->DefineSection(9,-73.3,60.1,278.);
+  tpc->DefineSection(8,-253.6,67.88,278.);//hs
+  tpc->DefineSection(9,-74.0,60.68,278.);// hs
   //
-  tpc->DefineSection(10,-73.3,56.9,278.); 
-  tpc->DefineSection(11,73.3,56.9,278.);
+  tpc->DefineSection(10,-74.0,60.1,278.);
+  tpc->DefineSection(11,-73.3,60.1,278.);
   //
-  tpc->DefineSection(12,73.3,60.1,278.);
-  tpc->DefineSection(13,74.0,60.1,278.);
+  tpc->DefineSection(12,-73.3,56.9,278.); 
+  tpc->DefineSection(13,-68.5,56.9,278.);
   //
-  tpc->DefineSection(14,74.0,60.8,278.);
-  tpc->DefineSection(15,253.6,65.5,278.);
+  tpc->DefineSection(14,-68.5,60.,278.);
+  tpc->DefineSection(15,-64.7,60.,278.);
   //
-  tpc->DefineSection(16,253.6,65.6,278.);
-  tpc->DefineSection(17,259.6,65.6,278.);
+  tpc->DefineSection(16,-64.7,56.9,278.); 
+  tpc->DefineSection(17,73.3,56.9,278.);
   //
-  tpc->DefineSection(18,259.6,70.0,278.);
-  tpc->DefineSection(19,291.,77.,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);
@@ -162,7 +179,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_Ne-CO2-2");
   TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
   //
   v1->AddNode(v9,1);
@@ -213,7 +230,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)
@@ -302,6 +321,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
   //-----------------------------------------------
@@ -323,6 +352,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
@@ -382,6 +420,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 
@@ -814,7 +854,6 @@ void AliTPCv3::CreateGeometry()
   TGeoMedium *m7=gGeoManager->GetMedium("TPC_Cu");
   TGeoMedium *m10 =  gGeoManager->GetMedium("TPC_Alumina");
   TGeoMedium *m11 =  gGeoManager->GetMedium("TPC_Peek");
-  TGeoMedium *m12 =  gGeoManager->GetMedium("TPC_Water");
   // upper and lower rods differ in length!
   Double_t *upar;
   upar=NULL;
@@ -928,6 +967,7 @@ void AliTPCv3::CreateGeometry()
  
 } // end of function
  
+ 
 
 //_____________________________________________________________________________
 void AliTPCv3::CreateMaterials()