X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliGenerator.cxx;h=e94345f16bf6e1b23611cfdc953c3734c69edbad;hb=54d34aac48bb923502ca39356d982e5f84398da5;hp=5cfca738935d9aa6bdd73512b959549cf22e62ac;hpb=d6eec42095393c07029883e71375fb8472463ac4;p=u%2Fmrichter%2FAliRoot.git diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx index 5cfca738935..e94345f16bf 100644 --- a/STEER/AliGenerator.cxx +++ b/STEER/AliGenerator.cxx @@ -51,6 +51,8 @@ ClassImp(AliGenerator) //_______________________________________________________________________ AliGenerator::AliGenerator(): + TNamed(), + AliRndm(), fMCEvGen(0), fThetaMin(0), fThetaMax(0), @@ -71,13 +73,22 @@ 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) + fCollisionGeometry(0), + fEnergyCMS(0), + fAProjectile(0), + fZProjectile(0), + fATarget(0), + fZTarget(0), + fProjectile(""), + fTarget("") { // // Default constructor @@ -108,6 +119,8 @@ AliGenerator::AliGenerator(): //_______________________________________________________________________ AliGenerator::AliGenerator(Int_t npart): + TNamed(), + AliRndm(), fMCEvGen(0), fThetaMin(0), fThetaMax(0), @@ -128,13 +141,22 @@ 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) + fCollisionGeometry(0), + fEnergyCMS(0), + fAProjectile(0), + fZProjectile(0), + fATarget(0), + fZTarget(0), + fProjectile(""), + fTarget("") { // // Standard constructor @@ -165,62 +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), - fContainer(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 - // - AliFatal("Not implemented!"); -} - //_______________________________________________________________________ AliGenerator::~AliGenerator() { @@ -405,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);