X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCv2.cxx;h=9bf7a07c264b362cd51b7853e1bc1becdbda349a;hb=296ee45877b9434095f1349a34d4a28fa7a1615f;hp=d5d1428217b368ac179d4e32ebc3c3e111951917;hpb=1ac29fc4b18c1f1b9aa25371a7416518f6ddda5e;p=u%2Fmrichter%2FAliRoot.git diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx index d5d1428217b..9bf7a07c264 100644 --- a/TPC/AliTPCv2.cxx +++ b/TPC/AliTPCv2.cxx @@ -35,9 +35,12 @@ #include #include #include "AliLog.h" +#include "AliMathBase.h" +#include "AliTrackReference.h" #include "AliTPCParam.h" #include "AliTPCTrackHitsV2.h" #include "AliTPCv2.h" +#include "AliGeomManager.h" #include "TGeoVolume.h" #include "TGeoPcon.h" #include "TGeoTube.h" @@ -64,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()); } //_____________________________________________________________________________ @@ -98,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); @@ -386,8 +393,8 @@ void AliTPCv2::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); @@ -680,12 +687,12 @@ void AliTPCv2::CreateGeometry() Double_t x0,y0; x0=110.2*TMath::Cos(openingAngle); y0=110.2*TMath::Sin(openingAngle); - TGeoCombiTrans *combi1a = new TGeoCombiTrans("combi1",x0,y0,1.09+0.222,rot); //a-side - TGeoCombiTrans *combi1c = new TGeoCombiTrans("combi1",x0,y0,1.09+0.195,rot); //c-side + 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.222,rot); //a-side - TGeoCombiTrans *combi2c = new TGeoCombiTrans("combi2",x0,y0,0.99+0.195,rot); //c-side + 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 // // // A-side @@ -841,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; @@ -857,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; @@ -867,23 +925,42 @@ 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; + TGeoVolume *alice = gGeoManager->GetVolume("ALIC"); alice->AddNode(v1,1); @@ -905,7 +982,8 @@ void AliTPCv2::AddAlignableVolumes() const void AliTPCv2::SetInnerChambersAlignable() const { // - Int_t modnum = 0; + AliGeomManager::ELayerID idTPC1 = AliGeomManager::kTPC1; + Int_t modUID, modnum = 0; TString vpstr1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_"; TString vpstr2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_"; TString vpappend = "/TPC_IROC_1"; @@ -915,42 +993,35 @@ void AliTPCv2::SetInnerChambersAlignable() const TString volpath, symname; for(Int_t cnt=1; cnt<=18; cnt++){ + modUID = AliGeomManager::LayerToVolUID(idTPC1,modnum++); volpath = vpstr1; volpath += cnt; volpath += vpappend; symname = snstr1; symname += cnt; symname += snappend; - if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data())) + if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID)) AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data())); - // - TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntry(symname.Data()); - const char *path = alignableEntry->GetTitle(); - if (!gGeoManager->cd(path)) - AliFatal(Form("Volume path %s not valid!",path)); - TGeoHMatrix* globMatrix = gGeoManager->GetCurrentMatrix(); + TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID); + TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig(); TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,cnt-1); alignableEntry->SetMatrix(matTtoL); - modnum++; } for(Int_t cnt=1; cnt<=18; cnt++){ + modUID = AliGeomManager::LayerToVolUID(idTPC1,modnum++); volpath = vpstr2; volpath += cnt; volpath += vpappend; symname = snstr2; symname += cnt; symname += snappend; - if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data())) + if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID)) AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data())); - TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntry(symname.Data()); - const char *path = alignableEntry->GetTitle(); - if (!gGeoManager->cd(path)) - AliFatal(Form("Volume path %s not valid!",path)); - TGeoHMatrix* globMatrix = gGeoManager->GetCurrentMatrix(); + TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID); + TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig(); TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,18+cnt-1); alignableEntry->SetMatrix(matTtoL); - modnum++; } } @@ -958,7 +1029,8 @@ void AliTPCv2::SetInnerChambersAlignable() const void AliTPCv2::SetOuterChambersAlignable() const { // - Int_t modnum = 0; + AliGeomManager::ELayerID idTPC2 = AliGeomManager::kTPC2; + Int_t modUID, modnum = 0; TString vpstr1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_"; TString vpstr2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_"; TString vpappend = "/TPC_OROC_1"; @@ -968,41 +1040,35 @@ void AliTPCv2::SetOuterChambersAlignable() const TString volpath, symname; for(Int_t cnt=1; cnt<=18; cnt++){ + modUID = AliGeomManager::LayerToVolUID(idTPC2,modnum++); volpath = vpstr1; volpath += cnt; volpath += vpappend; symname = snstr1; symname += cnt; symname += snappend; - if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data())) + if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID)) AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data())); - TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntry(symname.Data()); - const char *path = alignableEntry->GetTitle(); - if (!gGeoManager->cd(path)) - AliFatal(Form("Volume path %s not valid!",path)); - TGeoHMatrix* globMatrix = gGeoManager->GetCurrentMatrix(); + TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID); + TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig(); TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,36+cnt-1); alignableEntry->SetMatrix(matTtoL); - modnum++; } for(Int_t cnt=1; cnt<=18; cnt++){ + modUID = AliGeomManager::LayerToVolUID(idTPC2,modnum++); volpath = vpstr2; volpath += cnt; volpath += vpappend; symname = snstr2; symname += cnt; symname += snappend; - if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data())) + if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID)) AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data())); - TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntry(symname.Data()); - const char *path = alignableEntry->GetTitle(); - if (!gGeoManager->cd(path)) - AliFatal(Form("Volume path %s not valid!",path)); - TGeoHMatrix* globMatrix = gGeoManager->GetCurrentMatrix(); + TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID); + TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig(); TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,36+18+cnt-1); alignableEntry->SetMatrix(matTtoL); - modnum++; } } @@ -1141,12 +1207,21 @@ void AliTPCv2::Init() fIDrift=gMC->VolId("TPC_Drift"); fSecOld=-100; // fake number - gMC->SetMaxNStep(30000); // max. number of steps increased + gMC->SetMaxNStep(-30000); // max. number of steps increased - gMC->Gstpar(idtmed[2],"LOSS",5); // specific energy loss + if (fPrimaryIonisation) { + gMC->Gstpar(idtmed[2],"PRIMIO_E", 20.77); // 1st ionisation potential + + gMC->Gstpar(idtmed[2],"PRIMIO_N", 14.35); + gMC->Gstpar(idtmed[2],"LOSS", 14); // specific energy loss + gMC->Gstpar(idtmed[2],"STRA",4); + } else { + gMC->Gstpar(idtmed[2],"LOSS", 5); // specific energy loss + } - AliInfo("*** TPC version 2 initialized ***"); - AliInfo(Form("Maximum number of steps = %d",gMC->GetMaxNStep())); + + AliDebug(1,"*** TPC version 2 initialized ***"); + AliDebug(1,Form("Maximum number of steps = %d",gMC->GetMaxNStep())); // @@ -1165,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; @@ -1176,7 +1251,7 @@ void AliTPCv2::StepManager() vol[1]=0; // preset row number to 0 // - gMC->SetMaxStep(kbig); + if (fPrimaryIonisation) gMC->SetMaxStep(kbig); if(!gMC->IsTrackAlive()) return; // particle has disappeared @@ -1206,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())/ @@ -1221,11 +1296,18 @@ 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; // add track reference - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTPC); } // track is in the sensitive strip if(id == fIdSens){ @@ -1271,8 +1353,14 @@ void AliTPCv2::StepManager() // charged particle is in the sensitive drift volume //----------------------------------------------------------------- if(gMC->TrackStep() > 0) { - - Int_t nel = (Int_t)(((gMC->Edep())-kpoti)/kwIon) + 1; + Int_t nel=0; + if (!fPrimaryIonisation) { + nel = (Int_t)(((gMC->Edep())-kpoti)/kwIon) + 1; + } + else { + Float_t edep = gMC->Edep(); + if (edep > 0.) nel = (Int_t)((gMC->Edep()*1.5)/kwIon) + 1; + } nel=TMath::Min(nel,300); // 300 electrons corresponds to 10 keV // gMC->TrackPosition(p); @@ -1301,53 +1389,30 @@ void AliTPCv2::StepManager() Float_t pp; TLorentzVector mom; - gMC->TrackMomentum(mom); - Float_t ptot=mom.Rho(); - Float_t betaGamma = ptot/gMC->TrackMass(); - - Int_t pid=gMC->TrackPid(); - if((pid==kElectron || pid==kPositron) && ptot > 0.002) - { - pp = kprim*1.58; // electrons above 20 MeV/c are on the plateau! - } - else - { + // below is valid only for Geant3 (fPromaryIonisation not set) + if(!fPrimaryIonisation){ + gMC->TrackMomentum(mom); + Float_t ptot=mom.Rho(); + Float_t betaGamma = ptot/gMC->TrackMass(); - betaGamma = TMath::Max(betaGamma,(Float_t)7.e-3); // protection against too small bg - pp=kprim*BetheBloch(betaGamma); + Int_t pid=gMC->TrackPid(); + if((pid==kElectron || pid==kPositron) && ptot > 0.002) + { + pp = kprim*1.58; // electrons above 20 MeV/c are on the plateau! + } + else + { + + betaGamma = TMath::Max(betaGamma,(Float_t)7.e-3); // protection against too small bg + pp=kprim*AliMathBase::BetheBlochAleph(betaGamma); - if(TMath::Abs(charge) > 1.) pp *= (charge*charge); } - Double_t rnd = gMC->GetRandom()->Rndm(); - - gMC->SetMaxStep(-TMath::Log(rnd)/pp); - + Double_t rnd = gMC->GetRandom()->Rndm(); -} - -//_____________________________________________________________________________ -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); + gMC->SetMaxStep(-TMath::Log(rnd)/pp); + } - return ((Float_t)((kp2-aa-bb)*kp1/aa)); }