update from Marco

[u/mrichter/AliRoot.git] / PMD / AliPMDUtility.h

diff --git a/PMD/AliPMDUtility.h b/PMD/AliPMDUtility.h
index 76ff506c472451c5da5c66c5538a266277834876..f951057b209b28e050c535c57e1ca2eb7f766f3e 100644 (file)
--- a/PMD/AliPMDUtility.h
+++ b/PMD/AliPMDUtility.h
@@ -10,10 +10,12 @@
 //  Utility class for PMD                              //
 //                                                     //
 //-----------------------------------------------------//
-// Author - B.K. Nandi
+// Author - 
 //
 #include "Rtypes.h"
-class AliPMDUtility
+
+
+class AliPMDUtility:public TObject
 {
  public:
   AliPMDUtility();
@@ -28,14 +30,20 @@ class AliPMDUtility
   void RectGeomCellPos(Int_t ism, Float_t xpad, Float_t ypad,
                       Float_t & xpos, Float_t & ypos);
 
+  void RectGeomCellPos(Int_t ism, Float_t xpad, Float_t ypad,
+                      Float_t & xpos, Float_t & ypos, Float_t & zpos);
+
   void GenerateBoundaryPoints(Int_t ism, Float_t &x1ism, Float_t &y1ism
                              , Float_t &x2ism, Float_t &y2ism);
 
+  void GetEtaIndexXY(Int_t smn, Int_t row, Int_t col, 
+                    Float_t &xp, Float_t &yp, Double_t &eta, Int_t &etaindex);
+
   void DrawPMDModule(Int_t idet); 
 
   void ApplyVertexCorrection(Float_t vertex[], 
                             Float_t xpos, Float_t ypos, Float_t zpos);
-  void ApplyAlignment();
+  void ApplyAlignment(Double_t sectr[][3]);
   void SetPxPyPz(Float_t px, Float_t py, Float_t pz);
   void SetXYZ(Float_t xpos, Float_t ypos, Float_t zpos);
   void SetWriteModule(Int_t wrmod);
@@ -51,15 +59,17 @@ class AliPMDUtility
   Float_t GetZ() const;
   
  protected:
+
   Float_t fPx;     // Momentum along x
   Float_t fPy;     // Momentum along y
   Float_t fPz;     // Momentum along z
   Float_t fTheta;  // Polar angle in radian
   Float_t fEta;    // Pseudo-rapidity
   Float_t fPhi;    // Azimuthal angle in radian
+  Float_t fSecTr[4][3]; // Sector alignement (translation)
   Int_t   fWriteModule;  // Module number writing 
   
-  ClassDef(AliPMDUtility,5) // Utility class for the detector set:PMD
+  ClassDef(AliPMDUtility,8) // Utility class for the detector set:PMD
 };
 
 #endif