Correct double declared data members.

diff --git a/EVGEN/AliGenDoubleScan.cxx b/EVGEN/AliGenDoubleScan.cxx
index 3d8e47404cfaeb0b872d7417456a392c5fc540f6..88c4673e0d21675a50831b31fd7d3a3f6b5a8be8 100644 (file)
--- a/EVGEN/AliGenDoubleScan.cxx
+++ b/EVGEN/AliGenDoubleScan.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.4  2000/11/30 07:12:50  alibrary
+Introducing new Rndm and QA classes
+
 Revision 1.3  2000/10/02 21:28:06  fca
 Removal of useless dependecies via forward declarations
 
@@ -67,13 +70,13 @@ void AliGenDoubleScan::Generate()
     
     //
     if (fNy > 0) {
-       dx=(fXmax-fXmin)/fNx;
+       dx=(fXCmax-fXCmin)/fNx;
     } else {
        dx=1e10;
     }
 
     if (fNy > 0) {
-       dy=(fYmax-fYmin)/fNy;
+       dy=(fYCmax-fYCmin)/fNy;
     } else {
        dy=1e10;
     }
@@ -87,8 +90,8 @@ void AliGenDoubleScan::Generate()
       for (Int_t iy=0; iy<fNy; iy++) {
          for (Int_t iz=0; iz<fNz; iz++){
              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];
+             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);

diff --git a/EVGEN/AliGenParam.h b/EVGEN/AliGenParam.h
index 4520602d528674f97517ebd329e8a6bbf38125d8..9e0b774f99dc9ff906195a9c8047186e3a428428 100644 (file)
--- a/EVGEN/AliGenParam.h
+++ b/EVGEN/AliGenParam.h
@@ -60,7 +60,6 @@ class AliGenParam : public AliGenerator
     Float_t     fdNdy0;        // central multiplicity per event
     Float_t     fYWgt;         // Y-weight
     Float_t     fPtWgt;        // Pt-weight
-    Weighting_t fAnalog;       // Flag for anolog or pt-weighted generation
     Float_t     fBias;         // Biasing factor
     Int_t       fTrials;       // Number of trials
     Decay_t     fForceDecay;   // Decay channel forced

diff --git a/EVGEN/AliGenScan.cxx b/EVGEN/AliGenScan.cxx
index 2ed0a4cb49b84b160c0ccc850c7477333ebcaaba..90c9a66f1d052baa566432953ba4d2698a618605 100644 (file)
--- a/EVGEN/AliGenScan.cxx
+++ b/EVGEN/AliGenScan.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+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
 
@@ -38,11 +41,11 @@ Introduction of the Copyright and cvs Log
         :AliGenerator(-1)
 {
 // Constructor
-    fXmin=0;
-    fXmax=0;
+    fXCmin=0;
+    fXCmax=0;
     fNx=1;
-    fYmin=0;
-    fYmax=0;
+    fYCmin=0;
+    fYCmax=0;
     fNy=1;
     fZmin=0;
     fZmax=0;
@@ -56,11 +59,11 @@ AliGenScan::AliGenScan(Int_t npart)
     :AliGenerator(npart)
 {
 // Constructor
-    fXmin=0;
-    fXmax=0;
+    fXCmin=0;
+    fXCmax=0;
     fNx=1;
-    fYmin=0;
-    fYmax=0;
+    fYCmin=0;
+    fYCmax=0;
     fNy=1;
     fZmin=0;
     fZmax=0;
@@ -78,11 +81,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;
@@ -108,13 +111,13 @@ void AliGenScan::Generate()
   
   //
   if (fNy > 0) {
-      dx=(fXmax-fXmin)/fNx;
+      dx=(fXCmax-fXCmin)/fNx;
   } else {
       dx=1e10;
   }
 
   if (fNy > 0) {
-      dy=(fYmax-fYmin)/fNy;
+      dy=(fYCmax-fYCmin)/fNy;
   } else {
       dy=1e10;
   }
@@ -128,8 +131,8 @@ void AliGenScan::Generate()
       for (Int_t iy=0; iy<fNy; iy++) {
          for (Int_t iz=0; iz<fNz; iz++){
              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];
+             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);

diff --git a/EVGEN/AliGenScan.h b/EVGEN/AliGenScan.h
index f24bba61d3a8e64abc8df7ff3a982f52df242854..2fb39daef1f4270c43f02e740f43169ab40d10a4 100644 (file)
--- a/EVGEN/AliGenScan.h
+++ b/EVGEN/AliGenScan.h
@@ -24,16 +24,16 @@ public:
     virtual void Generate();
     virtual void SetPart(Int_t part) {fIpart=part;}   
  protected:
-    Float_t fXmin;     // Minimum x on grid
-    Float_t fXmax;     // Maximum x on grid
-    Int_t   fNx;       // Number of divisions in x
-    Float_t fYmin;     // Minimum y on grid
-    Float_t fYmax;     // Maximum y on grid
-    Int_t   fNy;       // Number of divisions in y
-    Float_t fZmin;     // Minimum z on grid
-    Float_t fZmax;     // Maximum z on grid
-    Int_t   fNz;       // Number of divisions in z
-    Int_t   fIpart;    // Particle type
+    Float_t fXCmin;     // Minimum x on grid
+    Float_t fXCmax;     // Maximum x on grid
+    Int_t   fNx;        // Number of divisions in x
+    Float_t fYCmin;     // Minimum y on grid
+    Float_t fYCmax;     // Maximum y on grid
+    Int_t   fNy;        // Number of divisions in y
+    Float_t fZmin;      // Minimum z on grid
+    Float_t fZmax;      // Maximum z on grid
+    Int_t   fNz;        // Number of divisions in z
+    Int_t   fIpart;     // Particle type
     
    
   ClassDef(AliGenScan,1) //Partcles on a regular grid