Moving to the new VMC naming convention
authoralibrary <alibrary@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 25 Jul 2003 15:13:48 +0000 (15:13 +0000)
committeralibrary <alibrary@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 25 Jul 2003 15:13:48 +0000 (15:13 +0000)
89 files changed:
CRT/AliCRTv0.cxx
CRT/AliCRTv1.cxx
CRT/AliGenCRT.cxx
EMCAL/AliEMCALv1.cxx
EVGEN/AliGenBeamGas.cxx
EVGEN/AliGenBox.cxx
EVGEN/AliGenCocktailAfterBurner.cxx
EVGEN/AliGenDoubleScan.cxx
EVGEN/AliGenExtFile.cxx
EVGEN/AliGenFLUKAsource.cxx
EVGEN/AliGenFixed.cxx
EVGEN/AliGenGeVSim.cxx
EVGEN/AliGenHIJINGpara.cxx
EVGEN/AliGenHIJINGparaBa.cxx
EVGEN/AliGenHalo.cxx
EVGEN/AliGenHaloProtvino.cxx
EVGEN/AliGenParam.cxx
EVGEN/AliGenScan.cxx
EVGEN/AliGenSlowNucleons.cxx
EVGEN/AliGenThetaSlice.cxx
FMD/AliFMDv1.cxx
FMD/AliFMDv2.cxx
ITS/AliITSv1.cxx
ITS/AliITSv5.cxx
ITS/AliITSv5asymm.cxx
ITS/AliITSv5symm.cxx
ITS/AliITSvPPRasymm.cxx
ITS/AliITSvPPRasymmFMD.cxx
ITS/AliITSvPPRcoarseasymm.cxx
ITS/AliITSvPPRcoarsesymm.cxx
ITS/AliITSvSPD02.cxx
ITS/AliITSvtest.cxx
MUON/AliMUONproto.cxx
MUON/AliMUONv0.cxx
MUON/AliMUONv1.cxx
MUON/AliMUONv3.cxx
PHOS/AliPHOSDebug.cxx
PHOS/AliPHOSv1.cxx
PHOS/AliPHOSv3.cxx
PHOS/AliPHOSv4.cxx
PHOS/AliPHOSvImpacts.cxx
PMD/AliPMDv0.cxx
PMD/AliPMDv1.cxx
PYTHIA6/AliGenPythia.cxx
PYTHIA6/AliGenPythiaJets.cxx
RICH/AliRICHResponseV0.cxx
RICH/AliRICHv1.cxx
RICH/AliRICHv3.cxx
START/AliSTARTv1.cxx
START/AliSTARTv2.cxx
STEER/AliGenerator.cxx
STEER/AliGenerator.h
STEER/AliLego.cxx
STEER/AliLegoGenerator.cxx
STEER/AliLegoGeneratorEta.cxx
STEER/AliLegoGeneratorPhiZ.cxx
STEER/AliLegoGeneratorXYZ.cxx
STEER/AliRun.cxx
STEER/AliRun.h
STEER/AliStack.cxx
STEER/AliStack.h
STRUCT/AliFRAMEv2.cxx
TDPMjet/AliGenDPMjet.cxx
TEPEMGEN/AliGenEpEmv1.cxx
TFluka/stupre.cxx
TFluka/stuprf.cxx
THerwig/AliGenHerwig.cxx
THijing/AliGenHijing.cxx
TMEVSIM/AliGenMevSim.cxx
TOF/AliTOFv0.cxx
TOF/AliTOFv1.cxx
TOF/AliTOFv2.cxx
TOF/AliTOFv2FHoles.cxx
TOF/AliTOFv3.cxx
TOF/AliTOFv4.cxx
TOF/AliTOFv4T0.cxx
TPC/AliTPCv1.cxx
TPC/AliTPCv2.cxx
TPC/AliTPCv3.cxx
TPHIC/AliGenTPHIC.cxx
TRD/AliTRDsimpleGen.cxx
TRD/AliTRDsimpleMC.cxx
TRD/AliTRDv0.cxx
TRD/AliTRDv1.cxx
VZERO/AliVZEROv0.cxx
VZERO/AliVZEROv2.cxx
ZDC/AliGenZDC.cxx
ZDC/AliZDCv1.cxx
ZDC/AliZDCv2.cxx

index 5c45b0e..eecce17 100644 (file)
@@ -623,7 +623,7 @@ void AliCRTv0::StepManager()
   TLorentzVector mom;
 
   static Float_t hits[14];
-  Int_t tracknumber = gAlice->CurrentTrack();
+  Int_t tracknumber = gAlice->GetCurrentTrackNumber();
 
   static Float_t eloss;
   static Float_t tlength;
@@ -674,7 +674,7 @@ void AliCRTv0::StepManager()
     hits[12] = tlength; // Trajectory lenght
     hits[13] = (Float_t)tracknumber;
 
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
 
   }
 
index 8f05fc5..3400250 100644 (file)
@@ -876,9 +876,9 @@ void AliCRTv1::StepManager()
     hits[12] = 0;
     hits[13] = 0;
 
-    //hits[9] = gAlice->CurrentTrack();
+    //hits[9] = gAlice->GetCurrentTrackNumber();
     
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
     
     eloss = 0.;
 
@@ -899,7 +899,7 @@ void AliCRTv1::StepManager()
 
     //hits[10] = 1;
     
-    //AddHit(gAlice->CurrentTrack(),vol, hits);
+    //AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
     
     //eloss = 0.;
 
@@ -925,7 +925,7 @@ void AliCRTv1::StepManager()
     hits[12] = 0;
     hits[13] = 0;
       
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
     
     //eloss = 0.;
 
@@ -950,7 +950,7 @@ void AliCRTv1::StepManager()
     hits[12] = 1;
     hits[13] = 0;
     
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
     
     //eloss = 0.;
 
@@ -977,7 +977,7 @@ void AliCRTv1::StepManager()
     hits[13] = 1;
 
     
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
     
     //eloss = 0.;
 
index ecf4cba..0bd3f28 100644 (file)
@@ -302,7 +302,7 @@ void AliGenCRT::Generate()
   }
 
   // Put the track on the stack.
-  SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
+  PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
 
 
 }
index dd6809d..061196c 100644 (file)
@@ -130,7 +130,7 @@ void AliEMCALv1::StepManager(void){
   Float_t        pmom[4]={0.,0.,0.,0.};
   TLorentzVector pos; // Lorentz vector of the track current position.
   TLorentzVector mom; // Lorentz vector of the track current momentum.
-  Int_t tracknumber =  gAlice->CurrentTrack();
+  Int_t tracknumber =  gAlice->GetCurrentTrackNumber();
   Int_t primary = 0;
   static Int_t iparent = 0;
   static Float_t ienergy = 0;
index 8ce4ceb..e91e313 100644 (file)
@@ -108,7 +108,7 @@ void AliGenBeamGas::Generate()
          Int_t idpart     = iparticle->GetPdgCode();
          Int_t decayed    = iparticle->GetFirstDaughter();
          Int_t doTracking = fTrackIt && (decayed < 0) && (TMath::Abs(idpart) > 10);
-         SetTrack(doTracking,-1,idpart,p,origin,polar,0,kPPrimary,nt);
+         PushTrack(doTracking,-1,idpart,p,origin,polar,0,kPPrimary,nt);
          KeepTrack(nt);
       } // track loop
       nInt++;
index 9946aba..60a9334 100644 (file)
@@ -115,7 +115,7 @@ void AliGenBox::Generate()
                    TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
            }
        }
-       SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
+       PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
     }
 }
 
index dea75dc..0eed269 100644 (file)
@@ -340,7 +340,7 @@ void AliGenCocktailAfterBurner::SetTracks(Int_t stackno)
       mech = AliGenCocktailAfterBurner::IntToMCProcess(p->GetUniqueID());
       weight = p->GetWeight();
 
-      gAlice->SetTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
+      gAlice->PushTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
                        polx, poly, polz, mech, ntr, weight);
     }
 }
index d1f0c1c..7f18a5b 100644 (file)
@@ -93,7 +93,7 @@ void AliGenDoubleScan::Generate()
              p[0] = pmom*TMath::Cos(phi)*TMath::Sin(theta);
              p[1] = pmom*TMath::Sin(phi)*TMath::Sin(theta);
              p[2] = pmom*TMath::Cos(theta);
-             SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
+             PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
 //
 // Generate 2nd particle at distance fDistance from  the first
 //
@@ -109,7 +109,7 @@ void AliGenDoubleScan::Generate()
              p[0] = pmom*TMath::Cos(phi)*TMath::Sin(theta);
              p[1] = pmom*TMath::Sin(phi)*TMath::Sin(theta);
              p[2] = pmom*TMath::Cos(theta);
-             SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
+             PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
          }
       }
   }
index 7382b19..aec99b7 100644 (file)
@@ -182,9 +182,9 @@ void AliGenExtFile::Generate()
                         (TMath::Abs(idpart) > 10) && selected;
       // printf("*** pdg, first daughter, trk = %d, %d, %d\n",
       //   idpart,decayed, doTracking);
-      //PH      SetTrack(doTracking,-1,idpart,p,origin,polar,0,kPPrimary,nt);
+      //PH      PushTrack(doTracking,-1,idpart,p,origin,polar,0,kPPrimary,nt);
       Int_t parent = iparticle->GetFirstMother();
-      SetTrack(doTracking,parent,idpart,p,origin,polar,0,kPPrimary,nt);
+      PushTrack(doTracking,parent,idpart,p,origin,polar,0,kPPrimary,nt);
       KeepTrack(nt);
     } // track loop
 
