Add const to SolenoidField() method for correct overwriting from the parent class

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

diff --git a/EVGEN/AliGenScan.cxx b/EVGEN/AliGenScan.cxx
index 42837c0cdd0be40a155b32f70554dfb8eba32b8c..526b4e0aa3f954f0a76d16aa463565ee1930c96c 100644 (file)
--- a/EVGEN/AliGenScan.cxx
+++ b/EVGEN/AliGenScan.cxx
@@ -1,17 +1,62 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/*
+$Log$
+Revision 1.10  2002/02/08 16:50:50  morsch
+Add name and title in constructor.
+
+Revision 1.9  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.8  2000/12/06 15:11:38  morsch
+Correct double declared data members.
+
+Revision 1.7  2000/11/30 07:12:50  alibrary
+Introducing new Rndm and QA classes
+
+Revision 1.6  2000/10/02 21:28:06  fca
+Removal of useless dependecies via forward declarations
+
+Revision 1.5  2000/06/09 20:37:20  morsch
+All coding rule violations except RS3 corrected
+
+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
+
+*/
+
 #include "AliGenScan.h"
-#include <stdlib.h>
 #include "AliRun.h"
+
  ClassImp(AliGenScan)
     
  AliGenScan::AliGenScan()
         :AliGenerator(-1)
 {
-//
-    fXmin=0;
-    fXmax=0;
+// Constructor
+    fXCmin=0;
+    fXCmax=0;
     fNx=1;
-    fYmin=0;
-    fYmax=0;
+    fYCmin=0;
+    fYCmax=0;
     fNy=1;
     fZmin=0;
     fZmax=0;
@@ -24,11 +69,16 @@
 AliGenScan::AliGenScan(Int_t npart)
     :AliGenerator(npart)
 {
-    fXmin=0;
-    fXmax=0;
+// Constructor
+    fName  = "Scan";
+    fTitle = "Generator for particles on a grid";
+
+
+    fXCmin=0;
+    fXCmax=0;
     fNx=1;
-    fYmin=0;
-    fYmax=0;
+    fYCmin=0;
+    fYCmax=0;
     fNy=1;
     fZmin=0;
     fZmax=0;
@@ -37,17 +87,20 @@ AliGenScan::AliGenScan(Int_t npart)
 
 //____________________________________________________________
 AliGenScan::~AliGenScan()
-{}
+{
+// Destructor
+}
 
 void AliGenScan::SetRange(Int_t nx, Float_t xmin, Float_t xmax,
                     Int_t ny, Float_t ymin, Float_t ymax,
                     Int_t nz, Float_t zmin, Float_t zmax)
 {
-    fXmin=xmin;
-    fXmax=xmax;
+// Define the grid
+    fXCmin=xmin;
+    fXCmax=xmax;
     fNx=nx;
-    fYmin=ymin;
-    fYmax=ymax;
+    fYCmin=ymin;
+    fYCmax=ymax;
     fNy=ny;
     fZmin=zmin;
     fZmax=zmax;
@@ -72,14 +125,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;
   }
@@ -92,9 +145,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);
@@ -102,7 +155,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(1,-1,fIpart,p,origin,polar,0,"Primary",nt);
+             SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
          }
       }
   }