// //
///////////////////////////////////////////////////////////////////
#include <TGenerator.h>
+#include <TMCProcess.h>
+#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)
//_______________________________________________________________________
AliGenerator::AliGenerator():
+ TNamed(),
+ AliRndm(),
fMCEvGen(0),
fThetaMin(0),
fThetaMax(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) {
- 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);
//_______________________________________________________________________
AliGenerator::AliGenerator(Int_t npart):
+ TNamed(),
+ AliRndm(),
fMCEvGen(0),
fThetaMin(0),
fThetaMax(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) {
- 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);
fVertexSmear(kNoSmear),
fVertexSource(kInternal),
fCutVertexZ(0),
+ fPileUpTimeWindow(-1.),
fTrackIt(0),
+ fVertexGenerator(0),
fOrigin(3),
fOsigma(3),
fVertex(3),
- fStack(0)
+ fStack(0),
+ fContainer(0),
+ fCollisionGeometry(0)
{
//
// Copy constructor
}
//_______________________________________________________________________
-void AliGenerator::Copy(AliGenerator &/* gen */) const
+void AliGenerator::Copy(TObject &/* gen */) const
{
//
// Copy *this onto gen
//
- Fatal("Copy","Not implemented!\n");
+ AliFatal("Not implemented!");
}
//_______________________________________________________________________
//_______________________________________________________________________
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();
}
//_______________________________________________________________________
//
// Loads one track on the stack
//
-
+
if (fStack)
fStack->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
mech, ntr, weight, is);
else
- gAlice->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
+ gAlice->GetMCApp()->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
mech, ntr, weight, is);
}
fStack->PushTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
polx, poly, polz, mech, ntr, weight, is);
else
- gAlice->PushTrack(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);
}
if (fStack)
fStack->KeepTrack(itrack);
else
- gAlice->KeepTrack(itrack);
+ gAlice->GetMCApp()->KeepTrack(itrack);
}
if (fStack)
fStack->SetHighWaterMark(nt);
else
- gAlice->SetHighWaterMark(nt);
+ gAlice->GetMCApp()->SetHighWaterMark(nt);
}
void AliGenerator::FinishRun()