From: fca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 26 Oct 1999 06:04:50 +0000 (+0000)
Subject: Introduce TLorentzVector in AliMC::GetSecondary. Thanks to I.Hrivnacova
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=5d84196c93311f742a890f7d70c728bd057191a6

Introduce TLorentzVector in AliMC::GetSecondary. Thanks to I.Hrivnacova
---

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index ee035d13e7b..4ed898caf3b 100644
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.12  1999/10/07 21:08:10  fca
+Corrections by G.Chabratova
+
 Revision 1.11  1999/10/05 17:15:45  fca
 Minor syntax for the Alpha OSF
 
@@ -628,7 +631,7 @@ void AliMUON::StepManager()
     /*
     const Float_t kRaddeg = 180/TMath::Pi();
     Int_t nsec, ipart;
-    Float_t x[4], p[4];
+    TLorentzVector x, p;
     Float_t pt, th0, th2;
     char proc[5];
     if(fAccCut) {
diff --git a/RICH/AliRICH.cxx b/RICH/AliRICH.cxx
index be2591c44d7..c55f3efc15a 100644
--- a/RICH/AliRICH.cxx
+++ b/RICH/AliRICH.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.12  1999/09/29 09:24:29  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ////////////////////////////////////////////////
@@ -436,31 +439,30 @@ void AliRICH::StepManager()
 {
     printf("Dummy version of RICH 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];
+    TLorentzVector x, p;
     Float_t pt, th0, th1;
     char proc[5];
     if(fAccCut) {
-	if((nsec=pMC->NSecondaries())>0) {
-	    pMC->ProdProcess(proc);
-	    if((pMC->TrackPid()==113 || pMC->TrackPid()==114) && !strcmp(proc,"DCAY")) {
+	if((nsec=gMC->NSecondaries())>0) {
+	    gMC->ProdProcess(proc);
+	    if((gMC->TrackPid()==113 || gMC->TrackPid()==114) && !strcmp(proc,"DCAY")) {
 		
 		// Check angular acceptance
 		//* --- and have muons from resonance decays in the wanted window --- 
 		if(nsec != 2) {
 		    printf(" AliRICH::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]);
 		    th1 = TMath::ATan2(pt,p[2])*kRaddeg;
 		    if(!(fAccMin < th0 && th0 < fAccMax) ||
 		       !(fAccMin < th1 && th1 < fAccMax)) 
-			pMC->StopEvent();
+			gMC->StopEvent();
 		}
 	    }
 	}
diff --git a/STEER/AliMC.h b/STEER/AliMC.h
index e94049e779b..42e6251784c 100644
--- a/STEER/AliMC.h
+++ b/STEER/AliMC.h
@@ -57,7 +57,7 @@ public:
   virtual Int_t   NSecondaries() const=0;
   virtual Int_t   CurrentEvent() const=0;
   virtual void    ProdProcess(char*) const=0;
-  virtual void    GetSecondary(Int_t, Int_t&, Float_t*, Float_t*)=0;
+  virtual void    GetSecondary(Int_t, Int_t&, TLorentzVector&, TLorentzVector&)=0;
   virtual void    StopTrack() =0;
   virtual void    StopEvent() =0;
   virtual Float_t MaxStep() const =0;
diff --git a/TGeant3/TGeant3.cxx b/TGeant3/TGeant3.cxx
index 60d4bf97720..bfb46d9cf21 100644
--- a/TGeant3/TGeant3.cxx
+++ b/TGeant3/TGeant3.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.14  1999/09/29 09:24:30  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1182,7 +1185,8 @@ void    TGeant3::ProdProcess(char* proc) const
 }
 
 //_____________________________________________________________________________
-void    TGeant3::GetSecondary(Int_t isec, Int_t& ipart, Float_t* x, Float_t* p)
+void    TGeant3::GetSecondary(Int_t isec, Int_t& ipart, 
+			      TLorentzVector &x, TLorentzVector &p)
 {
   //
   // Get the parameters of the secondary track number isec produced
diff --git a/TGeant3/TGeant3.h b/TGeant3/TGeant3.h
index ce725c5d7e8..01a85d5fbde 100644
--- a/TGeant3/TGeant3.h
+++ b/TGeant3/TGeant3.h
@@ -580,7 +580,7 @@ public:
   Int_t   NSecondaries() const;
   Int_t   CurrentEvent() const;
   void    ProdProcess(char*) const;
-  void    GetSecondary(Int_t, Int_t&, Float_t*, Float_t*);
+  void    GetSecondary(Int_t, Int_t&, TLorentzVector&, TLorentzVector&);
   void   StopTrack();
   void   StopEvent();
   Float_t MaxStep() const;