Minor script fixes

[u/mrichter/AliRoot.git] / TMEVSIM / AliGenMevSim.cxx

diff --git a/TMEVSIM/AliGenMevSim.cxx b/TMEVSIM/AliGenMevSim.cxx
index b973e61f49263549aabaa2f4746d586e65cc0cfd..a0b186c4d18cea20e6b6c1412317450ddaa7f38f 100644 (file)
--- a/TMEVSIM/AliGenMevSim.cxx
+++ b/TMEVSIM/AliGenMevSim.cxx
@@ -23,15 +23,17 @@
 // Sylwester Radomski <radomski@if.pw.edu.pl>
 //
 
-//#include "TSystem.h"
-//#include "TUnixSystem.h"
-#include "TParticle.h"
-#include "TMevSim.h"
+#include <Riostream.h>
+#include <TClonesArray.h>
+#include <TParticle.h>
 
 #include "AliGenMevSim.h"
-#include "AliRun.h"
+#include "AliMevSimConfig.h"
+#include "AliMevSimParticle.h"
+//#include "AliRun.h"
+#include "TMevSim.h"
 
-static TRandom * sRandom;
+static TRandom * gAliRandom;
 
 ClassImp(AliGenMevSim)
 
@@ -39,20 +41,22 @@ ClassImp(AliGenMevSim)
 AliGenMevSim::AliGenMevSim() : AliGenerator(-1) 
 {
   //
-  // Standard creator
+  // Default ctor
   //
-  
   fConfig = new AliMevSimConfig();
   fMevSim = new TMevSim();
-  sRandom = fRandom;
+  gAliRandom = fRandom;
   
 }
 //____________________________________________________________________________
-AliGenMevSim::AliGenMevSim(AliMevSimConfig *config): AliGenerator(-1) {
-
+AliGenMevSim::AliGenMevSim(AliMevSimConfig *config): AliGenerator(-1) 
+{
+  //
+  // Standard ctor
+  //
   fConfig = config;
   fMevSim = new TMevSim(); 
-  sRandom = fRandom;
+  gAliRandom = fRandom;
 }
 
 //____________________________________________________________________________
@@ -64,15 +68,23 @@ AliGenMevSim::~AliGenMevSim()
   if (fMevSim) delete fMevSim;
 }
 //____________________________________________________________________________
-void AliGenMevSim::SetConfig(AliMevSimConfig *config) {
-  
+void AliGenMevSim::SetConfig(AliMevSimConfig *config) 
+{
+  //
+  // Sets the MevSim configuration
+  //
   fConfig = config;
 }
-//____________________________________________________________________________
-void AliGenMevSim::AddParticleType(AliMevSimParticle *type) {
 
+//____________________________________________________________________________
+void AliGenMevSim::AddParticleType(AliMevSimParticle *type) 
+{
+  //
+  // Add one particle type to MevSim
+  //
   fMevSim->AddPartTypeParams((TMevSimPartTypeParams*)type);
 }
+
 //____________________________________________________________________________
 void AliGenMevSim::Init() 
 {
@@ -98,11 +110,14 @@ void AliGenMevSim::Init()
 
   // mevsim specyfic parameters
   
-  mevsim->SetModelType(fConfig->fModelType);
-  mevsim->SetReacPlaneCntrl(fConfig->fReacPlaneCntrl);
-  mevsim->SetPsiRParams(fConfig->fPsiRMean, fConfig->fPsiRStDev);
-  mevsim->SetMultFacParams(fConfig->fMultFacMean, fConfig->fMultFacStDev);
-  
+  mevsim->SetModelType(fConfig->GetModelType());
+  Int_t ctrl; Float_t psiRMean = 0; Float_t psiRStDev = 0;
+  fConfig->GetRectPlane(ctrl,psiRMean,psiRStDev);
+  mevsim->SetReacPlaneCntrl(ctrl);
+  mevsim->SetPsiRParams(psiRMean, psiRStDev);
+  Float_t mean; Float_t stDev;
+  fConfig->GetMultFac(mean,stDev);
+  mevsim->SetMultFacParams(mean,stDev);
   // mevsim initialisation
 
   mevsim->Initialize();
@@ -124,7 +139,7 @@ void AliGenMevSim::Generate()
   Float_t p[3] = {1,1,1};
   Float_t time = 0;
   
-  const Int_t parent = -1;
+  const Int_t kParent = -1;
   Int_t id;
 
   // vertexing 
@@ -160,17 +175,15 @@ void AliGenMevSim::Generate()
     p[1] = particle->Py();
     p[2] = particle->Pz();
     
-    PushTrack(fTrackIt, parent, pdg, p, orgin, polar, time, kPPrimary, id);
+    PushTrack(fTrackIt, kParent, pdg, p, orgin, polar, time, kPPrimary, id);
 
   }  
  
   particles->Clear();
   if (particles) delete particles;
 }
-//____________________________________________________________________________
-//____________________________________________________________________________
-
 
+//____________________________________________________________________________
 #ifndef WIN32
 # define ran ran_
 # define type_of_call
@@ -181,7 +194,9 @@ void AliGenMevSim::Generate()
 
 extern "C" Float_t type_of_call ran(Int_t &)
 {
-  return sRandom->Rndm(); 
+  //
+  //  Replacement for package random number generator
+  //
+  return gAliRandom->Rndm(); 
 }
 
-//____________________________________________________________________________