AliHMPIDDigitN no longer needed

[u/mrichter/AliRoot.git] / STEER / AliGenerator.cxx

diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx
index 507a2849cd4166fc0142123067734563c66aba91..8bae37d8181072f91b0ffeaa7048b1951b6b30d3 100644 (file)
--- a/STEER/AliGenerator.cxx
+++ b/STEER/AliGenerator.cxx
@@ -35,19 +35,24 @@
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 #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),
@@ -68,19 +73,21 @@ AliGenerator::AliGenerator():
   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");
+       AliDebug(1, "AliGenerator Default Constructor");
        AliMC * mc = gAlice->GetMCApp();
        if (mc) mc->SetGenerator(this);
     }
@@ -105,6 +112,8 @@ AliGenerator::AliGenerator():
 
 //_______________________________________________________________________
 AliGenerator::AliGenerator(Int_t npart):
+  TNamed(),
+  AliRndm(),
   fMCEvGen(0),
   fThetaMin(0),
   fThetaMax(0),
@@ -125,19 +134,21 @@ 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),
+  fContainer(0),
   fCollisionGeometry(0)
 {
   //
   // Standard constructor
   //
     if (gAlice) {
-       if (gAlice->GetDebug()>0)
-           printf("\n AliGenerator Constructor initializing number of particles \n\n");
+        AliDebug(1, "AliGenerator Constructor initializing number of particles");
        AliMC * mc = gAlice->GetMCApp();
        if (mc) mc->SetGenerator(this);
     }
@@ -186,11 +197,15 @@ AliGenerator::AliGenerator(const AliGenerator &gen):
   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
@@ -214,7 +229,7 @@ void AliGenerator::Copy(TObject &/* gen */) const
   //
   // Copy *this onto gen
   //
-  Fatal("Copy","Not implemented!\n");
+  AliFatal("Not implemented!");
 }
 
 //_______________________________________________________________________
@@ -357,12 +372,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();
 }
 
 //_______________________________________________________________________
@@ -400,7 +416,7 @@ void  AliGenerator::PushTrack(Int_t done, Int_t parent, Int_t pdg,
   //
   // Loads one track on the stack
   //
-
+    
   if (fStack)
     fStack->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
                      mech, ntr, weight, is);