From 50f986dbebf6f33585b30b230f0a9b88019a416a Mon Sep 17 00:00:00 2001
From: fca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 7 Oct 1999 21:08:10 +0000
Subject: [PATCH] Corrections by G.Chabratova

---
 MUON/AliMUON.cxx | 20 +++++++++++---------
 MUON/MUONcombi.C |  4 ++--
 MUON/reco_muon.F | 10 +++++++++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 38d692e63a5..ee035d13e7b 100644
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.11  1999/10/05 17:15:45  fca
+Minor syntax for the Alpha OSF
+
 Revision 1.10  1999/10/01 09:24:40  fca
 Protect against no current file in FinishEvent
 
@@ -624,31 +627,30 @@ void AliMUON::StepManager()
     printf("Dummy version of muon step -- it should never happen!!\n");
     /*
     const Float_t kRaddeg = 180/TMath::Pi();
-    AliMC* pMC = AliMC::GetMC();
     Int_t nsec, ipart;
     Float_t x[4], p[4];
     Float_t pt, th0, th2;
     char proc[5];
     if(fAccCut) {
-	if((nsec=pMC->NSecondaries())>0) {
-	    pMC->ProdProcess(proc);
-	    if((pMC->TrackPid()==443 || pMC->TrackPid()==553) && !strcmp(proc,"DCAY")) {
+	if((nsec=gMC->NSecondaries())>0) {
+	    gMC->ProdProcess(proc);
+	    if((gMC->TrackPid()==443 || gMC->TrackPid()==553) && !strcmp(proc,"DCAY")) {
 		//
 		// Check angular acceptance
 		// --- and have muons from resonance decays in the wanted window --- 
 		if(nsec != 2) {
 		    printf(" AliMUON::StepManager: Strange resonance Decay into %d particles\n",nsec);
-		    pMC->StopEvent();
+		    gMC->StopEvent();
 		} else {
-		    pMC->GetSecondary(0,ipart,x,p);
+		    gMC->GetSecondary(0,ipart,x,p);
 		    pt  = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
 		    th0 = TMath::ATan2(pt,p[2])*kRaddeg;
-	 	    pMC->GetSecondary(1,ipart,x,p);
+	 	    gMC->GetSecondary(1,ipart,x,p);
 		    pt  = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
 		    th2 = TMath::ATan2(pt,p[2])*kRaddeg;
 		    if(!(fAccMin < th0 && th0 < fAccMax) ||
 		       !(fAccMin < th2 && th2 < fAccMax)) 
-			pMC->StopEvent();
+			gMC->StopEvent();
 		}
 	    }
 	}
@@ -1766,7 +1768,7 @@ void AliMUON::Reconst(Int_t &ifit, Int_t &idebug, Int_t bgd_ev, Int_t &nev, Int_
       File=new TFile(fFileName);
       cout<<"I have opened "<<fFileName<<" file "<<endl;
       fHits2     = new TClonesArray("AliMUONhit",1000  );
-      fParticles2 = new TClonesArray("GParticle",1000);
+      fParticles2 = new TClonesArray("TParticle",1000);
       first=kFALSE;
     }
     File->cd();
diff --git a/MUON/MUONcombi.C b/MUON/MUONcombi.C
index 5ec65ea3d18..6264ea9d0f5 100644
--- a/MUON/MUONcombi.C
+++ b/MUON/MUONcombi.C
@@ -37,7 +37,7 @@ void MUONcombi (Int_t evNumber=0)
    }
 //   TClonesArray &Partarray = *(gAlice->Particles());
    TClonesArray *PartArray = gAlice->Particles();
-   GParticle *Part;
+   TParticle *Part;
    
 
 // Import the Kine and Hits Trees for the event evNumber in the file
@@ -97,7 +97,7 @@ void MUONcombi (Int_t evNumber=0)
 // Di-Muon Loop
 
    Float_t pt1,pt2;
-   GParticle* Muon1, *Muon2;
+   TParticle* Muon1, *Muon2;
 /*
    Combinator->ResetRange();
    for (Combinator->FirstMuonPairSelected(Muon1,Muon2);
diff --git a/MUON/reco_muon.F b/MUON/reco_muon.F
index 601106eb016..830b3bc9dde 100644
--- a/MUON/reco_muon.F
+++ b/MUON/reco_muon.F
@@ -3597,6 +3597,9 @@
 * $Id$
 *
 * $Log$
+* Revision 1.3  1999/10/05 17:15:45  fca
+* Minor syntax for the Alpha OSF
+*
 * Revision 1.2  1999/08/06 14:12:30  fca
 * Remove several warnings
 *
@@ -4953,6 +4956,8 @@ C --- Common containing magnetic field map data
      $,XMBEG,YMBEG,ZMBEG,XMEND,YMEND,ZMEND
      $,BV(MAXFLD)
 
+      CHARACTER*255 CHDIR
+
       ISXFMAP = 3
   
       IF(ISXFMAP.EQ.1) THEN
@@ -4963,7 +4968,10 @@ C --- Common containing magnetic field map data
 10000    FORMAT(' *SXFMAP* Magnetic field map flag: ',I5
      $        ,'; Reading magnetic field map data ')
 *
-         OPEN(77,FILE='data/field01.dat',
+         CHDIR=' '
+         CALL GETENVF('ALICE_ROOT',CHDIR)
+         LEND=LNBLNK(CHDIR)
+         OPEN(77,FILE=CHDIR(1:LEND)//'/data/field01.dat',
      $        FORM='FORMATTED',STATUS='OLD')
          READ(77,*) NX,NY,NZ,DX,DY,DZ,XMBEG,YMBEG,ZMBEG
          PRINT*,'NX,NY,NZ,DX,DY,DZ,XMBEG,YMBEG,ZMBEG',
-- 
2.31.1