X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliComplexCluster.h;h=097cd54adb94b732ef16c142ebec6c715e746913;hb=2073b7a5dc578bd2b808fee97ece7fb949d2ab20;hp=112af044411348ac6da8be76ddfbe721c72a21b3;hpb=ed23b388ae6ddb2b2537d05e91521e5c68fe904e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliComplexCluster.h b/TPC/AliComplexCluster.h
index 112af044411..097cd54adb9 100644
--- a/TPC/AliComplexCluster.h
+++ b/TPC/AliComplexCluster.h
@@ -16,16 +16,9 @@
 //
 
 class AliComplexCluster : public TObject {
-  friend class AliTPC;
-  friend class AliTPCClusterFinder;
-  friend class AliClusters;
-  friend class AliTPCFast;
 public:
 
-  AliComplexCluster() {
-    fTracks[0]=fTracks[1]=fTracks[2]=0; 
-    fX=fY=fQ=fSigmaX2=fSigmaY2=fSigmaXY=fArea=fMax=0.;
-  }
+  AliComplexCluster();
   virtual ~AliComplexCluster() {;}
   Bool_t    IsSortable() const;
   Int_t Compare(const TObject *o) const;
@@ -58,8 +51,6 @@ private:
 
 
 class AliTPCTrackerPoint  {  
-  friend class AliTPCtrackerMI;
-  friend class AliTPCseed;
  public:
 
   AliTPCTrackerPoint():
@@ -74,6 +65,7 @@ class AliTPCTrackerPoint  {
     fErrY(0),
     fIsShared(0){}
   virtual ~AliTPCTrackerPoint(){}
+  AliTPCTrackerPoint &operator=(const AliTPCTrackerPoint& o);
   Float_t  GetX() const  {return (fTX*0.01);}
   Float_t  GetZ() const {return (fTZ*0.01);}
   Float_t  GetY() const {return (fTY*0.01);}
@@ -94,6 +86,10 @@ class AliTPCTrackerPoint  {
 
   void     SetSigmaZ(Float_t sigmaz) {fSigmaZ = UChar_t(TMath::Nint(sigmaz*50.));}
   void     SetSigmaY(Float_t sigmay) {fSigmaY = UChar_t(TMath::Nint(sigmay*50.));}
+
+  Char_t   IsShared() const {return fIsShared;}
+  void     SetShared(Char_t s) {fIsShared=s;}
+
   //
  private:
   Short_t   fTX;        // x position of the cluster  in cm - 10 mum prec
@@ -107,12 +103,19 @@ class AliTPCTrackerPoint  {
   UShort_t  fErrY;       // y error estimate - in  mm - 50 mum precision 
   Char_t   fIsShared;     // indicate sharing of the point between several tracks
 
-  ClassDef(AliTPCTrackerPoint,1)  
+  ClassDef(AliTPCTrackerPoint,2)  
 };
 
 class AliTPCClusterPoint  {
  public:
-  AliTPCClusterPoint(){fCZ=fCY=fSigmaZ=fSigmaY=fQ=fMax=fCType=0;}
+  AliTPCClusterPoint():
+                      fCZ(0),
+                      fCY(0), 
+                      fSigmaZ(0),
+                      fSigmaY(0),
+                      fQ(0),
+                      fMax(0),
+                      fCType(0){}
   virtual ~AliTPCClusterPoint(){}
   Float_t  GetZ() const    {return (fCZ*0.01);}
   Float_t  GetY() const   {return (fCY*0.01);}
@@ -145,9 +148,18 @@ class AliTPCClusterPoint  {
 
 
 class AliTPCExactPoint : public TObject{
-  friend class AliTPCtrackerMI;
  public:
-  AliTPCExactPoint(){fEZ=fEY=fEAngleZ=fEAngleY=fEAmp=fEPrim=fTrackID=0;}
+  AliTPCExactPoint():TObject(),
+    fEZ(0.),
+    fEY(0.),
+    fEX(0.),
+    fEAngleZ(0.),
+    fEAngleY(0.),
+    fEAmp(0.),
+    fEPrim(0.),
+    fTrackID(0),
+    fRow(0),
+    fSec(0){}
  private:
   Float_t fEZ;       // current "exact" position according simulation
   Float_t fEY;       // current "exact" position according simulation
@@ -164,9 +176,11 @@ class AliTPCExactPoint : public TObject{
 
 
 class AliTPCTrackPoint: public TObject{
-  friend class AliTPCtrackerMI;
  public:
-  AliTPCTrackPoint(){}
+  AliTPCTrackPoint():TObject(),
+    fTPoint(),
+    fCPoint(){}
+
   // AliTPCClusterPoint & GetCPoint(){return fCPoint;}
   AliTPCTrackerPoint & GetTPoint(){return fTPoint;}
   AliTPCclusterMI & GetCPoint(){return fCPoint;}  
@@ -179,9 +193,21 @@ class AliTPCTrackPoint: public TObject{
 };
 
 class AliTPCTrackPoint2: public AliTPCTrackPoint{
-  friend class AliTPCtrackerMI;
  public:
-  AliTPCTrackPoint2(){}
+  AliTPCTrackPoint2():AliTPCTrackPoint(),
+    fGX(0.),
+    fGY(0.),
+    fGZ(0.),
+    fDY(0.),
+    fDZ(0.),
+    fDYU(0.),
+    fDYD(0),
+    fDZU(0.),
+    fDZD(0.),
+    fDDY(0),
+    fDDZ(0.),
+    fID(0),
+    fLab(0){}
  private: 
   Float_t fGX;    //global poition of the point
   Float_t fGY;    //global poition of the point
@@ -207,16 +233,6 @@ class AliTPCTrackPoint2: public AliTPCTrackPoint{
 
 
 
-class AliTPCTrackPointRef: public AliTPCTrackPoint{
-  friend class AliTPCtrackerMI;
- public:
-  AliTPCExactPoint & GetExactPoint(){return fEPoint;}
-  AliTPCExactPoint & GetNearestPoint(){return fNPoint;}  
- private:
-  AliTPCExactPoint fEPoint; //exact point belonging to track
-  AliTPCExactPoint fNPoint; //nearest point  
-  ClassDef(AliTPCTrackPointRef,1)  
-};
 
 
 #endif //ALICOMPLEXCLUSTER_H