M AliTPCcalibCalib.cxx - Disabled PointCorrection which is not yet...

M      AliTPCPointCorrection.cxx   - Access correction  parameters from the OCDB

Marian

diff --git a/TPC/AliTPCPointCorrection.cxx b/TPC/AliTPCPointCorrection.cxx
index fb46aaa92dad65bd291e310c935f74b5e8c89dd2..25c0513df1a44e1d22fa50b3c8644e80f54ee324 100644 (file)
--- a/TPC/AliTPCPointCorrection.cxx
+++ b/TPC/AliTPCPointCorrection.cxx
@@ -28,7 +28,7 @@
     
 */
 
-
+#include "AliTPCcalibDB.h"
 #include "TLinearFitter.h"
 #include "Riostream.h"
 #include "TList.h"
@@ -229,7 +229,11 @@ Double_t AliTPCPointCorrection::RPhiCOGCorrection(Int_t sector, Int_t padrow, Fl
   //  qMax  - cluster max charge - cl-.GetMax()
   //  threshold - clusterer threshold
   //
-  AliTPCClusterParam * clparam = AliTPCClusterParam::Instance(); 
+  AliTPCClusterParam * clparam = AliTPCcalibDB::Instance()->GetClusterParam();
+  if (!clparam) {
+    AliFatal("TPC OCDB not initialized"); 
+    return 0;
+  }
   Int_t padtype=0;
   if (sector>=36) padtype = (padrow>64)?2:1;
   Double_t padwidth=(padtype==0)? 0.4:0.6;

diff --git a/TPC/AliTPCcalibCalib.cxx b/TPC/AliTPCcalibCalib.cxx
index 088cef603998193ccd6d561247b1d412b42af28b..63edd3340d47316370c6d7071b739f71f69a60c1 100644 (file)
--- a/TPC/AliTPCcalibCalib.cxx
+++ b/TPC/AliTPCcalibCalib.cxx
@@ -195,7 +195,7 @@ Bool_t  AliTPCcalibCalib::RefitTrack(AliESDtrack * track, AliTPCseed *seed, Floa
   //
   // First apply calibration
   //
-  AliTPCPointCorrection * corr =  AliTPCPointCorrection::Instance();
+  //  AliTPCPointCorrection * corr =  AliTPCPointCorrection::Instance();
   for (Int_t irow=0;irow<159;irow++) {
     AliTPCclusterMI *cluster=seed->GetClusterPointer(irow);
     if (!cluster) continue; 
@@ -229,22 +229,22 @@ Bool_t  AliTPCcalibCalib::RefitTrack(AliESDtrack * track, AliTPCseed *seed, Floa
       x[1]-=dyq;
       x[2]-=dzq;
     }
-    //
-    // Apply r-phi correction  - To be done on track level- knowing the track angle !!!
-    //
-    Double_t corrclY =  
-      corr->RPhiCOGCorrection(cluster->GetDetector(),cluster->GetRow(), cluster->GetPad(),
-                                 cluster->GetY(),cluster->GetY(), cluster->GetZ(), 0., cluster->GetMax(),2.5);
-    // R correction
-    Double_t corrR   = corr->CorrectionOutR0(kFALSE,kFALSE,cluster->GetX(),cluster->GetY(),cluster->GetZ(),cluster->GetDetector());
-
-    if (0&fApplyRPhiCorrection){
-      if (cluster->GetY()>0) x[1]+=corrclY;  // rphi correction
-      if (cluster->GetY()<0) x[1]-=corrclY;  // rphi correction
-    }
-    if (0&fApplyRCorrection){      
-      x[0]+=corrR;                           // radial correction
-    }
+//     //
+//     // Apply r-phi correction  - To be done on track level- knowing the track angle !!!
+//     //
+//     Double_t corrclY =  
+//       corr->RPhiCOGCorrection(cluster->GetDetector(),cluster->GetRow(), cluster->GetPad(),
+//                               cluster->GetY(),cluster->GetY(), cluster->GetZ(), 0., cluster->GetMax(),2.5);
+//     // R correction
+//     Double_t corrR   = corr->CorrectionOutR0(kFALSE,kFALSE,cluster->GetX(),cluster->GetY(),cluster->GetZ(),cluster->GetDetector());
+
+//     if (0&fApplyRPhiCorrection){
+//       if (cluster->GetY()>0) x[1]+=corrclY;  // rphi correction
+//       if (cluster->GetY()<0) x[1]-=corrclY;  // rphi correction
+//     }
+//     if (0&fApplyRCorrection){      
+//       x[0]+=corrR;                           // radial correction
+//     }
 
     //
     //
@@ -287,8 +287,8 @@ Bool_t  AliTPCcalibCalib::RefitTrack(AliESDtrack * track, AliTPCseed *seed, Floa
          "cl.="<<cluster<<
          "cy="<<dy<<
          "cz="<<dz<<
-         "cY="<<corrclY<<
-         "cR="<<corrR<<
+         //      "cY="<<corrclY<<
+         //      "cR="<<corrR<<
          "dxq="<<dxq<<
          "dyq="<<dyq<<
          "dzq="<<dzq<<