Merge branch 'master' into TPCdev

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

diff --git a/STEER/STEERBase/AliTrackReference.cxx b/STEER/STEERBase/AliTrackReference.cxx
index 0552b7c96a5441ed325934432ec96d49890ee7ba..feba4446f336b6d0e2c16fd915a2aa61bce502fb 100644 (file)
--- a/STEER/STEERBase/AliTrackReference.cxx
+++ b/STEER/STEERBase/AliTrackReference.cxx
@@ -87,8 +87,8 @@ AliTrackReference::AliTrackReference(Int_t label, Int_t id) :
   fPx(0),
   fPy(0),
   fPz(0),
-  fLength(gMC->TrackLength()),
-  fTime(gMC->TrackTime()),
+  fLength(TVirtualMC::GetMC()->TrackLength()),
+  fTime(TVirtualMC::GetMC()->TrackTime()),
   fUserId(0),
   fDetectorId(id)
 {
@@ -105,13 +105,13 @@ AliTrackReference::AliTrackReference(Int_t label, Int_t id) :
     
   Double_t vec[4];
   
-  gMC->TrackPosition(vec[0],vec[1],vec[2]);
+  TVirtualMC::GetMC()->TrackPosition(vec[0],vec[1],vec[2]);
 
   fX = vec[0];
   fY = vec[1];
   fZ = vec[2];
   
-  gMC->TrackMomentum(vec[0],vec[1],vec[2],vec[3]);
+  TVirtualMC::GetMC()->TrackMomentum(vec[0],vec[1],vec[2],vec[3]);
   
   fPx = vec[0];
   fPy = vec[1];
@@ -122,14 +122,14 @@ AliTrackReference::AliTrackReference(Int_t label, Int_t id) :
 
   for(Int_t i=14; i<22; i++) ResetBit(BIT(i));
 
-  SetBit(BIT(14), gMC->IsNewTrack());
-  SetBit(BIT(15), gMC->IsTrackAlive());
-  SetBit(BIT(16), gMC->IsTrackDisappeared());
-  SetBit(BIT(17), gMC->IsTrackEntering());
-  SetBit(BIT(18), gMC->IsTrackExiting());
-  SetBit(BIT(19), gMC->IsTrackInside());
-  SetBit(BIT(20), gMC->IsTrackOut());
-  SetBit(BIT(21), gMC->IsTrackStop()); 
+  SetBit(BIT(14), TVirtualMC::GetMC()->IsNewTrack());
+  SetBit(BIT(15), TVirtualMC::GetMC()->IsTrackAlive());
+  SetBit(BIT(16), TVirtualMC::GetMC()->IsTrackDisappeared());
+  SetBit(BIT(17), TVirtualMC::GetMC()->IsTrackEntering());
+  SetBit(BIT(18), TVirtualMC::GetMC()->IsTrackExiting());
+  SetBit(BIT(19), TVirtualMC::GetMC()->IsTrackInside());
+  SetBit(BIT(20), TVirtualMC::GetMC()->IsTrackOut());
+  SetBit(BIT(21), TVirtualMC::GetMC()->IsTrackStop()); 
   //
   // This particle has to be kept