]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
git://git.uio.no / u / mrichter / AliRoot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 144414d)
Removed overlaps/extrusions down to 1 micrometer
authorkowal2 <kowal2@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 1 Feb 2006 11:53:44 +0000 (11:53 +0000)
committerkowal2 <kowal2@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 1 Feb 2006 11:53:44 +0000 (11:53 +0000)
TPC/AliTPCv0.cxx patch | blob | blame | history
TPC/AliTPCv1.cxx patch | blob | blame | history
TPC/AliTPCv2.cxx patch | blob | blame | history
TPC/AliTPCv3.cxx patch | blob | blame | history

diff --git a/TPC/AliTPCv0.cxx b/TPC/AliTPCv0.cxx
index b0dff063caed000be5a6fa762037a7b8252cb291..57bcffeeaed275bb72926adcb1bb51db8a413a9d 100644 (file)
--- a/TPC/AliTPCv0.cxx
+++ b/TPC/AliTPCv0.cxx
@@ -101,7 +101,7 @@ void AliTPCv0::CreateGeometry()
   //
   TGeoPcon *tpc = new TGeoPcon(0.,360.,18); //18 sections
   tpc->DefineSection(0,-290.,77.,278.);
-  tpc->DefineSection(1,-259.6,77.,278.);
+  tpc->DefineSection(1,-259.6,70.,278.);
   //
   tpc->DefineSection(2,-259.6,68.1,278.);
   tpc->DefineSection(3,-253.6,68.1,278.);
@@ -124,7 +124,7 @@ void AliTPCv0::CreateGeometry()
   tpc->DefineSection(14,253.6,65.6,278.);
   tpc->DefineSection(15,259.6,65.6,278.);
   //
