add PRF calibration object to the transform class (Theodor)

diff --git a/TRD/AliTRDtransform.cxx b/TRD/AliTRDtransform.cxx
index e0bd25109fb76e7b5d983e8774d66036f19f7e21..ca00a70919dd2c5d586c3c22c764b1e89b1b9184 100644 (file)
--- a/TRD/AliTRDtransform.cxx
+++ b/TRD/AliTRDtransform.cxx
@@ -50,6 +50,7 @@ AliTRDtransform::AliTRDtransform()
   ,fCalibration(0x0)
   ,fCalVdriftROC(0x0)
   ,fCalT0ROC(0x0)
+  ,fCalPRFROC(0x0)
   ,fCalVdriftDet(0x0)
   ,fCalT0Det(0x0)
   ,fCalVdriftDetValue(0)
@@ -76,6 +77,7 @@ AliTRDtransform::AliTRDtransform(Int_t det)
   ,fCalibration(0x0)
   ,fCalVdriftROC(0x0)
   ,fCalT0ROC(0x0)
+  ,fCalPRFROC(0x0)
   ,fCalVdriftDet(0x0)
   ,fCalT0Det(0x0)
   ,fCalVdriftDetValue(0)
@@ -124,6 +126,7 @@ AliTRDtransform::AliTRDtransform(const AliTRDtransform &t)
   ,fCalibration(0x0)
   ,fCalVdriftROC(0x0)
   ,fCalT0ROC(0x0)
+  ,fCalPRFROC(0x0)
   ,fCalVdriftDet(0x0)
   ,fCalT0Det(0x0)
   ,fCalVdriftDetValue(0)
@@ -184,6 +187,7 @@ void AliTRDtransform::SetDetector(Int_t det)
   // Get the calibration objects for the pad-by-pad calibration
   fCalVdriftROC      = fCalibration->GetVdriftROC(det);
   fCalT0ROC          = fCalibration->GetT0ROC(det);
+  fCalPRFROC         = fCalibration->GetPRFROC(det);
 
   // Get the detector wise defined calibration values
   fCalVdriftDetValue = fCalVdriftDet->GetValue(det);
@@ -231,7 +235,7 @@ Bool_t AliTRDtransform::Transform(AliTRDcluster *c)
   Float_t x = c->GetXloc(t0, vd);
 
   // pad response width with diffusion corrections
-  Double_t s2  = AliTRDcalibDB::Instance()->GetPRFWidth(fDetector, col, row); s2 *= s2; 
+  Double_t s2  = fCalPRFROC->GetValue(col, row); s2 *= s2; 
   Float_t dl, dt;
   AliTRDCommonParam::Instance()->GetDiffCoeff(dl, dt, vd);
   s2 += dl*dl*x/(1.+2.*exb*exb);

diff --git a/TRD/AliTRDtransform.h b/TRD/AliTRDtransform.h
index 65a3d1204a81612d41f9a2aa983e0abd9a99a51e..9ac22c92bb113293b991d4ce3b8eefacd80ee9ca 100644 (file)
--- a/TRD/AliTRDtransform.h
+++ b/TRD/AliTRDtransform.h
@@ -27,9 +27,7 @@ class AliTRDpadPlane;
 
 //class AliTRDtransform : public AliTransform {
 class AliTRDtransform : public TObject {
-
- public:
-
+public:
   AliTRDtransform();
   AliTRDtransform(Int_t det);
   AliTRDtransform(const AliTRDtransform &t);
@@ -42,29 +40,29 @@ class AliTRDtransform : public TObject {
 
           void     SetDetector(Int_t det);
 
- protected:
-
-  AliTRDgeometry          *fGeo;                 //  TRD geometry
-  Int_t                    fDetector;            //  Detector number
+protected:
+  AliTRDgeometry     *fGeo;                 //  TRD geometry
+  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 *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
 
-  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, 2)              //  Transforms clusters
 
 };