Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / HLT / TPCLib / tracking-ca / AliHLTTPCCABaseTrackParam.h

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCABaseTrackParam.h b/HLT/TPCLib/tracking-ca/AliHLTTPCCABaseTrackParam.h
index ee6c16ea9d64c5348675e1a39aec08aed2830b8c..30fc572b83561b5b2050655dd7f8f34d2447c704 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCABaseTrackParam.h
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCABaseTrackParam.h
@@ -12,7 +12,7 @@
 #define ALIHLTTPCCABASETRACKPARAM_H
 
 #include "AliHLTTPCCADef.h"
-class AliHLTTPCCATrackParam;
+MEM_CLASS_PRE() class AliHLTTPCCATrackParam;
 
 /**
  * @class AliHLTTPCCABaseTrackParam
@@ -21,7 +21,7 @@ class AliHLTTPCCATrackParam;
  * used in output of the AliHLTTPCCATracker slice tracker.
  * This class is used for transfer between tracker and merger and does not contain the covariance matrice
  */
-class AliHLTTPCCABaseTrackParam
+MEM_CLASS_PRE() class AliHLTTPCCABaseTrackParam
 {
   public:
 
@@ -32,17 +32,17 @@ class AliHLTTPCCABaseTrackParam
     GPUd() float DzDs()   const { return fP[3]; }
     GPUd() float QPt()    const { return fP[4]; }
 
-    GPUd() float GetX()      const { return fX; }
-    GPUd() float GetY()      const { return fP[0]; }
-    GPUd() float GetZ()      const { return fP[1]; }
-    GPUd() float GetSinPhi() const { return fP[2]; }
-    GPUd() float GetDzDs()   const { return fP[3]; }
-    GPUd() float GetQPt()    const { return fP[4]; }
+    GPUhd() float GetX()      const { return fX; }
+    GPUhd() float GetY()      const { return fP[0]; }
+    GPUhd() float GetZ()      const { return fP[1]; }
+    GPUhd() float GetSinPhi() const { return fP[2]; }
+    GPUhd() float GetDzDs()   const { return fP[3]; }
+    GPUhd() float GetQPt()    const { return fP[4]; }
 
     GPUd() float GetKappa( float Bz ) const { return -fP[4]*Bz; }
 
-    GPUhd() const float *Par() const { return fP; }
-    GPUd() const float *GetPar() const { return fP; }
+    GPUhd() MakeType(const float*) Par() const { return fP; }
+    GPUd() const MakeType(float*) GetPar() const { return fP; }
        GPUd() float GetPar(int i) const { return(fP[i]); }
 
     GPUhd() void SetPar( int i, float v ) { fP[i] = v; }