Coding Rule violations corrected.

diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx
index 84340ba899994268f9457a24c27771a20e3f6417..1812b835bdee605a8e470cfce65fce48e6047d5b 100644 (file)
--- a/EVGEN/AliGenParam.cxx
+++ b/EVGEN/AliGenParam.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.36  2002/02/08 16:50:50  morsch
+Add name and title in constructor.
+
 Revision 1.35  2002/01/21 10:02:40  morsch
 ty is Double_t
 Abort if too high rapidity causes numerical paroblem. User has to specify
@@ -105,6 +108,14 @@ Introduction of the Copyright and cvs Log
 
 */
 
+
+
+// Class to generate particles from using paramtrized pT and y distributions.
+// Distributions are obtained from pointer to object of type AliGenLib.
+// (For example AliGenMUONlib)
+// Decays are performed using Pythia.
+// andreas.morsch@cern.ch
+
 #include "AliGenParam.h"
 #include "AliDecayerPythia.h"
 #include "AliGenMUONlib.h"
@@ -226,9 +237,10 @@ AliGenParam::AliGenParam(Int_t npart, Int_t param,
 }
 
 
-AliGenParam::AliGenParam(const AliGenParam & Paramd)
+AliGenParam::AliGenParam(const AliGenParam & Param)
 {
 // copy constructor
+    Param.Copy(*this);
 }
 
 //____________________________________________________________

diff --git a/EVGEN/AliGenParam.h b/EVGEN/AliGenParam.h
index dfd4dc8ef686a48dc8c0bdd7e597726152e9c63e..c298981c1d37399a58b04a939ffe7c3f4af3ed56 100644 (file)
--- a/EVGEN/AliGenParam.h
+++ b/EVGEN/AliGenParam.h
@@ -5,8 +5,15 @@
 
 /* $Id$ */
 
+//
+// Class to generate particles from using paramtrized pT and y distributions.
+// Distributions are obtained from pointer to object of type AliGenLib.
+// (For example AliGenMUONlib)
+//
+// andreas.morsch@cern.ch
+//
+
 #include "AliGenMC.h"
-#include <TArrayI.h>
 
 class AliPythia;
 class TParticle;

diff --git a/EVGEN/AliGenPythia.cxx b/EVGEN/AliGenPythia.cxx
index 0c3edbdd26ee8f25425cc460b2d701f5f8a86b12..426112426961d6dbca43455af932393f977a8389 100644 (file)
--- a/EVGEN/AliGenPythia.cxx
+++ b/EVGEN/AliGenPythia.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.54  2002/03/28 11:49:10  morsch
+Pass status code in SetTrack.
+
 Revision 1.53  2002/03/25 14:51:13  morsch
 New stack-fill and count options introduced (N. Carrer).
 
@@ -156,6 +159,17 @@ Revision 1.11  1999/09/29 09:24:14  fca
 Introduction of the Copyright and cvs Log
 */
 
+//
+// Generator using the TPythia interface (via AliPythia)
+// to generate pp collisions.
+// Using SetNuclei() also nuclear modifications to the structure functions
+// can be taken into account. This makes, of course, only sense for the
+// generation of the products of hard processes (heavy flavor, jets ...)
+//
+// andreas.morsch@cern.ch
+//
+
+
 #include "AliGenPythia.h"
 #include "AliGenPythiaEventHeader.h"
 #include "AliDecayerPythia.h"
@@ -218,6 +232,7 @@ AliGenPythia::AliGenPythia(Int_t npart)
 AliGenPythia::AliGenPythia(const AliGenPythia & Pythia)
 {
 // copy constructor
+    Pythia.Copy(*this);
 }
 
 AliGenPythia::~AliGenPythia()
@@ -633,7 +648,7 @@ void AliGenPythia::SetNuclei(Int_t a1, Int_t a2)
 }
 
 