index 31abcdf..46bff06 100644 (file)
@@ -246,7 +246,7 @@ void AliGenFLUKAsource::Generate()
        if (part==1 && iwgt>100) iwgt=100;
        Int_t nstack=0;
        for (j=0; j<iwgt; j++) {
-           SetTrack(fTrackIt,-1,part,p,origin,polar,fAge,kPPrimary,nt);
+           PushTrack(fTrackIt,-1,part,p,origin,polar,fAge,kPPrimary,nt);
            Rndm(random,2);
            phi=2*random[1]*TMath::Pi();
            Float_t pn1=p[0]*TMath::Sin(phi) - p[1]*TMath::Cos(phi);
index e4598d0..37e57cb 100644 (file)
@@ -80,7 +80,7 @@ void AliGenFixed::Generate()
   Int_t i, nt;
   //
   for(i=0;i<fNpart;i++) 
-    SetTrack(fTrackIt,-1,fIpart,fP,fOrigin.GetArray(),polar,0,kPPrimary,nt);
+    PushTrack(fTrackIt,-1,fIpart,fP,fOrigin.GetArray(),polar,0,kPPrimary,nt);
 }
   
 //_____________________________________________________________________________
index 689df6f..b3d5afb 100644 (file)
@@ -790,7 +790,7 @@ void AliGenGeVSim::Generate() {
 
       // putting particle on the stack
 
-      SetTrack(fTrackIt, kParent, pdg, p, orgin, polar, time, kPPrimary, id, fTrackIt);     
+      PushTrack(fTrackIt, kParent, pdg, p, orgin, polar, time, kPPrimary, id, fTrackIt);     
       if (isMultTotal) nParticle++;
     }
   }
index 3477bbf..8ea8123 100644 (file)
@@ -332,11 +332,11 @@ void AliGenHIJINGpara::Generate()
            if (part == kPi0 && fPi0Decays){
 //
 //          Decay pi0 if requested
-               SetTrack(0,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
+               PushTrack(0,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
                KeepTrack(fNt);
                DecayPi0(origin, p);
            } else {
-               SetTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
+               PushTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
                KeepTrack(fNt);
            }
 
@@ -393,7 +393,7 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p)
        p[2] = iParticle->Pz();
        Int_t part = iParticle->GetPdgCode();
 
-       SetTrack(fTrackIt, fNt, part, p, orig, polar, 0, kPDecay, nt, fParentWeight);
+       PushTrack(fTrackIt, fNt, part, p, orig, polar, 0, kPDecay, nt, fParentWeight);
        KeepTrack(nt);
     }
     fNt = nt;
index caaa528..48d609f 100644 (file)
@@ -333,7 +333,7 @@ void AliGenHIJINGparaBa::Generate()
                        TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
                }
            }
-           SetTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,nt,fParentWeight);
+           PushTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,nt,fParentWeight);
            break;
        } // while(1)
     } // Particle loop
index 9bf8de4..352ce78 100644 (file)
@@ -120,12 +120,12 @@ void AliGenHalo::Generate()
       p[1]=p0*ty;
       p[2]=p0*tz;
       fParentWeight=wgt;
-      SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,kPNoProcess,nt,fParentWeight);
-//    SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo+",nt,fParentWeight);
+      PushTrack(fTrackIt,-1,ipart,p,origin,polar,0,kPNoProcess,nt,fParentWeight);
+//    PushTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo+",nt,fParentWeight);
       origin[2]=-origin[2];
       p[2]=-p[2];
-      SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,kPNoProcess,nt,fParentWeight);
-//    SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo-",nt,fParentWeight);
+      PushTrack(fTrackIt,-1,ipart,p,origin,polar,0,kPNoProcess,nt,fParentWeight);
+//    PushTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo-",nt,fParentWeight);
       origin[2]=-origin[2];
       p[2]=-p[2];
   }
index 5b2a60d..99b1f2e 100644 (file)
@@ -275,9 +275,9 @@ void AliGenHaloProtvino::Generate()
       if (!fAnalog || gRandom->Rndm() < fParentWeight) {
 //    Pass parent particle
 //
-         SetTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight);
+         PushTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight);
          KeepTrack(ntP);
-         SetTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight);
+         PushTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight);
       }
 
       //
@@ -290,9 +290,9 @@ void AliGenHaloProtvino::Generate()
              origin[2]  = -origin[2];
              originP[2] = -originP[2];
              p[2]=-p[2];
-             SetTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight);
+             PushTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight);
              KeepTrack(ntP);
-             SetTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight);
+             PushTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight);
          }
       }
       SetHighWaterMark(nt);
index 6cfdb4e..963e58d 100644 (file)
@@ -400,7 +400,7 @@ void AliGenParam::Generate()
                  ipa++;
 //
 // Parent
-                 SetTrack(0, -1, iPart, p, origin0, polar, 0, kPPrimary, nt, wgtp);
+                 PushTrack(0, -1, iPart, p, origin0, polar, 0, kPPrimary, nt, wgtp);
                  pParent[0] = nt;
                  KeepTrack(nt); 
 //
@@ -425,7 +425,7 @@ void AliGenParam::Generate()
                              iparent = -1;
                          }
                         
-                         SetTrack(fTrackIt*trackIt[i], iparent, kf,
+                         PushTrack(fTrackIt*trackIt[i], iparent, kf,
                                           pc, och, polar,
                                           0, kPDecay, nt, wgtch);
                          pParent[i] = nt;
@@ -442,7 +442,7 @@ void AliGenParam::Generate()
          else  // nodecay option, so parent will be tracked by GEANT (pions, kaons, eta, omegas, baryons)
          {
            gAlice->
-               SetTrack(fTrackIt,-1,iPart,p,origin0,polar,0,kPPrimary,nt,wgtp);
+               PushTrack(fTrackIt,-1,iPart,p,origin0,polar,0,kPPrimary,nt,wgtp);
             ipa++; 
          }
          break;
index d9198a8..9bd6a69 100644 (file)
@@ -127,7 +127,7 @@ void AliGenScan::Generate()
              p[0] = pmom*TMath::Cos(phi)*TMath::Sin(theta);
              p[1] = pmom*TMath::Sin(phi)*TMath::Sin(theta);
              p[2] = pmom*TMath::Cos(theta);
-             SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
+             PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
          }
       }
   }
index b23555c..8eb7a6e 100644 (file)
@@ -134,7 +134,7 @@ void AliGenSlowNucleons::Generate()
     kf = kProton;    
     for(i = 0; i < fNgp; i++) {
        GenerateSlow(fCharge, fTemperatureG, fBetaSourceG, p);
-       SetTrack(fTrackIt, -1, kf, p, origin, polar,
+       PushTrack(fTrackIt, -1, kf, p, origin, polar,
                 0., kPNoProcess, nt, 1.);
        KeepTrack(nt);
     }
@@ -145,7 +145,7 @@ void AliGenSlowNucleons::Generate()
     kf = kNeutron;    
     for(i = 0; i < fNgn; i++) {
        GenerateSlow(fCharge, fTemperatureG, fBetaSourceG, p);
-       SetTrack(fTrackIt, -1, kf, p, origin, polar,
+       PushTrack(fTrackIt, -1, kf, p, origin, polar,
                 0., kPNoProcess, nt, 1.);
        KeepTrack(nt);
     }
@@ -156,7 +156,7 @@ void AliGenSlowNucleons::Generate()
     kf = kProton;    
     for(i = 0; i < fNbp; i++) {
        GenerateSlow(fCharge, fTemperatureB, fBetaSourceB, p);
-       SetTrack(fTrackIt, -1, kf, p, origin, polar,
+       PushTrack(fTrackIt, -1, kf, p, origin, polar,
                 0., kPNoProcess, nt, 1.);
        KeepTrack(nt);
     }
@@ -167,7 +167,7 @@ void AliGenSlowNucleons::Generate()
     kf = kNeutron;    
     for(i = 0; i < fNbn; i++) {
        GenerateSlow(fCharge, fTemperatureB, fBetaSourceB, p);
-       SetTrack(fTrackIt, -1, kf, p, origin, polar,
+       PushTrack(fTrackIt, -1, kf, p, origin, polar,
                 0., kPNoProcess, nt, 1.);
        KeepTrack(nt);
     }
index 27d2663..47e5970 100644 (file)
@@ -113,7 +113,7 @@ void AliGenThetaSlice::Generate()
                    TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
            }
        }
-       SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
+       PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
     }
 }
 
index 0699b3b..94c27d7 100644 (file)
@@ -313,7 +313,7 @@ void AliFMDv1::StepManager()
          gMC->IsTrackStop())
         {
             hits[6]=de+1000.*gMC->Edep();
-      new(lhits[fNhits++]) AliFMDhit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+      new(lhits[fNhits++]) AliFMDhit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
         } // IsTrackExiting()
      }
   }
index 4e6307c..3bb51ac 100644 (file)
@@ -412,7 +412,7 @@ void AliFMDv2::StepManager()
          gMC->IsTrackStop())
         {
             hits[6]=de+1000.*gMC->Edep();
-      new(lhits[fNhits++]) AliFMDhit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+      new(lhits[fNhits++]) AliFMDhit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
         } // IsTrackExiting()
      }
   }
index e782594..e80b9d9 100644 (file)
@@ -860,6 +860,6 @@ void AliITSv1::StepManager(){
     hits[5]=momentum[2];
     hits[6]=gMC->Edep();
     hits[7]=gMC->TrackTime();
-    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 */
 }
index d1e7da2..2df2d4b 100644 (file)
@@ -800,6 +800,6 @@ void AliITSv5::StepManager(){
   hits[6]=gMC->Edep();
   hits[7]=gMC->TrackTime();
   // Fill hit structure with this new hit.
-  new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+  new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
   return;
 }
index b6a4064..c4de81a 100644 (file)
@@ -814,6 +814,6 @@ void AliITSv5asymm::StepManager(){
   hits[6]=gMC->Edep();
   hits[7]=gMC->TrackTime();
   // Fill hit structure with this new hit.
-  new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+  new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
   return;
 }
index 56e54a7..e172025 100644 (file)
@@ -806,6 +806,6 @@ void AliITSv5symm::StepManager(){
   hits[6]=gMC->Edep();
   hits[7]=gMC->TrackTime();
   // Fill hit structure with this new hit.
-  new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+  new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
   return;
 }