-  tpc->DefineSection(16,259.6,77.0,278.);
+  tpc->DefineSection(16,259.6,70.0,278.);
   tpc->DefineSection(17,290.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
@@ -228,7 +228,7 @@ void AliTPCv0::CreateGeometry()
   //
   tf1v->AddNode(tf2v,1); tf2v->AddNode(tf3v,1);
   //
-  v3->AddNode(tov1,1); v4->AddNode(tf1v,1);
+  v3->AddNode(tov1,1,new TGeoTranslation(0.,0.,-1.5)); v4->AddNode(tf1v,1);
   //
   v2->AddNode(v3,1); v2->AddNode(v4,1); 
   //
@@ -504,9 +504,10 @@ void AliTPCv0::CreateGeometry()
    ifstream in;
    in.open(fileName.Data(), ios_base::in); // asci file
    for(Int_t i =0;i<86;i++){
-      Double_t y = 3.9;
+      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);
diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx
index 273a2f510561081d4dda0fd2799a35c3c6d525e3..9f0fb1eb32ef9e377936aeb3e7d7976c53063b6c 100644 (file)
--- a/TPC/AliTPCv1.cxx
+++ b/TPC/AliTPCv1.cxx
@@ -117,7 +117,7 @@ void AliTPCv1::CreateGeometry()
   //
   TGeoPcon *tpc = new TGeoPcon(0.,360.,18); //18 sections
   tpc->DefineSection(0,-290.,77.,278.);
-  tpc->DefineSection(1,-259.6,77.,278.);
+  tpc->DefineSection(1,-259.6,70.,278.);
   //
   tpc->DefineSection(2,-259.6,68.1,278.);
   tpc->DefineSection(3,-253.6,68.1,278.);
@@ -140,7 +140,7 @@ void AliTPCv1::CreateGeometry()
   tpc->DefineSection(14,253.6,65.6,278.);
   tpc->DefineSection(15,259.6,65.6,278.);
   //
-  tpc->DefineSection(16,259.6,77.0,278.);
+  tpc->DefineSection(16,259.6,70.0,278.);
   tpc->DefineSection(17,290.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
@@ -246,7 +246,7 @@ void AliTPCv1::CreateGeometry()
   //
   tf1v->AddNode(tf2v,1); tf2v->AddNode(tf3v,1);
   //
-  v3->AddNode(tov1,1); v4->AddNode(tf1v,1);
+  v3->AddNode(tov1,1,new TGeoTranslation(0.,0.,-1.5)); v4->AddNode(tf1v,1);
   //
   v2->AddNode(v3,1); v2->AddNode(v4,1); 
   //
@@ -521,9 +521,10 @@ void AliTPCv1::CreateGeometry()
    ifstream in;
    in.open(fileName.Data(), ios_base::in); // asci file
    for(Int_t i =0;i<86;i++){
-      Double_t y = 3.9;
+      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);
diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index 05ea40bedbe43d4c3c2082aa39ed99aa6cbdc5be..28576bf8d2a782826cc43925c479f096e4a58fc1 100644 (file)
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -107,7 +107,7 @@ void AliTPCv2::CreateGeometry()
   //
   TGeoPcon *tpc = new TGeoPcon(0.,360.,18); //18 sections
   tpc->DefineSection(0,-290.,77.,278.);
-  tpc->DefineSection(1,-259.6,77.,278.);
+  tpc->DefineSection(1,-259.6,70.,278.);
   //
   tpc->DefineSection(2,-259.6,68.1,278.);
   tpc->DefineSection(3,-253.6,68.1,278.);
@@ -130,7 +130,7 @@ void AliTPCv2::CreateGeometry()
   tpc->DefineSection(14,253.6,65.6,278.);
   tpc->DefineSection(15,259.6,65.6,278.);
   //
-  tpc->DefineSection(16,259.6,77.0,278.);
+  tpc->DefineSection(16,259.6,70.0,278.);
   tpc->DefineSection(17,290.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
@@ -234,7 +234,7 @@ void AliTPCv2::CreateGeometry()
   //
   tf1v->AddNode(tf2v,1); tf2v->AddNode(tf3v,1);
   //
-  v3->AddNode(tov1,1); v4->AddNode(tf1v,1);
+  v3->AddNode(tov1,1,new TGeoTranslation(0.,0.,-1.5)); v4->AddNode(tf1v,1);
   //
   v2->AddNode(v3,1); v2->AddNode(v4,1); 
   //
@@ -509,9 +509,10 @@ void AliTPCv2::CreateGeometry()
    ifstream in;
    in.open(fileName.Data(), ios_base::in); // asci file
    for(Int_t i =0;i<86;i++){
-      Double_t y = 3.9;
+      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);
diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx
index 0b77fcf74ca2082d355c1f74c72464851d351566..02091f227de957bde7921c42f402ab8314667d34 100644 (file)
--- a/TPC/AliTPCv3.cxx
+++ b/TPC/AliTPCv3.cxx
@@ -116,7 +116,7 @@ void AliTPCv3::CreateGeometry()
   //
   TGeoPcon *tpc = new TGeoPcon(0.,360.,18); //18 sections
   tpc->DefineSection(0,-290.,77.,278.);
-  tpc->DefineSection(1,-259.6,77.,278.);
+  tpc->DefineSection(1,-259.6,70.,278.);
   //
   tpc->DefineSection(2,-259.6,68.1,278.);
   tpc->DefineSection(3,-253.6,68.1,278.);
@@ -139,7 +139,7 @@ void AliTPCv3::CreateGeometry()
   tpc->DefineSection(14,253.6,65.6,278.);
   tpc->DefineSection(15,259.6,65.6,278.);
   //
-  tpc->DefineSection(16,259.6,77.0,278.);
+  tpc->DefineSection(16,259.6,70.0,278.);
   tpc->DefineSection(17,290.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
@@ -244,7 +244,7 @@ void AliTPCv3::CreateGeometry()
   //
   tf1v->AddNode(tf2v,1); tf2v->AddNode(tf3v,1);
   //
-  v3->AddNode(tov1,1); v4->AddNode(tf1v,1);
+  v3->AddNode(tov1,1,new TGeoTranslation(0.,0.,-1.5)); v4->AddNode(tf1v,1);
   //
   v2->AddNode(v3,1); v2->AddNode(v4,1); 
   //
@@ -526,9 +526,10 @@ void AliTPCv3::CreateGeometry()
    ifstream in;
    in.open(fileName.Data(), ios_base::in); // asci file
    for(Int_t i =0;i<86;i++){
-      Double_t y = 3.9;
+      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);