X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliGenerator.cxx;h=e94345f16bf6e1b23611cfdc953c3734c69edbad;hb=d47d42ee3a97ab2826c47361817793c83be47ac1;hp=428ca19dc76d0e3aed0d6ec5c14bc20a0fe2ff08;hpb=0b910a042819519b64f84a7a80ab479b8a4a5113;p=u%2Fmrichter%2FAliRoot.git diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx index 428ca19dc76..e94345f16bf 100644 --- a/STEER/AliGenerator.cxx +++ b/STEER/AliGenerator.cxx @@ -35,19 +35,25 @@ // // /////////////////////////////////////////////////////////////////// #include +#include +#include "AliLog.h" #include "AliCollisionGeometry.h" #include "AliConfig.h" #include "AliGenerator.h" #include "AliRun.h" #include "AliStack.h" +#include "AliMC.h" +#include "AliVertexGenerator.h" ClassImp(AliGenerator) -TGenerator* AliGenerator::fgMCEvGen=0; //_______________________________________________________________________ AliGenerator::AliGenerator(): + TNamed(), + AliRndm(), + fMCEvGen(0), fThetaMin(0), fThetaMax(0), fPhiMin(0), @@ -67,20 +73,30 @@ AliGenerator::AliGenerator(): fVertexSmear(kNoSmear), fVertexSource(kInternal), fCutVertexZ(0), + fPileUpTimeWindow(-1.), fTrackIt(0), + fVertexGenerator(0), fOrigin(3), fOsigma(3), fVertex(3), fStack(0), - fCollisionGeometry(0) + fContainer(0), + fCollisionGeometry(0), + fEnergyCMS(0), + fAProjectile(0), + fZProjectile(0), + fATarget(0), + fZTarget(0), + fProjectile(""), + fTarget("") { // // Default constructor // if (gAlice) { - if (gAlice->GetDebug()>0) - printf("\n AliGenerator Default Constructor\n\n"); - gAlice->SetGenerator(this); + AliDebug(1, "AliGenerator Default Constructor"); + AliMC * mc = gAlice->GetMCApp(); + if (mc) mc->SetGenerator(this); } SetThetaRange(); ResetBit(kThetaRange); @@ -103,6 +119,9 @@ AliGenerator::AliGenerator(): //_______________________________________________________________________ AliGenerator::AliGenerator(Int_t npart): + TNamed(), + AliRndm(), + fMCEvGen(0), fThetaMin(0), fThetaMax(0), fPhiMin(0), @@ -122,20 +141,30 @@ AliGenerator::AliGenerator(Int_t npart): fVertexSmear(kNoSmear), fVertexSource(kInternal), fCutVertexZ(0), + fPileUpTimeWindow(-1.), fTrackIt(0), + fVertexGenerator(0), fOrigin(3), fOsigma(3), fVertex(3), fStack(0), - fCollisionGeometry(0) + fContainer(0), + fCollisionGeometry(0), + fEnergyCMS(0), + fAProjectile(0), + fZProjectile(0), + fATarget(0), + fZTarget(0), + fProjectile(""), + fTarget("") { // // Standard constructor // if (gAlice) { - if (gAlice->GetDebug()>0) - printf("\n AliGenerator Constructor initializing number of particles \n\n"); - gAlice->SetGenerator(this); + AliDebug(1, "AliGenerator Constructor initializing number of particles"); + AliMC * mc = gAlice->GetMCApp(); + if (mc) mc->SetGenerator(this); } SetThetaRange(); ResetBit(kThetaRange); @@ -158,60 +187,6 @@ AliGenerator::AliGenerator(Int_t npart): AliConfig::Instance()->Add(this); } -//_______________________________________________________________________ -AliGenerator::AliGenerator(const AliGenerator &gen): - TNamed(gen), - AliRndm(gen), - fThetaMin(0), - fThetaMax(0), - fPhiMin(0), - fPhiMax(0), - fPMin(0), - fPMax(0), - fPtMin(0), - fPtMax(0), - fYMin(0), - fYMax(0), - fVMin(3), - fVMax(3), - fNpart(0), - fParentWeight(0), - fChildWeight(0), - fAnalog(0), - fVertexSmear(kNoSmear), - fVertexSource(kInternal), - fCutVertexZ(0), - fTrackIt(0), - fOrigin(3), - fOsigma(3), - fVertex(3), - fStack(0) -{ - // - // Copy constructor - // - gen.Copy(*this); -} - -//_______________________________________________________________________ -AliGenerator & AliGenerator::operator=(const AliGenerator &gen) -{ - // - // Assignment operator - // - gen.Copy(*this); - return (*this); -} - -//_______________________________________________________________________ -void AliGenerator::Copy(AliGenerator &/* gen */) const -{ - // - // Copy *this onto gen - // - Fatal("Copy","Not implemented!\n"); -} - //_______________________________________________________________________ AliGenerator::~AliGenerator() { @@ -220,9 +195,9 @@ AliGenerator::~AliGenerator() // fOrigin.Set(0); fOsigma.Set(0); - if (fgMCEvGen) { - delete fgMCEvGen; - fgMCEvGen=0; + if (fMCEvGen) { + delete fMCEvGen; + fMCEvGen=0; } } @@ -352,12 +327,13 @@ void AliGenerator::Vertex() //_______________________________________________________________________ void AliGenerator::VertexExternal() { - // Dummy !!!!!! - // Obtain vertex from external source // - // Should be something like fVertex = gAlice->GetVertex() - - fVertex[0]=fVertex[1]=fVertex[2]=0; + // Obtain vertex from external source (vertex generator) + // + TVector3 vertex = fVertexGenerator->GetVertex(); + fVertex[0] = vertex.X(); + fVertex[1] = vertex.Y(); + fVertex[2] = vertex.Z(); } //_______________________________________________________________________ @@ -369,21 +345,25 @@ void AliGenerator::VertexInternal() Float_t random[6]; Float_t dv[3]; Int_t j; - dv[2] = 1.e10; - while(TMath::Abs(dv[2]) > fCutVertexZ*fOsigma[2]) { - Rndm(random,6); - for (j=0; j < 3; j++) { - dv[j] = fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())* - TMath::Sqrt(-2*TMath::Log(random[2*j+1])); + if (!TestBit(kVertexRange)) { + while(TMath::Abs(dv[2]) > fCutVertexZ*fOsigma[2]) { + Rndm(random,6); + for (j=0; j < 3; j++) { + dv[j] = fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())* + TMath::Sqrt(-2*TMath::Log(random[2*j+1])); + } } + for (j=0; j < 3; j++) fVertex[j] = fOrigin[j] + dv[j]; + } else { + Rndm(random,3); + for (j=0; j < 3; j++) + fVertex[j] = fVMin[j] + random[j] * (fVMax[j] - fVMin[j]); } - for (j=0; j < 3; j++) fVertex[j] = fOrigin[j] + dv[j]; - } //_______________________________________________________________________ -void AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg, +void AliGenerator::PushTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom, Float_t *vpos, Float_t *polar, Float_t tof, TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is) @@ -391,17 +371,17 @@ void AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg, // // Loads one track on the stack // - + if (fStack) - fStack->SetTrack(done, parent, pdg, pmom, vpos, polar, tof, + fStack->PushTrack(done, parent, pdg, pmom, vpos, polar, tof, mech, ntr, weight, is); else - gAlice->SetTrack(done, parent, pdg, pmom, vpos, polar, tof, + gAlice->GetMCApp()->PushTrack(done, parent, pdg, pmom, vpos, polar, tof, mech, ntr, weight, is); } //_______________________________________________________________________ -void AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg, +void AliGenerator::PushTrack(Int_t done, Int_t parent, Int_t pdg, Double_t px, Double_t py, Double_t pz, Double_t e, Double_t vx, Double_t vy, Double_t vz, Double_t tof, Double_t polx, Double_t poly, Double_t polz, @@ -412,10 +392,10 @@ void AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg, // if (fStack) - fStack->SetTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof, + fStack->PushTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof, polx, poly, polz, mech, ntr, weight, is); else - gAlice->SetTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof, + gAlice->GetMCApp()->PushTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof, polx, poly, polz, mech, ntr, weight, is); } @@ -429,7 +409,7 @@ void AliGenerator:: KeepTrack(Int_t itrack) if (fStack) fStack->KeepTrack(itrack); else - gAlice->KeepTrack(itrack); + gAlice->GetMCApp()->KeepTrack(itrack); } @@ -442,7 +422,7 @@ void AliGenerator:: SetHighWaterMark(Int_t nt) if (fStack) fStack->SetHighWaterMark(nt); else - gAlice->SetHighWaterMark(nt); + gAlice->GetMCApp()->SetHighWaterMark(nt); } void AliGenerator::FinishRun()