index 94fa4be..1bd7692 100644 (file)
@@ -29196,7 +29196,7 @@ void AliITSvPPRasymm::StepManager(){
        copy = fTrackReferences->GetEntriesFast();
        TClonesArray &lTR = *fTrackReferences;
        // Fill TrackReference structure with this new TrackReference.
-       new(lTR[copy]) AliTrackReference(gAlice->CurrentTrack());
+       new(lTR[copy]) AliTrackReference(gAlice->GetCurrentTrackNumber());
     } // if Outer ITS mother Volume
     if(!(this->IsActive())){
        return;
@@ -29285,7 +29285,7 @@ void AliITSvPPRasymm::StepManager(){
        return;
     } // end if IsEntering
     // Fill hit structure with this new hit.
-    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,
+    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,
                                   gMC->Edep(),gMC->TrackTime(),position,
                                   position0,momentum);
     //
index 3404b99..a366a74 100644 (file)
@@ -5330,7 +5330,7 @@ void AliITSvPPRasymmFMD::StepManager(){
        copy = fTrackReferences->GetEntriesFast();
        TClonesArray &lTR = *fTrackReferences;
        // Fill TrackReference structure with this new TrackReference.
-       new(lTR[copy]) AliTrackReference(gAlice->CurrentTrack());
+       new(lTR[copy]) AliTrackReference(gAlice->GetCurrentTrackNumber());
     } // if Outer ITS mother Volume
     if(!(this->IsActive())){
        return;
@@ -5429,8 +5429,8 @@ void AliITSvPPRasymmFMD::StepManager(){
        stat0 = vol[3];
     } // end if IsEntering
     // Fill hit structure with this new hit.
-//    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
-    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,
+//    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
+    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,
                                   gMC->Edep(),gMC->TrackTime(),position,
                                   position0,momentum);
     //
index 5891567..1d23c17 100644 (file)
@@ -1245,7 +1245,7 @@ void AliITSvPPRcoarseasymm::StepManager(){
     hits[5]=momentum[2];
     hits[6]=gMC->Edep();
     hits[7]=gMC->TrackTime();
-//    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+//    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 //
 // no hits for this coarse asymmetric version.
 //
index 559b024..52355b9 100644 (file)
@@ -1106,7 +1106,7 @@ void AliITSvPPRcoarsesymm::StepManager(){
     hits[5]=momentum[2];
     hits[6]=gMC->Edep();
     hits[7]=gMC->TrackTime();
-//    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+//    new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 //
 // no hits for this coarse symmetric version.
 //
index 059472f..0f9dd13 100644 (file)
@@ -678,7 +678,7 @@ void AliITSvSPD02::StepManager(){
        copy = fTrackReferences->GetEntriesFast();
        TClonesArray &lTR = *fTrackReferences;
        // Fill TrackReference structure with this new TrackReference.
-       new(lTR[copy]) AliTrackReference(gAlice->CurrentTrack());
+       new(lTR[copy]) AliTrackReference(gAlice->GetCurrentTrackNumber());
     } // if Outer ITS mother Volume
     if(!(this->IsActive())){
        return;
@@ -723,7 +723,7 @@ void AliITSvSPD02::StepManager(){
        return;
     } // end if IsEntering
     // Fill hit structure with this new hit only for non-entrerance hits.
-    else new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,
+    else new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,
                                        gMC->Edep(),gMC->TrackTime(),position,
                                        position0,momentum);
     //
index ec70dd6..1782209 100644 (file)
@@ -410,7 +410,7 @@ void AliITSvtest::StepManager(){
   hits[6]=gMC->Edep();
   hits[7]=gMC->TrackTime();
   // Fill hit structure with this new hit.
-  new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+  new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
   return;
 }
 
index 81e0513..ddad38e 100644 (file)
@@ -427,7 +427,7 @@ void AliMUONproto::StepManager()
       }
     
       new(lhits[fNhits++]) 
-         AliMUONHit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+         AliMUONHit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
       eloss = 0; 
       //
       // Check additional signal generation conditions 
index 3279021..0006652 100644 (file)
@@ -214,7 +214,7 @@ void AliMUONv0::StepManager()
       hits[13] = mom[2];                    // Pz
       hits[14] = gMC->TrackTime();          // time of flight
       new(lhits[fNhits++]) 
-         AliMUONHit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+         AliMUONHit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 
   }
 //  if( gMC->IsTrackExiting()) gMC->StopTrack(); 
index 01dda0f..0fcfdd7 100644 (file)
@@ -1987,7 +1987,7 @@ void AliMUONv1::StepManager()
     destep = gMC->Edep();
     step   = gMC->TrackStep();
     //new hit
-    AddHit(fIshunt, gAlice->CurrentTrack(), iChamber, ipart, 
+    AddHit(fIshunt, gAlice->GetCurrentTrackNumber(), iChamber, ipart, 
           pos.X(), pos.Y(), pos.Z(), tof, mom.P(), 
           theta, phi, step, destep);
   }
@@ -2148,7 +2148,7 @@ void AliMUONv1::StepManagerOld()
 //    new hit 
       
       new(lhits[fNhits++]) 
-         AliMUONHit(fIshunt, gAlice->CurrentTrack(), vol,hits);
+         AliMUONHit(fIshunt, gAlice->GetCurrentTrackNumber(), vol,hits);
       eloss = 0; 
       //
       // Check additional signal generation conditions 
index 993dbad..5a2ceea 100644 (file)
@@ -106,7 +106,7 @@ void AliMUONv3::StepManager()
   step   = gMC->TrackStep();
  //new hit
   if (destep>0.)  new(lhits[fNhits++]) 
-                   AliMUONHit(fIshunt, gAlice->CurrentTrack(), iChamber, ipart, 
+                   AliMUONHit(fIshunt, gAlice->GetCurrentTrackNumber(), iChamber, ipart, 
                               pos.X(), pos.Y(), pos.Z(), tof, mom.P(), 
                               theta, phi, step, destep);
 }
index e458cec..34f2a90 100644 (file)
@@ -517,8 +517,8 @@ void AliPHOSv1::StepManager(void)
   Bool_t         entered = kFALSE ;  
   Int_t          copy     ;
 
-  Int_t tracknumber =  gAlice->CurrentTrack() ; 
-  Int_t primary     =  gAlice->GetPrimary( gAlice->CurrentTrack() ); 
+  Int_t tracknumber =  gAlice->GetCurrentTrackNumber() ; 
+  Int_t primary     =  gAlice->GetPrimary( gAlice->GetCurrentTrackNumber() ); 
   TString name      =  GetGeometry()->GetName() ; 
   Int_t trackpid    =  0  ; 
 
index aa8fb41..cff830d 100644 (file)
@@ -284,8 +284,8 @@ void AliPHOSv1::StepManager(void)
   TLorentzVector pos      ;           // Lorentz vector of the track current position
   Int_t          copy     ;
 
-  Int_t tracknumber =  gAlice->CurrentTrack() ; 
-  Int_t primary     =  gAlice->GetPrimary( gAlice->CurrentTrack() ); 
+  Int_t tracknumber =  gAlice->GetCurrentTrackNumber() ; 
+  Int_t primary     =  gAlice->GetPrimary( gAlice->GetCurrentTrackNumber() ); 
   TString name      =  GetGeometry()->GetName() ; 
 
   Int_t moduleNumber ;
