Use TLorentzVector for position and momentum

diff --git a/EVGEN/Makefile b/EVGEN/Makefile
index a4b71d537f57e994686077d43f36ced360f926b1..340b32889178cd1ace6e1e79e884ef9417b12229 100644 (file)
--- a/EVGEN/Makefile
+++ b/EVGEN/Makefile
@@ -50,7 +50,7 @@ FFLAGS      = $(FOPT)
 SLIBRARY       = $(ALICE_ROOT)/lib/libEVGEN.$(SL)
 ALIBRARY       = $(ALICE_ROOT)/lib/libEVGEN.a
 
-default:       $(SLIBRARY) headers
+default:       $(SLIBRARY)
 
 $(ALICE_ROOT)/lib/libEVGEN.$(SL):              $(OBJS)
 

diff --git a/Makefile b/Makefile
index b1deedc86b44ee371f29115c33bac87993e20f59..15168008708b5d365050c44bc3df710b214bcdbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,9 @@ lib bin:
        @mkdir $@
 
 alilibs:  lib
+       @for i in $(ALIROOT_DIRS) ; do \
+          ${MAKE} -C $$i headers ; \
+       done
        @for i in $(ALIROOT_DIRS) ; do \
           ${MAKE} -C $$i depend ; \
        done

diff --git a/PHOS/AliPHOSv2.cxx b/PHOS/AliPHOSv2.cxx
index 4dc3a0df1efc175aec44f45e9a30832cb4bfd8c5..a0689664a714cdbe6868170380c1703e299d812c 100644 (file)
--- a/PHOS/AliPHOSv2.cxx
+++ b/PHOS/AliPHOSv2.cxx
@@ -594,12 +594,16 @@ void AliPHOSv2::StepManager(void)
 
   Int_t blrc[4]; // (box, layer, row, column) indices
   Float_t xyze[4]; // position wrt MRS and energy deposited
+  TLorentzVector pos;
 
   Int_t *IDTMED=fIdtmed->GetArray()-699;
 
   if(gMC->GetMedium()==IDTMED[700]){ // We are inside a CPV sensitive pad
 
-    gMC->TrackPosition(xyze);
+    gMC->TrackPosition(pos);
+    xyze[0]=pos[0];
+    xyze[1]=pos[1];
+    xyze[2]=pos[2];
     xyze[3]=gMC->Edep();
     
     gMC->CurrentVolOffID(3, blrc[0]);
@@ -613,7 +617,10 @@ void AliPHOSv2::StepManager(void)
 
   if(gMC->GetMedium()==IDTMED[699]){ // We are inside a PWO crystal
 
-    gMC->TrackPosition(xyze);
+    gMC->TrackPosition(pos);
+    xyze[0]=pos[0];
+    xyze[1]=pos[1];
+    xyze[2]=pos[2];
     xyze[3]=gMC->Edep();
 
     gMC->CurrentVolOffID(9, blrc[0]);

diff --git a/STEER/Makefile b/STEER/Makefile
index 8b410bc5892b5ead25452dd2f69e93952153a0a9..42e85a35528660e91e45ad260eaed6f5b9485cdb 100644 (file)
--- a/STEER/Makefile
+++ b/STEER/Makefile
@@ -52,7 +52,7 @@ FFLAGS      = $(FOPT)
 SLIBRARY       = $(ALICE_ROOT)/lib/libSTEER.$(SL)
 ALIBRARY       = $(ALICE_ROOT)/lib/libSTEER.a
 
-default:       headers $(SLIBRARY)
+default:       $(SLIBRARY)
 
 $(ALICE_ROOT)/lib/libSTEER.$(SL):              $(OBJS)
 

diff --git a/TGeant3/Makefile b/TGeant3/Makefile
index a7d92ace77958a9210c5800bf8ced38ee30fc5ef..fcec7cc9629eb68023418d0a6817cfb3753fec11 100644 (file)
--- a/TGeant3/Makefile
+++ b/TGeant3/Makefile
@@ -83,7 +83,7 @@ SLIBRARY      = $(ALICE_ROOT)/lib/libTGeant3.$(SL) \
                  $(ALICE_ROOT)/lib/libTGeant3Dummy.$(SL) 
 ALIBRARY       = $(ALICE_ROOT)/lib/libTGeant3.a
 
-default:       headers $(SLIBRARY)
+default:       $(SLIBRARY)
 
 $(ALICE_ROOT)/lib/libTGeant3.$(SL):            $(GOBJS)
 

diff --git a/TRD/Makefile b/TRD/Makefile
index dbf57a7447479c1bf413c6482fb880f01412db11..c5a383da16c912dc55285e435571ee07f5c8bee5 100644 (file)
--- a/TRD/Makefile
+++ b/TRD/Makefile
@@ -50,7 +50,7 @@ FFLAGS      = $(FOPT)
 SLIBRARY       = $(ALICE_ROOT)/lib/libTRD.$(SL)
 ALIBRARY       = $(ALICE_ROOT)/lib/libTRD.a
 
-default:       headers $(SLIBRARY)
+default:       $(SLIBRARY)
 
 $(ALICE_ROOT)/lib/libTRD.$(SL):        $(OBJS)