Removing PDG from AliRun

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 1dbaecdbf3d52e6ef71de0300711bc32036c4450..48da7fd83e0ae26a9361a11650383a3c27bea36f 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -42,7 +42,6 @@
 
 #include <TBRIK.h> 
 #include <TCint.h> 
-#include <TDatabasePDG.h>
 #include <TGeometry.h>
 #include <TROOT.h>
 #include <TRandom3.h>
@@ -81,7 +80,6 @@ AliRun::AliRun():
   fNdets(0),
   fInitDone(kFALSE),
   fLego(0),
-  fPDGDB(0),  //Particle factory object
   fConfigFunction(""),
   fRandom(0),
   fBaseFileName(""),
@@ -112,7 +110,6 @@ AliRun::AliRun(const char *name, const char *title):
   fNdets(0),
   fInitDone(kFALSE),
   fLego(0),
-  fPDGDB(TDatabasePDG::Instance()),        //Particle factory object!
   fConfigFunction("Config();"),
   fRandom(new TRandom3()),
   fBaseFileName(""),
@@ -144,9 +141,6 @@ AliRun::AliRun(const char *name, const char *title):
   // Create default mag field
   SetField();
 
-  // Add particle list to configuration
-  AliConfig::Instance()->Add(fPDGDB); 
-
 }
 
 
@@ -180,7 +174,6 @@ AliRun::~AliRun()
     delete fModules;
   }
   
-  delete fPDGDB;
 }
 
 //_______________________________________________________________________

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index 074d90ae340c25dc2ef945ed9787216531e1adc9..97dd258247620ce7885b9665c321043fbedc8ef3 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -86,7 +86,6 @@ public:
    virtual  Bool_t IsLegoRun() const {return (fLego!=0);}
    virtual  void  SetField(Int_t type=2, Int_t version=1, Float_t scale=1, Float_t maxField=10, const char* filename="$(ALICE_ROOT)/data/field01.dat");
    virtual  void  SetField(AliMagF* magField);
-   virtual  TDatabasePDG* PDGDB() const {return fPDGDB;}
    
    virtual  void Field(const Double_t* x, Double_t* b) const;
    
@@ -119,7 +118,6 @@ protected:
   Int_t          fNdets;             //  Number of detectors
   Bool_t         fInitDone;          //! True when initialisation done
   AliLego       *fLego;              //! Pointer to aliLego object if it exists
-  TDatabasePDG  *fPDGDB;             //  Particle factory object
   TString        fConfigFunction;    //  Configuration file to be executed
   TRandom       *fRandom;            //  Pointer to the random number generator
   TString        fBaseFileName;      //  Name of the base root file

diff --git a/ZDC/AliGenZDC.cxx b/ZDC/AliGenZDC.cxx
index bba504a5685b7d5670eefb09525ee7e4c4b7bf35..4879682eb4837ecda6f043f0d78f121deb28139b 100644 (file)
--- a/ZDC/AliGenZDC.cxx
+++ b/ZDC/AliGenZDC.cxx
@@ -143,7 +143,7 @@ void AliGenZDC::Generate()
   if(fFermiflag==1){
     if((fIpart==kProton) || (fIpart==kNeutron))
       ExtractFermi(fIpart, ddp);
-    mass=gAlice->PDGDB()->GetParticle(fIpart)->Mass();
+    mass=TDatabasePDG::Instance()->GetParticle(fIpart)->Mass();
     fP0 = TMath::Sqrt(fP[0]*fP[0]+fP[1]*fP[1]+fP[2]*fP[2]+mass*mass);
     for(i=0; i<=2; i++) dddp[i] = ddp[i];
     dddp0 = TMath::Sqrt(dddp[0]*dddp[0]+dddp[1]*dddp[1]+dddp[2]*dddp[2]+mass*mass);