ESD is properly read with methods of macros/AliReadESD.C copied in it

[u/mrichter/AliRoot.git] / ITS / AliITSclustererV2.h

diff --git a/ITS/AliITSclustererV2.h b/ITS/AliITSclustererV2.h
index 177a79c0c95b7ff72758b3062895b9f90fe993c2..01d297830d884d543c7451ad1592a2791fa9c003 100644 (file)
--- a/ITS/AliITSclustererV2.h
+++ b/ITS/AliITSclustererV2.h
@@ -17,16 +17,17 @@ class TClonesArray;
 
 class AliITSgeom;
 class AliITSclusterV2;
+class AliRawReader;
 class AliITSRawStream;
 
 class AliITSclustererV2 : public TObject {
 public:
-  AliITSclustererV2(){ fEvent=0; fI=0; }
+  AliITSclustererV2(){ fEvent=0; fI=0;}
   AliITSclustererV2(const AliITSgeom *geom);
 
   void SetEvent(Int_t event) { fEvent=event; }
   Int_t Digits2Clusters(TTree *in, TTree *out);
-  void Digits2Clusters(TFile *out);
+  void Digits2Clusters(AliRawReader* rawReader);
   void FindClustersSPD(const TClonesArray *dig, TClonesArray *cls);
   void FindClustersSPD(AliITSRawStream* input, TClonesArray** clusters);
   void FindClustersSDD(const TClonesArray *dig, TClonesArray *cls);
@@ -35,7 +36,6 @@ public:
   void FindClustersSSD(AliITSRawStream* input, TClonesArray** clusters);
 
   void RecPoints2Clusters(const TClonesArray *p, Int_t idx, TClonesArray *c);
-  Int_t Hits2Clusters(TTree *in, TTree *out);
 
 private:
   class Ali1Dcluster {
@@ -87,6 +87,9 @@ private:
 
   static void FindCluster(Int_t k,Int_t maxz,AliBin *bins,Int_t &n,Int_t *idx);
 
+protected:
+  Int_t fNModules;             // total number of modules
+
 private:
   Int_t fEvent;           //event number
 
@@ -94,7 +97,7 @@ private:
   Float_t fYshift[2200];       //y-shifts of detector local coor. systems 
   Float_t fZshift[2200];       //z-shifts of detector local coor. systems 
   Int_t fNdet[2200];            //detector index  
-  Int_t fNModules;             // total number of modules
+  Int_t fNlayer[2200];          //detector layer
 
   //SPD related values:
   Int_t fLastSPD1;       //index of the last SPD1 detector