reverting revisions 41975 and 41935

[u/mrichter/AliRoot.git] / HLT / TPCLib / AliHLTTPCClusterFinder.cxx

diff --git a/HLT/TPCLib/AliHLTTPCClusterFinder.cxx b/HLT/TPCLib/AliHLTTPCClusterFinder.cxx
index afc3361f0013d5ab8ed5506b58274bc7f05ed8a7..03de149c3ba8d6447453bca1783df436ffb988b3 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusterFinder.cxx
+++ b/HLT/TPCLib/AliHLTTPCClusterFinder.cxx
@@ -37,7 +37,6 @@
 #include <cmath>
 #include "AliTPCcalibDB.h"
 #include "AliTPCTransform.h"
-#include "AliTPCParam.h"
 
 #if __GNUC__ >= 3
 using namespace std;
@@ -87,31 +86,20 @@ AliHLTTPCClusterFinder::AliHLTTPCClusterFinder()
   fDoMC(kFALSE),
   fClusterMCVector(),
   fOfflineTransform(NULL),
-  fOfflineTPCParam( NULL ),
-  fOfflineTPCRecoParam(*AliTPCRecoParam::GetHLTParam()),
+  fOfflineTPCRecoParam(),
   fTimeMeanDiff(2),
   fReleaseMemory(0)
 {
   //constructor  
-
-  //uptate the transform class
-
   fOfflineTransform = AliTPCcalibDB::Instance()->GetTransform(); 
   if(!fOfflineTransform){
-    HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB::  Offline transform not in AliTPCcalibDB.");
+    HLTError("AliHLTTPCClusterFinder():  Offline transform not in AliTPCcalibDB.");
   }
   else{
+    fOfflineTPCRecoParam.SetUseExBCorrection(1);
+    fOfflineTPCRecoParam.SetUseTOFCorrection(1);
     fOfflineTransform->SetCurrentRecoParam(&fOfflineTPCRecoParam);
   }
-
-  fOfflineTPCParam = AliTPCcalibDB::Instance()->GetParameters();
-  if( !fOfflineTPCParam ){
-    HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB::  Offline TPC parameters not in AliTPCcalibDB.");
-  } else {
-    fOfflineTPCParam->Update();
-    fOfflineTPCParam->ReadGeoMatrices();
-  }    
-
 }
 
 AliHLTTPCClusterFinder::~AliHLTTPCClusterFinder(){
@@ -648,29 +636,14 @@ Bool_t AliHLTTPCClusterFinder::UpdateCalibDB(){
   //update the db
   AliTPCcalibDB::Instance()->Update();
 
-  Bool_t ret = 1;
-
   //uptate the transform class
-
-  fOfflineTransform = AliTPCcalibDB::Instance()->GetTransform(); 
-  if(!fOfflineTransform){
-    HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB::  Offline transform not in AliTPCcalibDB.");
-    ret = 0;
-  }
-  else{
-    fOfflineTransform->SetCurrentRecoParam(&fOfflineTPCRecoParam);
+  AliTPCTransform * tmp = AliTPCcalibDB::Instance()->GetTransform(); 
+  if(!tmp){
+    HLTError("AliHLTTPCClusterFinder::UpdateCAlibDB: Offline transform not in AliTPCcalibDB.");
+    return 0;
   }
-
-  fOfflineTPCParam = AliTPCcalibDB::Instance()->GetParameters();
-  if( !fOfflineTPCParam ){
-    HLTError("AliHLTTPCClusterFinder()::UpdateCAlibDB::  Offline TPC parameters not in AliTPCcalibDB.");
-    ret = 0;
-  } else {
-    fOfflineTPCParam->Update();
-    fOfflineTPCParam->ReadGeoMatrices();
-  }    
-
-  return ret;
+  fOfflineTransform = tmp;
+  return 1;
 }
 
 //---------------------------------- Under this line the old sorted clusterfinder functions can be found --------------------------------
@@ -1186,16 +1159,9 @@ void AliHLTTPCClusterFinder::WriteClusters(Int_t nclusters,AliClusterData *list)
          Double_t x[3]={thisrow,fpad+.5,ftime}; 
          Int_t iSector[1]={thissector};
          fOfflineTransform->Transform(x,iSector,0,1);
-         double y[3] = {x[0], x[1], x[2] };      
-         
-         if( fOfflineTPCParam && thissector<fOfflineTPCParam->GetNSector() ){
-           TGeoHMatrix  *alignment = fOfflineTPCParam->GetClusterMatrix( thissector );
-           if ( alignment ) alignment->LocalToMaster( x, y);
-         }       
-
-         fSpacePointData[counter].fX = y[0];
-         fSpacePointData[counter].fY = y[1];
-         fSpacePointData[counter].fZ = y[2];
+         fSpacePointData[counter].fX = x[0];
+         fSpacePointData[counter].fY = x[1];
+         fSpacePointData[counter].fZ = x[2];
        }
 
       }