@@ -407,7 +407,7 @@ void AliPHOSv1::StepManager(void)
       if (xyzd[1] >  GetGeometry()->GetCrystalSize(1)/2-0.002 ||
          xyzd[1] < -GetGeometry()->GetCrystalSize(1)/2+0.002) {
        TParticle * part = 0 ; 
-       Int_t parent = gAlice->CurrentTrack() ; 
+       Int_t parent = gAlice->GetCurrentTrackNumber() ; 
        while ( parent != -1 ) {
          part = gAlice->Particle(parent) ; 
          part->SetBit(kKeepBit);
index 369783b..d8050c9 100644 (file)
@@ -128,8 +128,8 @@ void AliPHOSv3::StepManager(void)
   Int_t          copy     ;
   Float_t        fLightYield ;   // Light Yield per GeV
 
-  Int_t tracknumber =  gAlice->CurrentTrack() ; 
-  Int_t primary     =  gAlice->GetPrimary( gAlice->CurrentTrack() ); 
+  Int_t tracknumber =  gAlice->GetCurrentTrackNumber() ; 
+  Int_t primary     =  gAlice->GetPrimary( gAlice->GetCurrentTrackNumber() ); 
   TString name      =  GetGeometry()->GetName() ; 
   Float_t        lostenergy ;
   Float_t        global[3] ;
index 37cec26..f789d66 100644 (file)
@@ -484,7 +484,7 @@ void AliPHOSv4::StepManager(void)
 {
   // Only verifies if the particle reaches PHOS and stops the tracking 
 
-  Int_t primary =  gAlice->GetPrimary( gAlice->CurrentTrack() ); 
+  Int_t primary =  gAlice->GetPrimary( gAlice->GetCurrentTrackNumber() ); 
 
   TLorentzVector lv ; 
   gMC->TrackPosition(lv) ;
index 3cae449..e698cfb 100644 (file)
@@ -191,8 +191,8 @@ void AliPHOSvImpacts::StepManager(void)
   TLorentzVector pos      ;           // Lorentz vector of the track current position
   Int_t          copy     ;
 
-  Int_t tracknumber =  gAlice->CurrentTrack() ; 
-  Int_t primary     =  gAlice->GetPrimary( gAlice->CurrentTrack() ); 
+  Int_t tracknumber =  gAlice->GetCurrentTrackNumber() ; 
+  Int_t primary     =  gAlice->GetPrimary( gAlice->GetCurrentTrackNumber() ); 
   TString name      =  GetGeometry()->GetName() ; 
 
   // Add impact to EMC
index e5925e2..49bef7c 100644 (file)
@@ -998,7 +998,7 @@ void AliPMDv0::StepManager()
 
     gMC->Gdtom(center,hits,1);
     hits[3] = destep*1e9; //Number in eV
-    AddHit(gAlice->CurrentTrack(), vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
   }
 }
 
index 801615e..9028231 100644 (file)
@@ -994,7 +994,7 @@ void AliPMDv1::StepManager()
 
     gMC->Gdtom(center,hits,1);
     hits[3] = destep*1e9; //Number in eV
-    AddHit(gAlice->CurrentTrack(), vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
   }
 }
 
index 5532a4f..70bab3d 100644 (file)
@@ -469,11 +469,11 @@ void AliGenPythia::Generate()
                    Float_t tof   = kconv*iparticle->T();
                    Int_t ipa     = iparticle->GetFirstMother()-1;
                    Int_t iparent = (ipa > -1) ? pParent[ipa] : -1;
-                   SetTrack(fTrackIt*trackIt[i] ,
+                   PushTrack(fTrackIt*trackIt[i] ,
                                     iparent, kf, p, origin, polar, tof, kPPrimary, nt, 1., ks);
                    pParent[i] = nt;
                    KeepTrack(nt); 
-               } //  SetTrack loop
+               } //  PushTrack loop
            }
        } else {
            nc = GenerateMB();
@@ -565,7 +565,7 @@ Int_t  AliGenPythia::GenerateMB()
            origin[1] = fOrigin[1]+iparticle->Vy()/10.;
            origin[2] = fOrigin[2]+iparticle->Vz()/10.;
            Float_t tof=kconv*iparticle->T();
-           SetTrack(fTrackIt*trackIt, iparent, kf, p, origin, polar,
+           PushTrack(fTrackIt*trackIt, iparent, kf, p, origin, polar,
                     tof, kPPrimary, nt, 1., ks);
            KeepTrack(nt);
            pParent[i] = nt;
index 275b4ba..ead7d30 100644 (file)
@@ -164,7 +164,7 @@ void AliGenPythiaJets::Generate()
                origin[1] = fOrigin[1]+iparticle->Vy()/10.;
                origin[2] = fOrigin[2]+iparticle->Vz()/10.;
                Float_t tof=kconv*iparticle->T();
-               SetTrack(fTrackIt*trackIt, iparent, kf, p, origin, polar,
+               PushTrack(fTrackIt*trackIt, iparent, kf, p, origin, polar,
                         tof, kPPrimary, nt, 1., ks);
                KeepTrack(nt);
                pParent[i] = nt;
index 1173976..2acd070 100644 (file)
@@ -201,7 +201,7 @@ Int_t AliRICHResponseV0::FeedBackPhotons(Float_t *source, Float_t qtot)
 
   //  Get weight of current particle
   TParticle *current = (TParticle*) 
-    (*gAlice->Particles())[gAlice->CurrentTrack()];
+    (*gAlice->Particles())[gAlice->GetCurrentTrackNumber()];
     
   ifeed = Int_t(current->GetWeight()/100+0.5);
   ipart = gMC->TrackPid();
@@ -291,7 +291,7 @@ Int_t AliRICHResponseV0::FeedBackPhotons(Float_t *source, Float_t qtot)
     // Put photon on the stack and label it as feedback (51, 52) 
     ++sNfeed;
 
-    gAlice->SetTrack(Int_t(1), gAlice->CurrentTrack(), Int_t(50000051),
+    gAlice->PushTrack(Int_t(1), gAlice->GetCurrentTrackNumber(), Int_t(50000051),
                     mom[0],mom[1],mom[2],mom[3],source[0],source[1],source[2],position[3],pol[0],pol[1],pol[2],
                     kPFeedBackPhoton, nt, 1.);
     
index fe02459..ce030c1 100644 (file)
@@ -228,7 +228,7 @@ void AliRICHv1::StepManager()
     const  Float_t kBig=1.e10;
        
     TClonesArray &lhits = *fHits;
-    TParticle *current = (TParticle*)(*gAlice->Particles())[gAlice->CurrentTrack()];
+    TParticle *current = (TParticle*)(*gAlice->Particles())[gAlice->GetCurrentTrackNumber()];
 
  //if (current->Energy()>1)
    //{
@@ -240,7 +240,7 @@ void AliRICHv1::StepManager()
     id=gMC->CurrentVolID(copy);
     idvol = copy-1;
     Float_t cherenkovLoss=0;
-    //gAlice->KeepTrack(gAlice->CurrentTrack());
+    //gAlice->KeepTrack(gAlice->GetCurrentTrackNumber());
     
     gMC->TrackPosition(position);
     pos[0]=position(0);
@@ -251,9 +251,9 @@ void AliRICHv1::StepManager()
     ckovData[2] = pos[1];                 // Y-position for hit
     ckovData[3] = pos[2];                 // Z-position for hit
     ckovData[6] = 0;                      // dummy track length
-    //ckovData[11] = gAlice->CurrentTrack();
+    //ckovData[11] = gAlice->GetCurrentTrackNumber();
     
-    //printf("\n+++++++++++\nTrack: %d\n++++++++++++\n",gAlice->CurrentTrack());
+    //printf("\n+++++++++++\nTrack: %d\n++++++++++++\n",gAlice->GetCurrentTrackNumber());
 
     //AliRICH *RICH = (AliRICH *) gAlice->GetDetector("RICH"); 
     
@@ -279,7 +279,7 @@ void AliRICHv1::StepManager()
                      //printf("Second Mother:%d\n",current->GetSecondMother());
                      
                      ckovData[10] = mother;
-                     ckovData[11] = gAlice->CurrentTrack();
+                     ckovData[11] = gAlice->GetCurrentTrackNumber();
                      ckovData[12] = 1;             //Media where photon was produced 1->Freon, 2->Quarz
                      //printf("Produced in FREO\n");
                      fCkovNumber++;
@@ -323,7 +323,7 @@ void AliRICHv1::StepManager()
                        if (ranf[0] > t) {
                          gMC->StopTrack();
                          ckovData[13] = 5;
-                         AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                         AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                          //printf("Added One (1)!\n");
                          //printf("Lost one in grid\n");
                        }
@@ -353,7 +353,7 @@ void AliRICHv1::StepManager()
                            if (ranf[0] < t) {
                              gMC->StopTrack();
                              ckovData[13] = 6;
-                             AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                             AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                                
                              //printf("Added One (2)!\n");
                              //printf("Lost by Fresnel\n");
@@ -377,7 +377,7 @@ void AliRICHv1::StepManager()
                      if (gMC->CurrentVolID(copy) == gMC->VolId("QUAR")) 
                        ckovData[13]=2;
                      //gMC->StopTrack();
-                     //AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                     //AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                    } //reflection question
                     
                    //        Absorption loss 
@@ -401,7 +401,7 @@ void AliRICHv1::StepManager()
                        ckovData[13]=16;
                      }
                      gMC->StopTrack();
-                     AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                     AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                      //printf("Added One (3)!\n");
                      //printf("Added cerenkov %d\n",fCkovNumber);
                    } //absorption question 
@@ -411,7 +411,7 @@ void AliRICHv1::StepManager()
                    else if (procs[i] == kPStop) {                 //is it below energy treshold?
                      ckovData[13]=21;
                      gMC->StopTrack();
-                     AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                     AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                      //printf("Added One (4)!\n");
                    }   // energy treshold question         
                  }  //number of mechanisms cycle
@@ -541,8 +541,8 @@ void AliRICHv1::StepManager()
                      }
                    //if (sector != -1)
                    //{
-                   AddHit(gAlice->CurrentTrack(),vol,ckovData);
-                   AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                   AddHit(gAlice->GetCurrentTrackNumber(),vol,ckovData);
+                   AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                    //printf("Added One (5)!\n");
                    //}
                }
@@ -690,7 +690,7 @@ void AliRICHv1::StepManager()
                }
                
                //if(sector !=-1)
-               new(lhits[fNhits++]) AliRICHHit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+               new(lhits[fNhits++]) AliRICHHit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
                eloss = 0; 
                //
                // Check additional signal generation conditions 
index 78f6301..a702d60 100644 (file)
@@ -807,7 +807,7 @@ void AliRICHv3::StepManager()
     const  Float_t kBig=1.e10;
        
     TClonesArray &lhits = *fHits;
-    TParticle *current = (TParticle*)(*gAlice->Particles())[gAlice->CurrentTrack()];
+    TParticle *current = (TParticle*)(*gAlice->Particles())[gAlice->GetCurrentTrackNumber()];
 
  //if (current->Energy()>1)
    //{
@@ -819,7 +819,7 @@ void AliRICHv3::StepManager()
     id=gMC->CurrentVolID(copy);
     idvol = copy-1;
     Float_t cherenkovLoss=0;
-    //gAlice->KeepTrack(gAlice->CurrentTrack());
+    //gAlice->KeepTrack(gAlice->GetCurrentTrackNumber());
     
     gMC->TrackPosition(position);
     pos[0]=position(0);
@@ -830,9 +830,9 @@ void AliRICHv3::StepManager()
     ckovData[2] = pos[1];                 // Y-position for hit
     ckovData[3] = pos[2];                 // Z-position for hit
     ckovData[6] = 0;                      // dummy track length
-    //ckovData[11] = gAlice->CurrentTrack();
+    //ckovData[11] = gAlice->GetCurrentTrackNumber();
     
-    //printf("\n+++++++++++\nTrack: %d\n++++++++++++\n",gAlice->CurrentTrack());
+    //printf("\n+++++++++++\nTrack: %d\n++++++++++++\n",gAlice->GetCurrentTrackNumber());
 
     //AliRICH *RICH = (AliRICH *) gAlice->GetDetector("RICH"); 
     
@@ -858,7 +858,7 @@ void AliRICHv3::StepManager()
                      //printf("Second Mother:%d\n",current->GetSecondMother());
                      
                      ckovData[10] = mother;
-                     ckovData[11] = gAlice->CurrentTrack();
+                     ckovData[11] = gAlice->GetCurrentTrackNumber();
                      ckovData[12] = 1;             //Media where photon was produced 1->Freon, 2->Quarz
                      //printf("Produced in FREO\n");
                      fCkovNumber++;
