Update master to aliroot

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

diff --git a/EVGEN/AliGenDoubleScan.cxx b/EVGEN/AliGenDoubleScan.cxx
index 3d8e47404cfaeb0b872d7417456a392c5fc540f6..c10bfc0cf84f007f83f702659f7cba1c2f6e0611 100644 (file)
--- a/EVGEN/AliGenDoubleScan.cxx
+++ b/EVGEN/AliGenDoubleScan.cxx
@@ -13,18 +13,13 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.3  2000/10/02 21:28:06  fca
-Removal of useless dependecies via forward declarations
+/* $Id$ */
 
-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
-
-*/
+// As AliGenScan,  generation of particles on a 3-dim grid
+// but here double hits with a predefined distance are generated.
+// The second particle is generated at a constant distance but with random phi.
+// Generator can be used to evaluate double hit resolutions.
+// Author: andreas.morsch@cern.ch
 
 #include "AliGenDoubleScan.h"
 #include "AliRun.h"
@@ -32,14 +27,19 @@ 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";
+    fTitle= "Particle Generator for two correlated particles on a grid";
 }
 
 //____________________________________________________________
@@ -66,14 +66,14 @@ void AliGenDoubleScan::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;
     }
@@ -87,8 +87,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);
@@ -96,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);
-             gAlice->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);
-             gAlice->SetTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
+             PushTrack(fTrackIt,-1,fIpart,p,origin,polar,0,kPPrimary,nt);
          }
       }
   }