Test beam raw data reading

[u/mrichter/AliRoot.git] / TRD / AliTRDgeometry.h

diff --git a/TRD/AliTRDgeometry.h b/TRD/AliTRDgeometry.h
index 2c6e6260c6191e1f210e7c76cac1f8d6d4ef25ad..411b91e3a590de52958b4ae586d7d0536a5c5046 100644 (file)
--- a/TRD/AliTRDgeometry.h
+++ b/TRD/AliTRDgeometry.h
@@ -48,13 +48,15 @@ class AliTRDgeometry : public AliGeometry {
           void     CreateFrame(Int_t *idtmed);
           void     CreateServices(Int_t *idtmed);
 
-          Bool_t   ReadGeoMatrices();  
+          Bool_t   CreateClusterMatrixArray();  
+  TGeoHMatrix     *GetClusterMatrix(Int_t det)                         { return (TGeoHMatrix *) 
+                                                                           fClusterMatrixArray->At(det); }
 
           void     SetSMstatus(Int_t sm, Char_t status)                { fSMstatus[sm] = status; }
 
   static  Int_t    GetDetectorSec(Int_t p, Int_t c);
   static  Int_t    GetDetector(Int_t p, Int_t c, Int_t s);
-  virtual Int_t    GetPlane(Int_t d) const;
+  static  Int_t    GetPlane(Int_t d);
   virtual Int_t    GetChamber(Int_t d) const;
   virtual Int_t    GetSector(Int_t d) const;
 
@@ -66,13 +68,13 @@ class AliTRDgeometry : public AliGeometry {
           Double_t GetRow0(Int_t p, Int_t c, Int_t /*s*/);
           Double_t GetCol0(Int_t p);
 
-  // Translation from MCM to Pad and vice versa
-  virtual Int_t    GetPadRowFromMCM(Int_t irob, Int_t imcm) const;
-  virtual Int_t    GetPadColFromADC(Int_t irob, Int_t imcm, Int_t iadc) const;
-  virtual Int_t    GetMCMfromPad(Int_t irow, Int_t icol) const;
-  virtual Int_t    GetROBfromPad(Int_t irow, Int_t icol) const;
-  virtual Int_t    GetRobSide(Int_t irob) const;
-  virtual Int_t    GetColSide(Int_t icol) const;
+  // Translation from MCM to Pad and vice versa (these functions are now in feeParam)
+  //virtual Int_t    GetPadRowFromMCM(Int_t irob, Int_t imcm) const;
+  //virtual Int_t    GetPadColFromADC(Int_t irob, Int_t imcm, Int_t iadc) const;
+  //virtual Int_t    GetMCMfromPad(Int_t irow, Int_t icol) const;
+  //virtual Int_t    GetROBfromPad(Int_t irow, Int_t icol) const;
+  //virtual Int_t    GetRobSide(Int_t irob) const;
+  //virtual Int_t    GetColSide(Int_t icol) const;
 
   static Float_t   GetTime0(Int_t p)                                   { return fgkTime0[p];     }
 
@@ -82,7 +84,7 @@ class AliTRDgeometry : public AliGeometry {
 
   virtual void     GetGlobal(const AliRecPoint*, TVector3&, TMatrixF& ) const { }; 
   virtual void     GetGlobal(const AliRecPoint*, TVector3& ) const            { };
- 
+
   static  Double_t GetAlpha()                                          { return 2.0 
                                                                            * 3.14159265358979324 
                                                                            / fgkNsect;           } 
@@ -121,13 +123,6 @@ class AliTRDgeometry : public AliGeometry {
   static  Int_t    RowmaxC0()                                          { return fgkRowmaxC0;     }
   static  Int_t    RowmaxC1()                                          { return fgkRowmaxC1;     }
 
-  TGeoHMatrix     *GetGeoMatrix(Int_t det)                             { return (TGeoHMatrix *) 
-                                                                           fMatrixGeo->At(det);             }
-  TGeoHMatrix     *GetMatrix(Int_t det)                                { return (TGeoHMatrix *) 
-                                                                           fMatrixArray->At(det);           }
-  TGeoHMatrix     *GetCorrectionMatrix(Int_t det)                      { return (TGeoHMatrix *) 
-                                                                           fMatrixCorrectionArray->At(det); }
-
  protected:
 
   static const Int_t    fgkNsect;                            //  Number of sectors in the full detector (18)
@@ -222,13 +217,10 @@ class AliTRDgeometry : public AliGeometry {
   Float_t               fChamberUFboxd[3*kNdets][3];         //  [3] = x, y, z
   Float_t               fChamberUUboxd[3*kNdets][3];         // 
 
-  TObjArray            *fMatrixArray;                        //! Transformation Global to Local
-  TObjArray            *fMatrixCorrectionArray;              //! Transformation Cluster to  Tracking systerm
-  TObjArray            *fMatrixGeo;                          //! Geo matrices
-
+  TObjArray            *fClusterMatrixArray;                 //! Transformation matrices loc. cluster to tracking cs
   TObjArray            *fPadPlaneArray;                      //! Array of pad plane objects
 
-  ClassDef(AliTRDgeometry,14)                                //  TRD geometry class
+  ClassDef(AliTRDgeometry,15)                                //  TRD geometry class
 
 };