X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCv0.cxx;h=deb7993c1dfc77f6137fbfdf21cbfe999c3730e3;hb=84290fcc7685f8042edd047c160800a572601361;hp=f707039a72aae6d5cac8622a2cae6436fdde6cbc;hpb=7281dc0788f9116d9f65678ae9564b805bb3797f;p=u%2Fmrichter%2FAliRoot.git diff --git a/TPC/AliTPCv0.cxx b/TPC/AliTPCv0.cxx index f707039a72a..deb7993c1df 100644 --- a/TPC/AliTPCv0.cxx +++ b/TPC/AliTPCv0.cxx @@ -31,10 +31,7 @@ #include -#include #include -#include -#include #include #include #include @@ -99,33 +96,37 @@ void AliTPCv0::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.,20); //20 sections // - tpc->DefineSection(2,-259.6,68.1,278.); - tpc->DefineSection(3,-253.6,68.1,278.); + tpc->DefineSection(0,-291.,77.,278.); + tpc->DefineSection(1,-270,77.,278.); // - tpc->DefineSection(4,-253.6,68.,278.); - tpc->DefineSection(5,-74.0,60.8,278.); + tpc->DefineSection(2,-270.,77.,278.); + tpc->DefineSection(3,-259.6,70.,278.); // - tpc->DefineSection(6,-74.0,60.1,278.); - tpc->DefineSection(7,-73.3,60.1,278.); + tpc->DefineSection(4,-259.6,68.1,278.); + tpc->DefineSection(5,-253.6,68.1,278.); // - tpc->DefineSection(8,-73.3,56.9,278.); - tpc->DefineSection(9,73.3,56.9,278.); + tpc->DefineSection(6,-253.6,68.,278.); + tpc->DefineSection(7,-74.0,60.8,278.); // - tpc->DefineSection(10,73.3,60.1,278.); - tpc->DefineSection(11,74.0,60.1,278.); + tpc->DefineSection(8,-74.0,60.1,278.); + tpc->DefineSection(9,-73.3,60.1,278.); // - tpc->DefineSection(12,74.0,60.8,278.); - tpc->DefineSection(13,253.6,65.5,278.); + tpc->DefineSection(10,-73.3,56.9,278.); + tpc->DefineSection(11,73.3,56.9,278.); // - tpc->DefineSection(14,253.6,65.6,278.); - tpc->DefineSection(15,259.6,65.6,278.); + tpc->DefineSection(12,73.3,60.1,278.); + tpc->DefineSection(13,74.0,60.1,278.); // - tpc->DefineSection(16,259.6,70.0,278.); - tpc->DefineSection(17,290.,77.,278.); + tpc->DefineSection(14,74.0,60.8,278.); + tpc->DefineSection(15,253.6,65.5,278.); + // + tpc->DefineSection(16,253.6,65.6,278.); + tpc->DefineSection(17,259.6,65.6,278.); + // + tpc->DefineSection(18,259.6,70.0,278.); + tpc->DefineSection(19,291.,77.,278.); // TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air"); TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1); @@ -388,8 +389,8 @@ void AliTPCv0::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); @@ -409,12 +410,12 @@ void AliTPCv0::CreateGeometry() // // define reflection matrix // - TGeoRotation *ref = new TGeoRotation("ref",90.,0.,90.,270.,180.,0.); + TGeoRotation *ref = new TGeoRotation("ref",90.,0.,90.,90.,180.,0.); // 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 @@ -435,25 +436,25 @@ void AliTPCv0::CreateGeometry() // end caps - they are make as an assembly of single segments // containing both readout chambers // - Double_t OpeningAngle = 10.*TMath::DegToRad(); + Double_t openingAngle = 10.*TMath::DegToRad(); Double_t thick=1.5; // rib - Double_t shift = thick/TMath::Sin(OpeningAngle); + Double_t shift = thick/TMath::Sin(openingAngle); // - Double_t LowEdge = 86.3; // hole in the wheel - Double_t UpEdge = 240.4; // hole in the wheel + Double_t lowEdge = 86.3; // hole in the wheel + Double_t upEdge = 240.4; // hole in the wheel // new TGeoTubeSeg("sec",74.5,264.4,3.,0.,20.); // TGeoPgon *hole = new TGeoPgon("hole",0.,20.,1,4); // - hole->DefineSection(0,-3.5,LowEdge-shift,UpEdge-shift); - hole->DefineSection(1,-1.5,LowEdge-shift,UpEdge-shift); + hole->DefineSection(0,-3.5,lowEdge-shift,upEdge-shift); + hole->DefineSection(1,-1.5,lowEdge-shift,upEdge-shift); // - hole->DefineSection(2,-1.5,LowEdge-shift,UpEdge+3.-shift); - hole->DefineSection(3,3.5,LowEdge-shift,UpEdge+3.-shift); + hole->DefineSection(2,-1.5,lowEdge-shift,upEdge+3.-shift); + hole->DefineSection(3,3.5,lowEdge-shift,upEdge+3.-shift); // - Double_t ys = shift*TMath::Sin(OpeningAngle); - Double_t xs = shift*TMath::Cos(OpeningAngle); + Double_t ys = shift*TMath::Sin(openingAngle); + Double_t xs = shift*TMath::Cos(openingAngle); TGeoTranslation *tr = new TGeoTranslation("tr",xs,ys,0.); tr->RegisterYourself(); TGeoCompositeShape *chamber = new TGeoCompositeShape("sec-hole:tr"); @@ -671,7 +672,10 @@ void AliTPCv0::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.); @@ -679,33 +683,43 @@ void AliTPCv0::CreateGeometry() *rot=rot1*rot2; // 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); - x0=188.45*TMath::Cos(OpeningAngle); - y0=188.45*TMath::Sin(OpeningAngle); - TGeoCombiTrans *combi2 = new TGeoCombiTrans("combi2",x0,y0,0.99,rot); + x0=110.2*TMath::Cos(openingAngle); + y0=110.2*TMath::Sin(openingAngle); + 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 *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 // - sect->AddNode(ch,1); - sect->AddNode(iroc,1,combi1); - sect->AddNode(oroc,1,combi2); + // A-side // - // segment is ready... - // now I try to make a wheel... + secta->AddNode(ch,1); + secta->AddNode(iroc,1,combi1a); + secta->AddNode(oroc,1,combi2a); // - TGeoVolumeAssembly *wheel = new TGeoVolumeAssembly("TPC_ENDCAP"); + // C-side + // + 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! - v9->AddNode(wheel,1,new TGeoTranslation(0.,0.,-256.6)); TGeoCombiTrans *combi3 = new TGeoCombiTrans("combi3",0.,0.,256.6,ref); - v9->AddNode(wheel,2,combi3); + v9->AddNode(wheela,1,combi3); + v9->AddNode(wheelc,2,new TGeoTranslation(0.,0.,-256.6)); //_____________________________________________________________ // service support wheel //_____________________________________________________________ @@ -715,7 +729,7 @@ void AliTPCv0::CreateGeometry() TGeoVolume *swv = new TGeoVolume("TPC_SWSEG",sw,m3); //Al // thick=1.; - shift = thick/TMath::Sin(OpeningAngle); + shift = thick/TMath::Sin(openingAngle); TGeoPgon *sh = new TGeoPgon(0.,20.,1,2); sh->DefineSection(0,-4.,81.5-shift,250.75-shift); sh->DefineSection(1,4.,81.5-shift,250.75-shift); @@ -730,8 +744,8 @@ void AliTPCv0::CreateGeometry() shv->AddNode(elv,1); // // - ys = shift*TMath::Sin(OpeningAngle); - xs = shift*TMath::Cos(OpeningAngle); + ys = shift*TMath::Sin(openingAngle); + xs = shift*TMath::Cos(openingAngle); swv->AddNode(shv,1,new TGeoTranslation(xs,ys,0.)); // cover TGeoPgon *co = new TGeoPgon(0.,20.,1,2); @@ -740,14 +754,14 @@ void AliTPCv0::CreateGeometry() TGeoVolume *cov = new TGeoVolume("TPC_SWC1",co,m3);//Al // hole in a cover TGeoPgon *coh = new TGeoPgon(0.,20.,1,2); - shift=4./TMath::Sin(OpeningAngle); + shift=4./TMath::Sin(openingAngle); coh->DefineSection(0,-0.5,85.-shift,247.25-shift); coh->DefineSection(1,0.5,85.-shift,247.25-shift); // TGeoVolume *cohv = new TGeoVolume("TPC_SWC2",coh,m1); // - ys = shift*TMath::Sin(OpeningAngle); - xs = shift*TMath::Cos(OpeningAngle); + ys = shift*TMath::Sin(openingAngle); + xs = shift*TMath::Cos(openingAngle); cov->AddNode(cohv,1,new TGeoTranslation(xs,ys,0.)); // // Sector as an Assembly @@ -774,6 +788,9 @@ void AliTPCv0::CreateGeometry() //---------------------------------------------------------- TGeoMedium *m6=gGeoManager->GetMedium("TPC_Makrolon"); 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; @@ -790,6 +807,53 @@ void AliTPCv0::CreateGeometry() TGeoVolume *hvrv = new TGeoVolume("TPC_HV_Rod",hvr,m6); TGeoVolume *hvcv = new TGeoVolume("TPC_HV_Cable",hvc,m7); hvrv->AddNode(hvcv,1); + // + // resistor rods + // + TGeoTube *cri = new TGeoTube(0.,0.45,126.64); //inner + TGeoTube *cro = new TGeoTube(0.,0.45,126.54); //outer + TGeoTube *cwi = new TGeoTube(0.,0.15,126.64); // water inner + TGeoTube *cwo = new TGeoTube(0.,0.15,126.54); // water outer + // + TGeoVolume *criv = new TGeoVolume("TPC_CR_I",cri,m10); + TGeoVolume *crov = new TGeoVolume("TPC_CR_O",cro,m10); + TGeoVolume *cwiv = new TGeoVolume("TPC_W_I",cwi,m11); + TGeoVolume *cwov = new TGeoVolume("TPC_W_O",cwo,m11); + // + // ceramic rod with water + // + criv->AddNode(cwiv,1); + crov->AddNode(cwov,1); + // + TGeoTube *pri =new TGeoTube(0.2,0.35,126.64); //inner + TGeoTube *pro = new TGeoTube(0.2,0.35,126.54); //outer + // + // peek rod + // + TGeoVolume *priv = new TGeoVolume("TPC_PR_I",pri,m12); + TGeoVolume *prov = new TGeoVolume("TPC_PR_O",pro,m12); + // + // resistor rods assembly + // + TGeoRotation *rotr = new TGeoRotation("rotr"); + rotr->RotateZ(-21.); + TGeoTube *rri = new TGeoTube(1.8,2.2,126.64);//inner + TGeoTube *rro = new TGeoTube(1.8,2.2,126.54);//inner + // + TGeoVolume *rriv = new TGeoVolume("TPC_RR_I",rri,m6); + TGeoVolume *rrov = new TGeoVolume("TPC_RR_O",rro,m6); + // + TGeoVolumeAssembly *rrin = new TGeoVolumeAssembly("TPC_RROD_I"); + TGeoVolumeAssembly *rrou = new TGeoVolumeAssembly("TPC_RROD_O"); + rrin->AddNode(rriv,1); + rrin->AddNode(criv,1,new TGeoTranslation(0.5,0.866, 0.)); + rrin->AddNode(criv,2,new TGeoTranslation(0.5,-0.866, 0.)); + rrin->AddNode(priv,1); + // + rrou->AddNode(rrov,1); + rrou->AddNode(crov,1,new TGeoTranslation(0.5,0.866, 0.)); + rrou->AddNode(crov,2,new TGeoTranslation(0.5,-0.866, 0.)); + rrou->AddNode(prov,1); for(Int_t i=0;i<18;i++){ Double_t angle,x,y; Double_t z,r; @@ -799,21 +863,38 @@ void AliTPCv0::CreateGeometry() 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 + if(i==3){ + v9->AddNode(rrin,1,new TGeoCombiTrans(x,y,z,rotr)); //A + v9->AddNode(rrin,2,new TGeoCombiTrans(x,y,-z,rotr)); //C + } + else { + gGeoManager->Node("TPC_Rod",i+1,"TPC_Drift",x,y,z,0,kTRUE,upar,3);//shaft + gGeoManager->Node("TPC_Rod",i+19,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);//muon } + + + // 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); + // + if(i==15){ + //v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z));//A-side only + v9->AddNode(hvrv,1,new TGeoTranslation(x,y,127.14));//A-side only + gGeoManager->Node("TPC_Rod",i+55,"TPC_Drift",x,y,-z,0,kTRUE,upar,3); + } + else if(i==11){ + v9->AddNode(rrou,1,new TGeoCombiTrans(x,y,z,rotr)); //A + v9->AddNode(rrou,2,new TGeoCombiTrans(x,y,-z,rotr)); //C + } + else{ + // + gGeoManager->Node("TPC_Rod",i+37,"TPC_Drift",x,y,z,0,kTRUE,upar,3); + gGeoManager->Node("TPC_Rod",i+55,"TPC_Drift",x,y,-z,0,kTRUE,upar,3); + } + } TGeoVolume *alice = gGeoManager->GetVolume("ALIC"); @@ -833,7 +914,7 @@ void AliTPCv0::CreateMaterials() } //_____________________________________________________________________________ -void AliTPCv0::DrawDetector() +void AliTPCv0::DrawDetector() const { // // Draw a shaded view of the Time Projection Chamber version 0