ReaderESD updated to read new type of ITS trackpoints

diff --git a/ANALYSIS/AliReaderESD.cxx b/ANALYSIS/AliReaderESD.cxx
index 0cc9eb967a0242b61a13494897ca1f6d5b32b348..cf968ef7ceec11565abf64b9b0d34b94f8bd105c 100644 (file)
--- a/ANALYSIS/AliReaderESD.cxx
+++ b/ANALYSIS/AliReaderESD.cxx
@@ -31,7 +31,6 @@
 #include "AliAOD.h"
 #include "AliAODParticle.h"
 #include "AliAODParticleCut.h"
-#include "AliTrackPoints.h"
 #include "AliClusterMap.h"
 
 ClassImp(AliReaderESD)
@@ -49,6 +48,7 @@ AliReaderESD::AliReaderESD(const Char_t* esdfilename, const Char_t* galfilename)
  fdR(0.0),
  fClusterMap(kFALSE),
  fITSTrackPoints(kFALSE),
+ fITSTrackPointsType(AliTrackPoints::kITS),
  fMustTPC(kFALSE),
  fReadCentralBarrel(kTRUE),
  fReadMuon(kFALSE),
@@ -101,6 +101,7 @@ AliReaderESD::AliReaderESD(TObjArray* dirs,const Char_t* esdfilename, const Char
  fdR(0.0),
  fClusterMap(kFALSE),
  fITSTrackPoints(kFALSE),
+ fITSTrackPointsType(AliTrackPoints::kITS),
  fMustTPC(kFALSE),
  fReadCentralBarrel(kTRUE),
  fReadMuon(kFALSE),
@@ -246,7 +247,7 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
   if ( (mf == 0.0) && ((fNTrackPoints > 0) || fITSTrackPoints) )
    {
       Error("ReadESD","Magnetic Field is 0 and Track Points Demended. Skipping to next event.");
-      return 1;
+
    }
 
   if (fITSTrackPoints)
@@ -409,7 +410,7 @@ Int_t AliReaderESD::ReadESDCentral(AliESD* esd)
       AliTrackPoints* itstpts = 0x0;
       if (fITSTrackPoints) 
        {
-         itstpts = new AliTrackPoints(AliTrackPoints::kITS,esdtrack,mf*10.0);
+         itstpts = new AliTrackPoints(fITSTrackPointsType,esdtrack,mf*10.0);
 //         itstpts->Move(-vertexpos[0],-vertexpos[1],-vertexpos[2]);
        }
 

diff --git a/ANALYSIS/AliReaderESD.h b/ANALYSIS/AliReaderESD.h
index fb5f72bb17b86d794e8716c5b00a7eae8bbdd634..1225e575cf6330f824da41746fa6ff5695a51774 100644 (file)
--- a/ANALYSIS/AliReaderESD.h
+++ b/ANALYSIS/AliReaderESD.h
@@ -13,6 +13,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "AliReader.h"
+#include "AliTrackPoints.h"
 #include <TString.h>
 class TFile;
 class AliRunLoader;
@@ -51,7 +52,8 @@ class AliReaderESD: public AliReader
     void          SetNumberOfTrackPoints(Int_t n = 5,Float_t dr = 30.0) {fNTrackPoints = n; fdR = dr;}
     Int_t         GetNumberOfTrackPoints() const {return fNTrackPoints;}
     void          SetClusterMap(Bool_t flag = kTRUE){fClusterMap = flag;}
-    void          SetITSTrackPoints(Bool_t flag = kTRUE){fITSTrackPoints = flag;}
+    void          SetITSTrackPoints(Bool_t flag, AliTrackPoints::ETypes type)
+                                   {fITSTrackPoints = flag; fITSTrackPointsType = type;}
     void          MustTPC(Bool_t flag){fMustTPC = flag;}
 
     void          SetReadCentralBarrel(Bool_t flag){fReadCentralBarrel = flag;}
@@ -88,10 +90,12 @@ class AliReaderESD: public AliReader
     Bool_t        fClusterMap;//Flag indicating if Claster Map should be created for each track
                               //Claster map is needed for Anti-Splitting Cut
 
-    Bool_t        fITSTrackPoints;//Flag indicalting if track positions in ITS are to be read
+    
+    Bool_t        fITSTrackPoints; //Flag indicalting if track positions in ITS are to be read
                                   //currently we use only position at first pixels wich are
                      //used by anti-merging cut in non-id analysis
-
+    AliTrackPoints::ETypes  fITSTrackPointsType;//defines the way track points are calculated
+    
     Bool_t        fMustTPC;// must be reconstructed in TPC -> reject tracks reconstructed ITS stand alone
 
     Bool_t        fReadCentralBarrel; // Flag for reading ESD central track 

diff --git a/ANALYSIS/AliTrackPoints.h b/ANALYSIS/AliTrackPoints.h
index ca18c078c21087372160bc6dd985519392ca1c5a..80d9c7838de6d117702c07351e4d713d2216076f 100644 (file)
--- a/ANALYSIS/AliTrackPoints.h
+++ b/ANALYSIS/AliTrackPoints.h
@@ -21,7 +21,7 @@ class AliESDtrack;
 class AliTrackPoints: public TObject
 {
   public:
-    enum ETypes
+    typedef enum ETypes
       {//defines the type and the track points are calculated
         kITS = 1,//points calculated in ITS, made out of the vector at vertex
         kITSInnerFromVertexOuterFromTPC //for ITS, for 3 inner layers calculated out of the vector at vertex