X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenHIJINGpara.cxx;h=737b0cd4dd559ac3bf618161b1e2c3af2171ab35;hb=f9223476c1758e9109c8a971ded5a47ee32739e7;hp=1d12581281aa101eac78ce3b3a630a3d2ebfabcc;hpb=828fff0d5cbc2744da23d0affe8bebacab3bbe99;p=u%2Fmrichter%2FAliRoot.git diff --git a/EVGEN/AliGenHIJINGpara.cxx b/EVGEN/AliGenHIJINGpara.cxx index 1d12581281a..737b0cd4dd5 100644 --- a/EVGEN/AliGenHIJINGpara.cxx +++ b/EVGEN/AliGenHIJINGpara.cxx @@ -38,34 +38,29 @@ /////////////////////////////////////////////////////////////////// #include +#include #include #include #include #include -#include #include -#include -#include +#include #include +#include #include "AliConst.h" #include "AliDecayer.h" #include "AliGenEventHeader.h" #include "AliGenHIJINGpara.h" +#include "AliLog.h" #include "AliRun.h" ClassImp(AliGenHIJINGpara) -AliGenHIJINGpara::AliGenHIJINGpara(const AliGenHIJINGpara & para): - AliGenerator(para) -{ -// Copy constructor - para.Copy(*this); -} //_____________________________________________________________________________ -static Double_t ptpi(Double_t *px, Double_t *) +static Double_t ptpi(const Double_t *px, const Double_t *) { // // PT-PARAMETERIZATION CDF, PRL 61(88) 1819 @@ -163,40 +158,46 @@ static Double_t etakac( Double_t *py, Double_t *) //_____________________________________________________________________________ AliGenHIJINGpara::AliGenHIJINGpara() - :AliGenerator() + :AliGenerator(), + fNt(-1), + fNpartProd(0), + fPi0Decays(kFALSE), + fPtWgtPi(0.), + fPtWgtKa(0.), + fPtpi(0), + fPtka(0), + fETApic(0), + fETAkac(0), + fDecayer(0) { // // Default constructor // - fPtpi = 0; - fPtka = 0; - fETApic = 0; - fETAkac = 0; - fDecayer = 0; - fNt = -1; SetCutVertexZ(); SetPtRange(); - SetPi0Decays(); } //_____________________________________________________________________________ AliGenHIJINGpara::AliGenHIJINGpara(Int_t npart) - :AliGenerator(npart) + :AliGenerator(npart), + fNt(-1), + fNpartProd(npart), + fPi0Decays(kFALSE), + fPtWgtPi(0.), + fPtWgtKa(0.), + fPtpi(0), + fPtka(0), + fETApic(0), + fETAkac(0), + fDecayer(0) { // // Standard constructor // fName="HIJINGpara"; fTitle="HIJING Parametrisation Particle Generator"; - fPtpi = 0; - fPtka = 0; - fETApic = 0; - fETAkac = 0; - fDecayer = 0; - fNt = -1; SetCutVertexZ(); SetPtRange(); - SetPi0Decays(); } //_____________________________________________________________________________ @@ -257,30 +258,36 @@ void AliGenHIJINGpara::Init() Float_t phiFrac = (fPhiMax-fPhiMin)/2/TMath::Pi(); - fParentWeight = Float_t(fNpart)/(intETASel*ptFrac*phiFrac); + fParentWeight = (intETASel*ptFrac*phiFrac) / Float_t(fNpart); if (fAnalog != 0) { fPtWgtPi = (fPtMax - fPtMin) / fPtpi->Integral(0., 20.); fPtWgtKa = (fPtMax - fPtMin) / fPtka->Integral(0., 20.); - fParentWeight = Float_t(fNpart)/(intETASel*phiFrac); + fParentWeight = (intETASel*phiFrac) / Float_t(fNpart); } - printf("%s: The number of particles in the selected kinematic region corresponds to %f percent of a full event\n ", - ClassName(),100.*fParentWeight); + AliInfo(Form("The number of particles in the selected kinematic region corresponds to %f percent of a full event", + 100./ fParentWeight)); // Issue warning message if etaMin or etaMax are outside the alowed range // of the parametrization if (etaMin < -8.001 || etaMax > 8.001) { - printf("\n \n WARNING FROM AliGenHIJINGPara !"); - printf("\n YOU ARE USING THE PARAMETERISATION OUTSIDE "); - printf("\n THE ALLOWED PSEUDORAPIDITY RANGE (-8. - 8.)"); - printf("\n YOUR LIMITS: %f %f \n \n ", etaMin, etaMax); + AliWarning("\nYOU ARE USING THE PARAMETERISATION OUTSIDE "); + AliWarning("THE ALLOWED PSEUDORAPIDITY RANGE (-8. - 8.)"); + AliWarning(Form("YOUR LIMITS: %f %f \n ", etaMin, etaMax)); } // // if (fPi0Decays && gMC) fDecayer = gMC->GetDecayer(); + + if (fPi0Decays) + { + fDecayer->SetForceDecay(kNeutralPion); + fDecayer->Init(); + } + } @@ -300,6 +307,7 @@ void AliGenHIJINGpara::Generate() const Int_t kKaons[4] = {kK0Long, kK0Short, kKPlus, kKMinus}; // Float_t origin[3]; + Float_t time; Float_t pt, pl, ptot, wgt; Float_t phi, theta; Float_t p[3]; @@ -311,16 +319,19 @@ void AliGenHIJINGpara::Generate() Float_t random[6]; // for (j=0;j<3;j++) origin[j]=fOrigin[j]; + time = fTimeOrigin; if(fVertexSmear == kPerEvent) { Vertex(); for (j=0; j < 3; j++) origin[j] = fVertex[j]; + time = fTime; } // if kPerEvent TArrayF eventVertex; eventVertex.Set(3); eventVertex[0] = origin[0]; eventVertex[1] = origin[1]; eventVertex[2] = origin[2]; + Float_t eventTime = time; for(i=0;iSetPrimaryVertex(eventVertex); + header->SetInteractionTime(eventTime); + header->SetNProduced(fNpartProd); gAlice->SetGenEventHeader(header); } @@ -396,7 +415,7 @@ void AliGenHIJINGpara::SetPtRange(Float_t ptmin, Float_t ptmax) { AliGenerator::SetPtRange(ptmin, ptmax); } -void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p) +void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p, Float_t time) { // // Decay the pi0 @@ -417,7 +436,8 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p) // Float_t polar[3] = {0., 0., 0.}; Int_t np = fDecayer->ImportParticles(particles); - Int_t nt; + fNpartProd += (np-1); + Int_t nt = 0; for (Int_t i = 1; i < np; i++) { TParticle* iParticle = (TParticle *) particles->At(i); @@ -426,18 +446,12 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p) p[2] = iParticle->Pz(); Int_t part = iParticle->GetPdgCode(); - PushTrack(fTrackIt, fNt, part, p, orig, polar, 0, kPDecay, nt, fParentWeight); + PushTrack(fTrackIt, fNt, part, p, orig, polar, time, kPDecay, nt, fParentWeight); KeepTrack(nt); } fNt = nt; } -void AliGenHIJINGpara::Copy(TObject &) const -{ - Fatal("Copy","Not implemented!\n"); -} - - void AliGenHIJINGpara::Draw( const char * /*opt*/) { //