X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=EVGEN%2FAliGenFixed.cxx;h=f359cbb917b62ef9af0777e6f078c519ec80f4d3;hb=da3a1bb2e6a10a3e3c0a6f4ca6ecf594b4d664e6;hp=923678aa415917676a952808e115191baa961905;hpb=49c4fdc30ad60369c6fc6aaedd39ae6409aba997;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenFixed.cxx b/EVGEN/AliGenFixed.cxx
index 923678aa415..f359cbb917b 100644
--- a/EVGEN/AliGenFixed.cxx
+++ b/EVGEN/AliGenFixed.cxx
@@ -13,80 +13,43 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.6  2001/07/27 17:09:36  morsch
-Use local SetTrack, KeepTrack and SetHighWaterMark methods
-to delegate either to local stack or to stack owned by AliRun.
-(Piotr Skowronski, A.M.)
-
-Revision 1.5  2001/02/24 11:41:59  morsch
-SetGun allows specify completely the particle kinematics and position in one go. (FCA)
-
-Revision 1.4  2000/12/21 16:24:06  morsch
-Coding convention clean-up
-
-Revision 1.3  2000/11/30 07:12:50  alibrary
-Introducing new Rndm and QA classes
-
-Revision 1.2  2000/10/02 15:17:54  morsch
-Unused includes removed.
-
-Revision 1.1  2000/06/09 20:24:00  morsch
-Same class as previously in AliSimpleGen.cxx
-All coding rule violations except RS3 corrected (AM)
-
-*/
-
-
+/* $Id$ */
 
 // Simple particle gun. 
 // Momentum, phi and theta of the partice as well as the particle type can be set.
+// If fExplicit is true the user set momentum vector is used,
+// otherwise it is calculated.
 // andreas.morsch@cern.ch
-//Begin_Html
-/*
-<img src="picts/AliGeneratorClass.gif">
-</pre>
-<br clear=left>
-<font size=+2 color=red>
-<p>The responsible person for this module is
-<a href="mailto:andreas.morsch@cern.ch">Andreas Morsch</a>.
-</font>
-<pre>
-*/
-//End_Html
-//                                                               //
-///////////////////////////////////////////////////////////////////
+
+#include "TPDGCode.h"
 
 #include "AliGenFixed.h"
 #include "AliRun.h"
-#include "AliPDG.h"
   
 ClassImp(AliGenFixed)
 
 //_____________________________________________________________________________
 AliGenFixed::AliGenFixed()
-  :AliGenerator()
+    :AliGenerator(), 
+     fIpart(0),
+     fExplicit(kFALSE)
 {
   //
   // Default constructor
   //
-  fIpart = 0;
-  fExplicit = kFALSE;
 }
 
 //_____________________________________________________________________________
 AliGenFixed::AliGenFixed(Int_t npart)
-  :AliGenerator(npart)
+    :AliGenerator(npart),
+     fIpart(kProton),
+     fExplicit(kFALSE)
 {
   //
   // Standard constructor
   //
   fName="Fixed";
   fTitle="Fixed Particle Generator";
-  // Generate Proton by default
-  fIpart=kProton;
-  fExplicit = kFALSE;
 }
 
 //_____________________________________________________________________________
@@ -103,12 +66,20 @@ void AliGenFixed::Generate()
   }
   Int_t i, nt;
   //
+  Float_t o[3];
+  o[0] = fOrigin[0];
+  o[1] = fOrigin[1];
+  o[2] = fOrigin[2];
+
+  printf("Origin %f %f %f \n", o[0], o[1], o[2]);
+  
+  
   for(i=0;i<fNpart;i++) 
-    SetTrack(fTrackIt,-1,fIpart,fP,fOrigin.GetArray(),polar,0,kPPrimary,nt);
+    PushTrack(fTrackIt,-1,fIpart,fP,o ,polar,0,kPPrimary,nt);
 }
   
 //_____________________________________________________________________________
-void AliGenFixed::SetSigma(Float_t sx, Float_t sy, Float_t sz)
+void AliGenFixed::SetSigma(Float_t /*sx*/, Float_t /*sy*/, Float_t /*sz*/)
 {
   //
   // Set the interaction point sigma