X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDtransform.h;h=18f3b625b8ad0e33de9a45ad365670e4a21d9bb8;hb=74b0bf8547e39fcb52b6ad978f5f02a48ef28f3f;hp=462ec829e1e4eb32f7936e1e332a10cdd7a1d012;hpb=c8ab451804b474dae3a3994907587b32bbfd1b8a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRDtransform.h b/TRD/AliTRDtransform.h
index 462ec829e1e..18f3b625b8a 100644
--- a/TRD/AliTRDtransform.h
+++ b/TRD/AliTRDtransform.h
@@ -13,7 +13,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "TObject.h"
-//#include "../TPC/AliTransform.h"
 
 class TGeoHMatrix;
 
@@ -25,7 +24,6 @@ class AliTRDCalROC;
 class AliTRDCalDet;
 class AliTRDpadPlane;
 
-//class AliTRDtransform : public AliTransform {
 class AliTRDtransform : public TObject {
 
  public:
@@ -34,41 +32,40 @@ class AliTRDtransform : public TObject {
   AliTRDtransform(Int_t det);
   AliTRDtransform(const AliTRDtransform &t);
   virtual ~AliTRDtransform();
-  AliTRDtransform &operator=(const AliTRDtransform &t) { *(new(this) AliTRDtransform(t));
-                                                          return *this; }
-
-  virtual Bool_t   Transform(Double_t *x
-                           , Int_t    *i
-                           , UInt_t    time
-                           , Int_t     coordinateType);
+  AliTRDtransform &operator=(const AliTRDtransform &t);
+  
+  virtual void     Copy(TObject &t) const;
+  AliTRDpadPlane*  GetPadPlane() const {return fPadPlane;}
+  virtual Bool_t   Transform(AliTRDcluster *c);
   virtual void     Recalibrate(AliTRDcluster *c, Bool_t setDet = kTRUE);
 
           void     SetDetector(Int_t det);
+  static  AliTRDgeometry& Geometry(); 
 
- protected:
-
-  AliTRDgeometry          *fGeo;                 //  TRD geometry
-  Int_t                    fDetector;            //  Detector number
+  protected:
+  Int_t               fDetector;            //  Detector number
 
-  AliTRDCommonParam       *fParam;               //  TRD common parameters
+  AliTRDCommonParam  *fParam;               //  TRD common parameters
 
-        AliTRDcalibDB     *fCalibration;         //  TRD calibration interface object
-        AliTRDCalROC      *fCalVdriftROC;        //  Pad wise Vdrift calibration object
-        AliTRDCalROC      *fCalT0ROC;            //  Pad wise T0 calibration object
-  const AliTRDCalDet      *fCalVdriftDet;        //  ROC wise Vdrift calibration object
-  const AliTRDCalDet      *fCalT0Det;            //  ROC wise T0 calibration object
-  Double_t                 fCalVdriftDetValue;   //  ROC wise Vdrift calibration value
-  Double_t                 fCalT0DetValue;       //  ROC wise T0 calibration value
+  AliTRDcalibDB      *fCalibration;         //  TRD calibration interface object
+  AliTRDCalROC       *fCalVdriftROC;        //  Pad wise Vdrift calibration object
+  AliTRDCalROC       *fCalT0ROC;            //  Pad wise T0 calibration object
+  AliTRDCalROC       *fCalPRFROC;           //  Pad wise PRF calibration object
+  const AliTRDCalDet *fkCalVdriftDet;       //  ROC wise Vdrift calibration object
+  const AliTRDCalDet *fkCalT0Det;           //  ROC wise T0 calibration object
+  const AliTRDCalDet *fkCalExBDet;          //  ROC wise ExB calibration object
+  Double_t            fCalVdriftDetValue;   //  ROC wise Vdrift calibration value
+  Double_t            fCalT0DetValue;       //  ROC wise T0 calibration value
+  Double_t            fCalExBDetValue;      //  Det wise ExB calibration value
 
-  Double_t                 fSamplingFrequency;   //  ADC sampling frequency
+  Double_t            fSamplingFrequency;   //  ADC sampling frequency
 
-  AliTRDpadPlane          *fPadPlane;            //  The current pad plane object
-  Double_t                 fZShiftIdeal;         //  Needed to define Z-position relative to middle of chamber
+  AliTRDpadPlane     *fPadPlane;            //  The current pad plane object
+  Double_t            fZShiftIdeal;         //  Needed to define Z-position relative to middle of chamber
 
-  TGeoHMatrix             *fMatrix;              //  Transformation matrix for a given chamber
+  TGeoHMatrix        *fMatrix;              //  Transformation matrix for a given chamber
 
-  ClassDef(AliTRDtransform,1)                    //  Transforms clusters
+  ClassDef(AliTRDtransform, 3)              //  Transforms clusters
 
 };
-
 #endif