Fit mathematics improved, obsollete GBTracker cleaned up

[u/mrichter/AliRoot.git] / HLT / TPCLib / tracking-ca / AliHLTTPCCAParam.cxx

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.cxx b/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.cxx
index a661fbd8b8ece02818c6b1345c92891d990e719e..5a25d9e81bdb20324d0990fa10bc17d301ac85cb 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.cxx
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.cxx
@@ -75,6 +75,15 @@ GPUd() AliHLTTPCCAParam::AliHLTTPCCAParam()
   fParamS0Par[1][2][5] = 0.000425504;
   fParamS0Par[1][2][6] = 20.9294;
 
+  const Double_t kCLight = 0.000299792458;
+  
+  fPolinomialFieldBz[0] = kCLight* 4.99643;
+  fPolinomialFieldBz[1] = kCLight* -2.27193e-06;
+  fPolinomialFieldBz[2] = kCLight* 0.000116475; 
+  fPolinomialFieldBz[3] = kCLight* -1.49956e-06; 
+  fPolinomialFieldBz[4] = kCLight* -1.01721e-07; 
+  fPolinomialFieldBz[5] = kCLight* 4.85701e-07; 
+
   Update();
 }
 #endif
@@ -146,6 +155,23 @@ GPUd() Float_t AliHLTTPCCAParam::GetClusterError2( Int_t yz, Int_t type, Float_t
   return CAMath::Abs(v); 
 }
 
+GPUd() void AliHLTTPCCAParam::GetClusterErrors2( Int_t iRow, Float_t z, Float_t sinPhi, Float_t cosPhi, Float_t DzDs, Float_t &Err2Y, Float_t &Err2Z ) const
+{
+  //
+  // Use calibrated cluster error from OCDB
+  //
+
+  z = CAMath::Abs((250.-0.275)-CAMath::Abs(z));
+  Int_t    type = (iRow<63) ? 0: ( (iRow>126) ? 1:2 );
+  Float_t cosPhiInv = CAMath::Abs(cosPhi)>1.e-2 ?1./cosPhi :0;
+  Float_t angleY = sinPhi*cosPhiInv ;
+  Float_t angleZ = DzDs*cosPhiInv ; // SG was bug??? 
+
+  Err2Y = GetClusterError2(0,type, z,angleY);  
+  Err2Z = GetClusterError2(1,type, z,angleZ);
+}
+
+
 GPUh() void AliHLTTPCCAParam::WriteSettings( std::ostream &out ) const 
 {
   // write settings to the file