Bug fix

[u/mrichter/AliRoot.git] / STEER / AliTrackReference.cxx

diff --git a/STEER/AliTrackReference.cxx b/STEER/AliTrackReference.cxx
index ffd513bc276a71ebc15fa92c250c7f0b3ee602a9..1076bb8b67c90ec478ad520eb0c1e78277b60cf0 100644 (file)
--- a/STEER/AliTrackReference.cxx
+++ b/STEER/AliTrackReference.cxx
@@ -13,11 +13,14 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
+#include "TVirtualMC.h"
 
-#include "AliTrackReference.h"
-#include "TParticle.h"
 #include "AliRun.h"
-#include "TLorentzVector.h"
+#include "AliTrackReference.h"
+#include "AliExternalTrackParam.h"
+#include "AliKalmanTrack.h"
 
 // 
 // Track Reference object is created every time particle is 
@@ -36,6 +39,7 @@ ClassImp(AliTrackReference)
 
 //_______________________________________________________________________
  AliTrackReference::AliTrackReference():
+   TObject(),
    fTrack(0),
    fX(0),
    fY(0),
@@ -43,7 +47,9 @@ ClassImp(AliTrackReference)
    fPx(0),
    fPy(0),
    fPz(0),
-   fLength(0)
+   fLength(0),
+   fTime(0),
+   fUserId(0)
 {
   //
   // Default constructor
@@ -53,7 +59,19 @@ ClassImp(AliTrackReference)
 }
 
 //_______________________________________________________________________
-AliTrackReference::AliTrackReference(Int_t label, TVirtualMC *vMC) {
+AliTrackReference::AliTrackReference(Int_t label) :
+  TObject(),
+  fTrack(label),
+  fX(0),
+  fY(0),
+  fZ(0),
+  fPx(0),
+  fPy(0),
+  fPz(0),
+  fLength(gMC->TrackLength()),
+  fTime(gMC->TrackTime()),
+  fUserId(0)
+{
   //
   // Create Reference object out of label and
   // data in TVirtualMC object
@@ -64,20 +82,16 @@ AliTrackReference::AliTrackReference(Int_t label, TVirtualMC *vMC) {
   // Sylwester Radomski, (S.Radomski@gsi.de)
   // GSI, Jan 31, 2003
   //
-
-  TLorentzVector vec;
+    
+  Double_t vec[4];
   
-  fTrack = label;
-  fLength = vMC->TrackLength();
-  fTime = vMC->TrackTime();
-
-  vMC->TrackPosition(vec);
+  gMC->TrackPosition(vec[0],vec[1],vec[2]);
 
   fX = vec[0];
   fY = vec[1];
   fZ = vec[2];
   
-  vMC->TrackMomentum(vec);
+  gMC->TrackMomentum(vec[0],vec[1],vec[2],vec[3]);
   
   fPx = vec[0];
   fPy = vec[1];
@@ -88,13 +102,40 @@ AliTrackReference::AliTrackReference(Int_t label, TVirtualMC *vMC) {
 
   for(Int_t i=0; i<16; i++) ResetBit(BIT(i));
 
-  SetBit(BIT(0), vMC->IsNewTrack());
-  SetBit(BIT(1), vMC->IsTrackAlive());
-  SetBit(BIT(2), vMC->IsTrackDisappeared());
-  SetBit(BIT(3), vMC->IsTrackEntering());
-  SetBit(BIT(4), vMC->IsTrackExiting());
-  SetBit(BIT(5), vMC->IsTrackInside());
-  SetBit(BIT(6), vMC->IsTrackOut());
-  SetBit(BIT(7), vMC->IsTrackStop()); 
+  SetBit(BIT(0), gMC->IsNewTrack());
+  SetBit(BIT(1), gMC->IsTrackAlive());
+  SetBit(BIT(2), gMC->IsTrackDisappeared());
+  SetBit(BIT(3), gMC->IsTrackEntering());
+  SetBit(BIT(4), gMC->IsTrackExiting());
+  SetBit(BIT(5), gMC->IsTrackInside());
+  SetBit(BIT(6), gMC->IsTrackOut());
+  SetBit(BIT(7), gMC->IsTrackStop()); 
 }
 //_______________________________________________________________________
+AliExternalTrackParam * AliTrackReference::MakeTrack(const AliTrackReference *ref, Double_t mass)
+{
+  //
+  // Make dummy track from the track reference 
+  // negative mass means opposite charge 
+  //
+  Double_t xx[5];
+  Double_t cc[15];
+  for (Int_t i=0;i<15;i++) cc[i]=0;
+  Double_t x = ref->X(), y = ref->Y(), z = ref->Z();
+  Double_t alpha = TMath::ATan2(y,x);
+  Double_t xr = TMath::Sqrt(x*x+y*y);
+  xx[0] = ref->LocalY();
+  xx[1] = z;
+  xx[3] = ref->Pz()/ref->Pt();
+  xx[4] = 1./ref->Pt(); 
+  if (mass<0) xx[4]*=-1.;  // negative mass - negative direction
+  Double_t alphap = TMath::ATan2(ref->Py(),ref->Px())-alpha;
+  if (alphap> TMath::Pi()) alphap-=TMath::Pi();
+  if (alphap<-TMath::Pi()) alphap+=TMath::Pi();
+  xx[2] = TMath::Sin(alphap);
+
+  AliExternalTrackParam * track = new  AliExternalTrackParam(xr,alpha,xx,cc);
+  return track;
+}
+
+