adding newline at end of file

[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 691bd66af0a89961c0fe7270fd92e11ba17147b2..92f9b1938762ed3b07726542ebb350a06ad10d77 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.cxx
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.cxx
@@ -27,9 +27,9 @@
 GPUd() AliHLTTPCCAParam::AliHLTTPCCAParam()
     : fISlice( 0 ), fNRows( 63 ), fAlpha( 0.174533 ), fDAlpha( 0.349066 ),
     fCosAlpha( 0 ), fSinAlpha( 0 ), fAngleMin( 0 ), fAngleMax( 0 ), fRMin( 83.65 ), fRMax( 133.3 ),
-    fZMin( 0.0529937 ), fZMax( 249.778 ), fErrX( 0 ), fErrY( 0 ), fErrZ( 0.228808 ), fPadPitch( 0.4 ), fBz( -5. ),
-    fHitPickUpFactor( 1. ),
-    fMaxTrackMatchDRow( 4 ), fTrackConnectionFactor( 3.5 ), fTrackChiCut( 3.5 ), fTrackChi2Cut( 10 )
+    fZMin( 0.0529937 ), fZMax( 249.778 ), fErrX( 0 ), fErrY( 0 ), fErrZ( 0.228808 ), fPadPitch( 0.4 ), fBzkG( -5.00668 ),
+    fConstBz( -5.00668*0.000299792458 ), fHitPickUpFactor( 1. ),
+      fMaxTrackMatchDRow( 4 ), fNeighboursSearchArea(3.), fTrackConnectionFactor( 3.5 ), fTrackChiCut( 3.5 ), fTrackChi2Cut( 10 ), fClusterError2CorrectionY(1.), fClusterError2CorrectionZ(1.)
 {
   // constructor
   fParamS0Par[0][0][0] = 0.00047013;
@@ -75,20 +75,11 @@ GPUd() AliHLTTPCCAParam::AliHLTTPCCAParam()
   fParamS0Par[1][2][5] = 0.000425504;
   fParamS0Par[1][2][6] = 20.9294;
 
-  const double 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
 
-GPUd() void AliHLTTPCCAParam::Initialize( int iSlice,
+void AliHLTTPCCAParam::Initialize( int iSlice,
     int nRows, float rowX[],
     float alpha, float dAlpha,
     float rMin, float rMax,
@@ -108,27 +99,41 @@ GPUd() void AliHLTTPCCAParam::Initialize( int iSlice,
   fPadPitch = padPitch;
   fErrY = 1.; // not in use
   fErrZ = zSigma;
-  fBz = bz;
+  fBzkG = bz;
   fNRows = nRows;
   for ( int irow = 0; irow < nRows; irow++ ) {
     fRowX[irow] = rowX[irow];
-    std::cout<<" row "<<irow<<" x= "<<rowX[irow]<<std::endl;
+    //std::cout << " row " << irow << " x= " << rowX[irow] << std::endl;
   }
 
   Update();
 }
 
-GPUd() void AliHLTTPCCAParam::Update()
+void AliHLTTPCCAParam::Update()
 {
   // update of calculated values
+
+  const double kCLight = 0.000299792458;
+  fConstBz = fBzkG * kCLight;
+
+  fPolinomialFieldBz[0] = fConstBz * (  0.999286   );
+  fPolinomialFieldBz[1] = fConstBz * ( -4.54386e-7 );
+  fPolinomialFieldBz[2] = fConstBz * (  2.32950e-5 );
+  fPolinomialFieldBz[3] = fConstBz * ( -2.99912e-7 );
+  fPolinomialFieldBz[4] = fConstBz * ( -2.03442e-8 );
+  fPolinomialFieldBz[5] = fConstBz * (  9.71402e-8 );
+
   fCosAlpha = CAMath::Cos( fAlpha );
   fSinAlpha = CAMath::Sin( fAlpha );
-  fAngleMin = fAlpha - fDAlpha / 2.;
-  fAngleMax = fAlpha + fDAlpha / 2.;
+  fAngleMin = fAlpha - fDAlpha / 2.f;
+  fAngleMax = fAlpha + fDAlpha / 2.f;
   fErrX = fPadPitch / CAMath::Sqrt( 12. );
   fTrackChi2Cut = fTrackChiCut * fTrackChiCut;
 }
 
+#endif
+
+
 GPUd() void AliHLTTPCCAParam::Slice2Global( float x, float y,  float z,
     float *X, float *Y,  float *Z ) const
 {
@@ -173,7 +178,7 @@ GPUd() void AliHLTTPCCAParam::GetClusterErrors2( int iRow, float z, float sinPhi
   Err2Z = GetClusterError2( 1, type, z, angleZ );
 }
 
-
+#ifndef HLTCA_GPUCODE
 GPUh() void AliHLTTPCCAParam::WriteSettings( std::ostream &out ) const
 {
   // write settings to the file
@@ -193,7 +198,7 @@ GPUh() void AliHLTTPCCAParam::WriteSettings( std::ostream &out ) const
   out << fErrY << std::endl;
   out << fErrZ << std::endl;
   out << fPadPitch << std::endl;
-  out << fBz << std::endl;
+  out << fBzkG << std::endl;
   out << fHitPickUpFactor << std::endl;
   out << fMaxTrackMatchDRow << std::endl;
   out << fTrackConnectionFactor << std::endl;
@@ -230,7 +235,7 @@ GPUh() void AliHLTTPCCAParam::ReadSettings( std::istream &in )
   in >> fErrY;
   in >> fErrZ;
   in >> fPadPitch;
-  in >> fBz;
+  in >> fBzkG;
   in >> fHitPickUpFactor;
   in >> fMaxTrackMatchDRow;
   in >> fTrackConnectionFactor;
@@ -244,3 +249,4 @@ GPUh() void AliHLTTPCCAParam::ReadSettings( std::istream &in )
       for ( int k = 0; k < 7; k++ )
         in >> fParamS0Par[i][j][k];
 }
+#endif