Merge branch 'master' into TPCdev

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

diff --git a/ITS/AliITSsegmentationSPD.h b/ITS/AliITSsegmentationSPD.h
index de9f1e915db7e47c4772bc08475dd8e2f2d184fd..7a8e3ff6aa1896cdc720be27af30d7317a2f78d4 100644 (file)
--- a/ITS/AliITSsegmentationSPD.h
+++ b/ITS/AliITSsegmentationSPD.h
@@ -4,7 +4,6 @@
 #include "AliITSsegmentation.h"
 
 
-class AliITSgeom;
 
 // segmentation and response for SPD 
 
@@ -13,7 +12,6 @@ public AliITSsegmentation {
  public:
 
     AliITSsegmentationSPD(Option_t *opt="" );
-    AliITSsegmentationSPD(AliITSgeom *gm);
     AliITSsegmentationSPD(const AliITSsegmentationSPD &source);
     virtual ~AliITSsegmentationSPD(){}
     AliITSsegmentationSPD& operator=(const AliITSsegmentationSPD &source);
@@ -46,7 +44,11 @@ public AliITSsegmentation {
                               Double_t &zl,Double_t &zu) const;
     //
     virtual Int_t    GetNumberOfChips() const {return fgkNchipsPerModule;}
+    virtual Int_t    GetMaximumChipIndex() const {return fgkNchipsPerModule-1;}
+    
     virtual Int_t    GetChipFromLocal(Float_t, Float_t zloc) const;
+    virtual Int_t    GetChipsInLocalWindow(Int_t* array, Float_t zmin, Float_t zmax, Float_t, Float_t) const;
+
     virtual Int_t    GetChipFromChannel(Int_t, Int_t iz) const;
     //
     // Initialisation
@@ -86,7 +88,7 @@ public AliITSsegmentation {
 
     Float_t ColFromZ300(Float_t z) const;
     Float_t ZFromCol300(Int_t col) const;
-    Float_t ZpitchFromCol300(Int_t col) const;
+    Float_t Zpitch300() const;
     Float_t ColFromZ(Float_t z) const;
     Float_t ZFromCol(Int_t col) const;
     Float_t ZpitchFromCol(Int_t col) const;