@@ -902,7 +902,7 @@ void AliRICHv3::StepManager()
                        if (ranf[0] > t) {
                          gMC->StopTrack();
                          ckovData[13] = 5;
-                         AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                         AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                          //printf("Added One (1)!\n");
                          //printf("Lost one in grid\n");
                        }
@@ -932,7 +932,7 @@ void AliRICHv3::StepManager()
                            if (ranf[0] < t) {
                              gMC->StopTrack();
                              ckovData[13] = 6;
-                             AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                             AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                                
                              //printf("Added One (2)!\n");
                              //printf("Lost by Fresnel\n");
@@ -956,7 +956,7 @@ void AliRICHv3::StepManager()
                      if (gMC->CurrentVolID(copy) == gMC->VolId("QUAR")) 
                        ckovData[13]=2;
                      //gMC->StopTrack();
-                     //AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                     //AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                    } //reflection question
                     
                    //        Absorption loss 
@@ -980,7 +980,7 @@ void AliRICHv3::StepManager()
                        ckovData[13]=16;
                      }
                      gMC->StopTrack();
-                     AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                     AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                      //printf("Added One (3)!\n");
                      //printf("Added cerenkov %d\n",fCkovNumber);
                    } //absorption question 
@@ -990,7 +990,7 @@ void AliRICHv3::StepManager()
                    else if (procs[i] == kPStop) {                 //is it below energy treshold?
                      ckovData[13]=21;
                      gMC->StopTrack();
-                     AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                     AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                      //printf("Added One (4)!\n");
                    }   // energy treshold question         
                  }  //number of mechanisms cycle
@@ -1120,8 +1120,8 @@ void AliRICHv3::StepManager()
                      }
                    //if (sector != -1)
                    //{
-                   AddHit(gAlice->CurrentTrack(),vol,ckovData);
-                   AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                   AddHit(gAlice->GetCurrentTrackNumber(),vol,ckovData);
+                   AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                    //printf("Added One (5)!\n");
                    //}
                }
@@ -1269,7 +1269,7 @@ void AliRICHv3::StepManager()
                }
                
                //if(sector !=-1)
-               new(lhits[fNhits++]) AliRICHHit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+               new(lhits[fNhits++]) AliRICHHit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
                eloss = 0; 
                //
                // Check additional signal generation conditions 
index 8c59fd9..adcf5c3 100755 (executable)
@@ -612,7 +612,7 @@ void AliSTARTv1::StepManager()
       Float_t de=gMC->Edep(); 
       edep=edep+de;
       hits[3]=edep*1e3;
-      new(lhits[fNhits++]) AliSTARThit(fIshunt,gAlice->CurrentTrack(),vol,hits);      
+      new(lhits[fNhits++]) AliSTARThit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);      
     }
   }
 //---------------------------------------------------------------------
index 3f17c68..e4c25eb 100644 (file)
@@ -372,7 +372,7 @@ void AliSTARTv2::StepManager()
           hitPhoton[4] = 1e9 * gMC->TrackTime();
           hitPhoton[5] = 1e9 * gMC->Etot();
           
-          AddHitPhoton (gAlice->CurrentTrack(), vol, hitPhoton);
+          AddHitPhoton (gAlice->GetCurrentTrackNumber(), vol, hitPhoton);
        }
        gMC->StopTrack();
      }
@@ -436,7 +436,7 @@ void AliSTARTv2::StepManager()
       //        printf(" HITS on START Exit %f\n",hits[i]); } 
       //for (i=0; i<=1; i++) { printf("START vol %d\n",vol[i]);}
      
-      new(lhits[fNhits++]) AliSTARThit(fIshunt,gAlice->CurrentTrack(),vol,hits);      
+      new(lhits[fNhits++]) AliSTARThit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);      
     }
   }
 
index 428ca19..9098436 100644 (file)
@@ -383,7 +383,7 @@ void AliGenerator::VertexInternal()
 }
 
 //_______________________________________________________________________
-void  AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg,
+void  AliGenerator::PushTrack(Int_t done, Int_t parent, Int_t pdg,
                                Float_t *pmom, Float_t *vpos, Float_t *polar,
                                Float_t tof, TMCProcess mech, Int_t &ntr,
                                Float_t weight, Int_t is)
@@ -393,15 +393,15 @@ void  AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg,
   //
 
   if (fStack)
-    fStack->SetTrack(done, parent, pdg, pmom, vpos, polar, tof,
+    fStack->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
                      mech, ntr, weight, is);
   else 
-    gAlice->SetTrack(done, parent, pdg, pmom, vpos, polar, tof,
+    gAlice->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
                      mech, ntr, weight, is);
 }
 
 //_______________________________________________________________________
-void  AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg,
+void  AliGenerator::PushTrack(Int_t done, Int_t parent, Int_t pdg,
                       Double_t px, Double_t py, Double_t pz, Double_t e,
                       Double_t vx, Double_t vy, Double_t vz, Double_t tof,
                       Double_t polx, Double_t poly, Double_t polz,
@@ -412,10 +412,10 @@ void  AliGenerator::SetTrack(Int_t done, Int_t parent, Int_t pdg,
   //
   
   if (fStack)
-     fStack->SetTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
+     fStack->PushTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
                       polx, poly, polz, mech, ntr, weight, is);
   else 
-     gAlice->SetTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
+     gAlice->PushTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
                         polx, poly, polz, mech, ntr, weight, is);
 }
 
index 1dc7a72..97d3dd5 100644 (file)
@@ -86,11 +86,11 @@ class AliGenerator : public TNamed, public AliRndm
     virtual AliCollisionGeometry* CollisionGeometry() {return fCollisionGeometry;}
     virtual void SetCollisionGeometry(AliCollisionGeometry* geom) {fCollisionGeometry = geom;}
  protected:
-    virtual  void  SetTrack(Int_t done, Int_t parent, Int_t pdg,
+    virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg,
                                Float_t *pmom, Float_t *vpos, Float_t *polar,
                                Float_t tof, TMCProcess mech, Int_t &ntr,
                                Float_t weight = 1, Int_t is = 0);
-    virtual  void  SetTrack(Int_t done, Int_t parent, Int_t pdg,
+    virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg,
                       Double_t px, Double_t py, Double_t pz, Double_t e,
                       Double_t vx, Double_t vy, Double_t vz, Double_t tof,
                       Double_t polx, Double_t poly, Double_t polz,
index 26e2ac1..4e84871 100644 (file)
@@ -220,7 +220,7 @@ void AliLego::BeginEvent()
     fStepsForward    = 0;
     fStepsBackward   = 0;                
     fErrorCondition  = 0;
-    if (gAlice->CurrentTrack() == 0) fStepBack = 0;
+    if (gAlice->GetCurrentTrackNumber() == 0) fStepBack = 0;
   }
 }
 
@@ -349,7 +349,7 @@ void AliLego::StepManager()
           orig[1] =  vect[1];     
           orig[2] =  vect[2];
           
-          gAlice->SetTrack(1, gAlice->CurrentTrack(), 
+          gAlice->PushTrack(1, gAlice->GetCurrentTrackNumber(), 
                            0, pmom, orig, polar, 0., kPNoProcess, ntr);
         } // debug
         
index e8f3fbe..9bb7a81 100644 (file)
@@ -125,7 +125,7 @@ void AliLegoGenerator::Generate()
    
    Float_t polar[3]={0.,0.,0.};
    Int_t ntr;
-   gAlice->SetTrack(1, -1, kMpart, pmom, orig, polar, 0, kPPrimary, ntr);
+   gAlice->PushTrack(1, -1, kMpart, pmom, orig, polar, 0, kPPrimary, ntr);
    
 }
 
index 680c8a1..4dc1489 100644 (file)
@@ -81,6 +81,6 @@ void AliLegoGeneratorEta::Generate()
    
    Float_t polar[3]={0.,0.,0.};
    Int_t ntr;
-   gAlice->SetTrack(1, -1, kMpart, pmom, orig, polar, 0, kPPrimary, ntr);
+   gAlice->PushTrack(1, -1, kMpart, pmom, orig, polar, 0, kPPrimary, ntr);
    
 }
index 2c2089e..3c4be20 100644 (file)
@@ -78,6 +78,6 @@ void AliLegoGeneratorPhiZ::Generate()
    
    Float_t polar[3]={0.,0.,0.};
    Int_t ntr;
-   gAlice->SetTrack(1, -1, kMpart, pmom, orig, polar, 0, kPPrimary, ntr);
+   gAlice->PushTrack(1, -1, kMpart, pmom, orig, polar, 0, kPPrimary, ntr);
    
 }
index 1ad9748..80da302 100644 (file)
@@ -128,7 +128,7 @@ void AliLegoGeneratorXYZ::Generate()
    
    Float_t polar[3]={0.,0.,0.};
    Int_t ntr;
-   gAlice->SetTrack(1, -1, kMpart, pmom, orig, polar, 0, kPPrimary, ntr);
+   gAlice->PushTrack(1, -1, kMpart, pmom, orig, polar, 0, kPPrimary, ntr);
    
 }
 
index 2f4444d..e543370 100644 (file)
@@ -1345,18 +1345,18 @@ void AliRun::SetCurrentTrack(Int_t track)
 }
  
 //_______________________________________________________________________
