Update DataLoader and ESDtrack

diff --git a/STEER/AliDataLoader.cxx b/STEER/AliDataLoader.cxx
index ad82a20493d459e09d7cc20d09eeea0e1d3cb1e2..342f93e046e8369d2c3649d3d30971d7534ee046 100644 (file)
--- a/STEER/AliDataLoader.cxx
+++ b/STEER/AliDataLoader.cxx
@@ -742,8 +742,9 @@ Int_t AliBaseLoader::Load(Option_t* opt)
 
   if (Get())
    {
-      Warning("Load","Data <<%s>> are already loaded. Use ReloadData to force reload. Nothing done",GetName());
-      return 0;
+     if (GetDebug())
+       Warning("Load","Data <<%s>> are already loaded. Use ReloadData to force reload. Nothing done",GetName());
+     return 0;
    }
   
   Int_t retval;

diff --git a/STEER/AliDataLoader.h b/STEER/AliDataLoader.h
index 701fdb3cafabf6d9b1105c6b6e7bb29ce0e57552..f4debec95bb13d3a862c6c5babe263875e24da40 100644 (file)
--- a/STEER/AliDataLoader.h
+++ b/STEER/AliDataLoader.h
@@ -1,5 +1,10 @@
 #ifndef ALIDATALOADER_H
 #define ALIDATALOADER_H
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
+
 //__________________________________________
 ////////////////////////////////////////////
 //                                        //

diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx
index 2db574fcb9469430f9b9cbc883ef89170a44f14c..a0736c8cf50801d00d1d1d6c3b45e51386acf273 100644 (file)
--- a/STEER/AliESDtrack.cxx
+++ b/STEER/AliESDtrack.cxx
@@ -72,6 +72,11 @@ fRICHsignal(-1)
     fPHOSr[i]=1.;
     fRICHr[i]=1.;
   }
+  fPHOSr[kSPECIES]= 1.;
+  fPHOSr[kSPECIES+1]= 1.;
+  fPHOSr[kSPECIES+2]= 1.;
+  fPHOSr[kSPECIES+3]= 1.;
+
   fPHOSpos[0]=fPHOSpos[1]=fPHOSpos[2]=0.;
   Int_t i;
   for (i=0; i<5; i++)  { fRp[i]=0.; fCp[i]=0.; fIp[i]=0.; fOp[i]=0.;}
@@ -511,14 +516,14 @@ void AliESDtrack::GetTOFpid(Double_t *p) const {
 //_______________________________________________________________________
 void AliESDtrack::SetPHOSpid(const Double_t *p) {  
   // Sets the probability of each particle type (in PHOS)
-  for (Int_t i=0; i<kSPECIES; i++) fPHOSr[i]=p[i];
+  for (Int_t i=0; i<kSPECIES+4; i++) fPHOSr[i]=p[i];
   SetStatus(AliESDtrack::kPHOSpid);
 }
 
 //_______________________________________________________________________
 void AliESDtrack::GetPHOSpid(Double_t *p) const {
   // Gets probabilities of each particle type (in PHOS)
-  for (Int_t i=0; i<kSPECIES; i++) p[i]=fPHOSr[i];
+  for (Int_t i=0; i<kSPECIES+4; i++) p[i]=fPHOSr[i];
 }
 
 

diff --git a/STEER/AliESDtrack.h b/STEER/AliESDtrack.h
index 49ffda7cc835b957b3e4c64726b67fb0b5f05310..72c0a934de78d7fe1df7854fe399d05ee4293f19 100644 (file)
--- a/STEER/AliESDtrack.h
+++ b/STEER/AliESDtrack.h
@@ -113,6 +113,7 @@ public:
 
   Bool_t IsOn(Int_t mask){ return (fFlags&mask)>0;}
   Bool_t IsRICH(){ return fFlags&kRICHpid;}
+  Bool_t IsPHOS(){ return fFlags&kPHOSpid;}
   enum {
     kITSin=0x0001,kITSout=0x0002,kITSrefit=0x0004,kITSpid=0x0008,
     kTPCin=0x0010,kTPCout=0x0020,kTPCrefit=0x0040,kTPCpid=0x0080,
@@ -123,8 +124,11 @@ public:
     kESDpid=0x40000000,
     kTIME=0x80000000
   }; 
-  enum {kSPECIES=5}; // Number of particle species recognized by the PID
-
+  enum {
+    kSPECIES=5, // Number of particle species recognized by the PID
+    kElectron=0, kMuon=1, kPion=2, kKaon=3, kProton=4, kPhoton=5, 
+    kPi0=6, kNeutron=7, kKaon0=8 // PHOS definition
+  };
 protected:
   ULong_t   fFlags;        // Reconstruction status flags 
   Int_t     fLabel;        // Track label
@@ -186,7 +190,7 @@ protected:
   // PHOS related track information 
   Float_t fPHOSpos[3]; //position localised by PHOS in global coordinate system
   Float_t fPHOSsignal; // energy measured by PHOS
-  Float_t fPHOSr[kSPECIES]; // PID information from PHOS
+  Float_t fPHOSr[kSPECIES+4]; // PID information from PHOS
 
   // HMPID related track information
   Float_t fRICHsignal;     // detector's PID signal (beta for RICH)