Use PDG code incude

diff --git a/EVGEN/AliGenSTRANGElib.cxx b/EVGEN/AliGenSTRANGElib.cxx
index 6784237..572e027 100644 (file)
--- a/EVGEN/AliGenSTRANGElib.cxx
+++ b/EVGEN/AliGenSTRANGElib.cxx
@@ -36,8 +36,9 @@
 
 /* $Id$ */
 
-#include "TMath.h"
-#include "TRandom.h"
+#include <TMath.h>
+#include <TPDGCode.h>
+#include <TRandom.h>
 
 #include "AliGenSTRANGElib.h"
 

diff --git a/EVGEN/AliGenSTRANGElib.h b/EVGEN/AliGenSTRANGElib.h
index af9f167..551b988 100644 (file)
--- a/EVGEN/AliGenSTRANGElib.h
+++ b/EVGEN/AliGenSTRANGElib.h
@@ -21,7 +21,7 @@ class AliGenSTRANGElib :
 public AliGenLib
 {
  public:
-    enum constants{kKaon, kPhi, kLambda, kXiMinus, kOmegaMinus, kLambda1520};
+    enum constants{kKaon, kPhi, kLambda, kLambda1520=3124};
     GenFunc   GetPt(Int_t param, const char* tname=0) const;
     GenFunc   GetY (Int_t param, const char* tname=0) const;
     GenFuncIp GetIp(Int_t param, const char* tname=0) const;    

diff --git a/PWG1/comparison/AliAnalysisTaskCheckESD.cxx b/PWG1/comparison/AliAnalysisTaskCheckESD.cxx
index 16eec53..e2e2be8 100644 (file)
--- a/PWG1/comparison/AliAnalysisTaskCheckESD.cxx
+++ b/PWG1/comparison/AliAnalysisTaskCheckESD.cxx
@@ -1,3 +1,20 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/* $Id$ */
+
 #include "TChain.h"
 #include "TROOT.h"
 #include "TFile.h"
@@ -231,8 +248,6 @@ void AliAnalysisTaskCheckESD::UserCreateOutputObjects()
 
 void AliAnalysisTaskCheckESD::UserExec(Option_t *option)
 {
-  const Int_t kXiMinus = 3312;
-  const Int_t kOmegaMinus = 3334;
   // check the content of the ESD
   Double_t cutPtV0 = 0.3;
   Double_t cutPtCascade = 0.5;

diff --git a/STEER/AliCascadeComparison.C b/STEER/AliCascadeComparison.C
index 3d81a53..fdd1ff4 100644 (file)
--- a/STEER/AliCascadeComparison.C
+++ b/STEER/AliCascadeComparison.C
@@ -7,6 +7,7 @@
  *  Origin: Christian Kuhn, IReS, Strasbourg, christian.kuhn@ires.in2p3.fr  *
  ****************************************************************************/
 
+#include <TPDGCode.h>
 #if !defined(__CINT__) || defined(__MAKECINT__)
   #include <TMath.h>
   #include <TError.h>
@@ -29,11 +30,6 @@
   #include "AliRun.h"
   #include "AliESDEvent.h"
   #include "AliESDcascade.h"
-#else
-  const Int_t kXiMinus    = 3312;
-  const Int_t kXiPlusBar  = -3312;
-  const Int_t kOmegaMinus = 3334;
-  const Int_t kOmegaPlusBar = -3334;
 #endif
 
 Int_t GoodCascades(const Char_t *dir=".");

diff --git a/STEER/AliESDcascade.h b/STEER/AliESDcascade.h
index ac32cea..b7d6a02 100644 (file)
--- a/STEER/AliESDcascade.h
+++ b/STEER/AliESDcascade.h
@@ -14,6 +14,7 @@
 //            and  Boris Hippolyte,IPHC, hippolyt@in2p3.fr 
 //-------------------------------------------------------------------------
 
+#include <TPDGCode.h>
 #include "AliESDv0.h"
 
 class AliLog;
@@ -21,11 +22,6 @@ class AliExternalTrackParam;
 
 class AliESDcascade : public AliESDv0 {
 
-  enum  { kOmegaPlusBar =  -3334,
-         kXiPlusBar    =  -3312,
-         kXiMinus      =   3312,
-         kOmegaMinus   =   3334};
-
 public:
   AliESDcascade();
   AliESDcascade(const AliESDcascade& cas);

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index 63df899..62f01e2 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -61,7 +61,6 @@ public:
    virtual  void  SDigits2Digits(const char *detector=0) {Tree2Tree("D",detector);}
    virtual  void  Digits2Reco(const char *detector=0)    {Tree2Tree("R",detector);}
    virtual  void  InitMC(const char *setup="Config.C");
-   virtual  void  Init(const char *setup="Config.C") {InitMC(setup);}
    Bool_t         IsFolder() const {return kTRUE;}
    virtual AliLego* Lego() const {return fLego;}
    Bool_t         IsRootGeometry() const {return fIsRootGeometry;}

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index a388192..717f0d6 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -765,7 +765,7 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents)
   AliInfo(Form("initializing gAlice with config file %s",
           fConfigFileName.Data()));
   StdoutToAliInfo(StderrToAliError(
-    gAlice->Init(fConfigFileName.Data());
+    gAlice->InitMC(fConfigFileName.Data());
   ););
   
   // Get the trigger descriptor string
@@ -875,8 +875,6 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents)
   AliInfo("running gAlice");
   AliSysInfo::AddStamp("Start_simulation");
 
-  gAlice->InitMC("Config.C");
-  
   // Create the Root Tree with one branch per detector
   //Hits moved to begin event -> now we are crating separate tree for each event
 
@@ -1512,7 +1510,7 @@ Bool_t AliSimulation::ConvertRaw2SDigits(const char* rawDirectory, const char* e
     }
     
     AliInfo(Form("initializing gAlice with config file %s",fConfigFileName.Data()));
-    StdoutToAliInfo(StderrToAliError(gAlice->Init(fConfigFileName.Data());););
+    StdoutToAliInfo(StderrToAliError(gAlice->InitMC(fConfigFileName.Data());););
 //
 //  Initialize CDB     
     InitCDB();

diff --git a/STEER/CheckESD.C b/STEER/CheckESD.C
index 204652c..fa9c51f 100644 (file)
--- a/STEER/CheckESD.C
+++ b/STEER/CheckESD.C
@@ -23,9 +23,6 @@
 #include "AliGenEventHeader.h"
 #include "AliPID.h"
 #endif
-const Int_t kXiMinus = 3312;
-const Int_t kOmegaMinus = 3334;
-
 
 TH1F* CreateHisto(const char* name, const char* title, 
                  Int_t nBins, Double_t xMin, Double_t xMax,

diff --git a/TPC/testMC/ConfigCosmic.C b/TPC/testMC/ConfigCosmic.C
index 432ce3b..c5c4e51 100644 (file)
--- a/TPC/testMC/ConfigCosmic.C
+++ b/TPC/testMC/ConfigCosmic.C
@@ -1388,7 +1388,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1396,7 +1396,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);

diff --git a/TPC/testMC/ConfigHPT.C b/TPC/testMC/ConfigHPT.C
index 7a23f52..8e92991 100644 (file)
--- a/TPC/testMC/ConfigHPT.C
+++ b/TPC/testMC/ConfigHPT.C
@@ -1450,7 +1450,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1458,7 +1458,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);

