- enum constants for paramterisation type (particle family) moved to AliGen*lib.h

- use AliGenGSIlib::kUpsilon, AliGenPHOSlib::kEtaPrime to access the constants

diff --git a/EVGEN/AliGenGSIlib.cxx b/EVGEN/AliGenGSIlib.cxx
index 681237301fd30e66acd2c84d11d8af222678c71d..c5f685a925bdb380035dbe048e5d3239e959d65a 100644 (file)
--- a/EVGEN/AliGenGSIlib.cxx
+++ b/EVGEN/AliGenGSIlib.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.3  2000/12/21 16:24:06  morsch
+Coding convention clean-up
+
 Revision 1.2  2000/11/30 07:12:50  alibrary
 Introducing new Rndm and QA classes
 
@@ -180,14 +183,14 @@ typedef Int_t (*GenFuncIp) (TRandom *);
 
 
 
-GenFunc AliGenGSIlib::GetPt(Param_t param, const char * tname)
+GenFunc AliGenGSIlib::GetPt(Int_t param, const char * tname)
 {
 // Return pointer to pT parameterisation
   GenFunc func=0;
   TString sname(tname);
   switch (param) 
     {
-    case upsilon_p:
+    case kUpsilon:
       if (sname=="MUON"){
        func= PtUpsilonMUON;
        break;
@@ -212,14 +215,14 @@ GenFunc AliGenGSIlib::GetPt(Param_t param, const char * tname)
 
 
 
-GenFunc AliGenGSIlib::GetY(Param_t param, const char * tname)
+GenFunc AliGenGSIlib::GetY(Int_t param, const char * tname)
 {
   // Return pointer to y- parameterisation
    GenFunc func=0;
     TString sname(tname);
     switch (param) 
     {
-    case upsilon_p:
+    case kUpsilon:
       if (sname=="MUON"){
        func= YUpsilonMUON;
        break;
@@ -244,14 +247,14 @@ GenFunc AliGenGSIlib::GetY(Param_t param, const char * tname)
 
 
 
-GenFuncIp AliGenGSIlib::GetIp(Param_t param, const char * tname)
+GenFuncIp AliGenGSIlib::GetIp(Int_t param, const char * tname)
 {
 // Return pointer to particle type parameterisation
     GenFuncIp func=0;
     TString sname(tname);
     switch (param) 
     {
-    case upsilon_p:
+    case kUpsilon:
       if (sname=="MUON"){
        func=IpUpsilonMUON;
        break;

diff --git a/EVGEN/AliGenGSIlib.h b/EVGEN/AliGenGSIlib.h
index 99a2e0b2972311ab9a1195db890f6173d2cb17d1..119449166f093bab47287c2ed1502d44272446f8 100644 (file)
--- a/EVGEN/AliGenGSIlib.h
+++ b/EVGEN/AliGenGSIlib.h
@@ -14,7 +14,7 @@ class TRandom;
 
 class AliGenGSIlib :public AliGenLib {
  public:
-
+    enum constants{kUpsilon};
 // Upsilon RITMAN   
     static Double_t PtUpsilonRitman( Double_t *px, Double_t *dummy );
     static Double_t YUpsilonRitman(Double_t *py, Double_t *dummy);
@@ -32,9 +32,9 @@ class AliGenGSIlib :public AliGenLib {
     typedef Double_t (*GenFunc)  (Double_t *, Double_t *);
     typedef Int_t    (*GenFuncIp)(TRandom *ran);
     
-    GenFunc   GetPt(Param_t param, const char * tname=0);
-    GenFunc   GetY(Param_t param,  const char * tname=0);
-    GenFuncIp GetIp(Param_t param, const char * tname=0);    
+    GenFunc   GetPt(Int_t param, const char * tname=0);
+    GenFunc   GetY(Int_t param,  const char * tname=0);
+    GenFuncIp GetIp(Int_t param, const char * tname=0);    
     static void SetDebug(Bool_t debug){fgDebug=debug;}
 private:
     static Bool_t fgDebug;  // Debug flag 

diff --git a/EVGEN/AliGenLib.h b/EVGEN/AliGenLib.h
index dc884aa3d072662826b77ebb2b83494600b6fee3..0ea6e74c74c51c3970ee7931de10630cf6e5d44a 100644 (file)
--- a/EVGEN/AliGenLib.h
+++ b/EVGEN/AliGenLib.h
@@ -7,7 +7,6 @@
 
 #include <TObject.h>
 
-#include "GenTypeDefs.h"
 class TRandom;
 
 class AliGenLib :
@@ -18,9 +17,9 @@ class AliGenLib :
     virtual ~AliGenLib(){}
     typedef Double_t (*GenFunc)  (Double_t *, Double_t *);
     typedef Int_t    (*GenFuncIp)(TRandom *);    
-    virtual GenFunc   GetPt(Param_t param, const char *tname)   = 0;
-    virtual GenFunc   GetY (Param_t param, const char *tname)  = 0;
-    virtual GenFuncIp GetIp(Param_t param, const char *tname)  = 0;    
+    virtual GenFunc   GetPt(Int_t param, const char *tname)   = 0;
+    virtual GenFunc   GetY (Int_t param, const char *tname)  = 0;
+    virtual GenFuncIp GetIp(Int_t param, const char *tname)  = 0;    
     ClassDef(AliGenLib,0) // Library providing y and pT parameterisations
 };
 #endif

diff --git a/EVGEN/AliGenMUONlib.cxx b/EVGEN/AliGenMUONlib.cxx
index 53a4597f59cad7cb2c7d03cd5aecb83c48b7e087..2ec6a0563ff635cb48d30ea2fa953057d3ede44d 100644 (file)
--- a/EVGEN/AliGenMUONlib.cxx
+++ b/EVGEN/AliGenMUONlib.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.11  2000/11/30 07:12:50  alibrary
+Introducing new Rndm and QA classes
+
 Revision 1.10  2000/06/29 21:08:27  morsch
 All paramatrisation libraries derive from the pure virtual base class AliGenLib.
 This allows to pass a pointer to a library directly to AliGenParam and avoids the
@@ -350,31 +353,31 @@ Int_t AliGenMUONlib::IpBeauty(TRandom *ran)
 }
 
 typedef Double_t (*GenFunc) (Double_t*,  Double_t*);
-GenFunc AliGenMUONlib::GetPt(Param_t param,  const char* tname)
+GenFunc AliGenMUONlib::GetPt(Int_t param,  const char* tname)
 {
 // Return pointer to pT parameterisation
     GenFunc func;
     switch (param) 
     {
-    case phi_p:
+    case kPhi:
        func=PtPhi;
        break;
-    case jpsi_p:
+    case kJpsi:
        func=PtJpsi;
        break;
-    case upsilon_p:
+    case kUpsilon:
        func=PtUpsilon;
        break;
-    case charm_p:
+    case kCharm:
        func=PtCharm;
        break;
-    case beauty_p:
+    case kBeauty:
        func=PtBeauty;
        break;
-    case pion_p:
+    case kPion:
        func=PtPion;
        break;
-    case kaon_p:
+    case kKaon:
        func=PtKaon;
        break;
     default:
@@ -384,31 +387,31 @@ GenFunc AliGenMUONlib::GetPt(Param_t param,  const char* tname)
     return func;
 }
 
-GenFunc AliGenMUONlib::GetY(Param_t param, const char* tname)
+GenFunc AliGenMUONlib::GetY(Int_t param, const char* tname)
 {
 // Return pointer to y- parameterisation
     GenFunc func;
     switch (param) 
     {
-    case phi_p:
+    case kPhi:
        func=YPhi;
        break;
-    case jpsi_p:
+    case kJpsi:
        func=YJpsi;
        break;
-    case upsilon_p:
+    case kUpsilon:
        func=YUpsilon;
        break;
-    case charm_p:
+    case kCharm:
        func=YCharm;
        break;
-    case beauty_p:
+    case kBeauty:
        func=YBeauty;
        break;
-    case pion_p:
+    case kPion:
        func=YPion;
        break;
-    case kaon_p:
+    case kKaon:
        func=YKaon;
        break;
     default:
@@ -418,31 +421,31 @@ GenFunc AliGenMUONlib::GetY(Param_t param, const char* tname)
     return func;
 }
 typedef Int_t (*GenFuncIp) (TRandom *);
-GenFuncIp AliGenMUONlib::GetIp(Param_t param,  const char* tname)
+GenFuncIp AliGenMUONlib::GetIp(Int_t param,  const char* tname)
 {
 // Return pointer to particle type parameterisation
     GenFuncIp func;
     switch (param) 
     {
-    case phi_p:
+    case kPhi:
        func=IpPhi;
        break;
-    case jpsi_p:
+    case kJpsi:
        func=IpJpsi;
        break;
-    case upsilon_p:
+    case kUpsilon:
        func=IpUpsilon;
        break;
-    case charm_p:
+    case kCharm:
        func=IpCharm;
        break;
-    case beauty_p:
+    case kBeauty:
        func=IpBeauty;
        break;
-    case pion_p:
+    case kPion:
        func=IpPion;
        break;
-    case kaon_p:
+    case kKaon:
        func=IpKaon;
        break;
     default:

diff --git a/EVGEN/AliGenMUONlib.h b/EVGEN/AliGenMUONlib.h
index 4c71e354eae72b5fdd4e64acfaa14b7165430c7c..48ee53bee9214065554d86a363f99fa3259951a0 100644 (file)
--- a/EVGEN/AliGenMUONlib.h
+++ b/EVGEN/AliGenMUONlib.h
@@ -11,6 +11,9 @@ class AliGenMUONlib :
   public AliGenLib
 {
  public:
+    enum constants{kPhi, kJpsi, kUpsilon, kCharm, kBeauty, kPion, kKaon};
+    
+    
 // pions
     static Double_t PtPion(Double_t *px, Double_t *dummy);
     static Double_t PtScal(Double_t pt, Int_t np);
@@ -43,9 +46,9 @@ class AliGenMUONlib :
     static Double_t YBeauty(Double_t *py, Double_t *dummy);
     static Int_t    IpBeauty(TRandom *ran);
 //
-    GenFunc   GetPt(Param_t param, const char* tname=0);
-    GenFunc   GetY (Param_t param, const char* tname=0);
-    GenFuncIp GetIp(Param_t param, const char* tname=0);    
+    GenFunc   GetPt(Int_t param, const char* tname=0);
+    GenFunc   GetY (Int_t param, const char* tname=0);
+    GenFuncIp GetIp(Int_t param, const char* tname=0);    
     ClassDef(AliGenMUONlib,0) // Library providing y and pT parameterisations
 };
 #endif

diff --git a/EVGEN/AliGenPHOSlib.cxx b/EVGEN/AliGenPHOSlib.cxx
index 3d8e95749f378b3c568a759c8800e3ef9d7d2559..bf523d5c1578ecf6f2d9e08ba19ea544bae7010d 100644 (file)
--- a/EVGEN/AliGenPHOSlib.cxx
+++ b/EVGEN/AliGenPHOSlib.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.6  2000/11/30 07:12:50  alibrary
+Introducing new Rndm and QA classes
+
 Revision 1.5  2000/06/29 21:08:27  morsch
 All paramatrisation libraries derive from the pure virtual base class AliGenLib.
 This allows to pass a pointer to a library directly to AliGenParam and avoids the
@@ -412,29 +415,29 @@ ClassImp(AliGenPHOSlib)
 
 
 typedef Double_t (*GenFunc) (Double_t*,  Double_t*);
- GenFunc AliGenPHOSlib::GetPt(Param_t param, const char* tname)
+ GenFunc AliGenPHOSlib::GetPt(Int_t param, const char* tname)
 {
 // Return pinter to pT parameterisation
     GenFunc func;
     
     switch (param)
     {
-    case Pion:     
+    case kPion:     
         func=PtPion;
         break;
-    case Kaon:
+    case kKaon:
         func=PtKaon;
         break;
-    case Eta:
+    case kEta:
         func=PtEta;
         break;
-    case Omega:
+    case kOmega:
         func=PtOmega;
         break;
-    case Etaprime:
+    case kEtaPrime:
         func=PtEtaprime;
         break;
-    case Baryon:
+    case kBaryon:
         func=PtBaryon;
         break;
     default:
@@ -444,31 +447,31 @@ typedef Double_t (*GenFunc) (Double_t*,  Double_t*);
     return func;
 }
 
- GenFunc AliGenPHOSlib::GetY(Param_t param, const char* tname)
+ GenFunc AliGenPHOSlib::GetY(Int_t param, const char* tname)
 {
 // Return pointer to Y parameterisation
     GenFunc func;
     switch (param)
     {
-    case Pion:
+    case kPion:
         func=YPion;
         break;
-    case Kaon:
+    case kKaon:
         func=YKaon;
         break;
-    case Eta:
+    case kEta:
         func=YEta;
         break;
-    case Omega:
+    case kOmega:
         func=YOmega;
         break;
-    case Etaprime:
+    case kEtaPrime:
         func=YEtaprime;
         break;
-    case Phi:
+    case kPhi:
         func=YPhi;
         break;
-    case Baryon:
+    case kBaryon:
         func=YBaryon;
         break;
     default:
@@ -478,32 +481,32 @@ typedef Double_t (*GenFunc) (Double_t*,  Double_t*);
     return func;
 }
 typedef Int_t (*GenFuncIp) (TRandom *);
- GenFuncIp AliGenPHOSlib::GetIp(Param_t param,  const char* tname)
+ GenFuncIp AliGenPHOSlib::GetIp(Int_t param,  const char* tname)
 {
 // Return pointer to particle composition
     GenFuncIp func;
     switch (param)
     {
-    case Pion:
+    case kPion:
         
         func=IpPion;
         break;
-    case Kaon:
+    case kKaon:
         func=IpKaon;
         break;
-    case Eta:
+    case kEta:
         func=IpEta;
         break;
-    case Omega:
+    case kOmega:
         func=IpOmega;
         break;
-    case Etaprime:
+    case kEtaPrime:
         func=IpEtaprime;
         break;
-    case Phi:
+    case kPhi:
         func=IpPhi;
         break;
-    case Baryon:
+    case kBaryon:
         func=IpBaryon;
         break;
     default:

diff --git a/EVGEN/AliGenPHOSlib.h b/EVGEN/AliGenPHOSlib.h
index 8a01e2a15a4ee691d240ccb334d93acfce6af7ee..0841ab6fcd3c843b9372cfd1e84a590086811eed 100644 (file)
--- a/EVGEN/AliGenPHOSlib.h
+++ b/EVGEN/AliGenPHOSlib.h
@@ -12,6 +12,7 @@ class AliGenPHOSlib :
 public AliGenLib
 {
  public:
+    enum constants{kPion, kKaon, kEta, kOmega, kEtaPrime, kPhi, kBaryon};
 // pions
     static Double_t PtPion(Double_t *px, Double_t *dummy);
     static Double_t PtScal(Double_t pt, Int_t np);
@@ -42,9 +43,9 @@ public AliGenLib
     static Double_t YBaryon( Double_t *py, Double_t *dummy);
     static Int_t    IpBaryon(TRandom *ran);
     
-    GenFunc   GetPt(Param_t param, const char* tname=0);
-    GenFunc   GetY (Param_t param, const char* tname=0);
-    GenFuncIp GetIp(Param_t param, const char* tname=0);    
+    GenFunc   GetPt(Int_t param, const char* tname=0);
+    GenFunc   GetY (Int_t param, const char* tname=0);
+    GenFuncIp GetIp(Int_t param, const char* tname=0);    
     ClassDef(AliGenPHOSlib,0) // Library providing y and pT parameterisations
 };
 #endif

diff --git a/EVGEN/AliGenPMDlib.cxx b/EVGEN/AliGenPMDlib.cxx
index 5c60ce474e1412f7d68fb2d6593ce4f1caa40f6a..3d7b33c1049b24b4eb3c38fdb129863aaa077329 100644 (file)
--- a/EVGEN/AliGenPMDlib.cxx
+++ b/EVGEN/AliGenPMDlib.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  2000/11/30 07:12:50  alibrary
+Introducing new Rndm and QA classes
+
 Revision 1.1  2000/09/08 15:37:58  morsch
 pt and y-parameterisations for PMD physics simulation.
 THIS VERSION IS JUST A TEMPLATE THE PT AND Y DISTRIBUTIONS HAVE TO BE CORRECTED !!!!.
@@ -146,16 +149,16 @@ Int_t AliGenPMDlib::IpEta(TRandom *)
 
 
 typedef Double_t (*GenFunc) (Double_t*,  Double_t*);
-GenFunc AliGenPMDlib::GetPt(Param_t param,  const char* tname)
+GenFunc AliGenPMDlib::GetPt(Int_t param,  const char* tname)
 {
 // Return pointer to pT parameterisation
     GenFunc func=NULL;
     switch (param) 
     {
-    case Pion:
+    case kPion:
        func=PtPi0;
        break;
-    case Eta:
+    case kEta:
        func=PtEta;
        break;
     default:
@@ -165,16 +168,16 @@ GenFunc AliGenPMDlib::GetPt(Param_t param,  const char* tname)
     return func;
 }
 
-GenFunc AliGenPMDlib::GetY(Param_t param, const char* tname)
+GenFunc AliGenPMDlib::GetY(Int_t param, const char* tname)
 {
 // Return pointer to y- parameterisation
     GenFunc func=NULL;
     switch (param) 
     {
-    case Pion:
+    case kPion:
        func=YPi0;
        break;
-    case Eta:
+    case kEta:
        func=YEta;
        break;
     default:
@@ -185,16 +188,16 @@ GenFunc AliGenPMDlib::GetY(Param_t param, const char* tname)
 
 }
 typedef Int_t (*GenFuncIp) (TRandom *);
-GenFuncIp AliGenPMDlib::GetIp(Param_t param,  const char* tname)
+GenFuncIp AliGenPMDlib::GetIp(Int_t param,  const char* tname)
 {
 // Return pointer to particle type parameterisation
     GenFuncIp func=NULL;
     switch (param) 
     {
-    case Pion:
+    case kPion:
        func=IpPi0;
        break;
-    case Eta:
+    case kEta:
        func=IpEta;
        break;
     default:

diff --git a/EVGEN/AliGenPMDlib.h b/EVGEN/AliGenPMDlib.h
index d231d58c4760e5cd8586ce327ae0fc5c2b282ab3..8734b5a2d6456e64f59ba1a949807a58093473b1 100644 (file)
--- a/EVGEN/AliGenPMDlib.h
+++ b/EVGEN/AliGenPMDlib.h
@@ -12,6 +12,7 @@ class AliGenPMDlib :
 public AliGenLib
 {
  public:
+     enum constants{kPion, kEta};
 // Neutral pions
     static Double_t PtPi0(Double_t *px, Double_t *dummy);
     static Double_t PtScal(Double_t pt, Int_t np);
@@ -22,9 +23,9 @@ public AliGenLib
     static Double_t YEta( Double_t *py, Double_t *dummy);
     static Int_t    IpEta(TRandom *ran);
 //
-    GenFunc   GetPt(Param_t param, const char* tname=0);
-    GenFunc   GetY (Param_t param, const char* tname=0);
-    GenFuncIp GetIp(Param_t param, const char* tname=0);    
+    GenFunc   GetPt(Int_t param, const char* tname=0);
+    GenFunc   GetY (Int_t param, const char* tname=0);
+    GenFuncIp GetIp(Int_t param, const char* tname=0);    
     ClassDef(AliGenPMDlib,0) // Library providing y and pT parameterisations
 };
 #endif

diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx
index b4e2450628844a3d879772a500eec52608a978c3..b49ed69898ef4199ce64ad6b806afcd4ae5ef0f2 100644 (file)
--- a/EVGEN/AliGenParam.cxx
+++ b/EVGEN/AliGenParam.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.27  2001/02/02 15:21:10  morsch
+Set high water mark after last particle.
+Use Vertex() method for Vertex.
+
 Revision 1.26  2000/12/21 16:24:06  morsch
 Coding convention clean-up
 
@@ -98,8 +102,8 @@ AliGenParam::AliGenParam()
 // Deafault constructor
     fPtPara = 0;
     fYPara  = 0;
-    fParam  = jpsi_p;
-    fAnalog = analog;
+    fParam  = 0;
+    fAnalog = kAnalog;
     SetCutOnChild();
     SetChildMomentumRange();
     SetChildPtRange();
@@ -111,7 +115,7 @@ AliGenParam::AliGenParam()
     sRandom = fRandom;
 }
 
-AliGenParam::AliGenParam(Int_t npart, AliGenLib * Library,  Param_t param, char* tname):AliGenerator(npart)
+AliGenParam::AliGenParam(Int_t npart, AliGenLib * Library,  Int_t param, char* tname):AliGenerator(npart)
 {
 // Constructor using number of particles parameterisation id and library
     
@@ -122,7 +126,7 @@ AliGenParam::AliGenParam(Int_t npart, AliGenLib * Library,  Param_t param, char*
     fPtPara = 0;
     fYPara  = 0;
     fParam  = param;
-    fAnalog = analog;
+    fAnalog = kAnalog;
     fChildSelect.Set(5);
     for (Int_t i=0; i<5; i++) fChildSelect[i]=0;
     SetForceDecay();
@@ -139,7 +143,7 @@ AliGenParam::AliGenParam(Int_t npart, AliGenLib * Library,  Param_t param, char*
 
 //____________________________________________________________
 
-AliGenParam::AliGenParam(Int_t npart, Param_t param, char* tname):AliGenerator(npart)
+AliGenParam::AliGenParam(Int_t npart, Int_t param, char* tname):AliGenerator(npart)
 {
 // Constructor using parameterisation id and number of particles
 //      
@@ -152,7 +156,7 @@ AliGenParam::AliGenParam(Int_t npart, Param_t param, char* tname):AliGenerator(n
     fPtPara = 0;
     fYPara  = 0;
     fParam  = param;
-    fAnalog = analog;
+    fAnalog = kAnalog;
     fChildSelect.Set(5);
     for (Int_t i=0; i<5; i++) fChildSelect[i]=0;
     SetForceDecay();
@@ -164,7 +168,7 @@ AliGenParam::AliGenParam(Int_t npart, Param_t param, char* tname):AliGenerator(n
     SetDeltaPt(); 
 }
 
-AliGenParam::AliGenParam(Int_t npart, Param_t param,
+AliGenParam::AliGenParam(Int_t npart, Int_t param,
                          Double_t (*PtPara) (Double_t*, Double_t*),
                          Double_t (*YPara ) (Double_t* ,Double_t*),
                         Int_t    (*IpPara) (TRandom *))                 
@@ -179,7 +183,7 @@ AliGenParam::AliGenParam(Int_t npart, Param_t param,
     fPtPara = 0;
     fYPara  = 0;
     fParam  = param;
-    fAnalog = analog;
+    fAnalog = kAnalog;
     fChildSelect.Set(5);
     for (Int_t i=0; i<5; i++) fChildSelect[i]=0;
     SetForceDecay();
@@ -239,7 +243,7 @@ void AliGenParam::Init()
     Float_t intPt0 = ptPara->Integral(0,15);
     Float_t intPtS = ptPara->Integral(fPtMin,fPtMax);
     Float_t phiWgt=(fPhiMax-fPhiMin)/2./TMath::Pi();
-    if (fAnalog == analog) {
+    if (fAnalog == kAnalog) {
        fYWgt  = intYS/fdNdy0;
        fPtWgt = intPtS/intPt0;
        fParentWeight = fYWgt*fPtWgt*phiWgt/fNpart;
@@ -256,30 +260,30 @@ void AliGenParam::Init()
 //
     switch (fForceDecay) 
     {
-    case semielectronic:
-    case dielectron:
-    case b_jpsi_dielectron:
-    case b_psip_dielectron:
+    case kSemiElectronic:
+    case kDiElectron:
+    case kBJpsiDiElectron:
+    case kBPsiPrimeDiElectron:
        fChildSelect[0]=11;     
        break;
-    case semimuonic:
-    case dimuon:
-    case b_jpsi_dimuon:
-    case b_psip_dimuon:
+    case kSemiMuonic:
+    case kDiMuon:
+    case kBJpsiDiMuon:
+    case kBPsiPrimeDiMuon:
        fChildSelect[0]=13;
        break;
-    case pitomu:
+    case kPiToMu:
        fChildSelect[0]=13;
        break;
-    case katomu:
+    case kKaToMu:
        fChildSelect[0]=13;
        break;
-    case hadronicD:
+    case kHadronicD:
 // Implement me !!
        break;
-    case nodecay:
+    case kNoDecay:
        break;
-    case all:
+    case kAll:
        break;
     }
 }
@@ -352,7 +356,7 @@ void AliGenParam::Generate()
          ty=Float_t(TMath::TanH(fYPara->GetRandom()));
 //
 // pT
-         if (fAnalog == analog) {
+         if (fAnalog == kAnalog) {
              pt=fPtPara->GetRandom();
              wgtp=fParentWeight;
              wgtch=fChildWeight;
@@ -390,7 +394,7 @@ void AliGenParam::Generate()
 // if fForceDecay == none Primary particle is tracked by GEANT 
 // (In the latest, make sure that GEANT actually does all the decays you want)   
 //
-         if (fForceDecay != nodecay) {
+         if (fForceDecay != kNoDecay) {
 // Using lujet to decay particle
              Float_t energy=TMath::Sqrt(ptot*ptot+am*am);
              TLorentzVector pmom(p[0], p[1], p[2], energy);
@@ -404,7 +408,7 @@ void AliGenParam::Generate()
                  Int_t kf = iparticle->GetPdgCode();
 //
 // children
-                 if (ChildSelected(TMath::Abs(kf)) || fForceDecay==all)
+                 if (ChildSelected(TMath::Abs(kf)) || fForceDecay == kAll)
                  {
                      pc[0]=iparticle->Px();
                      pc[1]=iparticle->Py();

diff --git a/EVGEN/AliGenParam.h b/EVGEN/AliGenParam.h
index 9e0b774f99dc9ff906195a9c8047186e3a428428..ec57eec89e930b90983961836106138502a26d0b 100644 (file)
--- a/EVGEN/AliGenParam.h
+++ b/EVGEN/AliGenParam.h
@@ -6,23 +6,23 @@
 /* $Id$ */
 
 #include "AliGenerator.h"
-#include "GenTypeDefs.h"
+#include "AliDecayer.h"
 #include <TArrayI.h>
 
-class AliDecayer;
 class AliPythia;
 class TParticle;
 class AliGenLib;
 class TF1;
 
+typedef enum { kAnalog, kNonAnalog} Weighting_t;
 //-------------------------------------------------------------
 class AliGenParam : public AliGenerator
 {
  public:
     AliGenParam();
-    AliGenParam(Int_t npart, AliGenLib * Library, Param_t param, char* tname=0);
-    AliGenParam(Int_t npart, Param_t param, char* tname=0);
-    AliGenParam(Int_t npart, Param_t param,
+    AliGenParam(Int_t npart, AliGenLib * Library, Int_t param, char* tname = 0);
+    AliGenParam(Int_t npart, Int_t param, char* tname = 0);
+    AliGenParam(Int_t npart, Int_t param,
                Double_t (*PtPara)(Double_t*, Double_t*),
                Double_t (*YPara )(Double_t*, Double_t*),
                Int_t    (*IpPara)(TRandom*)           );
@@ -32,22 +32,22 @@ class AliGenParam : public AliGenerator
     virtual void Generate();
     virtual void Init();
     // select particle type
-    virtual void SetParam(Param_t param=jpsi_p) {fParam=param;}
+    virtual void SetParam(Int_t param) {fParam = param;}
     // force decay type
-    virtual void SetForceDecay(Decay_t decay=dimuon) {fForceDecay=decay;}
-    virtual void SetWeighting(Weighting_t flag=analog) {fAnalog=flag;} 
-    virtual void SetCutOnChild(Int_t flag=0) {fCutOnChild=flag;}
-    virtual void SetChildMomentumRange(Float_t pmin=0, Float_t pmax=1.e10)
+    virtual void SetForceDecay(Decay_t decay = kDiMuon) {fForceDecay = decay;}
+    virtual void SetWeighting(Weighting_t flag = kAnalog) {fAnalog = flag;}    
+    virtual void SetCutOnChild(Int_t flag = 0) {fCutOnChild = flag;}
+    virtual void SetChildMomentumRange(Float_t pmin = 0, Float_t pmax = 1.e10)
        {fChildPMin = pmin; fChildPMax = pmax;}
-    virtual void SetChildPtRange(Float_t ptmin=0, Float_t ptmax=20.)
+    virtual void SetChildPtRange(Float_t ptmin = 0, Float_t ptmax = 20.)
        {fChildPtMin = ptmin; fChildPtMax = ptmax;}
-    virtual void SetChildPhiRange(Float_t phimin=-180., Float_t phimax=180)
+    virtual void SetChildPhiRange(Float_t phimin = -180., Float_t phimax = 180)
        {fChildPhiMin = TMath::Pi()*phimin/180;
-       fChildPhiMax = TMath::Pi()*phimax/180;}
-    virtual void SetChildThetaRange(Float_t thetamin=0, Float_t thetamax=180)
+       fChildPhiMax  = TMath::Pi()*phimax/180;}
+    virtual void SetChildThetaRange(Float_t thetamin = 0, Float_t thetamax = 180)
        {fChildThetaMin = TMath::Pi()*thetamin/180;
-       fChildThetaMax = TMath::Pi()*thetamax/180;}
-    virtual void SetDeltaPt(Float_t delta=0.01) {fDeltaPt=delta;}
+       fChildThetaMax  = TMath::Pi()*thetamax/180;}
+    virtual void SetDeltaPt(Float_t delta=0.01) {fDeltaPt = delta;}
     
     AliGenParam & operator=(const AliGenParam & rhs);
  protected:
@@ -56,7 +56,7 @@ class AliGenParam : public AliGenerator
     Int_t    (*fIpParaFunc )(TRandom*);    //! Pointer to particle type parametrisation function
     TF1* fPtPara;              // Transverse momentum parameterisation
     TF1* fYPara;               // Rapidity parameterisation
-    Param_t     fParam;        // Parameterisation type 
+    Int_t       fParam;        // Parameterisation type 
     Float_t     fdNdy0;        // central multiplicity per event
     Float_t     fYWgt;         // Y-weight
     Float_t     fPtWgt;        // Pt-weight