]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TGeant3/TGeant3.cxx
the MIXT geometry (IHEP+GPS2) has been introduced
[u/mrichter/AliRoot.git] / TGeant3 / TGeant3.cxx
index 4e5474dc8264b1cf416ada149302bbbde0729cb4..f0a4623040302894280808dbb8979ae0a6b1b549 100644 (file)
 
 /*
 $Log$
+Revision 1.39  2000/11/30 07:12:54  alibrary
+Introducing new Rndm and QA classes
+
+Revision 1.38  2000/10/30 15:19:06  morsch
+Xi(b) (pdg code 5232) added to Pdg data base.
+
+Revision 1.37  2000/10/02 21:28:16  fca
+Removal of useless dependecies via forward declarations
+
+Revision 1.36  2000/09/14 07:08:41  fca
+Introducing glvolu in the interface
+
+Revision 1.35  2000/09/12 14:27:10  morsch
+No instance of AliDecayer created to initialize fDecayer.
+
+Revision 1.34  2000/09/07 12:12:01  morsch
+Comment inside comment removed.
+
+Revision 1.33  2000/09/06 16:03:42  morsch
+Set ExternalDecayer, Decayer  and SetForceDecay methods added.
+Gspart calls for charmed and bottom hadrons added.
+Decay mode definitions for charmed and beauty hadrons have been taken out.
+They will be  handled by an external decayer.
+
+Revision 1.32  2000/08/24 16:28:53  hristov
+TGeant3::IsNewTrack corrected by F.Carminati
+
+Revision 1.31  2000/07/13 16:19:10  fca
+Mainly coding conventions + some small bug fixes
+
+Revision 1.30  2000/07/12 08:56:30  fca
+Coding convention correction and warning removal
+
+Revision 1.29  2000/07/11 18:24:59  fca
+Coding convention corrections + few minor bug fixes
+
+Revision 1.28  2000/06/29 10:51:55  morsch
+Add some charmed and bottom baryons to the particle list (TDatabasePDG). This
+is needed by Hijing. Should be part of a future review of TDatabasePDG.
+
+Revision 1.27  2000/06/21 17:40:15  fca
+Adding possibility to set ISTRA, PAI model
+
+Revision 1.26  2000/05/16 13:10:41  fca
+New method IsNewTrack and fix for a problem in Father-Daughter relations
+
 Revision 1.25  2000/04/07 11:12:35  fca
 G4 compatibility changes
 
@@ -74,7 +120,9 @@ Introduction of the Copyright and cvs Log
 #include "ctype.h" 
 #include <TDatabasePDG.h>
 #include "AliCallf77.h" 
+#include "AliDecayer.h" 
+#include "TLorentzVector.h"
+
 #ifndef WIN32 
 # define gzebra  gzebra_ 
 # define grfile  grfile_ 
@@ -116,7 +164,7 @@ Introduction of the Copyright and cvs Log
 # define gsxyz   gsxyz_ 
 # define gtrack  gtrack_ 
 # define gtreve  gtreve_ 
-# define gtreve_root  gtreve_root_ 
+# define gtreveroot  gtreveroot_ 
 # define grndm   grndm_ 
 # define grndmq  grndmq_ 
 # define gdtom   gdtom_ 
@@ -160,6 +208,7 @@ Introduction of the Copyright and cvs Log
 # define gfpara  gfpara_
 # define gckpar  gckpar_
 # define gckmat  gckmat_
+# define glvolu  glvolu_
 # define geditv  geditv_
 # define mzdrop  mzdrop_
 
@@ -213,7 +262,7 @@ Introduction of the Copyright and cvs Log
 # define gsxyz   GSXYZ 
 # define gtrack  GTRACK 
 # define gtreve  GTREVE 
-# define gtreve_root  GTREVE_ROOT
+# define gtreveroot  GTREVEROOT
 # define grndm   GRNDM
 # define grndmq  GRNDMQ
 # define gdtom   GDTOM 
@@ -258,6 +307,7 @@ Introduction of the Copyright and cvs Log
 # define gfpara  GFPARA
 # define gckpar  GCKPAR
 # define gckmat  GCKMAT
+# define glvolu  GLVOLU
 # define geditv  GEDITV
 # define mzdrop  MZDROP 
 
@@ -341,12 +391,14 @@ extern "C"
 
   void type_of_call gtreve(); 
 
-  void type_of_call gtreve_root(); 
+  void type_of_call gtreveroot(); 
 
-  void type_of_call grndm(Float_t *, const Int_t &); 
+  void type_of_call grndm(Float_t *r, const Int_t &n)
+  {gMC->Rndm(r,n);}
 
   void type_of_call grndmq(Int_t &, Int_t &, const Int_t &,
-                          DEFCHARD DEFCHARL); 
+                          DEFCHARD DEFCHARL)
+  {/*printf("Dummy grndmq called\n");*/}
 
   void type_of_call gdtom(Float_t *, Float_t *, Int_t &); 
 
@@ -440,6 +492,8 @@ extern "C"
 
   void type_of_call gckmat(Int_t&, DEFCHARD DEFCHARL);
 
+  void type_of_call glvolu(Int_t&, Int_t*, Int_t*, Int_t&);
+
   void type_of_call gprint(DEFCHARD,const int& DEFCHARL); 
 
   void type_of_call gdinit(); 
@@ -497,7 +551,7 @@ extern "C"
 //
 // Geant3 global pointer
 //
-static Int_t defSize = 600;
+static const Int_t kDefSize = 600;
 
 ClassImp(TGeant3) 
  
@@ -530,6 +584,7 @@ TGeant3::TGeant3(const char *title, Int_t nwgeant)
   //
   // Zero number of particles
   fNPDGCodes=0;
+  fDecayer=0;
 } 
 
 //____________________________________________________________________________ 
@@ -553,11 +608,11 @@ void TGeant3::DefaultRange()
   //
   // Set range of current drawing pad to 20x20 cm
   //
-  if (!higz) {
-    new THIGZ(defSize); 
+  if (!gHigz) {
+    new THIGZ(kDefSize); 
     gdinit();
   }
-  higz->Range(0,0,20,20);
+  gHigz->Range(0,0,20,20);
 }
 
 //____________________________________________________________________________ 
@@ -566,8 +621,8 @@ void TGeant3::InitHIGZ()
   //
   // Initialise HIGZ
   //
-  if (!higz) {
-    new THIGZ(defSize); 
+  if (!gHigz) {
+    new THIGZ(kDefSize); 
     gdinit();
   }
 }
@@ -598,6 +653,7 @@ void TGeant3::LoadAddress()
   gcomad(PASSCHARD("GCNUM"), (int*&) fGcnum   PASSCHARL("GCNUM"));
   gcomad(PASSCHARD("GCSETS"),(int*&) fGcsets  PASSCHARL("GCSETS"));
   gcomad(PASSCHARD("GCPHYS"),(int*&) fGcphys  PASSCHARL("GCPHYS"));
