X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenParam.cxx;h=ab0a0fcca525a11caa264a334e18b88d99d55c2a;hb=b64943d863ff50587a206fb6ff4138508c571a38;hp=4fefe48e44d9ac0ab398de6449cb036d3cd3b289;hpb=c5c3e4b0b743c0bfbd26fe71ce3ab3361baf48f4;p=u%2Fmrichter%2FAliRoot.git diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx index 4fefe48e44d..ab0a0fcca52 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,73 @@ 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), + 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, AliGenLib * Library, Int_t param, 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), + 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), + 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 +127,34 @@ 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*), 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), + 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 +164,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); } //____________________________________________________________ @@ -169,14 +188,19 @@ void AliGenParam::Init() char name[256]; sprintf(name, "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); fPtPara->SetNpx(npx); sprintf(name, "y-parameterisation for %s", GetName()); + if (fYPara) fYPara->Delete(); fYPara = new TF1(name, fYParaFunc, fYMin, fYMax, 0); + gROOT->GetListOfFunctions()->Remove(fYPara); + sprintf(name, "pt-for-%s", GetName()); TF1 ptPara(name ,fPtParaFunc, 0, 15, 0); @@ -191,9 +215,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; @@ -228,7 +252,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) @@ -258,10 +284,12 @@ void AliGenParam::Generate() Int_t ipa=0; // Generating fNpart particles + fNprimaries = 0; + while (ipaGetPartialBranchingRatio(iPart))*fParentWeight; TParticlePDG *particle = pDataBase->GetParticle(iPart); @@ -412,6 +440,8 @@ void AliGenParam::Generate() PushTrack(0, -1, iPart, p, origin0, polar, 0, kPPrimary, nt, wgtp); pParent[0] = nt; KeepTrack(nt); + fNprimaries++; + // // Decay Products // @@ -439,6 +469,7 @@ void AliGenParam::Generate() 0, kPDecay, nt, wgtch); pParent[i] = nt; KeepTrack(nt); + fNprimaries++; } // Selected } // Particle loop } // Decays by Lujet @@ -453,12 +484,33 @@ void AliGenParam::Generate() gAlice->GetMCApp()-> PushTrack(fTrackIt,-1,iPart,p,origin0,polar,0,kPPrimary,nt,wgtp); 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( const char * /*opt*/) { @@ -475,12 +527,6 @@ void AliGenParam::Draw( const char * /*opt*/) fYPara->GetHistogram()->SetXTitle("y"); } -AliGenParam& AliGenParam::operator=(const AliGenParam& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -}