Avoid conflict with global enum in Root6

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

diff --git a/TRD/AliTRDtransform.h b/TRD/AliTRDtransform.h
index 9ac22c92bb113293b991d4ce3b8eefacd80ee9ca..18f3b625b8ad0e33de9a45ad365670e4a21d9bb8 100644 (file)
--- a/TRD/AliTRDtransform.h
+++ b/TRD/AliTRDtransform.h
@@ -13,7 +13,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "TObject.h"
-//#include "../TPC/AliTransform.h"
 
 class TGeoHMatrix;
 
@@ -25,23 +24,25 @@ class AliTRDCalROC;
 class AliTRDCalDet;
 class AliTRDpadPlane;
 
-//class AliTRDtransform : public AliTransform {
 class AliTRDtransform : public TObject {
-public:
+
+ public:
+
   AliTRDtransform();
   AliTRDtransform(Int_t det);
   AliTRDtransform(const AliTRDtransform &t);
   virtual ~AliTRDtransform();
-  AliTRDtransform &operator=(const AliTRDtransform &t) { *(new(this) AliTRDtransform(t));
-                                                          return *this; }
-
+  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
+  protected:
   Int_t               fDetector;            //  Detector number
 
   AliTRDCommonParam  *fParam;               //  TRD common parameters
@@ -50,10 +51,12 @@ protected:
   AliTRDCalROC       *fCalVdriftROC;        //  Pad wise Vdrift calibration object
   AliTRDCalROC       *fCalT0ROC;            //  Pad wise T0 calibration object
   AliTRDCalROC       *fCalPRFROC;           //  Pad wise PRF calibration object
-  const AliTRDCalDet *fCalVdriftDet;        //  ROC wise Vdrift calibration object
-  const AliTRDCalDet *fCalT0Det;            //  ROC wise T0 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
 
@@ -62,8 +65,7 @@ protected:
 
   TGeoHMatrix        *fMatrix;              //  Transformation matrix for a given chamber
 
-  ClassDef(AliTRDtransform, 2)              //  Transforms clusters
+  ClassDef(AliTRDtransform, 3)              //  Transforms clusters
 
 };
-
 #endif