+  gcomad(PASSCHARD("GCPHLT"),(int*&) fGcphlt  PASSCHARL("GCPHLT"));
   gcomad(PASSCHARD("GCOPTI"),(int*&) fGcopti  PASSCHARL("GCOPTI"));
   gcomad(PASSCHARD("GCTLIT"),(int*&) fGctlit  PASSCHARL("GCTLIT"));
   gcomad(PASSCHARD("GCVDMA"),(int*&) fGcvdma  PASSCHARL("GCVDMA"));
@@ -743,7 +799,7 @@ Int_t TGeant3::IdFromPDG(Int_t pdg) const
 {
   //
   // Return Geant3 code from PDG and pseudo ENDF code
-
+  //
   for(Int_t i=0;i<fNPDGCodes;++i)
     if(pdg==fPDGCode[i]) return i;
   return -1;
@@ -752,6 +808,9 @@ Int_t TGeant3::IdFromPDG(Int_t pdg) const
 //_____________________________________________________________________________
 Int_t TGeant3::PDGFromId(Int_t id) const 
 {
+  //
+  // Return PDG code and pseudo ENDF code from Geant3 code
+  //
   if(id>0 && id<fNPDGCodes) return fPDGCode[id];
   else return -1;
 }
@@ -832,10 +891,10 @@ void TGeant3::DefineParticles()
   fPDGCode[fNPDGCodes++]=213;   // 42 = RHO+
 
   Gspart(43, "RHO -", 4, 0.768, -1., 4.353e-24);
-  fPDGCode[fNPDGCodes++]=-213;   // 40 = RHO-
+  fPDGCode[fNPDGCodes++]=-213;   // 43 = RHO-
 
   Gspart(44, "RHO 0", 3, 0.768, 0., 4.353e-24);
-  fPDGCode[fNPDGCodes++]=113;   // 37 = D0
+  fPDGCode[fNPDGCodes++]=113;   //  44 = RHO0
 
   //
   // Use ENDF-6 mapping for ions = 10000*z+10*a+iso
@@ -849,28 +908,312 @@ void TGeant3::DefineParticles()
 
   TDatabasePDG *pdgDB = TDatabasePDG::Instance();
 
-  const Double_t autogev=0.9314943228;
-  const Double_t hslash = 1.0545726663e-27;
-  const Double_t erggev = 1/1.6021773349e-3;
-  const Double_t hshgev = hslash*erggev;
-  const Double_t yearstosec = 3600*24*365.25;
+  const Double_t kAu2Gev=0.9314943228;
+  const Double_t khSlash = 1.0545726663e-27;
+  const Double_t kErg2Gev = 1/1.6021773349e-3;
+  const Double_t khShGev = khSlash*kErg2Gev;
+  const Double_t kYear2Sec = 3600*24*365.25;
+//
+// Bottom mesons
+// mass and life-time from PDG
+  pdgDB->AddParticle("B(s)*0","B(s)*0",
+                    5.4163, kTRUE, 0.047, +0.,"Meson",  533);
+
+  pdgDB->AddParticle("B(s)*0 bar","B(s)*0 bar",
+                    5.4163, kTRUE, 0.047, -0.,"Meson", -533);
+
+// Charmed baryons
+// 
+// value for mass used by Hijing
+  pdgDB->AddParticle("Sigma(c)*+","Sigma(c)*+",
+                    2.4536, kTRUE, -1., +1.,"Baryon",  4214);
+
+  pdgDB->AddParticle("Sigma(c)*-","Sigma(c)*-",
+                    2.4536, kTRUE, -1., -1.,"Baryon", -4214);
+// equivalent to 4312 ? Hijing uses m=2.55
+  pdgDB->AddParticle("Xsi(c)0","Xsi(c)0",
+                    2.4703, kTRUE, -1., +0.,"Baryon",  4132);
+
+  pdgDB->AddParticle("Xsi(c)0 bar","Xsi(c)0 bar",
+                    2.4703, kTRUE, -1., -0.,"Baryon", -4132);
+// equivalent to 4322 ? Hijing uses m=2.55
+  pdgDB->AddParticle("Xi(c)+","Xi(c)+",
+                    2.4656, kFALSE, -1., +1.,"Baryon",  4232);
+  
+  pdgDB->AddParticle("Xi(c)-","Xi(c)-",
+                    2.4656, kFALSE, -1., -1.,"Baryon", -4232);
+// mass values from Hijing
+
+  pdgDB->AddParticle("Xsi(c)*0","Xsi(c)*0",
+                    2.63, kTRUE, -1., +0.,"Baryon",  4314);
+
+  pdgDB->AddParticle("Xsi(c)*0 bar","Xsi(c)*0 bar",
+                    2.63, kTRUE, -1., -0.,"Baryon", -4314);
+
+  pdgDB->AddParticle("Xsi(c)*+","Xsi(c)*+",
+                    2.63, kTRUE, -1., +1.,"Baryon",  4324);
+
+  pdgDB->AddParticle("Xsi(c)*-","Xsi(c)*-",
+                    2.63, kTRUE, -1., -1.,"Baryon", -4324);
+
+// pdg mass value, Hijing uses m=2.73.
+  pdgDB->AddParticle("Omega(c)0","Omega(c)0",
+                    2.7040, kFALSE, khShGev/0.064e-12, +0.,"Baryon",  4332);
+  
+  pdgDB->AddParticle("Omega(c)0 bar","Omega(c)0 bar",
+                    2.7040, kFALSE, khShGev/0.064e-12, -0.,"Baryon", -4332);
+// mass value from Hijing
+  pdgDB->AddParticle("Omega(c)*0","Omega(c)*0",
+                    2.8000, kFALSE, -1., +0.,"Baryon",  4334);
+  
+  pdgDB->AddParticle("Omega(c)*0 bar","Omega(c)*0",
+                    2.8000, kFALSE, -1., -0.,"Baryon", -4334);
+
+
+// Xi(cc)
+
+  pdgDB->AddParticle("Xsi(cc)+","Xsi(cc)+",
+                    3.60, kTRUE, -1., +1.,"Baryon",  4412);
+
+  pdgDB->AddParticle("Xsi(cc) bar-","Xsi(cc) bar-",
+                    3.60, kTRUE, -1., -1.,"Baryon", -4412);
+
+  pdgDB->AddParticle("Xsi*(cc)+","Xsi*(cc)+",
+                    3.66, kTRUE, -1., +1.,"Baryon",  4414);
+
+  pdgDB->AddParticle("Xsi*(cc) bar-","Xsi*(cc) bar-",
+                    3.66, kTRUE, -1., -1.,"Baryon", -4414);
+
+
+  pdgDB->AddParticle("Xsi(cc)++","Xsi(cc)++",
+                    3.60, kTRUE, -1., +2.,"Baryon",  4422);
+
+  pdgDB->AddParticle("Xsi(cc) bar--","Xsi(cc) bar--",
+                    3.60, kTRUE, -1., -2.,"Baryon", -4422);
+
+
+  pdgDB->AddParticle("Xsi*(cc)++","Xsi*(cc)++",
+                    3.66, kTRUE, -1., +2.,"Baryon",  4424);
+
+  pdgDB->AddParticle("Xsi*(cc) bar-","Xsi*(cc) bar-",
+                    3.66, kTRUE, -1., -2.,"Baryon", -4424);
+
+  pdgDB->AddParticle("Omega(cc)+","Omega(cc)+",
+                    3.78, kTRUE, -1., +1.,"Baryon",  4432);
+
+  pdgDB->AddParticle("Omega(cc) bar-","Omega(cc) bar-",
+                    3.78, kTRUE, -1., -1.,"Baryon", -4432);
+
+  pdgDB->AddParticle("Omega*(cc)+","Omega*(cc)+",
+                    3.82, kTRUE, -1., +1.,"Baryon",  4434);
+
+  pdgDB->AddParticle("Omega*(cc) bar-","Omega*(cc) bar-",
+                    3.82, kTRUE, -1., -1.,"Baryon", -4434);
+
+
+  pdgDB->AddParticle("Omega*(ccc)+","Omega*(cc)++",
+                    4.91, kTRUE, -1., +2.,"Baryon",  4444);
+
+  pdgDB->AddParticle("Omega*(ccc) bar--","Omega*(cc) bar--",
+                    4.91, kTRUE, -1., -2.,"Baryon", -4444);
+
+
+
+// Bottom baryons
+//
+// mass value from Hijing
+  pdgDB->AddParticle("Sigma(b)*+","Sigma(b)*+",
+                    5.8100, kFALSE, -1., +1.,"Baryon", 5224);
+
+  pdgDB->AddParticle("Sigma(b)*-","Sigma(b)*-",
+                    5.8100, kFALSE, -1., -1.,"Baryon", -5224);
+
+
+  pdgDB->AddParticle("Xi(b)0","Xi(b)0",
+                    5.8400, kFALSE, -1., +0.,"Baryon", 5232);
+
+  pdgDB->AddParticle("Xi(b)0 bar","Xi(b)0 bar",
+                    5.8100, kFALSE, -1., -0.,"Baryon", -5232);
+
+// B(s) 
+  pdgDB->AddParticle("Xi'(b)-","Xi'(b)-",
+                    5.9600, kFALSE, -1., -1.,"Baryon", 5312);
+
+  pdgDB->AddParticle("Xi'(b) bar+","Xi'(b) bar+",
+                    5.9600, kFALSE, -1.,  1.,"Baryon", -5312);
+
+  pdgDB->AddParticle("Xi*(b)-","Xi*(b)-",
+                    5.9700, kFALSE, -1., -1.,"Baryon", 5314);
+
+  pdgDB->AddParticle("Xi*(b) bar+","Xi*(b) bar+",
+                    5.9700, kFALSE, -1.,  1.,"Baryon", -5314);
+
+  pdgDB->AddParticle("Xi'(b)0","Xi'(b)0",
+                    5.9600, kFALSE, -1., -0.,"Baryon", 5322);
+
+  pdgDB->AddParticle("Xi'(b) bar0","Xi'(b) bar0",
+                    5.9600, kFALSE, -1.,  0.,"Baryon", -5322);
+
+  pdgDB->AddParticle("Xi*(b)0","Xi*(b)0",
+                    5.9700, kFALSE, -1., -0.,"Baryon", 5324);
+
+  pdgDB->AddParticle("Xi*(b) bar0","Xi*(b) bar0",
+                    5.9700, kFALSE, -1.,  0.,"Baryon", -5324);
+
+  pdgDB->AddParticle("Omega(b)-","Omega(b)-",
+                    6.1200, kFALSE, -1., -1.,"Baryon", 5332);
+
+  pdgDB->AddParticle("Omega(b) bar+","Omega(b) bar+",
+                    6.1200, kFALSE, -1.,  1.,"Baryon", -5332);
+
+  pdgDB->AddParticle("Omega*(b)-","Omega*(b)-",
+                    6.1300, kFALSE, -1., -1.,"Baryon", 5334);
+
+  pdgDB->AddParticle("Omega*(b) bar+","Omega*(b) bar+",
+                    6.1300, kFALSE, -1.,  1.,"Baryon", -5334);
+
+
+  pdgDB->AddParticle("Omega*(b)-","Omega*(b)-",
+                    6.1300, kFALSE, -1., -1.,"Baryon", 5334);
+
+  pdgDB->AddParticle("Omega*(b) bar+","Omega*(b) bar+",
+                    6.1300, kFALSE, -1.,  1.,"Baryon", -5334);
+
+// B(c) 
+
+  pdgDB->AddParticle("Omega(bc)0","Omega(bc)0",
+                    7.1900, kFALSE, -1., -0.,"Baryon", 5342);
+
+  pdgDB->AddParticle("Omega(bc) bar0","Omega(bc) bar0",
+                    7.1900, kFALSE, -1.,  0.,"Baryon", -5342);
+
+  pdgDB->AddParticle("Xi'(bc)0","Xi'(bc)0",
+                    7.0400, kFALSE, -1., -0.,"Baryon", 5412);
+
+  pdgDB->AddParticle("Xi'(bc) bar0","Xi'(bc) bar0",
+                    7.0400, kFALSE, -1.,  0.,"Baryon", -5412);
+
+  pdgDB->AddParticle("Xi*(bc)0","Xi*(bc)0",
+                    7.0500, kFALSE, -1., -0.,"Baryon", 5414);
+
+  pdgDB->AddParticle("Xi*(bc) bar0","Xi*(bc) bar0",
+                    7.0500, kFALSE, -1.,  0.,"Baryon", -5414);
+
+  pdgDB->AddParticle("Xi'(bc)+","Xi'(bc)+",
+                    7.0400, kFALSE, -1., +1.,"Baryon", 5422);
+
+  pdgDB->AddParticle("Xi'(bc) bar-","Xi'(bc) bar-",
+                    7.0400, kFALSE, -1., -1.,"Baryon", -5422);
+
+  pdgDB->AddParticle("Xi*(bc)+","Xi*(bc)+",
+                    7.0500, kFALSE, -1., +1.,"Baryon", 5424);
+
+  pdgDB->AddParticle("Xi*(bc) bar-","Xi*(bc) bar-",
+                    7.0500, kFALSE, -1., -1.,"Baryon", -5424);
+
+  pdgDB->AddParticle("Omega'(bc)0","Omega'(bc)0",
+                    7.2100, kFALSE, -1., -0.,"Baryon", 5432);
+
+  pdgDB->AddParticle("Omega'(bc) bar0","Omega'(bc) bar0",
+                    7.2100, kFALSE, -1.,  0.,"Baryon", -5432);
+
+  pdgDB->AddParticle("Omega*(bc)0","Omega*(bc)0",
+                    7.2200, kFALSE, -1., -0.,"Baryon", 5434);
+
+  pdgDB->AddParticle("Omega*(bc) bar0","Omega*(bc) bar0",
+                    7.2200, kFALSE, -1.,  0.,"Baryon", -5434);
+// B(bcc)
+  pdgDB->AddParticle("Omega(bcc)+","Omega(bcc)+",
+                    8.3100, kFALSE, -1., +1.,"Baryon", 5442);
+
+  pdgDB->AddParticle("Omega(bcc) bar-","Omega(bcc) bar-",
+                    8.3100, kFALSE, -1., -1.,"Baryon", -5442);
+
+  pdgDB->AddParticle("Omega*(bcc)+","Omega*(bcc)+",
+                   8.3100, kFALSE, -1., +1.,"Baryon", 5444);
+
+  pdgDB->AddParticle("Omega*(bcc) bar-","Omega*(bcc) bar-",
+                    8.3100, kFALSE, -1., -1.,"Baryon", -5444);
+
 
 
-  pdgDB->AddParticle("Deuteron","Deuteron",2*autogev+8.071e-3,kTRUE,
+
+// B(bb)
+
+  pdgDB->AddParticle("Xsi(bb)-","Xsi(bb)-",
+                    10.4200, kFALSE, -1., -1.,"Baryon", 5512);
+  
+  pdgDB->AddParticle("Xsi(bb) bar+","Xsi(bb) bar+",
+                    10.4200, kFALSE, -1., +1.,"Baryon", -5512);
+
+  pdgDB->AddParticle("Xsi*(bb)-","Xsi*(bb)-",
+                    10.4400, kFALSE, -1., -1.,"Baryon", 5514);
+  
+  pdgDB->AddParticle("Xsi*(bb) bar+","Xsi*(bb) bar+",
+                    10.4400, kFALSE, -1., +1.,"Baryon", -5514);
+
+  pdgDB->AddParticle("Xsi(bb)0","Xsi(bb)0",
+                    10.4200, kFALSE, -1., -0.,"Baryon", 5522);
+  
+  pdgDB->AddParticle("Xsi(bb) bar0","Xsi(bb) bar0",
+                    10.4200, kFALSE, -1., +0.,"Baryon", -5522);
+
+  pdgDB->AddParticle("Xsi*(bb)0","Xsi*(bb)0",
+                    10.4400, kFALSE, -1., -0.,"Baryon", 5524);
+  
+  pdgDB->AddParticle("Xsi*(bb) bar0","Xsi*(bb) bar0",
+                    10.4400, kFALSE, -1., +0.,"Baryon", -5524);
+
+  pdgDB->AddParticle("Omega*(bb)-","Omega(bb)-",
+                    10.6000, kFALSE, -1., -1.,"Baryon", 5532);
+
+  pdgDB->AddParticle("Omega(bb) bar+","Omega(bb) bar+",
+                    10.6000, kFALSE, -1., +1.,"Baryon", -5532);
+
+  pdgDB->AddParticle("Omega*(bb)-","Omega*(bb)-",
+                    10.6000, kFALSE, -1., -1.,"Baryon", 5534);
+
+  pdgDB->AddParticle("Omega*(bb) bar+","Omega*(bb) bar+",
+                    10.6000, kFALSE, -1., +1.,"Baryon", -5534);
+
+// B(bbc)
+
+  pdgDB->AddParticle("Omega(bbc)0","Omega(bbc)0",
+                    11.7100, kFALSE, -1., -0.,"Baryon", 5542);
+
+  pdgDB->AddParticle("Omega(bbc) bar0","Omega(bbc) bar0",
+                    11.7100, kFALSE, -1., +0.,"Baryon", -5542);
+
+  pdgDB->AddParticle("Omega*(bbc)0","Omega*(bbc)0",
+                    11.7100, kFALSE, -1., -0.,"Baryon", 5544);
+
+  pdgDB->AddParticle("Omega*(bbc) bar0","Omega*(bbc) bar0",
+                    11.7100, kFALSE, -1., +0.,"Baryon", -5544);
+// B(bbb)
+
+  pdgDB->AddParticle("Omega*(bbb)-","Omega*(bbb)-",
+                    15.1000, kFALSE, -1., -1.,"Baryon", 5544);
+
+  pdgDB->AddParticle("Omega*(bbb) bar+","Omega*(bbb) bar+",
+                    15.100, kFALSE, -1., +1.,"Baryon", -5544);
+
+//
+//
+  pdgDB->AddParticle("Deuteron","Deuteron",2*kAu2Gev+8.071e-3,kTRUE,
                     0,1,"Ion",kion+10020);
   fPDGCode[fNPDGCodes++]=kion+10020;   // 45 = Deuteron
 
-  pdgDB->AddParticle("Triton","Triton",3*autogev+14.931e-3,kFALSE,
-                    hshgev/(12.33*yearstosec),1,"Ion",kion+10030);
+  pdgDB->AddParticle("Triton","Triton",3*kAu2Gev+14.931e-3,kFALSE,
+                    khShGev/(12.33*kYear2Sec),1,"Ion",kion+10030);
   fPDGCode[fNPDGCodes++]=kion+10030;   // 46 = Triton
 
-  pdgDB->AddParticle("Alpha","Alpha",4*autogev+2.424e-3,kTRUE,
-                    hshgev/(12.33*yearstosec),2,"Ion",kion+20040);
+  pdgDB->AddParticle("Alpha","Alpha",4*kAu2Gev+2.424e-3,kTRUE,
+                    khShGev/(12.33*kYear2Sec),2,"Ion",kion+20040);
   fPDGCode[fNPDGCodes++]=kion+20040;   // 47 = Alpha
 
   fPDGCode[fNPDGCodes++]=0;   // 48 = geantino mapped to rootino
 
-  pdgDB->AddParticle("HE3","HE3",3*autogev+14.931e-3,kFALSE,
+  pdgDB->AddParticle("HE3","HE3",3*kAu2Gev+14.931e-3,kFALSE,
                     0,2,"Ion",kion+20030);
   fPDGCode[fNPDGCodes++]=kion+20030;   // 49 = HE3
 
@@ -882,6 +1225,62 @@ void TGeant3::DefineParticles()
   pdgDB->AddParticle("FeedbackPhoton","FeedbackPhoton",0,kFALSE,
                     0,0,"Special",kspe+51);
   fPDGCode[fNPDGCodes++]=kspe+51;   // 51 = FeedbackPhoton
+  Gspart(52, "Lambda_c+", 4, 2.2849, +1., 2.06e-13);
+  fPDGCode[fNPDGCodes++]=4122;   //52 = Lambda_c+
+
+  Gspart(53, "Lambda_c-", 4, 2.2849, -1., 2.06e-13);
+  fPDGCode[fNPDGCodes++]=-4122; //53 = Lambda_c-  
+
+  Gspart(54, "D_s+", 4, 1.9685, +1., 4.67e-13);
+  fPDGCode[fNPDGCodes++]=431;   //54 = D_s+
+
+  Gspart(55, "D_s-", 4, 1.9685, -1., 4.67e-13);
+  fPDGCode[fNPDGCodes++]=-431; //55 = D_s-
+
+  Gspart(56, "Tau+", 5, 1.77705, +1., 2.9e-13);
+  fPDGCode[fNPDGCodes++]=15;   //56 = Tau+
+
+  Gspart(57, "Tau-", 5, 1.77705, -1., 2.9e-13);
+  fPDGCode[fNPDGCodes++]=-15;  //57 = Tau-  
+
+  Gspart(58, "B0",     3, 5.2792, +0., 1.56e-12);
+  fPDGCode[fNPDGCodes++]=511;   //58 = B0
+
+  Gspart(59, "B0 bar", 3, 5.2792, -0., 1.56e-12);
+  fPDGCode[fNPDGCodes++]=-511;  //58 = B0bar
+
+  Gspart(60, "B+",     4, 5.2789, +1., 1.65e-12);
+  fPDGCode[fNPDGCodes++]=521;   //60 = B+
+
+  Gspart(61, "B-",     4, 5.2789, -1., 1.65e-12);
+  fPDGCode[fNPDGCodes++]=-521;  //61 = B-
+
+  Gspart(62, "Bs",     3, 5.3693, +0., 1.54e-12);
+  fPDGCode[fNPDGCodes++]=521;   //62 = B_s
+
+  Gspart(63, "Bs bar", 3, 5.3693, -0., 1.54e-12);
+  fPDGCode[fNPDGCodes++]=-521;  //63 = B_s bar
+
+  Gspart(64, "Lambda_b",     3, 5.624, +0., 1.24e-12);
+  fPDGCode[fNPDGCodes++]=5122;   //64 = Lambda_b
+
+  Gspart(65, "Lambda_b bar", 3, 5.624, -0., 1.24e-12);
+  fPDGCode[fNPDGCodes++]=-5122;  //65 = Lambda_b bar
+
+  Gspart(66, "J/Psi", 3.09688, 3, 0., 0.);
+  fPDGCode[fNPDGCodes++]=443;       // 66 = J/Psi
+
+  Gspart(67, "Psi Prime", 3, 3.686, 0., 0.);
+  fPDGCode[fNPDGCodes++]=20443;    // 67 = Psi prime
+
+  Gspart(68, "Upsilon(1S)", 9.46037, 3, 0., 0.);
+  fPDGCode[fNPDGCodes++]=553;       // 68 = Upsilon(1S)
+
+  Gspart(69, "Upsilon(2S)", 10.0233, 3, 0., 0.);
+  fPDGCode[fNPDGCodes++]=20553;       // 69 = Upsilon(2S)
+
+  Gspart(70, "Upsilon(3S)", 10.3553, 3, 0., 0.);
+  fPDGCode[fNPDGCodes++]=30553;       // 70 = Upsilon(3S)
 
 /* --- Define additional decay modes --- */
 /* --- omega(783) --- */
@@ -915,6 +1314,7 @@ void TGeant3::DefineParticles()
     mode[4] = 1701;
     Gsdk(ipa, bratio, mode);
 /* --- D+ --- */
+    /*
     for (kz = 0; kz < 6; ++kz) {
        bratio[kz] = 0.;
        mode[kz] = 0;
@@ -929,7 +1329,9 @@ void TGeant3::DefineParticles()
     mode[2] = 111208;
     mode[3] = 110809;
     Gsdk(ipa, bratio, mode);
+    */
 /* --- D- --- */
+    /*
     for (kz = 0; kz < 6; ++kz) {
        bratio[kz] = 0.;
        mode[kz] = 0;
@@ -944,7 +1346,9 @@ void TGeant3::DefineParticles()
     mode[2] = 121109;
     mode[3] = 120908;
     Gsdk(ipa, bratio, mode);
+    */
 /* --- D0 --- */
+    /*
     for (kz = 0; kz < 6; ++kz) {
        bratio[kz] = 0.;
        mode[kz] = 0;
@@ -957,7 +1361,9 @@ void TGeant3::DefineParticles()
     mode[1] = 1208;
     mode[2] = 1112;
     Gsdk(ipa, bratio, mode);
+    */
 /* --- Anti D0 --- */
+    /*
     for (kz = 0; kz < 6; ++kz) {
        bratio[kz] = 0.;
        mode[kz] = 0;
@@ -970,6 +1376,7 @@ void TGeant3::DefineParticles()
     mode[1] = 1109;
     mode[2] = 1112;
     Gsdk(ipa, bratio, mode);
+    */
 /* --- rho+ --- */
     for (kz = 0; kz < 6; ++kz) {
        bratio[kz] = 0.;
@@ -1048,9 +1455,8 @@ const char* TGeant3::VolName(Int_t id) const
   //
   // Return the volume name given the volume identifier
   //
-  const char name[5]="NULL";
   if(id<1 || id > fGcnum->nvolum || fGclink->jvolum<=0) 
-    return name;
+    return fVolNames[fGcnum->nvolum];
   else
     return fVolNames[id-1];
 }
@@ -1058,6 +1464,9 @@ const char* TGeant3::VolName(Int_t id) const
 //_____________________________________________________________________________
 void    TGeant3::SetCut(const char* cutName, Float_t cutValue)
 {
+  //
+  // Set transport cuts for particles
+  //
   if(!strcmp(cutName,"CUTGAM")) 
     fGccuts->cutgam=cutValue; 
   else if(!strcmp(cutName,"CUTGAM")) 
@@ -1086,6 +1495,9 @@ void    TGeant3::SetCut(const char* cutName, Float_t cutValue)
 //_____________________________________________________________________________
 void    TGeant3::SetProcess(const char* flagName, Int_t flagValue)
 {
+  //
+  // Set thresholds for different processes
+  //
   if(!strcmp(flagName,"PAIR")) 
     fGcphys->ipair=flagValue;
   else if(!strcmp(flagName,"COMP")) 
@@ -1112,13 +1524,20 @@ void    TGeant3::SetProcess(const char* flagName, Int_t flagValue)
     fGcphys->imuls=flagValue;
   else if(!strcmp(flagName,"RAYL")) 
     fGcphys->irayl=flagValue;
+  else if(!strcmp(flagName,"STRA")) 
+    fGcphlt->istra=flagValue;
+  else if(!strcmp(flagName,"SYNC")) 
+    fGcphlt->isync=flagValue;
   else  Warning("SetFlag","Flag %s not implemented\n",flagName);
 }
 
 //_____________________________________________________________________________
-Float_t TGeant3::Xsec(char* reac, Float_t energy, Int_t part, Int_t mate)
+Float_t TGeant3::Xsec(char* reac, Float_t /* energy */, 
+                     Int_t part, Int_t /* mate */)
 {
-  Int_t gpart = IdFromPDG(part);
+  //
+  // Calculate X-sections -- dummy for the moment
+  //
   if(!strcmp(reac,"PHOT"))
   {
     if(part!=22) {
@@ -1215,7 +1634,7 @@ Bool_t TGeant3::IsNewTrack() const
   //
   // True if the track is not at the boundary of the current volume
   //
-  return (fGctrak->sleng>0);
+  return (fGctrak->sleng==0);
 }
 
 //_____________________________________________________________________________
@@ -1282,34 +1701,27 @@ Int_t   TGeant3::CurrentEvent() const
 }
 
 //_____________________________________________________________________________
-const char* TGeant3::ProdProcess() const
+AliMCProcess TGeant3::ProdProcess() const
 {
   //
   // Name of the process that has produced the secondary particles
   // in the current step
   //
-  static char proc[5];
-  const Int_t ipmec[13] = { 5,6,7,8,9,10,11,12,21,23,25,105,108 };
-  Int_t mec, km, im;
-  //
-  if(fGcking->ngkine>0) {
-    for (km = 0; km < fGctrak->nmec; ++km) {
-      for (im = 0; im < 13; ++im) {
-       if (fGctrak->lmec[km] == ipmec[im]) {
-         mec = fGctrak->lmec[km];
-         if (0 < mec && mec < 31) {
-           strncpy(proc,(char *)&fGctrak->namec[mec - 1],4);
-         } else if (mec - 100 <= 30 && mec - 100 > 0) {
-           strncpy(proc,(char *)&fGctpol->namec1[mec - 101],4);
-         }
-         proc[4]='\0';
-         return proc;
-       }
-      }
-    }
-    strcpy(proc,"UNKN");
-  } else strcpy(proc,"NONE");
-  return proc;
+  const Int_t kIpMec[13] = { 5,6,7,8,9,10,11,12,21,23,25,105,108 };
+  const Int_t kIpProc[13] = { kPDecay, kPPair, kPCompton, 
+                             kPPhotoelectric, kPBrem, kPDeltaRay,
+                             kPAnnihilation, kPHadronic, 
+                             kPMuonNuclear, kPPhotoFission,
+                             kPRayleigh, kPCerenkov, kPSynchrotron};
+  Int_t km, im;
+  //
+  if(fGcking->ngkine>0) 
+    for (km = 0; km < fGctrak->nmec; ++km) 
+      for (im = 0; im < 13; ++im) 
+       if (fGctrak->lmec[km] == kIpMec[im]) 
+           return (AliMCProcess) kIpProc[im];
+  //  
+  return (AliMCProcess) kPNoProcess;
 }
 
 //_____________________________________________________________________________
@@ -1339,6 +1751,9 @@ void    TGeant3::GetSecondary(Int_t isec, Int_t& ipart,
 //_____________________________________________________________________________
 void TGeant3::InitLego()
 {
+  //
+  // Set switches for lego transport
+  //
   SetSWIT(4,0);
   SetDEBU(0,0,0);  //do not print a message 
 }
@@ -1587,16 +2002,6 @@ Float_t TGeant3::Etot() const
   return fGctrak->getot;
 }
 
-//_____________________________________________________________________________
-void TGeant3::Rndm(Float_t* r, const Int_t n) const
-{
-  //
-  // Return an array of n random numbers uniformly distributed 
-  // between 0 and 1 not included
-  //
-  Grndm(r,n);
-}
-
 //*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
 //
 //                        Functions from GBASE
@@ -1639,9 +2044,9 @@ void  TGeant3::Gpcxyz()
   //
   //    Print track and volume parameters at current point
   //
-  gpcxyz(); 
+    
+    gpcxyz(); 
 } 
 //_____________________________________________________________________________
 void  TGeant3::Ggclos() 
 { 
@@ -1666,12 +2071,13 @@ void  TGeant3::Ggclos()
   //
   ggclos(); 
   // Create internal list of volumes
-  fVolNames = new char[fGcnum->nvolum][5];
+  fVolNames = new char[fGcnum->nvolum+1][5];
   Int_t i;
   for(i=0; i<fGcnum->nvolum; ++i) {
     strncpy(fVolNames[i], (char *) &fZiq[fGclink->jvolum+i+1], 4);
     fVolNames[i][4]='\0';
   }
+  strcpy(fVolNames[fGcnum->nvolum],"NULL");
 } 
  
 //_____________________________________________________________________________
@@ -1709,7 +2115,7 @@ void  TGeant3::Gtrig()
 { 
   //
   // Steering function to process one event
-  //
+  //  
   gtrig(); 
 } 
  
@@ -1807,14 +2213,22 @@ void  TGeant3::Gftmed(Int_t numed, char *name, Int_t &nmat, Int_t &isvol,
 
 } 
 
+//_____________________________________________________________________________
 Float_t TGeant3::Gbrelm(Float_t z, Float_t t, Float_t bcut)
 {
-    return gbrelm(z,t,bcut);
+  //
+  // To calculate energy loss due to soft muon BREMSSTRAHLUNG
+  //
+  return gbrelm(z,t,bcut);
 }
 
+//_____________________________________________________________________________
 Float_t TGeant3::Gprelm(Float_t z, Float_t t, Float_t bcut)
 {
-    return gprelm(z,t,bcut);
+  //
+  // To calculate DE/DX in GeV*barn/atom for direct pair production by muons
+  //
+  return gprelm(z,t,bcut);
 }
  
 //_____________________________________________________________________________
@@ -2192,12 +2606,12 @@ void  TGeant3::Gtreve()
 } 
 
 //_____________________________________________________________________________
-void  TGeant3::Gtreve_root() 
+void  TGeant3::GtreveRoot() 
 { 
   //
   //   Controls tracking of all particles belonging to the current event
   //
-  gtreve_root(); 
+  gtreveroot(); 
 } 
 
 //_____________________________________________________________________________
@@ -2206,17 +2620,17 @@ void  TGeant3::Grndm(Float_t *rvec, const Int_t len) const
   //
   //   To generate a vector RVECV of LEN random numbers 
   //   Copy of the CERN Library routine RANECU 
-  grndm(rvec,len);
+  Rndm(rvec,len);
 }
 
 //_____________________________________________________________________________
-void  TGeant3::Grndmq(Int_t &is1, Int_t &is2, const Int_t iseq,
-                     const Text_t *chopt)
+void  TGeant3::Grndmq(Int_t &/*is1*/, Int_t &/*is2*/, const Int_t /*iseq*/,
+                     const Text_t */*chopt*/)
 {
   //
   //  To set/retrieve the seed of the random number generator
   //
-  grndmq(is1,is2,iseq,PASSCHARD(chopt) PASSCHARL(chopt));
+  /*printf("Dummy grndmq called\n");*/
 }
 
 //*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -2470,6 +2884,7 @@ void  TGeant3::Gspos(const char *name, Int_t nr, const char *mother, Float_t x,
   //
   //  It positions a previously defined volume in the mother.
   //  
+    
   char vname[5];
   Vname(name,vname);
   char vmother[5];
@@ -2723,6 +3138,31 @@ void TGeant3::Gckmat(Int_t itmed, char* natmed)
   gckmat(itmed, PASSCHARD(natmed) PASSCHARL(natmed));
 }
 
+//_____________________________________________________________________________
+Int_t TGeant3::Glvolu(Int_t nlev, Int_t *lnam,Int_t *lnum) 
+{ 
+  //
+  //  nlev   number of leveles deap into the volume tree
+  //         size of the arrays lnam and lnum
+  //  lnam   an integer array whos 4 bytes contain the askii code for the
+  //         volume names
+  //  lnum   an integer array containing the copy numbers for that specific
+  //         volume
+  //
+  //  This routine fills the volulme paramters in common /gcvolu/ for a
+  //  physical tree, specified by the list lnam and lnum of volume names
+  //  and numbers, and for all its ascendants up to level 1. This routine
+  //  is optimsed and does not re-compute the part of the history already
+  //  available in GCVOLU. This means that if it is used in user programs
+  //  outside the usual framwork of the tracking, the user has to initilise
+  //  to zero NLEVEL in the common GCVOLU. It return 0 if there were no
+  //  problems in make the call.
+  //
+  Int_t ier;
+  glvolu(nlev, lnam, lnum, ier); 
+  return ier;
+}
+
 //_____________________________________________________________________________
 void TGeant3::Gdelete(Int_t iview)
 { 
@@ -2750,7 +3190,7 @@ void TGeant3::Gdopen(Int_t iview)
   //  with solid colours can now be stored in a view bank or in 'PICTURE FILES'
   //
   InitHIGZ();
-  higz->Clear();
+  gHigz->Clear();
   gdopen(iview);
 }
  
@@ -2855,7 +3295,7 @@ void TGeant3::Gdraw(const char *name,Float_t theta, Float_t phi, Float_t psi,
   //  string for the NAME of the volume can be found using the command DTREE).
   //
   InitHIGZ();
-  higz->Clear();
+  gHigz->Clear();
   char vname[5];
   Vname(name,vname);
   if (fGcvdma->raytra != 1) {
@@ -2886,7 +3326,7 @@ void TGeant3::Gdrawc(const char *name,Int_t axis, Float_t cut,Float_t u0,
   //  the CVOL/BOX function.
   //  
   InitHIGZ();
-  higz->Clear();
+  gHigz->Clear();
   char vname[5];
   Vname(name,vname);
   gdrawc(PASSCHARD(vname), axis,cut,u0,v0,ul,vl PASSCHARL(vname)); 
@@ -2915,7 +3355,7 @@ void TGeant3::Gdrawx(const char *name,Float_t cutthe, Float_t cutphi,
   //  The resulting picture is seen from the viewing angles theta,phi.
   //
   InitHIGZ();
-  higz->Clear();
+  gHigz->Clear();
   char vname[5];
   Vname(name,vname);
   gdrawx(PASSCHARD(vname), cutthe,cutphi,cutval,theta,phi,u0,v0,ul,vl
@@ -2986,7 +3426,7 @@ void TGeant3::Gdspec(const char *name)
   //  volume.
   //  
   InitHIGZ();
-  higz->Clear();
+  gHigz->Clear();
   char vname[5];
   Vname(name,vname);
   gdspec(PASSCHARD(vname) PASSCHARL(vname)); 
@@ -2999,12 +3439,12 @@ void TGeant3::DrawOneSpec(const char *name)
   //  Function called when one double-clicks on a volume name
   //  in a TPavelabel drawn by Gdtree.
   //
-  THIGZ *higzSave = higz;
+  THIGZ *higzSave = gHigz;
   higzSave->SetName("higzSave");
   THIGZ *higzSpec = (THIGZ*)gROOT->FindObject("higzSpec");
-  //printf("DrawOneSpec, higz=%x, higzSpec=%x\n",higz,higzSpec);
-  if (higzSpec) higz     = higzSpec;
-  else          higzSpec = new THIGZ(defSize);
+  //printf("DrawOneSpec, gHigz=%x, higzSpec=%x\n",gHigz,higzSpec);
+  if (higzSpec) gHigz     = higzSpec;
+  else          higzSpec = new THIGZ(kDefSize);
   higzSpec->SetName("higzSpec");
   higzSpec->cd();
   higzSpec->Clear();
@@ -3014,7 +3454,7 @@ void TGeant3::DrawOneSpec(const char *name)
   higzSpec->Update();
   higzSave->cd();
   higzSave->SetName("higz");
-  higz = higzSave;
+  gHigz = higzSave;
 } 
 
 //_____________________________________________________________________________
@@ -3034,11 +3474,11 @@ void TGeant3::Gdtree(const char *name,Int_t levmax, Int_t isel)
   //    - drawing tree of parent
   //  
   InitHIGZ();
-  higz->Clear();
+  gHigz->Clear();
   char vname[5];
   Vname(name,vname);
   gdtree(PASSCHARD(vname), levmax, isel PASSCHARL(vname)); 
-  higz->fPname = "";
+  gHigz->SetPname("");
 } 
 
 //_____________________________________________________________________________
@@ -3052,7 +3492,7 @@ void TGeant3::GdtreeParent(const char *name,Int_t levmax, Int_t isel)
   //  This function draws the logical tree of the parent of name.
   //  
   InitHIGZ();
-  higz->Clear();
+  gHigz->Clear();
   // Scan list of volumes in JVOLUM
   char vname[5];
   Int_t gname, i, jvo, in, nin, jin, num;
@@ -3068,7 +3508,7 @@ void TGeant3::GdtreeParent(const char *name,Int_t levmax, Int_t isel)
        strncpy(vname,(char*)&fZiq[fGclink->jvolum+i],4);
        vname[4] = 0;           
        gdtree(PASSCHARD(vname), levmax, isel PASSCHARL(vname)); 
-       higz->fPname = "";
+       gHigz->SetPname("");
        return;
       }
     }
@@ -3443,6 +3883,18 @@ void TGeant3::SetRAYL(Int_t par)
   fGcphys->irayl = par;
 }
  
+//_____________________________________________________________________________
+void TGeant3::SetSTRA(Int_t par)
+{
+  //
+  //  To control energy loss fluctuations
+  //  with the PhotoAbsorption Ionisation model.
+  //   par =0 no Straggling.
+  //       =1 Straggling yes => no Delta rays.
+  //  
+  fGcphlt->istra = par;
+}
 //_____________________________________________________________________________
 void TGeant3::SetSWIT(Int_t sw, Int_t val)
 {
@@ -3509,6 +3961,9 @@ void TGeant3::Vname(const char *name, char *vname)
 //______________________________________________________________________________
 void TGeant3::Ertrgo()
 {
+  //
+  // Perform the tracking of the track Track parameters are in VECT
+  //
   ertrgo();
 }
 
@@ -3517,6 +3972,39 @@ void TGeant3::Ertrak(const Float_t *const x1, const Float_t *const p1,
                        const Float_t *x2, const Float_t *p2,
                        Int_t ipa,  Option_t *chopt)
 {
+  //************************************************************************
+  //*                                                                      *
+  //*          Perform the tracking of the track from point X1 to          *
+  //*                    point X2                                          *
+  //*          (Before calling this routine the user should also provide   *
+  //*                    the input informations in /EROPTS/ and /ERTRIO/   *
+  //*                    using subroutine EUFIL(L/P/V)                     *
+  //*                 X1       - Starting coordinates (Cartesian)          *
+  //*                 P1       - Starting 3-momentum  (Cartesian)          *
+  //*                 X2       - Final coordinates    (Cartesian)          *
+  //*                 P2       - Final 3-momentum     (Cartesian)          *
+  //*                 IPA      - Particle code (a la GEANT) of the track   *
+  //*                                                                      *
+  //*                 CHOPT                                                *
+  //*                     'B'   'Backward tracking' - i.e. energy loss     *
+  //*                                        added to the current energy   *
+  //*                     'E'   'Exact' calculation of errors assuming     *
+  //*                                        helix (i.e. pathlength not    *
+  //*                                        assumed as infinitesimal)     *
+  //*                     'L'   Tracking upto prescribed Lengths reached   *
+  //*                     'M'   'Mixed' prediction (not yet coded)         *
+  //*                     'O'   Tracking 'Only' without calculating errors *
+  //*                     'P'   Tracking upto prescribed Planes reached    *
+  //*                     'V'   Tracking upto prescribed Volumes reached   *
+  //*                     'X'   Tracking upto prescribed Point approached  *
+  //*                                                                      *
+  //*                Interface with GEANT :                                *
+  //*             Track parameters are in /CGKINE/ and /GCTRAK/            *
+  //*                                                                      *
+  //*          ==>Called by : USER                                         *
+  //*             Authors   M.Maire, E.Nagy  ********//*                     *
+  //*                                                                      *
+  //************************************************************************
   ertrak(x1,p1,x2,p2,ipa,PASSCHARD(chopt) PASSCHARL(chopt));
 }
         
@@ -3549,7 +4037,7 @@ void TGeant3::WriteEuclid(const char* filnam, const char* topvol,
   //     this procedure fails, ordering starts from 1.
   //     Arrays IOTMED and IOMATE are used for this procedure
   //
-  const char shape[][5]={"BOX ","TRD1","TRD2","TRAP","TUBE","TUBS","CONE",
+  const char kShape[][5]={"BOX ","TRD1","TRD2","TRAP","TUBE","TUBS","CONE",
                         "CONS","SPHE","PARA","PGON","PCON","ELTU","HYPE",
                         "GTRA","CTUB"};
   Int_t i, end, itm, irm, jrm, k, nmed;
@@ -3578,7 +4066,7 @@ void TGeant3::WriteEuclid(const char* filnam, const char* topvol,
   Int_t itmedc, nmatc, isvolc, ifieldc, nwbufc, isvol, nmat, ifield, nwbuf;
   Float_t fieldmc, tmaxfdc, stemaxc, deemaxc, epsilc, stminc, fieldm;
   Float_t tmaxf, stemax, deemax, epsil, stmin;
-  const char *f10000="!\n%s\n!\n";
+  const char *k10000="!\n%s\n!\n";
   //Open the input file
   end=strlen(filnam);
   for(i=0;i<end;i++) if(filnam[i]=='.') {
@@ -3779,7 +4267,7 @@ void TGeant3::WriteEuclid(const char* filnam, const char* topvol,
   // *** write down the tracking medium definition
   //
   strcpy(card,"!       Tracking medium");
-  fprintf(lun,f10000,card);
+  fprintf(lun,k10000,card);
   //
   for(itm=1;itm<=fGcnum->ntmed;itm++) {
     if (iws[iadtmd+itm]>0) {
@@ -3809,7 +4297,7 @@ void TGeant3::WriteEuclid(const char* filnam, const char* topvol,
       //* *** write down the rotation matrix
   //*
   strcpy(card,"!       Reperes");
-  fprintf(lun,f10000,card);
+  fprintf(lun,k10000,card);
   //
   for(irm=1;irm<=fGcnum->nrotm;irm++) {
     if (iws[iadrot+irm]>0) {
@@ -3823,7 +4311,7 @@ void TGeant3::WriteEuclid(const char* filnam, const char* topvol,
   //* *** write down the volume definition
   //*
   strcpy(card,"!       Volumes");
-  fprintf(lun,f10000,card);
+  fprintf(lun,k10000,card);
   //*
   for(ivstak=1;ivstak<=nvstak;ivstak++) {
     ivo = iws[ivstak];
@@ -3837,7 +4325,7 @@ void TGeant3::WriteEuclid(const char* filnam, const char* topvol,
       if (npar>0) {
        if (ivstak>1) for(i=0;i<npar;i++) par[i]=fZq[jvo+7+i];
        Gckpar (ish,npar,par);
-       fprintf(lun,"VOLU '%4s' '%4s' %3d %3d\n",name,shape[ish-1],iotmed[nmed],npar);
+       fprintf(lun,"VOLU '%4s' '%4s' %3d %3d\n",name,kShape[ish-1],iotmed[nmed],npar);
        for(i=0;i<(npar-1)/6+1;i++) {
          fprintf(lun,"     ");
          left=npar-i*6;
@@ -3845,14 +4333,14 @@ void TGeant3::WriteEuclid(const char* filnam, const char* topvol,
          fprintf(lun,"\n");
        }
       } else {
-       fprintf(lun,"VOLU '%4s' '%4s' %3d %3d\n",name,shape[ish-1],iotmed[nmed],npar);
+       fprintf(lun,"VOLU '%4s' '%4s' %3d %3d\n",name,kShape[ish-1],iotmed[nmed],npar);
       }
     }
   }
   //*
   //* *** write down the division of volumes
   //*
-  fprintf(lun,f10000,"!       Divisions");
+  fprintf(lun,k10000,"!       Divisions");
   for(ivstak=1;ivstak<=nvstak;ivstak++) {
     ivo = TMath::Abs(iws[ivstak]);
     jvo  = fZlq[fGclink->jvolum-ivo];
@@ -3890,7 +4378,7 @@ void TGeant3::WriteEuclid(const char* filnam, const char* topvol,
   //*
   //* *** write down the the positionnement of volumes
   //*
-  fprintf(lun,f10000,"!       Positionnements\n");
+  fprintf(lun,k10000,"!       Positionnements\n");
   //
   for(ivstak = 1;ivstak<=nvstak;ivstak++) {
     ivo = TMath::Abs(iws[ivstak]);
@@ -4003,4 +4491,3 @@ void TGeant3::Streamer(TBuffer &R__b)
   }
 }
 
-