X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliGenerator.cxx;h=8bae37d8181072f91b0ffeaa7048b1951b6b30d3;hb=745cdf2394a7b5ce9c03ffcb5a1cdba25ffdafaa;hp=a0c1b580eed726dd75be1c63acc5d57290381bdb;hpb=69a313ecccc22198dea77536d300aed029ab19c7;p=u%2Fmrichter%2FAliRoot.git
diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx
index a0c1b580eed..8bae37d8181 100644
--- a/STEER/AliGenerator.cxx
+++ b/STEER/AliGenerator.cxx
@@ -13,45 +13,13 @@
* provided "as is" without express or implied warranty. *
**************************************************************************/
-/*
-$Log$
-Revision 1.13 2001/05/16 14:57:22 alibrary
-New files for folders and Stack
-
-Revision 1.12 2001/02/02 11:12:50 morsch
-Add Vertex() method that allows to get vertex from merging manager, if needed.
-
-Revision 1.11 2001/01/26 19:58:48 hristov
-Major upgrade of AliRoot code
-
-Revision 1.10 2000/12/21 15:30:18 fca
-Correcting coding convention violations
-
-Revision 1.9 2000/10/04 10:08:01 fca
-Correction of minor typing mistakes
-
-Revision 1.8 2000/10/02 21:28:14 fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.7 2000/07/12 08:56:25 fca
-Coding convention correction and warning removal
+/* $Id$ */
-Revision 1.6 2000/07/11 18:24:59 fca
-Coding convention corrections + few minor bug fixes
-
-Revision 1.5 2000/06/08 13:34:50 fca
-Better control of momentum range in GenBox
-
-Revision 1.4 1999/09/29 09:24:29 fca
-Introduction of the Copyright and cvs Log
-
-*/
-
-///////////////////////////////////////////////////////////////////
-// //
-// Generate the final state of the interaction as the input //
-// to the MonteCarlo //
-//
+//-----------------------------------------------------------------
+// Generate the final state of the interaction as the input
+// to the MonteCarlo
+// Author: A.Morsch
+//-----------------------------------------------------------------
//Begin_Html
/*
@@ -66,28 +34,64 @@ Introduction of the Copyright and cvs Log
//End_Html
// //
///////////////////////////////////////////////////////////////////
+#include
+#include
+#include "AliLog.h"
+#include "AliCollisionGeometry.h"
+#include "AliConfig.h"
#include "AliGenerator.h"
-#include "TGenerator.h"
#include "AliRun.h"
-#include "AliConfig.h"
#include "AliStack.h"
-
+#include "AliMC.h"
+#include "AliVertexGenerator.h"
ClassImp(AliGenerator)
-TGenerator* AliGenerator::fgMCEvGen=0;
-//____________________________________________________________
-AliGenerator::AliGenerator()
+//_______________________________________________________________________
+AliGenerator::AliGenerator():
+ TNamed(),
+ AliRndm(),
+ fMCEvGen(0),
+ 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),
+ fPileUpTimeWindow(-1.),
+ fTrackIt(0),
+ fVertexGenerator(0),
+ fOrigin(3),
+ fOsigma(3),
+ fVertex(3),
+ fStack(0),
+ fContainer(0),
+ fCollisionGeometry(0)
{
//
// Default constructor
//
- if (gAlice->GetDebug()>0)
- printf("\n AliGenerator Default Constructor\n\n");
-
- gAlice->SetGenerator(this);
+ if (gAlice) {
+ AliDebug(1, "AliGenerator Default Constructor");
+ AliMC * mc = gAlice->GetMCApp();
+ if (mc) mc->SetGenerator(this);
+ }
+
SetThetaRange(); ResetBit(kThetaRange);
SetPhiRange(); ResetBit(kPhiRange);
SetMomentumRange(); ResetBit(kMomentumRange);
@@ -95,60 +99,113 @@ AliGenerator::AliGenerator()
SetYRange(); ResetBit(kYRange);
SetNumberParticles();
SetTrackingFlag();
+ SetCutVertexZ();
- fOrigin.Set(3);
- fOsigma.Set(3);
- fVertex.Set(3);
fOrigin[0]=fOrigin[1]=fOrigin[2]=0;
fOsigma[0]=fOsigma[1]=fOsigma[2]=0;
fVertex[0]=fVertex[1]=fVertex[2]=0;
- fVMin.Set(3);
fVMin[0]=fVMin[1]=fVMin[2]=0;
- fVMax.Set(3);
fVMax[0]=fVMax[1]=fVMax[2]=10000;
- fStack = 0;
}
-//____________________________________________________________
-AliGenerator::AliGenerator(Int_t npart)
- : TNamed(" "," ")
+//_______________________________________________________________________
+AliGenerator::AliGenerator(Int_t npart):
+ TNamed(),
+ AliRndm(),
+ fMCEvGen(0),
+ 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),
+ fPileUpTimeWindow(-1.),
+ fTrackIt(0),
+ fVertexGenerator(0),
+ fOrigin(3),
+ fOsigma(3),
+ fVertex(3),
+ fStack(0),
+ fContainer(0),
+ fCollisionGeometry(0)
{
//
// Standard constructor
//
- if (gAlice->GetDebug()>0)
- printf("\n AliGenerator Constructor initializing number of particles \n\n");
- gAlice->SetGenerator(this);
+ if (gAlice) {
+ AliDebug(1, "AliGenerator Constructor initializing number of particles");
+ AliMC * mc = gAlice->GetMCApp();
+ if (mc) mc->SetGenerator(this);
+ }
+
SetThetaRange(); ResetBit(kThetaRange);
SetPhiRange(); ResetBit(kPhiRange);
SetMomentumRange(); ResetBit(kMomentumRange);
SetPtRange(); ResetBit(kPtRange);
SetYRange(); ResetBit(kYRange);
SetTrackingFlag();
-
- fOrigin.Set(3);
- fOsigma.Set(3);
- fVertex.Set(3);
+ SetCutVertexZ();
fOrigin[0]=fOrigin[1]=fOrigin[2]=0;
fOsigma[0]=fOsigma[1]=fOsigma[2]=0;
fVertex[0]=fVertex[1]=fVertex[2]=0;
- fVMin.Set(3);
fVMin[0]=fVMin[1]=fVMin[2]=0;
- fVMax.Set(3);
fVMax[0]=fVMax[1]=fVMax[2]=10000;
SetNumberParticles(npart);
AliConfig::Instance()->Add(this);
- fStack = 0;
}
-//____________________________________________________________
-AliGenerator::AliGenerator(const AliGenerator &gen) : TNamed(" "," ")
+//_______________________________________________________________________
+AliGenerator::AliGenerator(const AliGenerator &gen):
+ TNamed(gen),
+ AliRndm(gen),
+ fMCEvGen(0),
+ 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),
+ fPileUpTimeWindow(-1.),
+ fTrackIt(0),
+ fVertexGenerator(0),
+ fOrigin(3),
+ fOsigma(3),
+ fVertex(3),
+ fStack(0),
+ fContainer(0),
+ fCollisionGeometry(0)
{
//
// Copy constructor
@@ -156,7 +213,7 @@ AliGenerator::AliGenerator(const AliGenerator &gen) : TNamed(" "," ")
gen.Copy(*this);
}
-//____________________________________________________________
+//_______________________________________________________________________
AliGenerator & AliGenerator::operator=(const AliGenerator &gen)
{
//
@@ -166,16 +223,16 @@ AliGenerator & AliGenerator::operator=(const AliGenerator &gen)
return (*this);
}
-//____________________________________________________________
-void AliGenerator::Copy(AliGenerator &/* gen */) const
+//_______________________________________________________________________
+void AliGenerator::Copy(TObject &/* gen */) const
{
//
// Copy *this onto gen
//
- Fatal("Copy","Not implemented!\n");
+ AliFatal("Not implemented!");
}
-//____________________________________________________________
+//_______________________________________________________________________
AliGenerator::~AliGenerator()
{
//
@@ -183,9 +240,13 @@ AliGenerator::~AliGenerator()
//
fOrigin.Set(0);
fOsigma.Set(0);
- delete fgMCEvGen;
+ if (fMCEvGen) {
+ delete fMCEvGen;
+ fMCEvGen=0;
+ }
}
+//_______________________________________________________________________
void AliGenerator::Init()
{
//
@@ -255,7 +316,8 @@ void AliGenerator::SetPhiRange(Float_t phimin, Float_t phimax)
// Set the Phi range for the generated particles
//
fPhiMin = TMath::Pi()*phimin/180;
- fPhiMax = TMath::Pi()*phimax/180; SetBit(kPhiRange);
+ fPhiMax = TMath::Pi()*phimax/180;
+ SetBit(kPhiRange);
}
//_______________________________________________________________________
@@ -289,7 +351,8 @@ void AliGenerator::SetThetaRange(Float_t thetamin, Float_t thetamax)
// Set the theta range for the generated particles
//
fThetaMin = TMath::Pi()*thetamin/180;
- fThetaMax = TMath::Pi()*thetamax/180; SetBit(kThetaRange);
+ fThetaMax = TMath::Pi()*thetamax/180;
+ SetBit(kThetaRange);
}
void AliGenerator::Vertex()
@@ -299,79 +362,115 @@ void AliGenerator::Vertex()
//
if (fVertexSource == kInternal) {
VertexInternal();
- } else {
+ } else if (fVertexSource == kContainer) {
+ ;
+ } else if (fVertexSource == kExternal) {
VertexExternal();
}
}
-
+//_______________________________________________________________________
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();
}
+//_______________________________________________________________________
void AliGenerator::VertexInternal()
{
//
// Obtain calculated vertex
// Default is gaussian smearing
Float_t random[6];
- Rndm(random,6);
- for (Int_t j = 0; j<3 ; j++) {
- fVertex[j]=
- fOrigin[j]+fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())*
- TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
+ Float_t dv[3];
+ Int_t j;
+ dv[2] = 1.e10;
+ 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]);
}
}
-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, AliMCProcess mech, Int_t &ntr,
- Float_t weight=1)
+ Float_t tof, TMCProcess mech, Int_t &ntr,
+ Float_t weight, Int_t is)
{
-
+ //
+ // Loads one track on the stack
+ //
+
if (fStack)
- fStack->SetTrack(done, parent, pdg, pmom, vpos, polar, tof,
- mech, ntr, weight);
+ fStack->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
+ mech, ntr, weight, is);
else
- gAlice->SetTrack(done, parent, pdg, pmom, vpos, polar, tof,
- mech, ntr, weight);
+ 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,
- AliMCProcess mech, Int_t &ntr, Float_t weight=1)
+ TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is)
{
+ //
+ // Loads one track on the stack
+ //
if (fStack)
- fStack->SetTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
- polx, poly, polz, mech, ntr, weight);
+ 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,
- polx, poly, polz, mech, ntr, weight);
+ gAlice->GetMCApp()->PushTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
+ polx, poly, polz, mech, ntr, weight, is);
}
+//_______________________________________________________________________
void AliGenerator:: KeepTrack(Int_t itrack)
{
+ //
+ // Declare a track permanent on the stack
+ //
if (fStack)
fStack->KeepTrack(itrack);
else
- gAlice->KeepTrack(itrack);
+ gAlice->GetMCApp()->KeepTrack(itrack);
}
+//_______________________________________________________________________
void AliGenerator:: SetHighWaterMark(Int_t nt)
{
+ //
+ // Internal function to set the maximum index used in the stack
+ //
if (fStack)
fStack->SetHighWaterMark(nt);
else
- gAlice->SetHighWaterMark(nt);
+ gAlice->GetMCApp()->SetHighWaterMark(nt);
}
+void AliGenerator::FinishRun()
+{
+ ;
+}