Moved calibration and cleaning to RawDigiProducer

[u/mrichter/AliRoot.git] / TPC / AliTPCParam.cxx

diff --git a/TPC/AliTPCParam.cxx b/TPC/AliTPCParam.cxx
index b4f098277ea15105d333a82670f25972af814992..ff15faf3143444b283c9ec804a8548999b49fdd9 100644 (file)
--- a/TPC/AliTPCParam.cxx
+++ b/TPC/AliTPCParam.cxx
@@ -33,7 +33,7 @@
 #include <TGeoManager.h>
 #include <TGeoPhysicalNode.h>
 #include "AliAlignObj.h"
-#include "AliAlignObjAngles.h"
+#include "AliAlignObjParams.h"
 #include "AliLog.h"
 
 ClassImp(AliTPCParam)
@@ -595,8 +595,8 @@ Bool_t AliTPCParam::Update()
   //
   //response data
   //
-  if (fResponseBin==0) delete [] fResponseBin;
-  if (fResponseWeight==0) delete [] fResponseBin;
+  if (fResponseBin) delete [] fResponseBin;
+  if (fResponseWeight) delete [] fResponseWeight;
   fResponseBin    = new Int_t[3*fNResponseMax];
   fResponseWeight = new Float_t[fNResponseMax];
 
@@ -615,7 +615,7 @@ Bool_t AliTPCParam::ReadGeoMatrices(){
   if (!gGeoManager){
     AliFatal("Geo manager not initialized\n");
   }
-  AliAlignObjAngles o;
+  AliAlignObjParams o;
   //
   if (fTrackingMatrix) delete [] fTrackingMatrix;
   fTrackingMatrix = new TGeoHMatrix*[fNSector];
@@ -683,6 +683,19 @@ Bool_t AliTPCParam::ReadGeoMatrices(){
   return kTRUE;
 }
 
+TGeoHMatrix *  AliTPCParam::Tracking2LocalMatrix(const TGeoHMatrix * geoMatrix, Int_t sector) const{
+  //
+  // make local to tracking matrix
+  //
+  Double_t sectorAngle = 20.*(sector%18)+10;
+  TGeoHMatrix *newMatrix = new TGeoHMatrix();
+  newMatrix->RotateZ(sectorAngle);
+  newMatrix->MultiplyLeft(&(geoMatrix->Inverse()));
+  return newMatrix;
+}
+
+
+
 
 Bool_t AliTPCParam::GetStatus() const
 {
@@ -791,7 +804,7 @@ Float_t AliTPCParam::GetChamberCenter(Int_t isec, Float_t * center) const
     if (center){
       center[0] = kROCcenterIn;
       center[1] = 0; 
-      center[2] = -5.51; 
+      center[2] = -5.51-0.08; 
     }
     return kROCcenterIn;
   }
@@ -799,7 +812,7 @@ Float_t AliTPCParam::GetChamberCenter(Int_t isec, Float_t * center) const
     if (center){
       center[0] = kROCcenterOut;
       center[1] = 0; 
-      center[2] = -5.61; 
+      center[2] = -5.61-0.08; 
     }
     return kROCcenterOut;
   }