Coding Rule violations corrected.

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

diff --git a/EVGEN/AliGenBox.cxx b/EVGEN/AliGenBox.cxx
index 1613e15b838d62db0ec082dc94a44f5315be445b..60a93346d5ac572e98ce0d006cfda086d92d5277 100644 (file)
--- a/EVGEN/AliGenBox.cxx
+++ b/EVGEN/AliGenBox.cxx
@@ -13,33 +13,15 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.1  2000/06/09 20:22:58  morsch
-Same class as previously in AliSimpleGen.cxx
-All coding rule violations except RS3 corrected (AM)
-
-*/
-
-/*
-Old Log:
-Revision 1.8  2000/06/08 13:34:50  fca
-Better control of momentum range in GenBox
-
-Revision 1.7  2000/06/07 16:29:58  fca
-Adding check for pt range in AliGenBox
+/* $Id$ */
 
-Revision 1.6  1999/11/03 17:43:20  fca
-New version from G.Martinez & A.Morsch
-
-Revision 1.5  1999/09/29 09:24:14  fca
-Introduction of the Copyright and cvs Log
-*/
 
-///////////////////////////////////////////////////////////////////
-//                                                               //
-//    Generate the final state of the interaction as the input   //
-//    to the MonteCarlo                                          //
+// Generator for particles in a preset
+// kinematic range (flat distribution)
+// Note that for a given theta pt and p are not independent 
+// Range for only one variable (pt or p) should be given.
+//
+// Comments and suggestions: andreas.morsch@cern.ch
 //
 //Begin_Html
 /*
@@ -56,10 +38,11 @@ Introduction of the Copyright and cvs Log
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
+#include "TPDGCode.h"
+
+#include "AliConst.h"
 #include "AliGenBox.h"
 #include "AliRun.h"
-#include "AliConst.h"
-#include "AliPDG.h"
 
 ClassImp(AliGenBox)
 
@@ -80,8 +63,8 @@ AliGenBox::AliGenBox(Int_t npart)
   //
   // Standard constructor
   //
-  fName="Box";
-  fTitle="Box particle generator";
+  fName  = "Box";
+  fTitle = "Box particle generator";
   // Generate Proton by default
   fIpart=kProton;
 }
@@ -105,14 +88,12 @@ void AliGenBox::Generate()
   //
     for (j=0;j<3;j++) origin[j]=fOrigin[j];
     if(fVertexSmear==kPerEvent) {
-       gMC->Rndm(random,6);
-       for (j=0;j<3;j++) {
-           origin[j]+=fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())*
-               TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
-       }
+       Vertex();
+       for (j=0;j<3;j++) origin[j]=fVertex[j];
     }
+
     for(i=0;i<fNpart;i++) {
-       gMC->Rndm(random,3);
+       Rndm(random,3);
        theta=fThetaMin+random[0]*(fThetaMax-fThetaMin);
        if(TestBit(kMomentumRange)) {
            pmom=fPMin+random[1]*(fPMax-fPMin);
@@ -128,13 +109,13 @@ void AliGenBox::Generate()
        p[2] = pmom*TMath::Cos(theta);
 
        if(fVertexSmear==kPerTrack) {
-           gMC->Rndm(random,6);
+           Rndm(random,6);
            for (j=0;j<3;j++) {
                origin[j]=fOrigin[j]+fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())*
                    TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
            }
        }
-       gAlice->SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,"Primary",nt);
+       PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
     }
 }