Overlaps corrected, new shape of sectors

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

diff --git a/EVGEN/AliGenScan.cxx b/EVGEN/AliGenScan.cxx
index ca69cb926d278b5899055d9a217beb1dc14ac510..c55f4ccb4d12b7ff009fd1d5c102b2037a5774b4 100644 (file)
--- a/EVGEN/AliGenScan.cxx
+++ b/EVGEN/AliGenScan.cxx
@@ -13,56 +13,53 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.5  2000/06/09 20:37:20  morsch
-All coding rule violations except RS3 corrected
+/* $Id$ */
 
-Revision 1.4  1999/11/03 17:43:20  fca
-New version from G.Martinez & A.Morsch
-
-Revision 1.3  1999/09/29 09:24:14  fca
-Introduction of the Copyright and cvs Log
-
-*/
+// Realisation of AliGenerator that generates particles with
+// vertices on a user defined grid.
+// The vertex positions can be smeared. 
+// Momentum vectors are defined through the methods provided by AliGenerator.
+// Author: andreas.morsch@cern.ch
 
 #include "AliGenScan.h"
-#include "AliRun.h"
-#include "AliMC.h"
 
  ClassImp(AliGenScan)
     
  AliGenScan::AliGenScan()
-        :AliGenerator(-1)
+     :AliGenerator(-1), 
+      fXCmin(0),
+      fXCmax(0),
+      fNx(1),
+      fYCmin(0),
+      fYCmax(0),
+      fNy(1),
+      fZmin(0),
+      fZmax(0),
+      fNz(1),
+      fIpart(0)
 {
 // Constructor
-    fXmin=0;
-    fXmax=0;
-    fNx=1;
-    fYmin=0;
-    fYmax=0;
-    fNy=1;
-    fZmin=0;
-    fZmax=0;
-    fNz=1;
 //
 //  Read all particles
     fNpart=-1;
 }
 
 AliGenScan::AliGenScan(Int_t npart)
-    :AliGenerator(npart)
+    :AliGenerator(npart), 
+      fXCmin(0),
+      fXCmax(0),
+      fNx(1),
+      fYCmin(0),
+      fYCmax(0),
+      fNy(1),
+      fZmin(0),
+      fZmax(0),
+      fNz(1),
+      fIpart(0)
 {
 // Constructor
-    fXmin=0;
-    fXmax=0;
-    fNx=1;
-    fYmin=0;
-    fYmax=0;
-    fNy=1;
-    fZmin=0;
-    fZmax=0;
-    fNz=1;
+    fName  = "Scan";
+    fTitle = "Generator for particles on a grid";
 }
 
 //____________________________________________________________
@@ -76,11 +73,11 @@ void AliGenScan::SetRange(Int_t nx, Float_t xmin, Float_t xmax,
                     Int_t nz, Float_t zmin, Float_t zmax)
 {
 // Define the grid
-    fXmin=xmin;
-    fXmax=xmax;
+    fXCmin=xmin;
+    fXCmax=xmax;
     fNx=nx;
-    fYmin=ymin;
-    fYmax=ymax;
+    fYCmin=ymin;
+    fYCmax=ymax;
     fNy=ny;
     fZmin=zmin;
     fZmax=zmax;
@@ -105,14 +102,14 @@ void AliGenScan::Generate()
   Float_t dx,dy,dz;
   
   //
-  if (fNy > 0) {
-      dx=(fXmax-fXmin)/fNx;
+  if (fNx > 0) {
+      dx=(fXCmax-fXCmin)/fNx;
   } else {
       dx=1e10;
   }
 
   if (fNy > 0) {
-      dy=(fYmax-fYmin)/fNy;
+      dy=(fYCmax-fYCmin)/fNy;
   } else {
       dy=1e10;
   }
@@ -125,9 +122,9 @@ void AliGenScan::Generate()
   for (Int_t ix=0; ix<fNx; ix++) {
       for (Int_t iy=0; iy<fNy; iy++) {
          for (Int_t iz=0; iz<fNz; iz++){
-             gMC->Rndm(random,6);
-             origin[0]=fXmin+ix*dx+2*(random[0]-0.5)*fOsigma[0];
-             origin[1]=fYmin+iy*dy+2*(random[1]-0.5)*fOsigma[1];
+             Rndm(random,6);
+             origin[0]=fXCmin+ix*dx+2*(random[0]-0.5)*fOsigma[0];
+             origin[1]=fYCmin+iy*dy+2*(random[1]-0.5)*fOsigma[1];
              origin[2]=fZmin+iz*dz+2*(random[2]-0.5)*fOsigma[2];            
              pmom=fPMin+random[3]*(fPMax-fPMin);
              theta=fThetaMin+random[4]*(fThetaMax-fThetaMin);
@@ -135,7 +132,7 @@ void AliGenScan::Generate()
              p[0] = pmom*TMath::Cos(phi)*TMath::Sin(theta);
              p[1] = pmom*TMath::Sin(phi)*TMath::Sin(theta);
              p[2] = pmom*TMath::Cos(theta);
-             gAlice->SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,"Primary",nt);
+             PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
          }
       }
   }