Removing obsolete macros

[u/mrichter/AliRoot.git] / ITS / AliITSvPPRasymm.cxx

diff --git a/ITS/AliITSvPPRasymm.cxx b/ITS/AliITSvPPRasymm.cxx
index aaec567140e9f342c90f3eb46d76fc29ed86a4c9..eba6385aceeae200c1c0cc4ee257eb634aa7c0f6 100644 (file)
--- a/ITS/AliITSvPPRasymm.cxx
+++ b/ITS/AliITSvPPRasymm.cxx
@@ -15,6 +15,18 @@
 
 /*
 $Log$
+Revision 1.63  2003/02/12 10:39:05  hristov
+Updated AliTrackReference class (S.Radomski)
+
+Revision 1.62  2003/01/16 08:10:13  hristov
+Correcting usage of string arrays (valgrind)
+
+Revision 1.61  2002/11/21 23:05:27  alibrary
+Removing AliMC and AliMCProcess
+
+Revision 1.60  2002/10/22 14:45:47  alibrary
+Introducing Riostream.h
+
 Revision 1.59  2002/10/14 14:57:08  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 
@@ -220,7 +232,6 @@ New ITS detailed geometry to be used for the PPR
 #include <TBRIK.h>
 #include <TSystem.h>
 
-#include "AliMC.h"
 #include "AliRun.h"
 #include "AliMagF.h"
 #include "AliConst.h"
@@ -29066,7 +29077,7 @@ void AliITSvPPRasymm::InitAliITSgeom(){
     Int_t    npar,natt,idshape,imat,imed;
     AliITSGeant3Geometry *ig = new AliITSGeant3Geometry();
     Int_t mod,lay,lad,det,i,j,k;
-    Char_t names[nlayers][ndeep][4];
+    Char_t names[nlayers][ndeep][5];
     Int_t itsGeomTreeCopys[nlayers][ndeep];
     if(fMinorVersion == 1){ // Option A
     Char_t *namesA[nlayers][ndeep] = {
@@ -29083,7 +29094,8 @@ void AliITSvPPRasymm::InitAliITSgeom(){
                                              {1,1,1,1,34,22, 1,0,0},// lay=5
                                              {1,1,1,1,38,25, 1,0,0}};//lay=6
     for(i=0;i<nlayers;i++)for(j=0;j<ndeep;j++){
-       for(k=0;k<4;k++) names[i][j][k] = namesA[i][j][k];
+      //PH     for(k=0;k<4;k++) names[i][j][k] = namesA[i][j][k];
+       strcpy(names[i][j], namesA[i][j]);
        itsGeomTreeCopys[i][j] = itsGeomTreeCopysA[i][j];
     } // end for i,j
     }else if(fMinorVersion == 2){ // Option B
@@ -29101,7 +29113,8 @@ void AliITSvPPRasymm::InitAliITSgeom(){
                                              {1,1,1,1,34,22, 1,0,0},// lay=5
                                              {1,1,1,1,38,25, 1,0,0}};//lay=6
     for(i=0;i<nlayers;i++)for(j=0;j<ndeep;j++){
-       for(k=0;k<4;k++) names[i][j][k] = namesB[i][j][k];
+      //PH     for(k=0;k<4;k++) names[i][j][k] = namesB[i][j][k];
+       strcpy(names[i][j], namesB[i][j]);
        itsGeomTreeCopys[i][j] = itsGeomTreeCopysB[i][j];
     } // end for i,j
     } // end if fMinorVersion
@@ -29365,16 +29378,10 @@ void AliITSvPPRasymm::StepManager(){
     static Int_t stat0=0;
     if((id=gMC->CurrentVolID(copy) == fIDMother)&&
        (gMC->IsTrackEntering()||gMC->IsTrackExiting())){
-       gMC->TrackPosition(position); // Get Position
-       gMC->TrackMomentum(momentum); // Get Momentum
        copy = fTrackReferences->GetEntriesFast();
        TClonesArray &lTR = *fTrackReferences;
        // Fill TrackReference structure with this new TrackReference.
-       AliTrackReference *tr = new(lTR[copy]) AliTrackReference();
-       tr->SetTrack(gAlice->CurrentTrack());
-       tr->SetPosition(position.X(),position.Y(),position.Z());
-       tr->SetMomentum(momentum.Px(),momentum.Py(),momentum.Pz());
-       tr->SetLength(gMC->TrackLength());
+       new(lTR[copy]) AliTrackReference(gAlice->CurrentTrack());
     } // if Outer ITS mother Volume
     if(!(this->IsActive())){
        return;