-void AliGenPythia::MakeHeader()
+void AliGenPythia::MakeHeader() const
 {
 // Builds the event header, to be called after each event
     AliGenEventHeader* header = new AliGenPythiaEventHeader("Pythia");

diff --git a/EVGEN/AliGenPythia.h b/EVGEN/AliGenPythia.h
index 87ffee69e495447b5011126bb0f1df1d0c680954..5b95c17ac4a2d67e4968c79a74405140bf16ce84 100644 (file)
--- a/EVGEN/AliGenPythia.h
+++ b/EVGEN/AliGenPythia.h
@@ -5,6 +5,15 @@
 
 /* $Id$ */
 
+//
+// Generator using the TPythia interface (via AliPythia)
+// to generate pp collisions.
+// Using SetNuclei() also nuclear modifications to the structure functions
+// can be taken into account. This makes, of course, only sense for the
+// generation of the products of hard processes (heavy flavor, jets ...)
+//
+// andreas.morsch@cern.ch
+//
 
 #include "AliGenMC.h"
 #include "AliPythia.h"
@@ -31,7 +40,7 @@ class AliGenPythia : public AliGenMC
     // select process type
     virtual void    SetProcess(Process_t proc = kPyCharm) {fProcess = proc;}
     // select structure function
-    virtual void    SetStrucFunc(StrucFunc_t func = kGRV_HO) {fStrucFunc = func;}
+    virtual void    SetStrucFunc(StrucFunc_t func = kGRVHO) {fStrucFunc = func;}
     // select pt of hard scattering 
     virtual void    SetPtHard(Float_t ptmin = 0, Float_t ptmax = 1.e10)
        {fPtHardMin = ptmin; fPtHardMax = ptmax; }
@@ -72,10 +81,12 @@ class AliGenPythia : public AliGenMC
     
     // Assignment Operator
     AliGenPythia & operator=(const AliGenPythia & rhs);
- private:
-    Int_t  GenerateMB();
-    virtual void    MakeHeader();    
  protected:
+    // adjust the weight from kinematic cuts
+    void   AdjustWeights();
+    Int_t  GenerateMB();
+    void   MakeHeader() const;    
+
     TClonesArray* fParticles;     //Particle  List
     
     Process_t   fProcess;         //Process type
@@ -94,15 +105,15 @@ class AliGenPythia : public AliGenMC
     AliDecayer  *fDecayer;        //!Pointer to the decayer instance
     Int_t       fDebugEventFirst; //!First event to debug
     Int_t       fDebugEventLast;  //!Last  event to debug
-    Float_t     fEtaMinJet;      // Minimum eta of triggered Jet
-    Float_t     fEtaMaxJet;      // Maximum eta of triggered Jet
-    Float_t     fPhiMinJet;      // Minimum phi of triggered Jet
-    Float_t     fPhiMaxJet;      // Maximum phi of triggered Jet
+    Float_t     fEtaMinJet;       //Minimum eta of triggered Jet
+    Float_t     fEtaMaxJet;       //Maximum eta of triggered Jet
+    Float_t     fPhiMinJet;       //Minimum phi of triggered Jet
+    Float_t     fPhiMaxJet;       //Maximum phi of triggered Jet
 
-    Float_t     fEtaMinGamma;    // Minimum eta of triggered gamma
-    Float_t     fEtaMaxGamma;    // Maximum eta of triggered gamma
-    Float_t     fPhiMinGamma;    // Minimum phi of triggered gamma
-    Float_t     fPhiMaxGamma;    // Maximum phi of triggered gamma
+    Float_t     fEtaMinGamma;     // Minimum eta of triggered gamma
+    Float_t     fEtaMaxGamma;     // Maximum eta of triggered gamma
+    Float_t     fPhiMinGamma;     // Minimum phi of triggered gamma
+    Float_t     fPhiMaxGamma;     // Maximum phi of triggered gamma
 
     StackFillOpt_t fStackFillOpt; // Stack filling with all particles with
                                   // that flavour or only with selected
@@ -118,12 +129,10 @@ class AliGenPythia : public AliGenMC
     // fCountMode = kCountParents     --> Only selected parents are counted
     // fCountMode = kCountTrackabless --> Only particles flagged for tracking
     //                                     are counted
-
- private:
-    // adjust the weight from kinematic cuts
-    void   AdjustWeights();
+    //
 
     ClassDef(AliGenPythia,2) // AliGenerator interface to Pythia
+
 };
 #endif