Fix for event mixing, when it was selecting events out of range of multiplicity cut

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

diff --git a/EVGEN/AliGenDoubleScan.cxx b/EVGEN/AliGenDoubleScan.cxx
index a674d2ccd5647139a0517b3d702fd8b7afb941c1..c10bfc0cf84f007f83f702659f7cba1c2f6e0611 100644 (file)
--- a/EVGEN/AliGenDoubleScan.cxx
+++ b/EVGEN/AliGenDoubleScan.cxx
@@ -13,42 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.8.6.1  2002/07/30 15:00:39  alibrary
-Correction in initialization of dx (Enrique Gamez Flores).
-
-Revision 1.9  2002/07/30 13:48:03  morsch
-
-Correction in initialization of dx (Enrique Gamez Flores).
-
-Revision 1.8  2002/02/08 16:50:50  morsch
-Add name and title in constructor.
-
-Revision 1.7  2001/07/27 17:09:35  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.6  2000/12/21 16:24:06  morsch
-Coding convention clean-up
-
-Revision 1.5  2000/12/06 15:11:38  morsch
-Correct double declared data members.
-
-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
-
-Revision 1.2  2000/06/09 20:37:51  morsch
-All coding rule violations except RS3 corrected
-
-Revision 1.1  2000/02/23 16:25:14  morsch
-First commit of this file
-
-*/
+/* $Id$ */
 
 // As AliGenScan,  generation of particles on a 3-dim grid
 // but here double hits with a predefined distance are generated.
@@ -62,12 +27,15 @@ First commit of this file
  ClassImp(AliGenDoubleScan)
     
  AliGenDoubleScan::AliGenDoubleScan()
-        :AliGenScan(-1)
+     :AliGenScan(-1),
+      fDistance(0.)
 {
+    // Default constructor
 }
 
 AliGenDoubleScan::AliGenDoubleScan(Int_t npart)
-    :AliGenScan(npart)
+    :AliGenScan(npart),
+     fDistance(0.)
 {
 // Constructor
     fName = "Double Scan";
@@ -128,23 +96,23 @@ void AliGenDoubleScan::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);
-             SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
+             PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
 //
 // Generate 2nd particle at distance fDistance from  the first
 //
              Rndm(random,6);
              Float_t phi2=2.*TMath::Pi()*random[0];
-             Float_t dx  =fDistance*TMath::Sin(phi2);
-             Float_t dy  =fDistance*TMath::Cos(phi2);        
-             origin[0]=origin[0]+dx;
-             origin[1]=origin[1]+dy;         
+             Float_t dx2  =fDistance*TMath::Sin(phi2);
+             Float_t dy2  =fDistance*TMath::Cos(phi2);       
+             origin[0]=origin[0]+dx2;
+             origin[1]=origin[1]+dy2;        
              pmom=fPMin+random[1]*(fPMax-fPMin);
              theta=fThetaMin+random[2]*(fThetaMax-fThetaMin);
              phi=fPhiMin+random[3]*(fPhiMax-fPhiMin);
              p[0] = pmom*TMath::Cos(phi)*TMath::Sin(theta);
              p[1] = pmom*TMath::Sin(phi)*TMath::Sin(theta);
              p[2] = pmom*TMath::Cos(theta);
-             SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
+             PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
          }
       }
   }