Coding Rule violations corrected.

[u/mrichter/AliRoot.git] / EVGEN / AliGenHIJINGpara.cxx

diff --git a/EVGEN/AliGenHIJINGpara.cxx b/EVGEN/AliGenHIJINGpara.cxx
index 94550daff7891d70000b18d824c53463c3295d53..99d8b5a95866bd7c1d35c92e8346726797e212b3 100644 (file)
--- a/EVGEN/AliGenHIJINGpara.cxx
+++ b/EVGEN/AliGenHIJINGpara.cxx
@@ -13,69 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.17  2002/12/10 17:44:57  morsch
-Correct mother child relation for pi0.
-
-Revision 1.16  2002/11/28 11:46:15  morsch
-Don't track pi0 if already decayed.
-
-Revision 1.15  2002/11/28 11:38:53  morsch
-Typo corrected.
-
-Revision 1.14  2002/11/26 17:12:36  morsch
-Decay pi0 if requested.
-
-Revision 1.13  2002/10/14 14:55:35  hristov
-Merging the VirtualMC branch to the main development branch (HEAD)
-
-Revision 1.11.4.1  2002/07/24 08:56:28  alibrary
-Updating EVGEN on TVirtulaMC
-
-Revision 1.12  2002/06/19 06:56:34  hristov
-Memory leak corrected
-
-Revision 1.11  2002/03/20 10:21:13  hristov
-Set fPtMax to 15 GeV in order to avoid some numerical problems
-
-Revision 1.10  2001/10/15 16:44:46  morsch
-- Possibility for vertex distribution truncation.
-- Write mc header with vertex position.
-
-Revision 1.9  2001/07/27 17:09:36  morsch
-Use local SetTrack, KeepTrack and SetHighWaterMark methods
-to delegate either to local stack or to stack owned by AliRun.
-(Piotr Skowronski, A.M.)
-
-Revision 1.8  2001/07/20 11:03:58  morsch
-Issue warning message if used outside allowed eta range (-8 to 8).
-
-Revision 1.7  2001/07/17 12:41:01  morsch
-- Calculation of fraction of event corresponding to selected pt-range corrected
-(R. Turrisi)
-- Parent weight corrected.
-
-Revision 1.6  2001/05/16 14:57:10  alibrary
-New files for folders and Stack
-
-Revision 1.5  2000/12/21 16:24:06  morsch
-Coding convention clean-up
-
-Revision 1.4  2000/11/30 07:12:50  alibrary
-Introducing new Rndm and QA classes
-
-Revision 1.3  2000/10/02 21:28:06  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.2  2000/07/11 18:24:55  fca
-Coding convention corrections + few minor bug fixes
-
-Revision 1.1  2000/06/09 20:20:30  morsch
-Same class as previously in AliSimpleGen.cxx
-All coding rule violations except RS3 corrected (AM)
-
-*/
+/* $Id$ */
 
 // Parameterisation of pi and K, eta and pt distributions
 // used for the ALICE TDRs.
@@ -99,25 +37,28 @@ All coding rule violations except RS3 corrected (AM)
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
-#include "AliGenHIJINGpara.h"
-#include "AliGenEventHeader.h"
-#include "AliRun.h"
-#include "AliConst.h"
-#include "AliDecayer.h"
-#include "AliDecayerPythia.h"
-#include "AliPDG.h"
-
-#include <TF1.h>
 #include <TArrayF.h>
-#include <TDatabasePDG.h>
 #include <TClonesArray.h>
+#include <TDatabasePDG.h>
+#include <TF1.h>
 #include <TParticle.h>
+#include <TPDGCode.h>
+#include <TVirtualMC.h>
+
+#include "AliConst.h"
+#include "AliDecayer.h"
+#include "AliGenEventHeader.h"
+#include "AliGenHIJINGpara.h"
+#include "AliRun.h"
 
 ClassImp(AliGenHIJINGpara)
 
-AliGenHIJINGpara::AliGenHIJINGpara(const AliGenHIJINGpara & para)
+
+AliGenHIJINGpara::AliGenHIJINGpara(const AliGenHIJINGpara & para):
+    AliGenerator(para)
 {
-// copy constructor
+// Copy constructor
+    para.Copy(*this);
 }
 
 //_____________________________________________________________________________
@@ -241,7 +182,7 @@ AliGenHIJINGpara::AliGenHIJINGpara(Int_t npart)
   // 
   // Standard constructor
   //
-    fName="HIGINGpara";
+    fName="HIJINGpara";
     fTitle="HIJING Parametrisation Particle Generator";
     fPtpi    =  0;
     fPtka    =  0;
@@ -320,7 +261,8 @@ void AliGenHIJINGpara::Init()
     }
 //
 //
-    if (fPi0Decays) fDecayer = new AliDecayerPythia();
+    if (fPi0Decays && gMC)
+       fDecayer = gMC->GetDecayer();
 }
 
 
@@ -353,16 +295,8 @@ void AliGenHIJINGpara::Generate()
     for (j=0;j<3;j++) origin[j]=fOrigin[j];
 
     if(fVertexSmear == kPerEvent) {
-       Float_t dv[3];
-       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]));
-           }
-       }
-       for (j=0; j < 3; j++) origin[j] += dv[j];
+       Vertex();
+       for (j=0; j < 3; j++) origin[j] = fVertex[j];
     } // if kPerEvent
     TArrayF eventVertex;
     eventVertex.Set(3);
@@ -402,11 +336,11 @@ void AliGenHIJINGpara::Generate()
            if (part == kPi0 && fPi0Decays){
 //
 //          Decay pi0 if requested
-               SetTrack(0,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
+               PushTrack(0,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
                KeepTrack(fNt);
                DecayPi0(origin, p);
            } else {
-               SetTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
+               PushTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
                KeepTrack(fNt);
            }
 
@@ -423,12 +357,6 @@ void AliGenHIJINGpara::Generate()
     gAlice->SetGenEventHeader(header); 
 }
 
-AliGenHIJINGpara& AliGenHIJINGpara::operator=(const  AliGenHIJINGpara& rhs)
-{
-// Assignment operator
-    return *this;
-}
-
 void AliGenHIJINGpara::SetPtRange(Float_t ptmin, Float_t ptmax) {
     AliGenerator::SetPtRange(ptmin, ptmax);
 }
@@ -463,8 +391,13 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p)
        p[2] = iParticle->Pz();
        Int_t part = iParticle->GetPdgCode();
 
-       SetTrack(fTrackIt, fNt, part, p, orig, polar, 0, kPDecay, nt, fParentWeight);
+       PushTrack(fTrackIt, fNt, part, p, orig, polar, 0, kPDecay, nt, fParentWeight);
        KeepTrack(nt);
     }
     fNt = nt;
 }
+
+void AliGenHIJINGpara::Copy(AliGenHIJINGpara &) const
+{
+  Fatal("Copy","Not implemented!\n");
+}