From 456cb019e7a0a442c40d96e709a43e2257d232bd Mon Sep 17 00:00:00 2001 From: kowal2 Date: Wed, 1 Feb 2006 11:53:44 +0000 Subject: [PATCH] Removed overlaps/extrusions down to 1 micrometer --- TPC/AliTPCv0.cxx | 9 +++++---- TPC/AliTPCv1.cxx | 9 +++++---- TPC/AliTPCv2.cxx | 9 +++++---- TPC/AliTPCv3.cxx | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/TPC/AliTPCv0.cxx b/TPC/AliTPCv0.cxx index b0dff063cae..57bcffeeaed 100644 --- 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 273a2f51056..9f0fb1eb32e 100644 --- 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 05ea40bedbe..28576bf8d2a 100644 --- 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 0b77fcf74ca..02091f227de 100644 --- 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); -- 2.43.0