X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenParam.cxx;h=9428bb87b13daa5686ce71f15644370adada336f;hb=18e09c20b41d8dcf899471bb6bf6e86753a4d39f;hp=9203eb92561fe38608ddca33605a23791e8f4d76;hpb=5d12ce3847b64498d417a697c24fb86f715f2752;p=u%2Fmrichter%2FAliRoot.git diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx index 9203eb92561..9428bb87b13 100644 --- a/EVGEN/AliGenParam.cxx +++ b/EVGEN/AliGenParam.cxx @@ -21,20 +21,24 @@ // Decays are performed using Pythia. // andreas.morsch@cern.ch -#include "AliGenParam.h" -#include "AliDecayer.h" -#include "AliGenMUONlib.h" -#include "AliRun.h" -#include -#include +#include +#include #include +#include +#include #include +#include +#include +#include +#include #include -#include -#include -#include +#include "AliDecayer.h" +#include "AliGenMUONlib.h" +#include "AliGenParam.h" #include "AliMC.h" +#include "AliRun.h" +#include "AliGenEventHeader.h" ClassImp(AliGenParam) @@ -47,56 +51,76 @@ ClassImp(AliGenParam) //End_Html //____________________________________________________________ -//____________________________________________________________ -AliGenParam::AliGenParam() + AliGenParam::AliGenParam(): + fPtParaFunc(0), + fYParaFunc(0), + fIpParaFunc(0), + fPtPara(0), + fYPara(0), + fParam(0), + fdNdy0(0.), + fYWgt(0.), + fPtWgt(0.), + fBias(0.), + fTrials(0), + fDeltaPt(0.01), + fSelectAll(kFALSE), + fDecayer(0) { -// Deafault constructor - fPtPara = 0; - fYPara = 0; - fParam = 0; - fAnalog = kAnalog; - SetDeltaPt(); - fDecayer = 0; - - +// Default constructor } - -AliGenParam::AliGenParam(Int_t npart, AliGenLib * Library, Int_t param, char* tname):AliGenMC(npart) +//____________________________________________________________ +AliGenParam::AliGenParam(Int_t npart, const AliGenLib * Library, Int_t param, const char* tname) + :AliGenMC(npart), + fPtParaFunc(Library->GetPt(param, tname)), + fYParaFunc (Library->GetY (param, tname)), + fIpParaFunc(Library->GetIp(param, tname)), + fPtPara(0), + fYPara(0), + fParam(param), + fdNdy0(0.), + fYWgt(0.), + fPtWgt(0.), + fBias(0.), + fTrials(0), + fDeltaPt(0.01), + fSelectAll(kFALSE), + fDecayer(0) { // Constructor using number of particles parameterisation id and library fName = "Param"; fTitle= "Particle Generator using pT and y parameterisation"; - - fPtParaFunc = Library->GetPt(param, tname); - fYParaFunc = Library->GetY (param, tname); - fIpParaFunc = Library->GetIp(param, tname); - - fPtPara = 0; - fYPara = 0; - fParam = param; fAnalog = kAnalog; SetForceDecay(); - SetDeltaPt(); } - //____________________________________________________________ - -AliGenParam::AliGenParam(Int_t npart, Int_t param, char* tname):AliGenMC(npart) +AliGenParam::AliGenParam(Int_t npart, Int_t param, const char* tname, const char* name): + AliGenMC(npart), + fPtParaFunc(0), + fYParaFunc (0), + fIpParaFunc(0), + fPtPara(0), + fYPara(0), + fParam(param), + fdNdy0(0.), + fYWgt(0.), + fPtWgt(0.), + fBias(0.), + fTrials(0), + fDeltaPt(0.01), + fSelectAll(kFALSE), + fDecayer(0) { // Constructor using parameterisation id and number of particles // - fName = "Param"; + fName = name; fTitle= "Particle Generator using pT and y parameterisation"; AliGenLib* pLibrary = new AliGenMUONlib(); - fPtParaFunc = pLibrary->GetPt(param, tname); fYParaFunc = pLibrary->GetY (param, tname); fIpParaFunc = pLibrary->GetIp(param, tname); - fPtPara = 0; - fYPara = 0; - fParam = param; fAnalog = kAnalog; fChildSelect.Set(5); for (Int_t i=0; i<5; i++) fChildSelect[i]=0; @@ -106,27 +130,35 @@ AliGenParam::AliGenParam(Int_t npart, Int_t param, char* tname):AliGenMC(npart) SetChildPtRange(); SetChildPhiRange(); SetChildThetaRange(); - SetDeltaPt(); } +//____________________________________________________________ AliGenParam::AliGenParam(Int_t npart, Int_t param, - Double_t (*PtPara) (Double_t*, Double_t*), - Double_t (*YPara ) (Double_t* ,Double_t*), + Double_t (*PtPara) (const Double_t*, const Double_t*), + Double_t (*YPara ) (const Double_t* ,const Double_t*), Int_t (*IpPara) (TRandom *)) - :AliGenMC(npart) + :AliGenMC(npart), + + fPtParaFunc(PtPara), + fYParaFunc(YPara), + fIpParaFunc(IpPara), + fPtPara(0), + fYPara(0), + fParam(param), + fdNdy0(0.), + fYWgt(0.), + fPtWgt(0.), + fBias(0.), + fTrials(0), + fDeltaPt(0.01), + fSelectAll(kFALSE), + fDecayer(0) { // Constructor // Gines Martinez 1/10/99 fName = "Param"; fTitle= "Particle Generator using pT and y parameterisation"; - fPtParaFunc = PtPara; - fYParaFunc = YPara; - fIpParaFunc = IpPara; -// - fPtPara = 0; - fYPara = 0; - fParam = param; fAnalog = kAnalog; fChildSelect.Set(5); for (Int_t i=0; i<5; i++) fChildSelect[i]=0; @@ -136,15 +168,6 @@ AliGenParam::AliGenParam(Int_t npart, Int_t param, SetChildPtRange(); SetChildPhiRange(); SetChildThetaRange(); - SetDeltaPt(); -} - - -AliGenParam::AliGenParam(const AliGenParam & Param) - :AliGenMC(Param) -{ -// Copy constructor - Param.Copy(*this); } //____________________________________________________________ @@ -166,16 +189,27 @@ void AliGenParam::Init() */ //End_Html - - fPtPara = new TF1("Pt-Parametrization",fPtParaFunc,fPtMin,fPtMax,0); + char name[256]; + snprintf(name, 256, "pt-parameterisation for %s", GetName()); + + if (fPtPara) fPtPara->Delete(); + fPtPara = new TF1(name, fPtParaFunc, fPtMin, fPtMax,0); + gROOT->GetListOfFunctions()->Remove(fPtPara); // Set representation precision to 10 MeV - Int_t npx= Int_t((fPtMax-fPtMin)/fDeltaPt); + Int_t npx= Int_t((fPtMax - fPtMin) / fDeltaPt); fPtPara->SetNpx(npx); + + snprintf(name, 256, "y-parameterisation for %s", GetName()); + if (fYPara) fYPara->Delete(); + fYPara = new TF1(name, fYParaFunc, fYMin, fYMax, 0); + gROOT->GetListOfFunctions()->Remove(fYPara); + - fYPara = new TF1("Y -Parametrization",fYParaFunc,fYMin,fYMax,0); - TF1* ptPara = new TF1("Pt-Parametrization",fPtParaFunc,0,15,0); - TF1* yPara = new TF1("Y -Parametrization",fYParaFunc,-6,6,0); + snprintf(name, 256, "pt-for-%s", GetName()); + TF1 ptPara(name ,fPtParaFunc, 0, 15, 0); + snprintf(name, 256, "y-for-%s", GetName()); + TF1 yPara(name, fYParaFunc, -6, 6, 0); // // dN/dy| y=0 @@ -185,9 +219,9 @@ void AliGenParam::Init() fdNdy0=fYParaFunc(&y1,&y2); // // Integral over generation region - Float_t intYS = yPara ->Integral(fYMin, fYMax); - Float_t intPt0 = ptPara->Integral(0,15); - Float_t intPtS = ptPara->Integral(fPtMin,fPtMax); + Float_t intYS = yPara.Integral(fYMin, fYMax,(Double_t*) 0x0,1.e-6); + Float_t intPt0 = ptPara.Integral(0,15,(Double_t *) 0x0,1.e-6); + Float_t intPtS = ptPara.Integral(fPtMin,fPtMax,(Double_t*) 0x0,1.e-6); Float_t phiWgt=(fPhiMax-fPhiMin)/2./TMath::Pi(); if (fAnalog == kAnalog) { fYWgt = intYS/fdNdy0; @@ -222,7 +256,9 @@ void AliGenParam::Generate() // // // Reinitialize decayer - fDecayer->Init(); + fDecayer->SetForceDecay(fForceDecay); + fDecayer->Init(); + // Float_t polar[3]= {0,0,0}; // Polarisation of the parent particle (for GEANT tracking) Float_t origin0[3]; // Origin of the generated parent particle (for GEANT tracking) @@ -252,10 +288,12 @@ void AliGenParam::Generate() Int_t ipa=0; // Generating fNpart particles + fNprimaries = 0; + while (ipaGetPartialBranchingRatio(iPart))*fParentWeight; TParticlePDG *particle = pDataBase->GetParticle(iPart); @@ -287,7 +325,7 @@ void AliGenParam::Generate() "Division by 0: Please check you rapidity range !"); } - pl=xmt*ty/sqrt(1.-ty*ty); + pl=xmt*ty/sqrt((1.-ty)*(1.+ty)); theta=TMath::ATan2(pt,pl); // Cut on theta if(thetafThetaMax) continue; @@ -314,6 +352,8 @@ void AliGenParam::Generate() // if fForceDecay == none Primary particle is tracked by GEANT // (In the latest, make sure that GEANT actually does all the decays you want) // + Bool_t decayed = kFALSE; + if (fForceDecay != kNoDecay) { // Using lujet to decay particle @@ -340,7 +380,8 @@ void AliGenParam::Generate() } if (np >1) { - TParticle* iparticle = (TParticle *) particles->At(0); + decayed = kTRUE; + TParticle* iparticle = 0; Int_t ipF, ipL; for (i = 1; iPx(); @@ -403,17 +444,22 @@ void AliGenParam::Generate() ipa++; // // Parent - PushTrack(0, -1, iPart, p, origin0, polar, 0, kPPrimary, nt, wgtp); + + + PushTrack(0, -1, iPart, p, origin0, polar, 0, kPPrimary, nt, wgtp, ((decayed)? 11 : 1)); pParent[0] = nt; KeepTrack(nt); + fNprimaries++; + // // Decay Products // for (i = 1; i < np; i++) { if (pSelected[i]) { TParticle* iparticle = (TParticle *) particles->At(i); - Int_t kf = iparticle->GetPdgCode(); - Int_t ipa = iparticle->GetFirstMother()-1; + Int_t kf = iparticle->GetPdgCode(); + Int_t ksc = iparticle->GetStatusCode(); + Int_t jpa = iparticle->GetFirstMother()-1; och[0] = origin0[0]+iparticle->Vx()/10; och[1] = origin0[1]+iparticle->Vy()/10; @@ -422,17 +468,18 @@ void AliGenParam::Generate() pc[1] = iparticle->Py(); pc[2] = iparticle->Pz(); - if (ipa > -1) { - iparent = pParent[ipa]; + if (jpa > -1) { + iparent = pParent[jpa]; } else { iparent = -1; } - PushTrack(fTrackIt*trackIt[i], iparent, kf, + PushTrack(fTrackIt * trackIt[i], iparent, kf, pc, och, polar, - 0, kPDecay, nt, wgtch); + 0, kPDecay, nt, wgtch, ksc); pParent[i] = nt; KeepTrack(nt); + fNprimaries++; } // Selected } // Particle loop } // Decays by Lujet @@ -445,16 +492,37 @@ void AliGenParam::Generate() else // nodecay option, so parent will be tracked by GEANT (pions, kaons, eta, omegas, baryons) { gAlice->GetMCApp()-> - PushTrack(fTrackIt,-1,iPart,p,origin0,polar,0,kPPrimary,nt,wgtp); + PushTrack(fTrackIt,-1,iPart,p,origin0,polar,0,kPPrimary,nt,wgtp, 1); ipa++; + fNprimaries++; } break; } // while } // event loop + SetHighWaterMark(nt); + + AliGenEventHeader* header = new AliGenEventHeader("PARAM"); + header->SetPrimaryVertex(fVertex); + header->SetNProduced(fNprimaries); + AddHeader(header); +} +//____________________________________________________________________________________ +Float_t AliGenParam::GetRelativeArea(Float_t ptMin, Float_t ptMax, Float_t yMin, Float_t yMax, Float_t phiMin, Float_t phiMax) +{ +// +// Normalisation for selected kinematic region +// + Float_t ratio = + fPtPara->Integral(ptMin,ptMax,(Double_t *)0,1.e-6) / fPtPara->Integral( fPtPara->GetXmin(), fPtPara->GetXmax(),(Double_t *)0,1.e-6) * + fYPara->Integral(yMin,yMax,(Double_t *)0,1.e-6)/fYPara->Integral(fYPara->GetXmin(),fYPara->GetXmax(),(Double_t *)0,1.e-6) * + (phiMax-phiMin)/360.; + return TMath::Abs(ratio); } -void AliGenParam::Draw() +//____________________________________________________________________________________ + +void AliGenParam::Draw( const char * /*opt*/) { // // Draw the pT and y Distributions @@ -469,12 +537,6 @@ void AliGenParam::Draw() fYPara->GetHistogram()->SetXTitle("y"); } -AliGenParam& AliGenParam::operator=(const AliGenParam& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -}