Fix of sigmaZ for crossing tracklets from Alex

[u/mrichter/AliRoot.git] / TRD / AliTRDseedV1.h

diff --git a/TRD/AliTRDseedV1.h b/TRD/AliTRDseedV1.h
index c48da16d046a86c536c11f23645261d93925ebb0..00aea22ea12ed265770e9dcb591dbb22149a5c43 100644 (file)
--- a/TRD/AliTRDseedV1.h
+++ b/TRD/AliTRDseedV1.h
@@ -3,7 +3,7 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
 * See cxx source for full Copyright notice                               */
 
-/* $Id$ */
+/* $Id: AliTRDseedV1.h 60233 2013-01-10 09:04:08Z abercuci $ */
 
 ////////////////////////////////////////////////////////////////////////////
 //                                                                        //
@@ -37,7 +37,7 @@
 
 class TTreeSRedirector;
 class TLinearFitter;
-
+class TGeoHMatrix;
 class AliRieman;
 
 class AliTRDReconstructor;
@@ -90,8 +90,9 @@ public:
   void      CookdEdx(Int_t nslices);
   void      CookLabels();
   Bool_t    CookPID();
-  Bool_t    Fit(UChar_t opt=0);
-  Bool_t    FitRobust(Bool_t ChgPlus=kTRUE);
+  Bool_t    Fit(UChar_t opt=0); // OBSOLETE
+  Bool_t    FitRobust(AliTRDpadPlane *pp, Int_t opt=0);
+  Double_t  EstimatedCrossPoint(AliTRDpadPlane *pp);
   Bool_t    Init(const AliTRDtrackV1 *track);
   void      Init(const AliRieman *fit);
   Bool_t    IsEqual(const TObject *inTracklet) const;
@@ -133,9 +134,10 @@ public:
   void      GetCalibParam(Float_t &exb, Float_t &vd, Float_t &t0, Float_t &s2, Float_t &dl, Float_t &dt) const    { 
               exb = fExB; vd = fVD; t0 = fT0; s2 = fS2PRF; dl = fDiffL; dt = fDiffT;}
   AliTRDcluster*  GetClusters(Int_t i) const               { return i<0 || i>=kNclusters ? NULL: fClusters[i];}
-  Bool_t    GetEstimatedCrossPoint(Float_t &x, Float_t &z) const;
   Int_t     GetIndexes(Int_t i) const{ return i<0 || i>=kNclusters ? -1 : fIndexes[i];}
   Int_t     GetLabels(Int_t i) const { return fLabels[i];}  
+  Float_t   GetLocalZ() const        { return fZfit[0] - fZfit[1] * fX;}
+  Float_t   GetLocalY() const        { return fYfit[0] - fYfit[1] * fX;}
   Float_t   GetMomentum(Float_t *err = NULL) const;
   Int_t     GetN() const             { return (Int_t)fN&kMask;}
   Int_t     GetN2() const            { return GetN();}
@@ -161,14 +163,16 @@ public:
   UShort_t  GetVolumeId() const;
   Float_t   GetX0() const            { return fX0;}
   Float_t   GetX() const             { return fX0 - fX;}
-  Float_t   GetY() const             { return fYfit[0] - fYfit[1] * fX;}
-  Double_t  GetYat(Double_t x) const { return fYfit[0] - fYfit[1] * (fX0-x);}
+  Float_t   GetY() const             { return TMath::Abs(fY)<1.e-15?GetLocalY():fY;/*fYfit[0] - fYfit[1] * fX;*/}
+  Double_t  GetYat(Double_t x) const { return fY/*fit[0]*/ - fYfit[1] * (fX0-x);}
   Float_t   GetYfit(Int_t id) const  { return fYfit[id];}
   Float_t   GetYref(Int_t id) const  { return fYref[id];}
-  Float_t   GetZ() const             { return fZfit[0] - fZfit[1] * fX;}
-  Double_t  GetZat(Double_t x) const { return fZfit[0] - fZfit[1] * (fX0-x);}
+  Float_t   GetYref() const          { return fYref[0] - fYref[1] *fX;}
+  Float_t   GetZ() const             { return TMath::Abs(fZ)<1.e-15?GetLocalZ():fZ;/*fZfit[0] - fZfit[1] * fX;*/}
+  Double_t  GetZat(Double_t x) const { return fZ/*fit[0]*/ - fZfit[1] * (fX0-x);}
   Float_t   GetZfit(Int_t id) const  { return fZfit[id];}
   Float_t   GetZref(Int_t id) const  { return fZref[id];}
+  Float_t   GetZref() const          { return fZref[0] - fZref[1] *fX;}
   Int_t     GetYbin() const          { return Int_t(GetY()/0.016);}
   Int_t     GetZbin() const          { return Int_t(GetZ()/fPad[0]);}
 
@@ -198,15 +202,16 @@ public:
   void      SetDX(Float_t inDX)      { fdX = inDX;}
   void      SetReconstructor(const AliTRDReconstructor *rec) {fkReconstructor = rec;}
   void      SetX0(Float_t x0)        { fX0 = x0; }
-  void      SetYref(Int_t i, Float_t y) { fYref[i]     = y;}
-  void      SetZref(Int_t i, Float_t z) { fZref[i]     = z;}
+  void      SetXYZ(TGeoHMatrix *mDet/*, Float_t zpp*/);
+  void      SetYref(Int_t i, Float_t y) { if(i==0||i==1) fYref[i]     = y;}
+  void      SetZref(Int_t i, Float_t z) { if(i==0||i==1) fZref[i]     = z;}
 //   void      SetUsabilityMap(Long_t um)  { fUsable = um; }
   void      Update(const AliTRDtrackV1* trk);
   void      UpdateUsed();
   void      UseClusters();
 
 protected:
-  void        Copy(TObject &ref) const;
+  void      Copy(TObject &ref) const;
 
 private:
   inline void SetN(Int_t n);
@@ -232,14 +237,14 @@ private:
   Float_t          fPad[4];                 // local pad definition : length/width/tilt/anode wire offset 
   Float_t          fYref[2];                //  Reference y, dydx
   Float_t          fZref[2];                //  Reference z, dz/dx
-  Float_t          fYfit[2];                //  Fit y, dy/dx
-  Float_t          fZfit[2];                //  Fit z
+  Float_t          fYfit[2];                //  Fit :: chamber local y, dy/dx
+  Float_t          fZfit[2];                //  Fit :: chamber local z, dz/dx
   Float_t          fPt;                     //  Pt estimate @ tracklet [GeV/c]
   Float_t          fdX;                     // length of time bin
-  Float_t          fX0;                     // anode wire position
-  Float_t          fX;                      // radial position of the tracklet
-  Float_t          fY;                      // r-phi position of the tracklet
-  Float_t          fZ;                      // z position of the tracklet
+  Float_t          fX0;                     // anode wire position in TrackingCoordinates (alignment included)
+  Float_t          fX;                      // local radial offset from anode wire where tracklet position is estimated
+  Float_t          fY;                      // r-phi position of the tracklet  in TrackingCoordinates (alignment included)
+  Float_t          fZ;                      // z position of the tracklet in TrackingCoordinates (alignment included)
   Float_t          fS2Y;                    // estimated resolution in the r-phi direction 
   Float_t          fS2Z;                    // estimated resolution in the z direction 
   Float_t          fC[2];                   // Curvature for standalone [0] rieman [1] vertex constrained 
@@ -250,7 +255,7 @@ private:
   Double_t         fRefCov[7];              // covariance matrix of the track in the yz plane + the rest of the diagonal elements
   Double_t         fCov[3];                 // covariance matrix of the tracklet in the xy plane
 
-  ClassDef(AliTRDseedV1, 12)                 // The offline TRD tracklet 
+  ClassDef(AliTRDseedV1, 13)                 // The offline TRD tracklet 
 };
 
 //____________________________________________________________
@@ -407,3 +412,4 @@ inline void AliTRDseedV1::Swap(Double_t &d1, Double_t &d2) const
 
 
 
+