code cleanup, removing unused functionality; fully implemented in the AliHLTTPCDataCo...

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

diff --git a/HLT/TPCLib/AliHLTTPCTransform.cxx b/HLT/TPCLib/AliHLTTPCTransform.cxx
index 2788184d12aea334b59edfe9582b127794d35251..9848d6a45201ce50d068b9e53d40f91d514067ec 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCTransform.cxx
+++ b/HLT/TPCLib/AliHLTTPCTransform.cxx
@@ -10,7 +10,6 @@
 
 #ifdef use_aliroot
 #include <AliRun.h>
-#include <AliMagF.h>
 #include <AliTPCParamSR.h>
 #include <AliTPCPRF2D.h>
 #include <AliTPCRF1D.h>
@@ -1290,7 +1289,7 @@ void AliHLTTPCTransform::Local2Global(Float_t *xyz,Int_t slice)
 
   xyz[0]=x0*fgCos[slice]-y0*fgSin[slice];
   xyz[1]=x0*fgSin[slice]+y0*fgCos[slice];
-  xyz[2]=xyz[2];//global z=local z
+  //xyz[2]=xyz[2];//global z=local z
 }
 
 void AliHLTTPCTransform::Local2GlobalAngle(Float_t *angle,Int_t slice)
@@ -1325,9 +1324,9 @@ void AliHLTTPCTransform::Raw2Local(Float_t *xyz,Int_t sector,Int_t row,Float_t p
   Int_t npads= fgNPads[slicerow];
 
   if(fgSectorLow[sector])
-    xyz[1]=(pad-0.5*(npads-1))*fgPadPitchWidthLow;
+    xyz[1]=(pad-0.5*(npads))*fgPadPitchWidthLow;
   else
-    xyz[1]=(pad-0.5*(npads-1))*fgPadPitchWidthUp;
+    xyz[1]=(pad-0.5*(npads))*fgPadPitchWidthUp;
 
   //Z-Value (remember PULSA Delay)
   if(slice < 18)
@@ -1414,7 +1413,7 @@ void AliHLTTPCTransform::Local2Global(Float_t *xyz,Int_t sector,Int_t row)
                              
   xyz[0]=r*fgCos[slice]-xyz[1]*fgSin[slice];
   xyz[1]=r*fgSin[slice]+xyz[1]*fgCos[slice];
-  xyz[2]=xyz[2];//global z=local z
+  //xyz[2]=xyz[2];//global z=local z
 }
 
 void AliHLTTPCTransform::LocHLT2Global(Float_t *xyz,Int_t slice,Int_t slicerow)
@@ -1424,7 +1423,7 @@ void AliHLTTPCTransform::LocHLT2Global(Float_t *xyz,Int_t slice,Int_t slicerow)
                              
   xyz[0]=r*fgCos[slice]-xyz[1]*fgSin[slice];
   xyz[1]=r*fgSin[slice]+xyz[1]*fgCos[slice];
-  xyz[2]=xyz[2];//global z=local z
+  //xyz[2]=xyz[2];//global z=local z
 }
 
 void AliHLTTPCTransform::Global2Local(Float_t *xyz,Int_t sector)
@@ -1506,10 +1505,11 @@ void AliHLTTPCTransform::LocHLT2Raw(Float_t *xyz,Int_t slice,Int_t slicerow)
 
   xyz[0]=slicerow;
 
+  int sign=slice<18?1:-1;
   if(slicerow<fgNRowLow)
-    xyz[1]=xyz[1]/fgPadPitchWidthLow+0.5*(fgNPads[slicerow]-1);
+    xyz[1]=sign*xyz[1]/fgPadPitchWidthLow+0.5*(fgNPads[slicerow]);
   else
-    xyz[1]=xyz[1]/fgPadPitchWidthUp+0.5*(fgNPads[slicerow]-1);
+    xyz[1]=sign*xyz[1]/fgPadPitchWidthUp+0.5*(fgNPads[slicerow]);
 
   if(slice < 18)
     xyz[2]=(GetZLength()-xyz[2]+GetZOffset())/GetZWidth();