X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCv2.cxx;h=4d85e1c3b1e0bcd486003d295fae4f9c6e5261da;hb=f38eef4da8a59655bddc9147e80d9111b1fc3e8e;hp=8a06644f2a32fc91075d97a6dadf9926c9166ab2;hpb=3378c058ef153f5af65aa3765a4444985a72b573;p=u%2Fmrichter%2FAliRoot.git diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx index 8a06644f2a3..4d85e1c3b1e 100644 --- a/TPC/AliTPCv2.cxx +++ b/TPC/AliTPCv2.cxx @@ -35,6 +35,7 @@ #include #include #include "AliLog.h" +#include "AliMathBase.h" #include "AliTrackReference.h" #include "AliTPCParam.h" #include "AliTPCTrackHitsV2.h" @@ -66,8 +67,8 @@ AliTPCv2::AliTPCv2(const char *name, const char *title) : SetBufferSize(128000); - if (fTPCParam) - fTPCParam->Write(fTPCParam->GetTitle()); +// if (fTPCParam) +// fTPCParam->Write(fTPCParam->GetTitle()); } //_____________________________________________________________________________ @@ -100,33 +101,37 @@ void AliTPCv2::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); @@ -843,6 +848,9 @@ void AliTPCv2::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! delete [] upar; upar=NULL; @@ -859,7 +867,55 @@ void AliTPCv2::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; @@ -869,21 +925,38 @@ void AliTPCv2::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+19,"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+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); + // + 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); + } } delete [] upar; @@ -1167,7 +1240,7 @@ void AliTPCv2::StepManager() const Float_t kprim = 14.35; // number of primary collisions per 1 cm const Float_t kpoti = 20.77e-9; // first ionization potential for Ne/CO2 const Float_t kwIon = 35.97e-9; // energy for the ion-electron pair creation - + const Int_t kMaxDistRef =15; // maximal difference between 2 stored references const Float_t kbig = 1.e10; @@ -1208,8 +1281,8 @@ void AliTPCv2::StepManager() fTPCParam->AdjustCosSin(sector,cos,sin); Float_t x1=p[0]*cos + p[1]*sin; // check if within sector's limits - if(x1>=fTPCParam->GetInnerRadiusLow()&&x1<=fTPCParam->GetInnerRadiusUp() - ||x1>=fTPCParam->GetOuterRadiusLow()&&x1<=fTPCParam->GetOuterRadiusUp()){ + if((x1>=fTPCParam->GetInnerRadiusLow()&&x1<=fTPCParam->GetInnerRadiusUp()) + ||(x1>=fTPCParam->GetOuterRadiusLow()&&x1<=fTPCParam->GetOuterRadiusUp())){ // calculate real sector number... if (x1>fTPCParam->GetOuterRadiusLow()){ sector = TMath::Nint((angle-fTPCParam->GetOuterAngleShift())/ @@ -1223,6 +1296,13 @@ void AliTPCv2::StepManager() // vol[0]=sector; + + static Double_t lastReferenceR=0; + if (TMath::Abs(lastReferenceR-r)>kMaxDistRef){ + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTPC); + lastReferenceR = r; + } + // check if change of sector if(sector != fSecOld){ fSecOld=sector; @@ -1324,7 +1404,7 @@ void AliTPCv2::StepManager() { betaGamma = TMath::Max(betaGamma,(Float_t)7.e-3); // protection against too small bg - pp=kprim*BetheBloch(betaGamma); + pp=kprim*AliMathBase::BetheBlochAleph(betaGamma); } @@ -1335,28 +1415,4 @@ void AliTPCv2::StepManager() } -//_____________________________________________________________________________ -Float_t AliTPCv2::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)); -} -