X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFv2.cxx;h=362603bd838d19f54232ab8e5b9efce99dbb580b;hb=cd4059914f4d2c1f5752dc062feddd87ad527fa2;hp=f77382614b3e1aa4d68834e0a5c2630e44a475a5;hpb=da3d3acdb35a1789beb85ca161e018521ae64e65;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFv2.cxx b/TOF/AliTOFv2.cxx
index f77382614b3..362603bd838 100644
--- a/TOF/AliTOFv2.cxx
+++ b/TOF/AliTOFv2.cxx
@@ -22,7 +22,7 @@
 //                                                                           //
 //  VERSION WITH 5 MODULES AND TILTED STRIPS                                 //
 //                                                                           //
-//  HOLES FOR PHOS AND RICH DETECTOR                                         //
+//  HOLES FOR PHOS AND HMPID DETECTOR                                         //
 //                                                                           //
 //   Authors:                                                                //
 //                                                                           //
@@ -58,6 +58,7 @@
 #include "AliRun.h"
 #include "AliTOFv2.h"
 #include "AliTOFConstants.h" // AdC
+#include "AliMC.h"
  
 ClassImp(AliTOFv2)
  
@@ -170,7 +171,7 @@ void AliTOFv2::BuildGeometry()
 	node = new TNode(nodeName3,nodeName3,"S_TOF_B",krTof*TMath::Cos(ang),krTof*TMath::Sin(ang),-zOffsetB,rotMatNum);
 	node->SetLineColor(kColorTOF);
 	fNodes->Add(node); 
-      } // Holes for RICH detector
+      } // Holes for HMPID detector
     
     if ((nodeNum<7 || nodeNum>11) && nodeNum !=1 && nodeNum!=17 && nodeNum !=18)
       { 
@@ -178,7 +179,7 @@ void AliTOFv2::BuildGeometry()
 	node = new TNode(nodeName4,nodeName4,"S_TOF_A",krTof*TMath::Cos(ang),krTof*TMath::Sin(ang),zOffsetA,rotMatNum);
 	node->SetLineColor(kColorTOF);
 	fNodes->Add(node); 
-      } // Holes for PHOS detector (+ Holes for RICH detector, central part)
+      } // Holes for PHOS detector (+ Holes for HMPID detector, central part)
   } // end loop on nodeNum
 }
 
@@ -1036,7 +1037,7 @@ void AliTOFv2::Init()
            "  TOF  "
            "**************************************\n",ClassName());
     printf("\n%s:   Version 2 of TOF initialing, "
-           "TOF with holes for PHOS and RICH \n",ClassName());
+           "TOF with holes for PHOS and HMPID \n",ClassName());
   }  
 
   AliTOF::Init();
@@ -1070,7 +1071,7 @@ void AliTOFv2::StepManager()
   Int_t   *idtmed = fIdtmed->GetArray()-499;
   Float_t incidenceAngle;
   
-  if(gMC->GetMedium()==idtmed[513] && 
+  if(gMC->CurrentMedium()==idtmed[513] && 
      gMC->IsTrackEntering() && gMC->TrackCharge()
      && gMC->CurrentVolID(copy)==fIdSens) 
   {    
@@ -1153,6 +1154,6 @@ void AliTOFv2::StepManager()
     vol[3]= padx;
     vol[4]= padz;
     
-    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
+    AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(),vol, hits);
   }
 }