Bug fix. Removed delete statement

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

diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx
index ab3d33898b5836e1095037b9c44fbf41b877ef7a..e94345f16bf6e1b23611cfdc953c3734c69edbad 100644 (file)
--- a/STEER/AliGenerator.cxx
+++ b/STEER/AliGenerator.cxx
@@ -35,18 +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),
@@ -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,8 @@ AliGenerator::AliGenerator():
 
 //_______________________________________________________________________
 AliGenerator::AliGenerator(Int_t npart):
+  TNamed(),
+  AliRndm(),
   fMCEvGen(0),
   fThetaMin(0),
   fThetaMax(0),
@@ -123,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);
@@ -159,61 +187,6 @@ AliGenerator::AliGenerator(Int_t npart):
     AliConfig::Instance()->Add(this);
 }
 
-//_______________________________________________________________________
-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),
-  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()
 {
@@ -354,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();
 }
 
 //_______________________________________________________________________
@@ -371,17 +345,21 @@ 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];
-    
 }
 
 //_______________________________________________________________________
@@ -393,12 +371,12 @@ 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);
   else 
-    gAlice->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
+    gAlice->GetMCApp()->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
                      mech, ntr, weight, is);
 }
 
@@ -417,7 +395,7 @@ void  AliGenerator::PushTrack(Int_t done, Int_t parent, Int_t pdg,
      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);
 }
 
@@ -431,7 +409,7 @@ void AliGenerator:: KeepTrack(Int_t itrack)
   if (fStack)
      fStack->KeepTrack(itrack);
   else 
-     gAlice->KeepTrack(itrack);
+     gAlice->GetMCApp()->KeepTrack(itrack);
    
 }
 
@@ -444,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()