New reader for the pedestal run and vdrift (Julian) and some bug fixing (Raphaelle)

[u/mrichter/AliRoot.git] / EVGEN / AliGenFixed.cxx

diff --git a/EVGEN/AliGenFixed.cxx b/EVGEN/AliGenFixed.cxx
index 1f30d09b88d6efbe622c7116a4d45908df2eb0e5..08204c39f15f115a2fa62bad79b5b526ec969dba 100644 (file)
--- a/EVGEN/AliGenFixed.cxx
+++ b/EVGEN/AliGenFixed.cxx
@@ -13,71 +13,43 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-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;
 }
 
 //_____________________________________________________________________________
@@ -88,22 +60,19 @@ void AliGenFixed::Generate()
   //
   Float_t polar[3]= {0,0,0};
   if(!fExplicit) {
-    fP[0] = fPMin*TMath::Cos(fPhiMin)*TMath::Sin(fThetaMin);
-    fP[1] = fPMin*TMath::Sin(fPhiMin)*TMath::Sin(fThetaMin);
-    fP[2] = fPMin*TMath::Cos(fThetaMin);
+    fP[0] = fPMin * TMath::Cos(fPhiMin) * TMath::Sin(fThetaMin);
+    fP[1] = fPMin * TMath::Sin(fPhiMin) * TMath::Sin(fThetaMin);
+    fP[2] = fPMin * TMath::Cos(fThetaMin);
   }
-  Int_t i, nt;
+  Int_t i, j, nt;
   //
-  for(i=0;i<fNpart;i++) 
-    gAlice->SetTrack(fTrackIt,-1,fIpart,fP,fOrigin.GetArray(),polar,0,kPPrimary,nt);
+  Float_t o[3] = {0., 0., 0.}; 
+  if(fVertexSmear == kPerEvent) {
+      Vertex();
+      for (j = 0;j < 3; j++) o[j] = fVertex[j];
+  }
   
+  for(i = 0; i < fNpart; i++) 
+    PushTrack(fTrackIt, -1, fIpart, fP, o , polar, 0, kPPrimary, nt);
 }
   
-//_____________________________________________________________________________
-void AliGenFixed::SetSigma(Float_t sx, Float_t sy, Float_t sz)
-{
-  //
-  // Set the interaction point sigma
-  //
-  printf("Vertex smearing not implemented for fixed generator\n");
-}