-void AliRun::SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom,
+void AliRun::PushTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom,
                       Float_t *vpos, Float_t *polar, Float_t tof,
                       TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is)
 { 
 // Delegate to stack
 //
-    fRunLoader->Stack()->SetTrack(done, parent, pdg, pmom, vpos, polar, tof,
+    fRunLoader->Stack()->PushTrack(done, parent, pdg, pmom, vpos, polar, tof,
                     mech, ntr, weight, is);
 }
 
 //_______________________________________________________________________
-void AliRun::SetTrack(Int_t done, Int_t parent, Int_t pdg,
+void AliRun::PushTrack(Int_t done, Int_t parent, Int_t pdg,
                      Double_t px, Double_t py, Double_t pz, Double_t e,
                      Double_t vx, Double_t vy, Double_t vz, Double_t tof,
                      Double_t polx, Double_t poly, Double_t polz,
@@ -1364,7 +1364,7 @@ void AliRun::SetTrack(Int_t done, Int_t parent, Int_t pdg,
 { 
   // Delegate to stack
   //
-  fRunLoader->Stack()->SetTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
+  fRunLoader->Stack()->PushTrack(done, parent, pdg, px, py, pz, e, vx, vy, vz, tof,
                                 polx, poly, polz, mech, ntr, weight, is);
 }
 
@@ -1643,11 +1643,11 @@ void AliRun::Streamer(TBuffer &R__b)
 
 
 //_______________________________________________________________________
-Int_t AliRun::CurrentTrack() const {
+Int_t AliRun::GetCurrentTrackNumber() const {
   //
   // Returns current track
   //
-  return fRunLoader->Stack()->CurrentTrack();
+  return fRunLoader->Stack()->GetCurrentTrackNumber();
 }
 
 //_______________________________________________________________________
index 21e1c09..0c21bdf 100644 (file)
@@ -61,7 +61,7 @@ public:
    virtual  void  CleanDetectors();
    TObjArray     *Detectors() const {return fModules;}
    TObjArray     *Modules() const {return fModules;}
-   Int_t          CurrentTrack() const;
+   Int_t          GetCurrentTrackNumber() const;
    AliDisplay    *Display() const { return fDisplay;}
    virtual  Int_t DistancetoPrimitive(Int_t px, Int_t py) const;
    virtual  void  DumpPart (Int_t i) const;
@@ -126,11 +126,11 @@ public:
    virtual  void  SetDisplay(AliDisplay *display) {fDisplay = display;}
    virtual  void  SetField(Int_t type=2, Int_t version=1, Float_t scale=1, Float_t maxField=10, char*filename="$(ALICE_ROOT)/data/field01.dat");
    virtual  void  SetField(AliMagF* magField);
-   virtual  void  SetTrack(Int_t done, Int_t parent, Int_t pdg, 
+   virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg, 
                           Float_t *pmom, Float_t *vpos, Float_t *polar, 
                           Float_t tof, TMCProcess mech, Int_t &ntr,
                           Float_t weight = 1, Int_t is = 0);
-   virtual  void  SetTrack(Int_t done, Int_t parent, Int_t pdg,
+   virtual  void  PushTrack(Int_t done, Int_t parent, Int_t pdg,
                           Double_t px, Double_t py, Double_t pz, Double_t e,
                           Double_t vx, Double_t vy, Double_t vz, Double_t tof,
                           Double_t polx, Double_t poly, Double_t polz,
index 44eee06..3f9e663 100644 (file)
@@ -124,7 +124,7 @@ AliStack::~AliStack()
 //
 
 //_____________________________________________________________________________
-void AliStack::SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom,
+void AliStack::PushTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom,
                         Float_t *vpos, Float_t *polar, Float_t tof,
                         TMCProcess mech, Int_t &ntr, Float_t weight, Int_t is)
 { 
@@ -162,17 +162,17 @@ void AliStack::SetTrack(Int_t done, Int_t parent, Int_t pdg, Float_t *pmom,
 //        mass,e,fNtrack,pdg,parent,done,vpos[0],vpos[1],vpos[2],pmom[0],pmom[1],pmom[2],kS);
   
 
-       SetTrack(done, parent, pdg, pmom[0], pmom[1], pmom[2], e,
+       PushTrack(done, parent, pdg, pmom[0], pmom[1], pmom[2], e,
                 vpos[0], vpos[1], vpos[2], tof, polar[0], polar[1], polar[2],
                 mech, ntr, weight, is);
     } else {
-       Warning("SetTrack", "Particle type %d not defined in PDG Database !\n", pdg);
-       Warning("SetTrack", "Particle skipped !\n");
+       Warning("PushTrack", "Particle type %d not defined in PDG Database !\n", pdg);
+       Warning("PushTrack", "Particle skipped !\n");
     }
 }
 
 //_____________________________________________________________________________
-void AliStack::SetTrack(Int_t done, Int_t parent, Int_t pdg,
+void AliStack::PushTrack(Int_t done, Int_t parent, Int_t pdg,
                      Double_t px, Double_t py, Double_t pz, Double_t e,
                      Double_t vx, Double_t vy, Double_t vz, Double_t tof,
                      Double_t polx, Double_t poly, Double_t polz,
@@ -227,7 +227,7 @@ void AliStack::SetTrack(Int_t done, Int_t parent, Int_t pdg,
       if(particle->GetFirstDaughter()<0) particle->SetFirstDaughter(fNtrack);
     }
     else {
-      printf("Error in AliStack::SetTrack: Parent %d does not exist\n",parent);
+      printf("Error in AliStack::PushTrack: Parent %d does not exist\n",parent);
     }
   } 
   else { 
@@ -243,7 +243,7 @@ void AliStack::SetTrack(Int_t done, Int_t parent, Int_t pdg,
 }
 
 //_____________________________________________________________________________
-TParticle*  AliStack::GetNextTrack(Int_t& itrack)
+TParticle*  AliStack::PopNextTrack(Int_t& itrack)
 {
   //
   // Returns next track from stack of particles
@@ -264,7 +264,7 @@ TParticle*  AliStack::GetNextTrack(Int_t& itrack)
 }
 
 //_____________________________________________________________________________
-TParticle*  AliStack::GetPrimaryForTracking(Int_t i)
+TParticle*  AliStack::PopPrimaryForTracking(Int_t i)
 {
   //
   // Returns i-th primary particle if it is flagged to be tracked,
@@ -620,7 +620,7 @@ Int_t AliStack::TreeKEntry(Int_t id) const
 }
 
 //_____________________________________________________________________________
-Int_t AliStack::CurrentTrackParent() const
+Int_t AliStack::GetCurrentParentTrackNumber() const
 {
   //
   // Return number of the parent of the current track
@@ -631,7 +631,7 @@ Int_t AliStack::CurrentTrackParent() const
   if (current) 
     return current->GetFirstMother();
   else {
-    Warning("CurrentTrackParent", "Current track not found in the stack");
+    Warning("GetCurrentParentTrackNumber", "Current track not found in the stack");
     return -1;
   }  
 }
index 729ff17..7c41a52 100644 (file)
@@ -31,21 +31,21 @@ class AliStack : public TVirtualMCStack
 
     // methods
 
-    virtual void  SetTrack(Int_t done, Int_t parent, Int_t pdg, 
+    virtual void  PushTrack(Int_t done, Int_t parent, Int_t pdg, 
                            Float_t *pmom, Float_t *vpos, Float_t *polar, 
                            Float_t tof, TMCProcess mech, Int_t &ntr,
                            Float_t weight, Int_t is);
 
-    virtual void  SetTrack(Int_t done, Int_t parent, Int_t pdg,
+    virtual void  PushTrack(Int_t done, Int_t parent, Int_t pdg,
                            Double_t px, Double_t py, Double_t pz, Double_t e,
                            Double_t vx, Double_t vy, Double_t vz, Double_t tof,
                            Double_t polx, Double_t poly, Double_t polz,
                            TMCProcess mech, Int_t &ntr, Double_t weight,
                            Int_t is);
 
-    virtual TParticle* GetNextTrack(Int_t& track);
-    virtual TParticle* GetCurrentTrack() {return fCurrentTrack;}
-    virtual TParticle* GetPrimaryForTracking(Int_t i);    
+    virtual TParticle* PopNextTrack(Int_t& track);
+    virtual TParticle* GetCurrentTrack() const {return fCurrentTrack;}
+    virtual TParticle* PopPrimaryForTracking(Int_t i);    
 
     void  ConnectTree();
     void  BeginEvent();
@@ -67,8 +67,8 @@ class AliStack : public TVirtualMCStack
     // get methods
     virtual Int_t GetNtrack() const;
     Int_t       GetNprimary() const;
-    virtual Int_t CurrentTrack() const;
-    virtual Int_t CurrentTrackParent() const;
+    virtual Int_t GetCurrentTrackNumber() const;
+    virtual Int_t GetCurrentParentTrackNumber() const;
     TObjArray*  Particles() const;
     TParticle*  Particle(Int_t id);
     Int_t       GetPrimary(Int_t id);
@@ -119,7 +119,7 @@ inline Int_t AliStack::GetNtrack() const
 inline Int_t AliStack::GetNprimary() const
 { return fNprimary; }
 
-inline Int_t AliStack::CurrentTrack() const 
+inline Int_t AliStack::GetCurrentTrackNumber() const 
 { return fCurrent; }
 
 inline TObjArray* AliStack::Particles() const
index 7aab0d8..f7549aa 100644 (file)
@@ -1048,7 +1048,7 @@ void AliFRAMEv2::StepManager()
   //
   // Add the reference track
   //
-  AddTrackReference(gAlice->CurrentTrack());
+  AddTrackReference(gAlice->GetCurrentTrackNumber());
 }
 
   
index 71984fe..d20bfcf 100644 (file)
@@ -316,7 +316,7 @@ void AliGenDPMjet::Generate()
                 kf==5301 || kf==5303 || kf==5401 || kf==5403 || kf==5503) 
                 tFlag=kFALSE;
 */           
-             SetTrack(tFlag,imo,kf,p,origin,polar,tof,kPNoProcess,nt, 1., ks);
+             PushTrack(tFlag,imo,kf,p,origin,polar,tof,kPNoProcess,nt, 1., ks);
              KeepTrack(nt);
              newPos[i] = nt;
          } // if selected
index 1211af2..f6e54c0 100644 (file)
@@ -170,7 +170,7 @@ void AliGenEpEmv1::Generate()
   id =  11;
   if (fDebug == 2)
     printf("id=%+3d, p = (%+11.4e,%+11.4e,%+11.4e) GeV\n",id,p[0],p[1],p[2]);
-  SetTrack(fTrackIt,-1, id,p,origin,polar,0,kPPrimary,nt,weight);
+  PushTrack(fTrackIt,-1, id,p,origin,polar,0,kPPrimary,nt,weight);
 
   // Produce positron
   mt = TMath::Sqrt(ptPositron*ptPositron + fMass*fMass);
@@ -180,7 +180,7 @@ void AliGenEpEmv1::Generate()
   id = -11;
   if (fDebug == 2)
     printf("id=%+3d, p = (%+11.4e,%+11.4e,%+11.4e) GeV\n",id,p[0],p[1],p[2]);
-  SetTrack(fTrackIt,-1, id,p,origin,polar,0,kPPrimary,nt,weight);
+  PushTrack(fTrackIt,-1, id,p,origin,polar,0,kPPrimary,nt,weight);
   
   fEvent++;
   if (fEvent%1000 == 0) {
index 86c9d26..914e2c8 100644 (file)
@@ -106,7 +106,7 @@ void stupre()
        if (EVTFLG.lpairp == 1) mech = kPPair;
        else if (EVTFLG.lphoel == 1) mech = kPPhotoelectric;
        else mech = kPAnnihilation;
-        cppstack->SetTrack(done, parent, pdg,
+        cppstack->PushTrack(done, parent, pdg,
                           px, py, pz, e, vx, vy, vz, tof,
                           polx, poly, polz, mech, ntr, weight, is);
        cout << endl << " !!! stupre (PAIR, ..) : ntr=" << ntr << "pdg " << pdg << " parent=" << parent << endl;
@@ -119,7 +119,7 @@ void stupre()
 
        if (EMFSTK.ichemf[kp] != 0) {
            mech = kPCompton;
-           cppstack->SetTrack(done, parent, pdg,
+           cppstack->PushTrack(done, parent, pdg,
                               px, py, pz, e, vx, vy, vz, tof,
                               polx, poly, polz, mech, ntr, weight, is);
            cout << endl << " !!! stupre (COMPTON) : ntr=" << ntr << "pdg " << pdg << " parent=" << parent << endl;
@@ -131,7 +131,7 @@ void stupre()
     else if ((EVTFLG.lbrmsp == 1)) {
        if (EMFSTK.ichemf[kp] == 0) {
            mech = kPBrem;
-           cppstack->SetTrack(done, parent, pdg,
+           cppstack->PushTrack(done, parent, pdg,
                               px, py, pz, e, vx, vy, vz, tof,
                               polx, poly, polz, mech, ntr, weight, is);
            cout << endl << " !!! stupre (BREMS) : ntr=" << ntr << "pdg " << pdg << " parent=" << parent << endl;
@@ -144,7 +144,7 @@ void stupre()
        if (lbhabh == 1) {
            if (EMFSTK.ichemf[kp] == -1) {
                mech = kPDeltaRay;
-               cppstack->SetTrack(done, parent, pdg,
+               cppstack->PushTrack(done, parent, pdg,
                                   px, py, pz, e, vx, vy, vz, tof,
                                   polx, poly, polz, mech, ntr, weight, is);
                EMFSTK.iespak[kp][mkbmx2-1] = ntr;
@@ -156,7 +156,7 @@ void stupre()
 //*            lower energy, which has been put higher in the stack
        else if (kp == EMFSTK.npemf-1) {
            mech = kPDeltaRay;
-           cppstack->SetTrack(done, parent, pdg,
+           cppstack->PushTrack(done, parent, pdg,
                               px, py, pz, e, vx, vy, vz, tof,
                               polx, poly, polz, mech, ntr, weight, is);
            cout << endl << " !!! stupre (Moller) : ntr=" << ntr << "pdg " << pdg << " parent=" << parent << endl;
index 48898f2..dc5b6ef 100644 (file)
@@ -65,7 +65,7 @@ void stuprf(Int_t& ij, Int_t& mreg,
 // was numsec -1
 // clarify with Alberto
   if (numsec > npprmr) {
-// Now call the SetTrack(...)
+// Now call the PushTrack(...)
     Int_t done = 1;
 
     Int_t parent =  TRACKR.ispusr[mkbmx2-1];
@@ -111,7 +111,7 @@ void stuprf(Int_t& ij, Int_t& mreg,
     Int_t ntr;  
     // 
     // Save particle in VMC stack
-    cppstack->SetTrack(done, parent, pdg,
+    cppstack->PushTrack(done, parent, pdg,
                       px, py, pz, e,
                       vx, vy, vz, tof,
                       polx, poly, polz,
index 3ace77f..ddf1f6a 100644 (file)
@@ -202,7 +202,7 @@ void AliGenHerwig::Generate()
                Float_t tof = kconv*iparticle->T();
                Int_t   iparent = (imo > -1) ? newPos[imo] : -1;
                Int_t   trackIt = (ks == 1) && fTrackIt;
-               gAlice->SetTrack(trackIt, iparent, kf,
+               gAlice->PushTrack(trackIt, iparent, kf,
                                 p[0], p[1], p[2], p[3],
                                 origin[0], origin[1], origin[2], 
                                 tof,
index 2c7fe79..5c25022 100644 (file)
@@ -315,7 +315,7 @@ void AliGenHijing::Generate()
                  imo = (mother->GetPdgCode() != 92) ? imo = newPos[imo] : -1;
              } // if has mother   
              Bool_t tFlag = (fTrackIt && !hasDaughter);
-             SetTrack(tFlag,imo,kf,p,origin,polar,
+             PushTrack(tFlag,imo,kf,p,origin,polar,
                       tof,kPNoProcess,nt, 1., ks);
              KeepTrack(nt);
              newPos[i] = nt;
index cf3a305..b973e61 100644 (file)
@@ -160,7 +160,7 @@ void AliGenMevSim::Generate()
     p[1] = particle->Py();
     p[2] = particle->Pz();
     
-    SetTrack(fTrackIt, parent, pdg, p, orgin, polar, time, kPPrimary, id);
+    PushTrack(fTrackIt, parent, pdg, p, orgin, polar, time, kPPrimary, id);
 
   }  
  
index ae5583e..616975d 100644 (file)
@@ -1029,7 +1029,7 @@ void AliTOFv0::StepManager()
     vol[3]= padx;
     vol[4]= padz;
 
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
   }
 }
 
index 638a1b9..f6b3f0d 100644 (file)
@@ -1119,7 +1119,7 @@ void AliTOFv1::StepManager()
     vol[3]= padx;
     vol[4]= padz;
     
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
   }
 }
 
index 7689cc5..8840563 100644 (file)
@@ -1135,6 +1135,6 @@ void AliTOFv2::StepManager()
     vol[3]= padx;
     vol[4]= padz;
     
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
   }
 }
index 24d7a0a..47c9c0c 100644 (file)
@@ -1157,6 +1157,6 @@ void AliTOFv2FHoles::StepManager()
     vol[3]= padx;
     vol[4]= padz;
     
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
   }
 }
index 71b5b6f..a16ab9e 100644 (file)
@@ -1120,6 +1120,6 @@ void AliTOFv3::StepManager()
     vol[3]= padx;
     vol[4]= padz;
     
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
   }
 }
index c781051..a5aeb10 100644 (file)
@@ -1119,6 +1119,6 @@ void AliTOFv4::StepManager()
     vol[3]= padx;
     vol[4]= padz;
     
-    AddHit(gAlice->CurrentTrack(),vol, hits);
+    AddHit(gAlice->GetCurrentTrackNumber(),vol, hits);
   }
 }
index 598514b..d7f1e79 100644 (file)
@@ -1115,6 +1115,6 @@ void AliTOFv4T0::StepManager()
     vol[3]= padx;
     vol[4]= padz;
     
-    AddT0Hit(gAlice->CurrentTrack(),vol, hits);
+    AddT0Hit(gAlice->GetCurrentTrackNumber(),vol, hits);
   }
 }
index 6cf6cf3..538402f 100644 (file)
@@ -1766,27 +1766,27 @@ void AliTPCv1::StepManager()
         hits[1]=p[1];
         hits[2]=p[2];
         hits[3]=0.; // this hit has no energy loss
-       // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+       // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 
-        AddHit(gAlice->CurrentTrack(), vol,hits); // M.I. 
+        AddHit(gAlice->GetCurrentTrackNumber(), vol,hits); // M.I. 
 
         gMC->TrackPosition(p);
         hits[0]=p[0];
         hits[1]=p[1];
         hits[2]=p[2];
         hits[3]=0.; // this hit has no energy loss
-        // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+        // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 
-       AddHit(gAlice->CurrentTrack(), vol,hits); // M.I. 
+       AddHit(gAlice->GetCurrentTrackNumber(), vol,hits); // M.I. 
 
       } 
 
       gMC->TrackPosition(p);
       for(i=0;i<3;++i) hits[i]=p[i];
       hits[3]=1; //I'd like to have something positive here (I.Belikov)
-      // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+      // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 
-      AddHit(gAlice->CurrentTrack(), vol,hits); // M.I. 
+      AddHit(gAlice->GetCurrentTrackNumber(), vol,hits); // M.I. 
 
     }
 
index dfe6fef..432b38a 100644 (file)
@@ -1858,7 +1858,7 @@ void AliTPCv2::StepManager()
   if ( (gMC->IsTrackEntering() || gMC->IsTrackExiting()) &&
        ((id == fIdLSec) || (id == fIdUSec)) ) {
 
-    AddTrackReference(gAlice->CurrentTrack());
+    AddTrackReference(gAlice->GetCurrentTrackNumber());
   }
 
   if(id == fIdLSec){
@@ -1902,9 +1902,9 @@ void AliTPCv2::StepManager()
       hits[1]=p[1];
       hits[2]=p[2];
       hits[3]=0.; // this hit has no energy loss
-      // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+      // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 
-      AddHit(gAlice->CurrentTrack(), vol,hits);  //MI change
+      AddHit(gAlice->GetCurrentTrackNumber(), vol,hits);  //MI change
 
     }
 
@@ -1913,9 +1913,9 @@ void AliTPCv2::StepManager()
      hits[1]=p[1];
      hits[2]=p[2];
      hits[3]=0.; // this hit has no energy loss
-     // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+     // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
 
-     AddHit(gAlice->CurrentTrack(), vol,hits);  //MI change    
+     AddHit(gAlice->GetCurrentTrackNumber(), vol,hits);  //MI change    
 
   }
   else return;
@@ -1937,14 +1937,14 @@ void AliTPCv2::StepManager()
     
     // Add this hit
     
-    // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+    // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
     if (fHitType&&2){
       gMC->TrackMomentum(p);
       Float_t momentum = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
       Float_t precision =   (momentum>0.1) ? 0.002 :0.01;
       fTrackHits->SetHitPrecision(precision);
     }
-    AddHit(gAlice->CurrentTrack(), vol,hits);  //MI change 
+    AddHit(gAlice->GetCurrentTrackNumber(), vol,hits);  //MI change 
     
   } 
   
index 5ca11ce..84fe72b 100644 (file)
@@ -1680,7 +1680,7 @@ void AliTPCv3::StepManager()
     
     // Add this hit
    
-    AddHit(gAlice->CurrentTrack(), vol,hits);  //MI change
+    AddHit(gAlice->GetCurrentTrackNumber(), vol,hits);  //MI change
     
   } 
   
index a14a103..e3bb1e3 100644 (file)
@@ -175,7 +175,7 @@ void AliGenTPHIC::Generate()
     tof     = kconv*iparticle->T();
     if (ks == 1) trackIt = 1;
     else         trackIt = 0;
-    SetTrack(fTrackIt*trackIt,iparent,kf,p,origin,polar,tof,kPPrimary,nt,weight,ks);
+    PushTrack(fTrackIt*trackIt,iparent,kf,p,origin,polar,tof,kPPrimary,nt,weight,ks);
     KeepTrack(nt); 
 
     if (fDebug == 2)
index bd940fa..e0681ae 100644 (file)
@@ -116,7 +116,7 @@ void AliTRDsimpleGen::NewParticle(Int_t ievent)
     Float_t vtx[3] = { 0.0 };
     Float_t pol[3] = { 0.0 };
     Int_t   ntr    = 0;
-    gAlice->SetTrack(0,-1,fPdg,mom,vtx,pol,0.0,kPPrimary,ntr);
+    gAlice->PushTrack(0,-1,fPdg,mom,vtx,pol,0.0,kPPrimary,ntr);
 
   }
 
index 8ec90ad..11854d6 100644 (file)
@@ -65,7 +65,7 @@ AliTRDsimpleMC::AliTRDsimpleMC()
 
 //_____________________________________________________________________________
 AliTRDsimpleMC::AliTRDsimpleMC(const char *name, const char *title)
-               :TVirtualMC(name,title)
+               :TVirtualMC(name,title,kFALSE)
 {                       
   //
   // AliTRDsimpleMC default constructor
index a0e84f0..1ec364a 100644 (file)
@@ -176,7 +176,7 @@ void AliTRDv0::StepManager()
       pla = ((Int_t) idChamber % kNplan);
       det = fGeometry->GetDetector(pla,cha,sec);
 
-      AddHit(gAlice->CurrentTrack(),det,hits,0,kTRUE);       
+      AddHit(gAlice->GetCurrentTrackNumber(),det,hits,0,kTRUE);       
 
     }
 
index 2207e0b..46b7246 100644 (file)
@@ -264,7 +264,7 @@ void AliTRDv1::CreateTRhit(Int_t det)
 
       // Add the hit to the array. TR photon hits are marked 
       // by negative charge
-      AddHit(gAlice->CurrentTrack(),det,posHit,-q,kTRUE); 
+      AddHit(gAlice->GetCurrentTrackNumber(),det,posHit,-q,kTRUE); 
 
     }
 
@@ -553,7 +553,7 @@ void AliTRDv1::StepManager()
          // momentum components of the particle
           if (gMC->IsTrackEntering() || gMC->IsTrackExiting()) {
             gMC->TrackMomentum(mom);
-            AddTrackReference(gAlice->CurrentTrack());
+            AddTrackReference(gAlice->GetCurrentTrackNumber());
           }
 
           // Create the hits from TR photons
@@ -570,10 +570,10 @@ void AliTRDv1::StepManager()
 
        // Create a new dEdx hit
         if (drRegion) {
-          AddHit(gAlice->CurrentTrack(),det,hits,qTot,kTRUE);       
+          AddHit(gAlice->GetCurrentTrackNumber(),det,hits,qTot,kTRUE);       
        }
         else {
-          AddHit(gAlice->CurrentTrack(),det,hits,qTot,kFALSE);      
+          AddHit(gAlice->GetCurrentTrackNumber(),det,hits,qTot,kFALSE);      
        }
 
         // Calculate the maximum step size for the next tracking step
index dab8db3..f1c447c 100755 (executable)
@@ -1493,7 +1493,7 @@ void AliVZEROv0::StepManager()
         hits[13] = mom[2];
         
 
-         AddHit(gAlice->CurrentTrack(), vol, hits);
+         AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         
         }
      
index b34e634..258bdee 100755 (executable)
@@ -1052,7 +1052,7 @@ void AliVZEROv2::StepManager()
            hits[12] = mom[1];
            hits[13] = mom[2];
            
-           TParticle *par = gAlice->Particle(gAlice->CurrentTrack());
+           TParticle *par = gAlice->Particle(gAlice->GetCurrentTrackNumber());
             hits[14] = par->Vx();
             hits[15] = par->Vy();
             hits[16] = par->Vz();
@@ -1067,7 +1067,7 @@ void AliVZEROv2::StepManager()
         hits[17] =   eloss;
         hits[18] = tlength;
         
-         AddHit(gAlice->CurrentTrack(), vol, hits);
+         AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
                 
         tlength  = 0.0;
         eloss    = 0.0; 
index 73e10b0..1781060 100644 (file)
@@ -154,7 +154,7 @@ void AliGenZDC::Generate()
   }
       
   Float_t polar[3] = {0,0,0};
-  gAlice->SetTrack(fTrackIt,-1,fIpart,fPTrack,fOrigin.GetArray(),polar,0,
+  gAlice->PushTrack(fTrackIt,-1,fIpart,fPTrack,fOrigin.GetArray(),polar,0,
                   kPPrimary,nt);
   if(fDebugOpt == 1){
     printf("\n\n               Track momentum:\n");
index 3cf2721..bdc745f 100644 (file)
@@ -1253,7 +1253,7 @@ void AliZDCv1::StepManager()
 
 //       Int_t PcID = gMC->TrackPid();
 //       printf("Pc ID -> %d\n",PcID);
-       AddHit(gAlice->CurrentTrack(), vol, hits);
+       AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
        
        if(fNoShower==1){
 //       fpDetected += 1;
@@ -1273,13 +1273,13 @@ void AliZDCv1::StepManager()
           hits[9] = ekin;
           hits[7] = 0.;
           hits[8] = 0.;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
           }
         else{
           hits[9] = destep;
           hits[7] = 0.;
           hits[8] = 0.;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
           }
 //      printf(" Dep. E = %f \n",hits[9]);
       }
@@ -1359,13 +1359,13 @@ void AliZDCv1::StepManager()
           hits[7] = nphe;      //fLightPMQ
           hits[8] = 0;
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
         else{
           hits[7] = 0;
           hits[8] = nphe;      //fLightPMC
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
        } 
        else if((vol[0]==2)) {  // (2) ZP fibres
@@ -1378,13 +1378,13 @@ void AliZDCv1::StepManager()
           hits[7] = nphe;      //fLightPMQ
           hits[8] = 0;
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
         else{
           hits[7] = 0;
           hits[8] = nphe;      //fLightPMC
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
        } 
        else if((vol[0]==3)) {  // (3) ZEM fibres
@@ -1410,7 +1410,7 @@ void AliZDCv1::StepManager()
         hits[7] = 0;   
         hits[8] = nphe;        //fLightPMC
         hits[9] = 0;
-        AddHit(gAlice->CurrentTrack(), vol, hits);
+        AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
        }
      }
    }
index d449361..eb8eabd 100644 (file)
@@ -1308,7 +1308,7 @@ void AliZDCv2::StepManager()
 
 //       Int_t PcID = gMC->TrackPid();
 //       printf("Pc ID -> %d\n",PcID);
-       AddHit(gAlice->CurrentTrack(), vol, hits);
+       AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
        
        if(fNoShower==1){
          fpDetected += 1;
@@ -1328,13 +1328,13 @@ void AliZDCv2::StepManager()
           hits[9] = ekin;
           hits[7] = 0.;
           hits[8] = 0.;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
           }
         else{
           hits[9] = destep;
           hits[7] = 0.;
           hits[8] = 0.;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
           }
 //      printf(" Dep. E = %f \n",hits[9]);
       }
@@ -1416,13 +1416,13 @@ void AliZDCv2::StepManager()
           hits[7] = nphe;      //fLightPMQ
           hits[8] = 0;
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
         else{
           hits[7] = 0;
           hits[8] = nphe;      //fLightPMC
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
        } 
        else if((vol[0]==2)) {  // (2) ZP fibres
@@ -1435,13 +1435,13 @@ void AliZDCv2::StepManager()
           hits[7] = nphe;      //fLightPMQ
           hits[8] = 0;
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
         else{
           hits[7] = 0;
           hits[8] = nphe;      //fLightPMC
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
        } 
        else if((vol[0]==3)) {  // (3) ZEM fibres
@@ -1468,13 +1468,13 @@ void AliZDCv2::StepManager()
           hits[7] = 0;         
           hits[8] = nphe;      //fLightPMC (ZEM1)
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
         else{
           hits[7] = nphe;      //fLightPMQ (ZEM2)
           hits[8] = 0;         
           hits[9] = 0;
-          AddHit(gAlice->CurrentTrack(), vol, hits);
+          AddHit(gAlice->GetCurrentTrackNumber(), vol, hits);
         }
        }
      }