Use gMC and not pMC everywhere

[u/mrichter/AliRoot.git] / PHOS / AliPHOSv3.cxx

diff --git a/PHOS/AliPHOSv3.cxx b/PHOS/AliPHOSv3.cxx
index 6c4ff746a79ac203bb6b0b35cbf808db2f5a7333..adef6e42f4c641439d2bd50e3de252d81f5dbf2d 100644 (file)
--- a/PHOS/AliPHOSv3.cxx
+++ b/PHOS/AliPHOSv3.cxx
@@ -13,7 +13,7 @@
 // --- galice header files ---
 #include "AliPHOSv3.h"
 #include "AliRun.h"
-#include "TGeant3.h" 
+#include "AliMC.h" 
 
 ClassImp(AliPHOSv3)
 
@@ -37,8 +37,6 @@ void AliPHOSv3::CreateGeometry()
 
   cout << "AliPHOSv3::CreateGeometry() PHOS creation\n";
 
-  AliMC* pMC = AliMC::GetMC();
-
   AliPHOS *PHOS_tmp = (AliPHOS*)gAlice->GetModule("PHOS");
   if( NULL==PHOS_tmp )
   {
@@ -66,18 +64,18 @@ void AliPHOSv3::CreateGeometry()
   par[0] = GetCrystalSideSize()/2 + GetWrapThickness();
   par[1] = GetCrystalSideSize()/2 + GetWrapThickness();
   par[2] = GetCrystalLength()  /2 + GetWrapThickness()/2;
-  pMC->Gsvolu("WRAP","BOX ",GetPHOS_IDTMED_Tyvek(),par,3);
+  gMC->Gsvolu("WRAP","BOX ",GetPHOS_IDTMED_Tyvek(),par,3);
 
   par[0] = GetCrystalSideSize()/2;
   par[1] = GetCrystalSideSize()/2;
   par[2] = GetCrystalLength()/2;
-  pMC->Gsvolu("CRST","BOX ",GetPHOS_IDTMED_PbWO4(),par,3);
+  gMC->Gsvolu("CRST","BOX ",GetPHOS_IDTMED_PbWO4(),par,3);
 
   // PIN
   par[0] = GetPIN_SideSize()/2;
   par[1] = GetPIN_SideSize()/2;
   par[2] = GetPIN_Length()/2;
-  pMC->Gsvolu("PIN ","BOX ",GetPHOS_IDTMED_PIN(),par,3);
+  gMC->Gsvolu("PIN ","BOX ",GetPHOS_IDTMED_PIN(),par,3);
 
   //////////////////////////////////////////////////////////////////////////////
   // CRADLE,CPV creation.
@@ -86,30 +84,30 @@ void AliPHOSv3::CreateGeometry()
   par[0] = cell_side_size/2 * GetNz();
   par[1] = cell_side_size/2 * GetNphi();
   par[2] = cradle_thikness/2;
-  pMC->Gsvolu("PHOS","BOX ",GetPHOS_IDTMED_AIR(),par,3);
+  gMC->Gsvolu("PHOS","BOX ",GetPHOS_IDTMED_AIR(),par,3);
 
 //par[0] : the same as above
 //par[1] : the same as above
   par[2] = GetCPV_Thickness()/2;
-  pMC->Gsvolu("CPV ","BOX ",GetPHOS_IDTMED_CPV(),par,3);
+  gMC->Gsvolu("CPV ","BOX ",GetPHOS_IDTMED_CPV(),par,3);
 
   x = 0;
   y = 0;
   z = (cell_length+GetCPV_PHOS_Distance())/2;
-  pMC->Gspos("CPV ",1,"PHOS",x,y,z,0,"ONLY");
+  gMC->Gspos("CPV ",1,"PHOS",x,y,z,0,"ONLY");
 
   par[0] = cell_side_size/2 * GetNz();
   par[1] = cell_side_size/2 * GetNphi();
   par[2] = cell_length/2;
-  pMC->Gsvolu("CRS0","BOX ",GetPHOS_IDTMED_AIR(),par,3);
+  gMC->Gsvolu("CRS0","BOX ",GetPHOS_IDTMED_AIR(),par,3);
 
   x = 0;
   y = 0;
   z = -(cradle_thikness-cell_length)/2;
-  pMC->Gspos("CRS0",1,"PHOS",x,y,z,0,"ONLY");
+  gMC->Gspos("CRS0",1,"PHOS",x,y,z,0,"ONLY");
 
-  pMC->Gsdvn("CRS1","CRS0",GetNphi(),2);
-  pMC->Gsdvn("CELL","CRS1",GetNz()  ,1);
+  gMC->Gsdvn("CRS1","CRS0",GetNphi(),2);
+  gMC->Gsdvn("CELL","CRS1",GetNz()  ,1);
 
   //////////////////////////////////////////////////////////////////////////////
   // CELL creation
@@ -118,17 +116,17 @@ void AliPHOSv3::CreateGeometry()
   x = 0;
   y = 0;
   z = -GetWrapThickness()/2;
-  pMC->Gspos("CRST",1,"WRAP",x,y,z,0,"ONLY");
+  gMC->Gspos("CRST",1,"WRAP",x,y,z,0,"ONLY");
 
   x = 0;
   y = 0;
   z = GetPIN_Length()/2;
-  pMC->Gspos("WRAP",1,"CELL",x,y,z,0,"ONLY");
+  gMC->Gspos("WRAP",1,"CELL",x,y,z,0,"ONLY");
 
   x = 0;
   y = 0;
   z = -GetCrystalLength()/2-GetWrapThickness()/2;
-  pMC->Gspos("PIN ",1,"CELL",x,y,z,0,"ONLY");
+  gMC->Gspos("PIN ",1,"CELL",x,y,z,0,"ONLY");
 
   //////////////////////////////////////////////////////////////////////////////
   // CELL has been created.
@@ -143,7 +141,7 @@ void AliPHOSv3::CreateGeometry()
 //     for( int ix=0; ix<GetNz(); ix++ )
 //     {
 //       x = (ix-(GetNz()-1)/2.)*cell_side_size;
-//       pMC->Gspos("CELL",++n,"PHOS",x,y,z,0,"ONLY");
+//       gMC->Gspos("CELL",++n,"PHOS",x,y,z,0,"ONLY");
 //     }
 //   }
 
@@ -169,7 +167,7 @@ void AliPHOSv3::CreateGeometry()
     y = r*sin(cradle_angle_pos*kPI/180);
     z = 0;
     AliMatrix(rotation_matrix_number, 0,0 , 90,90+cradle_angle_pos , 90,180+cradle_angle_pos);
-    pMC->Gspos("PHOS",i+1,"ALIC",x,y,z,rotation_matrix_number,"ONLY");
+    gMC->Gspos("PHOS",i+1,"ALIC",x,y,z,rotation_matrix_number,"ONLY");
 
     GetCradleAngle(i) = cradle_angle_pos;
 //
@@ -206,27 +204,26 @@ void AliPHOSv3::CreateGeometry()
 void AliPHOSv3::StepManager()
 {
   static Bool_t inwold=0;   // Status of previous ctrak->inwvol
-  AliMC *MC = AliMC::GetMC();
   Int_t copy;
 
-//   if( MC->TrackEntering() ) {
-//     Int_t Volume_ID = MC->CurrentVol(Volume_name, copy);
+//   if( gMC->TrackEntering() ) {
+//     Int_t Volume_ID = gMC->CurrentVol(Volume_name, copy);
 //     cout << "AliPHOSv3::StepManager() entered to PHOS to the volume " << Volume_name << "!\n";
 //   }
 
   int cradle_number, cell_Z, cell_Phi;  // Variables that describe cell position.
 
-  if( MC->GetMedium()==GetPHOS_IDTMED_PIN() && MC->TrackEntering() && MC->TrackCharge()!=0 )
+  if( gMC->GetMedium()==GetPHOS_IDTMED_PIN() && gMC->TrackEntering() && gMC->TrackCharge()!=0 )
   {
     // GEANT particle just have entered into PIN diode.
 
     AliPHOS &PHOS = *(AliPHOS*)gAlice->GetModule("PHOS");
 
-    MC->CurrentVolOff(4,0,copy);
+    gMC->CurrentVolOff(4,0,copy);
     cradle_number  = copy-1;
-    MC->CurrentVolOff(1,0,copy);
+    gMC->CurrentVolOff(1,0,copy);
     cell_Z         = copy-1;
-    MC->CurrentVolOff(2,0,copy);
+    gMC->CurrentVolOff(2,0,copy);
     cell_Phi       = copy-1;
 
     TH2S &h = PHOS.GetCradle(cradle_number).fChargedTracksInPIN;
@@ -240,32 +237,32 @@ void AliPHOSv3::StepManager()
 
   //////////////////////////////////////////////////////////////////////////////
 
-  if( MC->GetMedium() == GetPHOS_IDTMED_PbWO4() )
+  if( gMC->GetMedium() == GetPHOS_IDTMED_PbWO4() )
   {
     // GEANT particle into crystal.
 
     AliPHOS &PHOS = *(AliPHOS*)gAlice->GetModule("PHOS");
 
-    MC->CurrentVolOff(5,0,copy);
+    gMC->CurrentVolOff(5,0,copy);
     cradle_number  = copy-1;
-    MC->CurrentVolOff(2,0,copy);
+    gMC->CurrentVolOff(2,0,copy);
     cell_Z         = copy-1;
-    MC->CurrentVolOff(3,0,copy);
+    gMC->CurrentVolOff(3,0,copy);
     cell_Phi       = copy-1;
 
     TH2F &h = PHOS.GetCradle(cradle_number).fCellEnergy;
-    h.AddBinContent(h.GetBin(cell_Z,cell_Phi),MC->Edep());
+    h.AddBinContent(h.GetBin(cell_Z,cell_Phi),gMC->Edep());
   }
 
   //////////////////////////////////////////////////////////////////////////////
 
-  if( MC->GetMedium()==GetPHOS_IDTMED_CPV() && MC->TrackEntering() )
+  if( gMC->GetMedium()==GetPHOS_IDTMED_CPV() && gMC->TrackEntering() )
   {
     // GEANT particle just have entered into CPV detector.
 
     AliPHOS &PHOS = *(AliPHOS*)gAlice->GetModule("PHOS");
 
-    MC->CurrentVolOff(1,0,cradle_number);
+    gMC->CurrentVolOff(1,0,cradle_number);
     cradle_number--;
 
     // Save CPV x,y hits position of charged particles.
@@ -273,7 +270,7 @@ void AliPHOSv3::StepManager()
     AliPHOSCradle  &cradle = PHOS.GetCradle(cradle_number);
 
     Float_t   xyz[3];
-    MC->TrackPosition(xyz);
+    gMC->TrackPosition(xyz);
     TVector3          p(xyz[0],xyz[1],xyz[2]),v;
 
     float x,y,l;
@@ -285,12 +282,12 @@ void AliPHOSv3::StepManager()
 
     // Store current particle in the list of Cradle particles.
     Float_t  pmom[4];
-    MC->TrackMomentum(pmom);
+    gMC->TrackMomentum(pmom);
     Float_t Px    = pmom[0] * pmom[3],
             Py    = pmom[1] * pmom[3],
             Pz    = pmom[2] * pmom[3];
-    Float_t Getot = MC->Etot();
-    Int_t   Ipart = MC->TrackPid();
+    Float_t Getot = gMC->Etot();
+    Int_t   Ipart = gMC->TrackPid();
 
     cradle.GetParticles().Add(new AliPHOSgamma(x,y,Getot,Px,Py,Pz,Ipart));
 
@@ -299,5 +296,5 @@ void AliPHOSv3::StepManager()
 
   }
 
-  inwold=MC->TrackEntering();         // Save current status of GEANT variable.
+  inwold=gMC->TrackEntering();         // Save current status of GEANT variable.
 }