LOG muondep:

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

diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx
index 8fb713f66a3efdb3e6f8874dfdc5b1f47420f5aa..e94345f16bf6e1b23611cfdc953c3734c69edbad 100644 (file)
--- a/STEER/AliGenerator.cxx
+++ b/STEER/AliGenerator.cxx
@@ -37,6 +37,7 @@
 #include <TGenerator.h>
 #include <TMCProcess.h>
 
+#include "AliLog.h"
 #include "AliCollisionGeometry.h"
 #include "AliConfig.h"
 #include "AliGenerator.h"
@@ -50,6 +51,8 @@ ClassImp(AliGenerator)
 
 //_______________________________________________________________________
 AliGenerator::AliGenerator():
+  TNamed(),
+  AliRndm(),
   fMCEvGen(0),
   fThetaMin(0),
   fThetaMax(0),
@@ -70,19 +73,28 @@ 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");
+       AliDebug(1, "AliGenerator Default Constructor");
        AliMC * mc = gAlice->GetMCApp();
        if (mc) mc->SetGenerator(this);
     }
@@ -107,6 +119,8 @@ AliGenerator::AliGenerator():
 
 //_______________________________________________________________________
 AliGenerator::AliGenerator(Int_t npart):
+  TNamed(),
+  AliRndm(),
   fMCEvGen(0),
   fThetaMin(0),
   fThetaMax(0),
@@ -127,19 +141,28 @@ 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");
+        AliDebug(1, "AliGenerator Constructor initializing number of particles");
        AliMC * mc = gAlice->GetMCApp();
        if (mc) mc->SetGenerator(this);
     }
@@ -164,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(TObject &/* gen */) const
-{
-  //
-  // Copy *this onto gen
-  //
-  Fatal("Copy","Not implemented!\n");
-}
-
 //_______________________________________________________________________
 AliGenerator::~AliGenerator()
 {
@@ -403,7 +371,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);