diff --git a/TPC/testMC/ConfigPP.C b/TPC/testMC/ConfigPP.C
index b61b785..cd88444 100644 (file)
--- a/TPC/testMC/ConfigPP.C
+++ b/TPC/testMC/ConfigPP.C
@@ -1383,7 +1383,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1391,7 +1391,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index cf788ea..363e58c 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -1390,7 +1390,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1398,7 +1398,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);

diff --git a/test/PbPbbench/Config.C b/test/PbPbbench/Config.C
index daba7dd..395a6e0 100644 (file)
--- a/test/PbPbbench/Config.C
+++ b/test/PbPbbench/Config.C
@@ -1381,7 +1381,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1389,7 +1389,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);

diff --git a/test/merge/backgr/Config.C b/test/merge/backgr/Config.C
index f96690f..0a67d35 100644 (file)
--- a/test/merge/backgr/Config.C
+++ b/test/merge/backgr/Config.C
@@ -1385,7 +1385,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1393,7 +1393,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);

diff --git a/test/merge/signal/Config.C b/test/merge/signal/Config.C
index 86a31e4..9ab2d79 100644 (file)
--- a/test/merge/signal/Config.C
+++ b/test/merge/signal/Config.C
@@ -1385,7 +1385,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1393,7 +1393,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);

diff --git a/test/ppbench/Config.C b/test/ppbench/Config.C
index 1066685..f6f81c5 100644 (file)
--- a/test/ppbench/Config.C
+++ b/test/ppbench/Config.C
@@ -1381,7 +1381,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1389,7 +1389,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);