Using symbolic particle types everywhere

diff --git a/FMD/Config.C b/FMD/Config.C
index 240d3209fcf51d89b1ff5f7afc4f9e50de89530b..75ce3a8346245e8bea0c9a08a741f7af89274c62 100644 (file)
--- a/FMD/Config.C
+++ b/FMD/Config.C
@@ -15,7 +15,7 @@
 */
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 */
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>

-#include <TRandom.h>
+#include <TPDGCode.h>

 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TGeant3.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TGeant3.h>


@@ -1581,7 +1581,7 @@ GeneratorFactory(EG_t eg, Rad_t rad, TString& comment)
     {
       comment = comment.Append(" Flat in FMD1 range");
       AliGenBox* gener = new AliGenBox(2000);
     {
       comment = comment.Append(" Flat in FMD1 range");
       AliGenBox* gener = new AliGenBox(2000);

-      gener->SetPart(211);
+      gener->SetPart(kPiPlus);

       gener->SetMomentumRange(3,4);
       gener->SetPhiRange(0, 360);
       gener->SetThetaRange(0.77, 3.08);
       gener->SetMomentumRange(3,4);
       gener->SetPhiRange(0, 360);
       gener->SetThetaRange(0.77, 3.08);


@@ -1592,7 +1592,7 @@ GeneratorFactory(EG_t eg, Rad_t rad, TString& comment)
     {
       comment = comment.Append(" Flat in FMD2 range");
       AliGenBox* gener = new AliGenBox(2000);
     {
       comment = comment.Append(" Flat in FMD2 range");
       AliGenBox* gener = new AliGenBox(2000);

-      gener->SetPart(211);
+      gener->SetPart(kPiPlus);

       gener->SetMomentumRange(3,4);
       gener->SetPhiRange(0, 360);
       gener->SetThetaRange(2.95, 20.42);
       gener->SetMomentumRange(3,4);
       gener->SetPhiRange(0, 360);
       gener->SetThetaRange(2.95, 20.42);


@@ -1603,7 +1603,7 @@ GeneratorFactory(EG_t eg, Rad_t rad, TString& comment)
     {
       comment = comment.Append(" Flat in FMD3 range");
       AliGenBox* gener = new AliGenBox(2000);
     {
       comment = comment.Append(" Flat in FMD3 range");
       AliGenBox* gener = new AliGenBox(2000);

-      gener->SetPart(211);
+      gener->SetPart(kPiPlus);

       gener->SetMomentumRange(3,4);
       gener->SetPhiRange(0, 360);
       gener->SetThetaRange(155.97, 176.73);
       gener->SetMomentumRange(3,4);
       gener->SetPhiRange(0, 360);
       gener->SetThetaRange(155.97, 176.73);


@@ -1618,15 +1618,15 @@ GeneratorFactory(EG_t eg, Rad_t rad, TString& comment)
       gener->SetPhiRange(0, 360);
       AliGenBox* gener3 = new AliGenBox(2000);
       gener3->SetThetaRange(155.97, 176.73);
       gener->SetPhiRange(0, 360);
       AliGenBox* gener3 = new AliGenBox(2000);
       gener3->SetThetaRange(155.97, 176.73);

-      gener3->SetPart(211);
+      gener3->SetPart(kPiPlus);

       gener->AddGenerator(gener3, "FMD3", .33);
       AliGenBox* gener2 = new AliGenBox(2000);
       gener2->SetThetaRange(2.95, 20.42);
       gener->AddGenerator(gener3, "FMD3", .33);
       AliGenBox* gener2 = new AliGenBox(2000);
       gener2->SetThetaRange(2.95, 20.42);

-      gener2->SetPart(211);
+      gener2->SetPart(kPiPlus);

       gener->AddGenerator(gener2, "FMD2", .33);
       AliGenBox* gener1 = new AliGenBox(2000);
       gener1->SetThetaRange(0.77, 3.08);
       gener->AddGenerator(gener2, "FMD2", .33);
       AliGenBox* gener1 = new AliGenBox(2000);
       gener1->SetThetaRange(0.77, 3.08);

-      gener1->SetPart(211);
+      gener1->SetPart(kPiPlus);

       gener->AddGenerator(gener1, "FMD1", .34);
       gGener = gener;
     }
       gener->AddGenerator(gener1, "FMD1", .34);
       gGener = gener;
     }

diff --git a/ITS/ConfigSDD03.C b/ITS/ConfigSDD03.C
index 2e3f892eb1543d1e66165fea964a7c8ecb991ba0..ae79a87b408987d3d6514f33df598423c2b0d018 100644 (file)
--- a/ITS/ConfigSDD03.C
+++ b/ITS/ConfigSDD03.C
@@ -1,6 +1,7 @@
 //
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 //
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>

+#include <TPDGCode.h>

 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>


@@ -93,7 +94,7 @@ void Config(){
     gener->SetOrigin(0.,0.,-800.);
     //vertex position
     gener->SetSigma(0.1,0.1,0.0); //Sigma in (X,Y,Z) (cm) on IP position
     gener->SetOrigin(0.,0.,-800.);
     //vertex position
     gener->SetSigma(0.1,0.1,0.0); //Sigma in (X,Y,Z) (cm) on IP position

-    gener->SetPart(211);                //GEANT particle type
+    gener->SetPart(kPiPlus);

     gener->Init();
     // Activate this line if you want the vertex smearing to happen
     // track by track
     gener->Init();
     // Activate this line if you want the vertex smearing to happen
     // track by track

diff --git a/ITS/ConfigSPD02.C b/ITS/ConfigSPD02.C
index 5d071c9a754853cab1ea71b45a7f936e308c9ef1..d07e20d0ed57099f16110e08f011a8bc5303d580 100644 (file)
--- a/ITS/ConfigSPD02.C
+++ b/ITS/ConfigSPD02.C
@@ -1,6 +1,7 @@
 //
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 //
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>

+#include <TPDGCode.h>

 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>


@@ -93,7 +94,7 @@ void Config(){
     gener->SetOrigin(0.,0.,-50.);
     //vertex position
     gener->SetSigma(0.1,0.1,0.0); //Sigma in (X,Y,Z) (cm) on IP position
     gener->SetOrigin(0.,0.,-50.);
     //vertex position
     gener->SetSigma(0.1,0.1,0.0); //Sigma in (X,Y,Z) (cm) on IP position

-    gener->SetPart(211);                //GEANT particle type
+    gener->SetPart(kPiPlus);

     gener->Init();
     // Activate this line if you want the vertex smearing to happen
     // track by track
     gener->Init();
     // Activate this line if you want the vertex smearing to happen
     // track by track

diff --git a/ITS/ConfigSSD03.C b/ITS/ConfigSSD03.C
index 41ddcdd365c0c6db9ce353f2a03173a067d9e84b..dc98a475a1161d0121733844a342bef5a6190c81 100644 (file)
--- a/ITS/ConfigSSD03.C
+++ b/ITS/ConfigSSD03.C
@@ -97,9 +97,9 @@ void Config(){
     //vertex position
     gener->SetSigma(1.,1.,0.0); //Sigma in (X,Y,Z) (cm) on IP position
 
     //vertex position
     gener->SetSigma(1.,1.,0.0); //Sigma in (X,Y,Z) (cm) on IP position
 

-    //gener->SetPart(211);                //GEANT particle type
+    //gener->SetPart(kPiPlus);

     //cout<<"kPiPlus="<<kPiPlus<<endl;
     //cout<<"kPiPlus="<<kPiPlus<<endl;

-    gener->SetPart(kPiPlus);                //GEANT particle type
+    gener->SetPart(kPiPlus);

     gener->Init();
     // Activate this line if you want the vertex smearing to happen
     // track by track
     gener->Init();
     // Activate this line if you want the vertex smearing to happen
     // track by track

diff --git a/ITS/oldmacros/ConfigSPD02.C b/ITS/oldmacros/ConfigSPD02.C
index 46a858433f15bcfdd49a61d87b6dcf8c658247e7..69337bda928c4dc23606a8d75de9e9e15327eb7d 100644 (file)
--- a/ITS/oldmacros/ConfigSPD02.C
+++ b/ITS/oldmacros/ConfigSPD02.C
@@ -1,3 +1,5 @@
+#include <TPDGCode.h>
+

 void Config(){
     // Set Random Number seed
     // gRandom->SetSeed(12345);
 void Config(){
     // Set Random Number seed
     // gRandom->SetSeed(12345);


@@ -70,7 +72,7 @@ void Config(){
     gener->SetOrigin(0.,0.,-50.);
     //vertex position
     gener->SetSigma(0.1,0.1,0.0); //Sigma in (X,Y,Z) (cm) on IP position
     gener->SetOrigin(0.,0.,-50.);
     //vertex position
     gener->SetSigma(0.1,0.1,0.0); //Sigma in (X,Y,Z) (cm) on IP position

-    gener->SetPart(211);                //GEANT particle type
+    gener->SetPart(kPiPlus);

     gener->Init();
     // Activate this line if you want the vertex smearing to happen
     // track by track
     gener->Init();
     // Activate this line if you want the vertex smearing to happen
     // track by track

diff --git a/ITS/oldmacros/Config_muon.C b/ITS/oldmacros/Config_muon.C
index 4a3adb8bb83a5b9a6ee2cf57ccf78e0eab224be4..ad87463b241f6e3c3e6327edc399f2fc75bc790a 100644 (file)
--- a/ITS/oldmacros/Config_muon.C
+++ b/ITS/oldmacros/Config_muon.C
@@ -1,3 +1,5 @@
+#include <TPDGCode.h>
+

 void Config(){
     // 7-DEC-2000 09:00
     // Switch on Transition Radiation simulation. 6/12/00 18:00  
 void Config(){
     // 7-DEC-2000 09:00
     // Switch on Transition Radiation simulation. 6/12/00 18:00  


@@ -80,7 +82,7 @@ void Config(){
      gener->SetPhi(180.);
      gener->SetTheta(95.);
      gener->SetOrigin(0,0,0);          //vertex position
      gener->SetPhi(180.);
      gener->SetTheta(95.);
      gener->SetOrigin(0,0,0);          //vertex position

-     gener->SetPart(13);                //GEANT particle type
+     gener->SetPart(kMuonMinus);

     gener->Init();
     // 
     // Activate this line if you want the vertex smearing to happen
     gener->Init();
     // 
     // Activate this line if you want the vertex smearing to happen

diff --git a/MUON/Config.C b/MUON/Config.C
index be3eadc276821119ee7fbc6ba6e0c17c4e3ad4c8..a598a92d3323c53d652a6e3a63e66a9fbd7c1b6f 100644 (file)
--- a/MUON/Config.C
+++ b/MUON/Config.C
@@ -70,7 +70,7 @@ void Config(char directory[100]="", char option[6]="param", const char* digitsto
     gener->SetMomentumRange(20.,20.1);
     gener->SetPhiRange(0., 360.);         
     gener->SetThetaRange(171.000,178.001);
     gener->SetMomentumRange(20.,20.1);
     gener->SetPhiRange(0., 360.);         
     gener->SetThetaRange(171.000,178.001);

-    gener->SetPart(13);           // Muons
+    gener->SetPart(kMuonMinus);           // Muons

     gener->SetOrigin(0.,0., 0.);  //vertex position
     gener->SetSigma(0.0, 0.0, 0.0);         //Sigma in (X,Y,Z) (cm) on IP position
   }
     gener->SetOrigin(0.,0., 0.);  //vertex position
     gener->SetSigma(0.0, 0.0, 0.0);         //Sigma in (X,Y,Z) (cm) on IP position
   }


@@ -80,7 +80,7 @@ void Config(char directory[100]="", char option[6]="param", const char* digitsto
     gener->SetPhiRange(0.);
     gener->SetThetaRange(0.);
     gener->SetOrigin(30,30,-1200);//vertex position
     gener->SetPhiRange(0.);
     gener->SetThetaRange(0.);
     gener->SetOrigin(30,30,-1200);//vertex position

-    gener->SetPart(13);          //GEANT particle type  13 is muons
+    gener->SetPart(kMuonMinus);          //GEANT particle type  13 is muons

   }
   if (!strcmp(option,"scan")) {
     AliGenScan *gener = new AliGenScan(-1);
   }
   if (!strcmp(option,"scan")) {
     AliGenScan *gener = new AliGenScan(-1);

diff --git a/PHOS/ConfigTestSuite.C b/PHOS/ConfigTestSuite.C
index c7700e6aad6c3e4e388e9bd98e881cf98573fa14..5f564df6052b3268c6ed225cdbee20df340199ee 100644 (file)
--- a/PHOS/ConfigTestSuite.C
+++ b/PHOS/ConfigTestSuite.C
@@ -1,3 +1,5 @@
+#include <TPDGCode.h>
+

 static Int_t    eventsPerRun = 100;
 enum PprGeo_t 
 {
 static Int_t    eventsPerRun = 100;
 enum PprGeo_t 
 {


@@ -106,7 +108,7 @@ void Config()
 //     gener->AddGenerator(hijingparam,"HIJING PARAM",1);
 
 //     AliGenBox *genbox = new AliGenBox(nParticles);
 //     gener->AddGenerator(hijingparam,"HIJING PARAM",1);
 
 //     AliGenBox *genbox = new AliGenBox(nParticles);

-//     genbox->SetPart(22);
+//     genbox->SetPart(kGamma);

 //     genbox->SetPtRange(0.3, 10.00);
 //     gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
 //     gener->Init();
 //     genbox->SetPtRange(0.3, 10.00);
 //     gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
 //     gener->Init();


@@ -118,7 +120,7 @@ void Config()
 
     gener->SetOrigin(0,0,0);        //vertex position
     gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position
 
     gener->SetOrigin(0,0,0);        //vertex position
     gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position

-    gener->SetPart(22);
+    gener->SetPart(kGamma);

     gener->Init();
  
     // 
     gener->Init();
  
     // 

diff --git a/PHOS/macros/AlignmentDB/Config.C b/PHOS/macros/AlignmentDB/Config.C
index 6f3ee7f6c4e3df6253118d2125be54d76ebb90f9..885ed46cdd467f483f614916918ebcd7da490100 100644 (file)
--- a/PHOS/macros/AlignmentDB/Config.C
+++ b/PHOS/macros/AlignmentDB/Config.C
@@ -10,6 +10,7 @@
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TGeant3TGeo.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TGeant3TGeo.h>

+#include <TPDGCode.h>

 #include "STEER/AliRunLoader.h"
 #include "STEER/AliRun.h"
 #include "STEER/AliConfig.h"
 #include "STEER/AliRunLoader.h"
 #include "STEER/AliRun.h"
 #include "STEER/AliConfig.h"


@@ -145,7 +146,7 @@ void Config()
     gener->SetSigma(0, 0, 0);   //Sigma in (X,Y,Z) (cm) on IP position
 
     AliGenBox *genbox = new AliGenBox(nParticles);
     gener->SetSigma(0, 0, 0);   //Sigma in (X,Y,Z) (cm) on IP position
 
     AliGenBox *genbox = new AliGenBox(nParticles);

-    genbox->SetPart(11);
+    genbox->SetPart(kElectron);

     genbox->SetPtRange(0.3, 10.00);
     gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
     gener->Init();
     genbox->SetPtRange(0.3, 10.00);
     gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
     gener->Init();

diff --git a/PHOS/macros/Embed/Config.C b/PHOS/macros/Embed/Config.C
index 87a69cca82985c2e60efd90dfddd3f706127d936..098871092df30230bcf152462265ac64f3bc93dd 100644 (file)
--- a/PHOS/macros/Embed/Config.C
+++ b/PHOS/macros/Embed/Config.C
@@ -1,3 +1,5 @@
+#include <TPDGCode.h>
+

 static Int_t    eventsPerRun = 100;
 enum PprGeo_t
 {
 static Int_t    eventsPerRun = 100;
 enum PprGeo_t
 {


@@ -29,6 +31,7 @@ Float_t EtaToTheta(Float_t arg);
 
 void Config()
 {
 
 void Config()
 {

+

   cout << "==> Config.C..." << endl;
   
   // Set Random Number seed
   cout << "==> Config.C..." << endl;
   
   // Set Random Number seed


@@ -129,7 +132,7 @@ void Config()
     gener->SetMomentumRange(0.5, 5.);
     gener->SetPhiRange(260., 280.);
     gener->SetThetaRange(82.,98.);
     gener->SetMomentumRange(0.5, 5.);
     gener->SetPhiRange(260., 280.);
     gener->SetThetaRange(82.,98.);

-    gener->SetPart(22);
+    gener->SetPart(kGamma);

 
     gener->SetOrigin(0, 0, 0);  //vertex position
     gener->SetSigma(0, 0, 0);   //Sigma in (X,Y,Z) (cm) on IP position
 
     gener->SetOrigin(0, 0, 0);  //vertex position
     gener->SetSigma(0, 0, 0);   //Sigma in (X,Y,Z) (cm) on IP position

diff --git a/PHOS/macros/testSuite/ConfigTestSuite.C b/PHOS/macros/testSuite/ConfigTestSuite.C
index 5eecfe78296db5a9f130b2513ad70736da6028ca..d3cce88486b72a6ca99f21812c8df640d0562c66 100644 (file)
--- a/PHOS/macros/testSuite/ConfigTestSuite.C
+++ b/PHOS/macros/testSuite/ConfigTestSuite.C
@@ -1,3 +1,5 @@
+#include <TPGCode.h>
+

 static Int_t    eventsPerRun = 100;
 enum PprGeo_t 
 {
 static Int_t    eventsPerRun = 100;
 enum PprGeo_t 
 {


@@ -7,6 +9,7 @@ static PprGeo_t geo = kHoles;
 
 void Config()
 {
 
 void Config()
 {

+

     // 7-DEC-2000 09:00
     // Switch on Transition Radiation simulation. 6/12/00 18:00
     // iZDC=1  7/12/00 09:00
     // 7-DEC-2000 09:00
     // Switch on Transition Radiation simulation. 6/12/00 18:00
     // iZDC=1  7/12/00 09:00


@@ -106,7 +109,7 @@ void Config()
 //     gener->AddGenerator(hijingparam,"HIJING PARAM",1);
 
 //     AliGenBox *genbox = new AliGenBox(nParticles);
 //     gener->AddGenerator(hijingparam,"HIJING PARAM",1);
 
 //     AliGenBox *genbox = new AliGenBox(nParticles);

-//     genbox->SetPart(22);
+//     genbox->SetPart(kGamma);

 //     genbox->SetPtRange(0.3, 10.00);
 //     gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
 //     gener->Init();
 //     genbox->SetPtRange(0.3, 10.00);
 //     gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
 //     gener->Init();


@@ -118,7 +121,7 @@ void Config()
 
     gener->SetOrigin(0,0,0);        //vertex position
     gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position
 
     gener->SetOrigin(0,0,0);        //vertex position
     gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position

-    gener->SetPart(22);
+    gener->SetPart(kGamma);

     gener->Init();
  
     // 
     gener->Init();
  
     // 

diff --git a/TDPMjet/ConfigDPMjet.C b/TDPMjet/ConfigDPMjet.C
index a05c14f1929ea9846a0a976a734e44eb1980aca3..3793887a6c04674a7da28289a24becffd548598a 100644 (file)
--- a/TDPMjet/ConfigDPMjet.C
+++ b/TDPMjet/ConfigDPMjet.C
@@ -1,5 +1,6 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>

+#include <TPDGCode.h>

 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>


@@ -137,7 +138,7 @@ gSystem->Load("libTDPMjet.so");
        gener->SetPhi(180.);
        gener->SetTheta(5.);
        gener->SetOrigin(0,0,0);        //vertex position
        gener->SetPhi(180.);
        gener->SetTheta(5.);
        gener->SetOrigin(0,0,0);        //vertex position

-       gener->SetPart(13);             //GEANT particle type
+       gener->SetPart(kNeutron);

        gGener = gener;
       }
       break;
        gGener = gener;
       }
       break;


@@ -153,7 +154,7 @@ gSystem->Load("libTDPMjet.so");
        gener->SetOrigin(0,0,0);   
        //vertex position
        gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position
        gener->SetOrigin(0,0,0);   
        //vertex position
        gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position

-       gener->SetPart(5);              //GEANT particle type
+       gener->SetPart(kMuonPlus);

        gGener = gener;
       }
       break;
        gGener = gener;
       }
       break;


@@ -168,7 +169,7 @@ gSystem->Load("libTDPMjet.so");
        gener->SetThetaRange(9,9);
        //vertex position
        gener->SetSigma(6,6,0);         //Sigma in (X,Y,Z) (cm) on IP position
        gener->SetThetaRange(9,9);
        //vertex position
        gener->SetSigma(6,6,0);         //Sigma in (X,Y,Z) (cm) on IP position

-       gener->SetPart(5); 
+       gener->SetPart(kMuonPlus); 

        gener->SetRange(20, -100, 100, 20, -100, 100, 1, 500, 500);
        gGener = gener;
       }
        gener->SetRange(20, -100, 100, 20, -100, 100, 1, 500, 500);
        gGener = gener;
       }

diff --git a/TRD/Macros/AliTRDConfigPID.C b/TRD/Macros/AliTRDConfigPID.C
index 3b40b63a00ae27c142d8ac7ad7efecc76fc2d458..0d4703e19d21ddb868600f6952a6fac38811123f 100644 (file)
--- a/TRD/Macros/AliTRDConfigPID.C
+++ b/TRD/Macros/AliTRDConfigPID.C
@@ -14,6 +14,7 @@
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>

+#include <TPDGCode.h>

 #include <TRandom.h>
 #include <TDatime.h>
 #include <TSystem.h>
 #include <TRandom.h>
 #include <TDatime.h>
 #include <TSystem.h>


@@ -250,7 +251,7 @@ void Config()
   
   // electron generator
   AliGenBox *eminus= new AliGenBox(Npart);
   
   // electron generator
   AliGenBox *eminus= new AliGenBox(Npart);

-  eminus->SetPart(11);
+  eminus->SetPart(kElectron);

   eminus->SetMomentumRange(momen,momen);
   eminus->SetPhiRange(0,360);
   eminus->SetThetaRange(thmin,thmax);
   eminus->SetMomentumRange(momen,momen);
   eminus->SetPhiRange(0,360);
   eminus->SetThetaRange(thmin,thmax);


@@ -259,7 +260,7 @@ void Config()
 
   // positron generator
   AliGenBox *eplus= new AliGenBox(Npart);
 
   // positron generator
   AliGenBox *eplus= new AliGenBox(Npart);

-  eplus->SetPart(-11);
+  eplus->SetPart(kPositron);

   eplus->SetMomentumRange(momen,momen);
   eplus->SetPhiRange(0,360);
   eplus->SetThetaRange(thmin,thmax);
   eplus->SetMomentumRange(momen,momen);
   eplus->SetPhiRange(0,360);
   eplus->SetThetaRange(thmin,thmax);


@@ -268,7 +269,7 @@ void Config()
 
   // mu- generator
   AliGenBox *muminus= new AliGenBox(Npart);
 
   // mu- generator
   AliGenBox *muminus= new AliGenBox(Npart);

-  muminus->SetPart(13);
+  muminus->SetPart(kMuonMinus);

   muminus->SetMomentumRange(momen,momen);
   muminus->SetPhiRange(0,360);
   muminus->SetThetaRange(thmin,thmax);
   muminus->SetMomentumRange(momen,momen);
   muminus->SetPhiRange(0,360);
   muminus->SetThetaRange(thmin,thmax);


@@ -277,7 +278,7 @@ void Config()
 
   // mu+ generator
   AliGenBox *muplus= new AliGenBox(Npart);
 
   // mu+ generator
   AliGenBox *muplus= new AliGenBox(Npart);

-  muplus->SetPart(-13);
+  muplus->SetPart(kMuonPlus);

   muplus->SetMomentumRange(momen,momen);
   muplus->SetPhiRange(0,360);
   muplus->SetThetaRange(thmin,thmax);
   muplus->SetMomentumRange(momen,momen);
   muplus->SetPhiRange(0,360);
   muplus->SetThetaRange(thmin,thmax);


@@ -286,7 +287,7 @@ void Config()
 
   // pi- generator
   AliGenBox *piminus= new AliGenBox(Npart);
 
   // pi- generator
   AliGenBox *piminus= new AliGenBox(Npart);

-  piminus->SetPart(-211);
+  piminus->SetPart(kPiMinus);

   piminus->SetMomentumRange(momen,momen);
   piminus->SetPhiRange(0,360);
   piminus->SetThetaRange(thmin,thmax);
   piminus->SetMomentumRange(momen,momen);
   piminus->SetPhiRange(0,360);
   piminus->SetThetaRange(thmin,thmax);


@@ -295,7 +296,7 @@ void Config()
 
   // pi+ generator
   AliGenBox *piplus= new AliGenBox(Npart);
 
   // pi+ generator
   AliGenBox *piplus= new AliGenBox(Npart);

-  piplus->SetPart(211);
+  piplus->SetPart(kPiPlus);

   piplus->SetMomentumRange(momen,momen);
   piplus->SetPhiRange(0,360);
   piplus->SetThetaRange(thmin,thmax);
   piplus->SetMomentumRange(momen,momen);
   piplus->SetPhiRange(0,360);
   piplus->SetThetaRange(thmin,thmax);


@@ -304,7 +305,7 @@ void Config()
 
   // K- generator
   AliGenBox *kminus= new AliGenBox(Npart);
 
   // K- generator
   AliGenBox *kminus= new AliGenBox(Npart);

-  kminus->SetPart(-321);
+  kminus->SetPart(kKMinus);

   kminus->SetMomentumRange(momen,momen);
   kminus->SetPhiRange(0,360);
   kminus->SetThetaRange(thmin,thmax);
   kminus->SetMomentumRange(momen,momen);
   kminus->SetPhiRange(0,360);
   kminus->SetThetaRange(thmin,thmax);


@@ -313,7 +314,7 @@ void Config()
 
   // K+ generator
   AliGenBox *kplus= new AliGenBox(Npart);
 
   // K+ generator
   AliGenBox *kplus= new AliGenBox(Npart);

-  kplus->SetPart(321);
+  kplus->SetPart(kKPlus);

   kplus->SetMomentumRange(momen,momen);
   kplus->SetPhiRange(0,360);
   kplus->SetThetaRange(thmin,thmax);
   kplus->SetMomentumRange(momen,momen);
   kplus->SetPhiRange(0,360);
   kplus->SetThetaRange(thmin,thmax);


@@ -322,7 +323,7 @@ void Config()
 
   // p generator
   AliGenBox *proton= new AliGenBox(Npart);
 
   // p generator
   AliGenBox *proton= new AliGenBox(Npart);

-  proton->SetPart(2212);
+  proton->SetPart(kProton);

   proton->SetMomentumRange(momen,momen);
   proton->SetPhiRange(0,360);
   proton->SetThetaRange(thmin,thmax);
   proton->SetMomentumRange(momen,momen);
   proton->SetPhiRange(0,360);
   proton->SetThetaRange(thmin,thmax);


@@ -331,7 +332,7 @@ void Config()
 
   // anti-p generator
   AliGenBox *aproton= new AliGenBox(Npart);
 
   // anti-p generator
   AliGenBox *aproton= new AliGenBox(Npart);

-  aproton->SetPart(-2212);
+  aproton->SetPart(kProtonBar);

   aproton->SetMomentumRange(momen,momen);
   aproton->SetPhiRange(0,360);
   aproton->SetThetaRange(thmin,thmax);
   aproton->SetMomentumRange(momen,momen);
   aproton->SetPhiRange(0,360);
   aproton->SetThetaRange(thmin,thmax);

diff --git a/TRD/Macros/AliTRDconfig.C b/TRD/Macros/AliTRDconfig.C
index e3525dd7d4a70dadc0cf6f4d22099c01d329544b..cd67657ca3ef72c72e289708ec19709d71d1aead 100644 (file)
--- a/TRD/Macros/AliTRDconfig.C
+++ b/TRD/Macros/AliTRDconfig.C
@@ -1,6 +1,7 @@
+#include <TPDGCode.h>
+

 void Config()
 {
 void Config()
 {

-

   Int_t iField = 0;
 
   // libraries required by geant321
   Int_t iField = 0;
 
   // libraries required by geant321


@@ -72,12 +73,12 @@ void Config()
   AliGenBox *genEl = new AliGenBox(100);
   genEl->SetOrigin(0,0,0);        // Vertex position
   genEl->SetSigma(0,0,0);         // Sigma in (X,Y,Z) (cm) on IP position
   AliGenBox *genEl = new AliGenBox(100);
   genEl->SetOrigin(0,0,0);        // Vertex position
   genEl->SetSigma(0,0,0);         // Sigma in (X,Y,Z) (cm) on IP position

-  genEl->SetPart(11);             // Only electrons 
+  genEl->SetPart(kElectron);             // Only electrons 

 
   AliGenBox *genPi = new AliGenBox(100);
   genPi->SetOrigin(0,0,0);        // Vertex position
   genPi->SetSigma(0,0,0);         // Sigma in (X,Y,Z) (cm) on IP position
 
   AliGenBox *genPi = new AliGenBox(100);
   genPi->SetOrigin(0,0,0);        // Vertex position
   genPi->SetSigma(0,0,0);         // Sigma in (X,Y,Z) (cm) on IP position

-  genPi->SetPart(-211);           // Only pions 
+  genPi->SetPart(kPiMinus);           // Only pions 

 
   gener->AddGenerator(genEl,"Electrons",1);
   gener->AddGenerator(genPi,"Pions"    ,1);
 
   gener->AddGenerator(genEl,"Electrons",1);
   gener->AddGenerator(genPi,"Pions"    ,1);

diff --git a/doc/aliroot-primer/scripts/Config.C b/doc/aliroot-primer/scripts/Config.C
index d9621be5c1e3afc32aeca1409acee83e1429a822..bce529132067addcbefa0959cc23210bb3ea4974 100644 (file)
--- a/doc/aliroot-primer/scripts/Config.C
+++ b/doc/aliroot-primer/scripts/Config.C
@@ -106,7 +106,7 @@ void Config()
   genbox->SetMomentumRange(10,11.);
   genbox->SetPhiRange(270.5,270.7);
   genbox->SetThetaRange(90.5,90.7);
   genbox->SetMomentumRange(10,11.);
   genbox->SetPhiRange(270.5,270.7);
   genbox->SetThetaRange(90.5,90.7);

-  genbox->SetPart(22);
+  genbox->SetPart(kGamma);

   gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
 
   gener->Init(); // Initialization of the coctail generator
   gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
 
   gener->Init(); // Initialization of the coctail generator

diff --git a/macros/Config.C b/macros/Config.C
index 28e80da27b0d3ab3f48575e88167a06df0891bc3..9dd4bece568cf7ee4028530d7be128eaabc920c5 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -6,6 +6,7 @@
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>

+#include <TPDGCode.h>

 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>


@@ -157,7 +158,7 @@ void Config()
     gener->AddGenerator(hijingparam,"HIJING PARAM",1);
 
 //    AliGenBox *genbox = new AliGenBox(nParticles);
     gener->AddGenerator(hijingparam,"HIJING PARAM",1);
 
 //    AliGenBox *genbox = new AliGenBox(nParticles);

-//    genbox->SetPart(22);
+//    genbox->SetPart(kGamma);

 //    genbox->SetPtRange(0.3, 10.00);
 //    gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
     gener->Init();
 //    genbox->SetPtRange(0.3, 10.00);
 //    gener->AddGenerator(genbox,"GENBOX GAMMA for PHOS",1);
     gener->Init();

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index 9dd2464872f29dcc40879c87dc3d9443e8739d5e..12c0691cc1aaf15ccd4cecec40985cec6711f875 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -6,6 +6,7 @@
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>

+#include <TPDGCode.h>

 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>


@@ -164,7 +165,7 @@ void Config()
    // g1->SetMomentumRange(0, 3);
    // g1->SetOrigin(0,0,0);        //vertex position
    // g1->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position
    // g1->SetMomentumRange(0, 3);
    // g1->SetOrigin(0,0,0);        //vertex position
    // g1->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position

-   // g1->SetPart(310);        //K0short(310), Lambda(3122)
+   // g1->SetPart(kK0Short);        //K0short(310), Lambda(3122)

    
 
     /*****************     M E V S I M    ********************************/    
    
 
     /*****************     M E V S I M    ********************************/    

diff --git a/macros/Config_gener.C b/macros/Config_gener.C
index 95e6424c5c1c685eceb4657ea077491a317d4496..8820a33bbd3ba49d08835badd20d6cc95cdfff0c 100644 (file)
--- a/macros/Config_gener.C
+++ b/macros/Config_gener.C
@@ -128,7 +128,7 @@ void Config()
        gener->SetPhi(180.);
        gener->SetTheta(5.);
        gener->SetOrigin(0,0,0);        //vertex position
        gener->SetPhi(180.);
        gener->SetTheta(5.);
        gener->SetOrigin(0,0,0);        //vertex position

-       gener->SetPart(13);             //GEANT particle type
+       gener->SetPart(kNeutron);

        gGener = gener;
       }
       break;
        gGener = gener;
       }
       break;


@@ -144,7 +144,7 @@ void Config()
        gener->SetOrigin(0,0,0);   
        //vertex position
        gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position
        gener->SetOrigin(0,0,0);   
        //vertex position
        gener->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position

-       gener->SetPart(5);              //GEANT particle type
+       gener->SetPart(kMuonPlus);

        gGener = gener;
       }
       break;
        gGener = gener;
       }
       break;


@@ -159,7 +159,7 @@ void Config()
        gener->SetThetaRange(9,9);
        //vertex position
        gener->SetSigma(6,6,0);         //Sigma in (X,Y,Z) (cm) on IP position
        gener->SetThetaRange(9,9);
        //vertex position
        gener->SetSigma(6,6,0);         //Sigma in (X,Y,Z) (cm) on IP position

-       gener->SetPart(5); 
+       gener->SetPart(kMuonPlus); 

        gener->SetRange(20, -100, 100, 20, -100, 100, 1, 500, 500);
        gGener = gener;
       }
        gener->SetRange(20, -100, 100, 20, -100, 100, 1, 500, 500);
        gGener = gener;
       }

diff --git a/macros/MUONConfig.C b/macros/MUONConfig.C
index 2cb7747daad3e814d7d9785a68b1d217859cfb64..81e710a9fc62757a964b6be764bd495d51560c5c 100644 (file)
--- a/macros/MUONConfig.C
+++ b/macros/MUONConfig.C
@@ -51,7 +51,7 @@ geant3->SetCUTS(cut,cut, cut, cut, cut, cut,  cut,  cut, cut,  cut, tofmax);
 //gener->SetPhiRange(0,0);
 //gener->SetThetaRange(5., 5.);
 //gener->SetOrigin(0,0,0);          //vertex position
 //gener->SetPhiRange(0,0);
 //gener->SetThetaRange(5., 5.);
 //gener->SetOrigin(0,0,0);          //vertex position

-//gener->SetPart(14)                //GEANT particle type
+//gener->SetPart(kProton);

 
 //*********************************************
 // Example for Moving Particle Gun            *
 
 //*********************************************
 // Example for Moving Particle Gun            *


@@ -64,7 +64,7 @@ gener->SetThetaRange(2., 10.);
 gener->SetOrigin(0,0,0);   
        //vertex position
 gener->SetSigma(0,0,5.6);           //Sigma in (X,Y,Z) (cm) on IP position
 gener->SetOrigin(0,0,0);   
        //vertex position
 gener->SetSigma(0,0,5.6);           //Sigma in (X,Y,Z) (cm) on IP position

-gener->SetPart(14)                //GEANT particle type
+gener->SetPart(kProton);

  */
 //**************************************
 // Example for HIJING Parameterisation *
  */
 //**************************************
 // Example for HIJING Parameterisation *

diff --git a/test/gun/Config.C b/test/gun/Config.C
index df4556b67e57a90ed3d680f053b14dcc68cac85b..fc3813fd51ca010d79de9763d86d82e9435ac8b4 100644 (file)
--- a/test/gun/Config.C
+++ b/test/gun/Config.C
@@ -6,6 +6,7 @@
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>

+#include <TPDGCode.h>

 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>


@@ -155,49 +156,49 @@ void Config()
     // Particle guns for the barrel part (taken from RichConfig)
 
     AliGenFixed *pG1=new AliGenFixed(1);
     // Particle guns for the barrel part (taken from RichConfig)
 
     AliGenFixed *pG1=new AliGenFixed(1);

-    pG1->SetPart(2212);
+    pG1->SetPart(kProton);

     pG1->SetMomentum(2.5);
     pG1->SetTheta(109.5-3);
     pG1->SetPhi(10);
     gener->AddGenerator(pG1,"g1",1);
     
     AliGenFixed *pG2=new AliGenFixed(1);
     pG1->SetMomentum(2.5);
     pG1->SetTheta(109.5-3);
     pG1->SetPhi(10);
     gener->AddGenerator(pG1,"g1",1);
     
     AliGenFixed *pG2=new AliGenFixed(1);

-    pG2->SetPart(211);
+    pG2->SetPart(kPiPlus);

     pG2->SetMomentum(1.0);
     pG2->SetTheta( 90.0-3);
     pG2->SetPhi(10);
     gener->AddGenerator(pG2,"g2",1);
 
     AliGenFixed *pG3=new AliGenFixed(1);
     pG2->SetMomentum(1.0);
     pG2->SetTheta( 90.0-3);
     pG2->SetPhi(10);
     gener->AddGenerator(pG2,"g2",1);
 
     AliGenFixed *pG3=new AliGenFixed(1);

-    pG3->SetPart(-211);
+    pG3->SetPart(kPiMinus);

     pG3->SetMomentum(1.5);
     pG3->SetTheta(109.5-3);
     pG3->SetPhi(30);
     gener->AddGenerator(pG3,"g3",1);
     
     AliGenFixed *pG4=new AliGenFixed(1);
     pG3->SetMomentum(1.5);
     pG3->SetTheta(109.5-3);
     pG3->SetPhi(30);
     gener->AddGenerator(pG3,"g3",1);
     
     AliGenFixed *pG4=new AliGenFixed(1);

-    pG4->SetPart(321);
+    pG4->SetPart(kKPlus);

     pG4->SetMomentum(0.7);
     pG4->SetTheta( 90.0-3);
     pG4->SetPhi(30);
     gener->AddGenerator(pG4,"g4",1);
     
     AliGenFixed *pG5=new AliGenFixed(1);
     pG4->SetMomentum(0.7);
     pG4->SetTheta( 90.0-3);
     pG4->SetPhi(30);
     gener->AddGenerator(pG4,"g4",1);
     
     AliGenFixed *pG5=new AliGenFixed(1);

-    pG5->SetPart(-321);
+    pG5->SetPart(kKMinus);

     pG5->SetMomentum(1.0);
     pG5->SetTheta( 70.0-3);
     pG5->SetPhi(30);
     gener->AddGenerator(pG5,"g5",1);
     
     AliGenFixed *pG6=new AliGenFixed(1);
     pG5->SetMomentum(1.0);
     pG5->SetTheta( 70.0-3);
     pG5->SetPhi(30);
     gener->AddGenerator(pG5,"g5",1);
     
     AliGenFixed *pG6=new AliGenFixed(1);

-    pG6->SetPart(-2212);
+    pG6->SetPart(kProtonBar);

     pG6->SetMomentum(2.5);
     pG6->SetTheta( 90.0-3);
     pG6->SetPhi(50);
     gener->AddGenerator(pG6,"g6",1);
     
     AliGenFixed *pG7=new AliGenFixed(1);
     pG6->SetMomentum(2.5);
     pG6->SetTheta( 90.0-3);
     pG6->SetPhi(50);
     gener->AddGenerator(pG6,"g6",1);
     
     AliGenFixed *pG7=new AliGenFixed(1);

-    pG7->SetPart(-211);
+    pG7->SetPart(kPiMinus);

     pG7->SetMomentum(0.7);
     pG7->SetTheta( 70.0-3);
     pG7->SetPhi(50);
     pG7->SetMomentum(0.7);
     pG7->SetTheta( 70.0-3);
     pG7->SetPhi(50);


@@ -206,14 +207,14 @@ void Config()
     // Electrons for TRD
 
     AliGenFixed *pG8=new AliGenFixed(1);
     // Electrons for TRD
 
     AliGenFixed *pG8=new AliGenFixed(1);

-    pG8->SetPart(11);
+    pG8->SetPart(kElectron);

     pG8->SetMomentum(1.2);
     pG8->SetTheta( 95.0);
     pG8->SetPhi(190);
     gener->AddGenerator(pG8,"g8",1);
 
     AliGenFixed *pG9=new AliGenFixed(1);
     pG8->SetMomentum(1.2);
     pG8->SetTheta( 95.0);
     pG8->SetPhi(190);
     gener->AddGenerator(pG8,"g8",1);
 
     AliGenFixed *pG9=new AliGenFixed(1);

-    pG9->SetPart(-11);
+    pG9->SetPart(kPositron);

     pG9->SetMomentum(1.2);
     pG9->SetTheta( 85.0);
     pG9->SetPhi(190);
     pG9->SetMomentum(1.2);
     pG9->SetTheta( 85.0);
     pG9->SetPhi(190);


@@ -225,7 +226,7 @@ void Config()
     gphos->SetMomentumRange(10,11.);
     gphos->SetPhiRange(270.5,270.7);
     gphos->SetThetaRange(90.5,90.7);
     gphos->SetMomentumRange(10,11.);
     gphos->SetPhiRange(270.5,270.7);
     gphos->SetThetaRange(90.5,90.7);

-    gphos->SetPart(22);
+    gphos->SetPart(kGamma);

     gener->AddGenerator(gphos,"GENBOX GAMMA for PHOS",1);
 
     // EMCAL
     gener->AddGenerator(gphos,"GENBOX GAMMA for PHOS",1);
 
     // EMCAL


@@ -234,7 +235,7 @@ void Config()
     gemcal->SetMomentumRange(10,11.);
     gemcal->SetPhiRange(90.5,199.5);
     gemcal->SetThetaRange(90.5,90.7);
     gemcal->SetMomentumRange(10,11.);
     gemcal->SetPhiRange(90.5,199.5);
     gemcal->SetThetaRange(90.5,90.7);

-    gemcal->SetPart(22);
+    gemcal->SetPart(kGamma);

     gener->AddGenerator(gemcal,"GENBOX GAMMA for EMCAL",1);
 
     // MUON
     gener->AddGenerator(gemcal,"GENBOX GAMMA for EMCAL",1);
 
     // MUON


@@ -242,19 +243,19 @@ void Config()
     gmuon1->SetMomentumRange(20.,20.1);
     gmuon1->SetPhiRange(0., 360.);         
     gmuon1->SetThetaRange(171.000,178.001);
     gmuon1->SetMomentumRange(20.,20.1);
     gmuon1->SetPhiRange(0., 360.);         
     gmuon1->SetThetaRange(171.000,178.001);

-    gmuon1->SetPart(13);           // Muons
+    gmuon1->SetPart(kMuonMinus);           // Muons

     gener->AddGenerator(gmuon1,"GENBOX MUON1",1);
 
     AliGenBox * gmuon2 = new AliGenBox(1);
     gmuon2->SetMomentumRange(20.,20.1);
     gmuon2->SetPhiRange(0., 360.);         
     gmuon2->SetThetaRange(171.000,178.001);
     gener->AddGenerator(gmuon1,"GENBOX MUON1",1);
 
     AliGenBox * gmuon2 = new AliGenBox(1);
     gmuon2->SetMomentumRange(20.,20.1);
     gmuon2->SetPhiRange(0., 360.);         
     gmuon2->SetThetaRange(171.000,178.001);

-    gmuon2->SetPart(-13);           // Muons
+    gmuon2->SetPart(kMuonPlus);           // Muons

     gener->AddGenerator(gmuon2,"GENBOX MUON1",1);
 
     //TOF
     AliGenFixed *gtof=new AliGenFixed(1);
     gener->AddGenerator(gmuon2,"GENBOX MUON1",1);
 
     //TOF
     AliGenFixed *gtof=new AliGenFixed(1);

-    gtof->SetPart(2212);
+    gtof->SetPart(kProton);

     gtof->SetMomentum(2.5);
     gtof->SetTheta(95);
     pG1->SetPhi(340);
     gtof->SetMomentum(2.5);
     gtof->SetTheta(95);
     pG1->SetPhi(340);