Add name and title in constructor.

diff --git a/EVGEN/AliGenBox.cxx b/EVGEN/AliGenBox.cxx
index 7447b1505cffb686865413fff0953ff58a3174e0..416c5c0dd709dde1922b8b490391e9495dc7a0df 100644 (file)
--- a/EVGEN/AliGenBox.cxx
+++ b/EVGEN/AliGenBox.cxx
@@ -15,6 +15,11 @@
 
 /*
 $Log$
+Revision 1.6  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.5  2000/12/21 16:24:06  morsch
 Coding convention clean-up
 
@@ -81,8 +86,8 @@ AliGenBox::AliGenBox(Int_t npart)
   //
   // Standard constructor
   //
-  fName="Box";
-  fTitle="Box particle generator";
+  fName  = "Box";
+  fTitle = "Box particle generator";
   // Generate Proton by default
   fIpart=kProton;
 }

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index ab04cd4579b7354ac0bc60c017ac3db2ef062940..4df3228782d4fc2583dc2a172a7ab6aad70034b6 100644 (file)
--- a/EVGEN/AliGenCocktail.cxx
+++ b/EVGEN/AliGenCocktail.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.13  2001/10/21 18:35:56  hristov
+Several pointers were set to zero in the default constructors to avoid memory management problems
+
 Revision 1.12  2001/06/18 13:07:30  morsch
 Forward kinematic ranges to entries only if not set by user.
 
@@ -64,6 +67,8 @@ AliGenCocktail::AliGenCocktail()
                  :AliGenerator()
 {
 // Constructor
+    fName = "Cocktail";
+    fTitle= "Particle Generator using cocktail of generators";
     fEntries = new TList;
     flnk1 = 0;
     flnk2 = 0;

diff --git a/EVGEN/AliGenDoubleScan.cxx b/EVGEN/AliGenDoubleScan.cxx
index 3597984021c8e9c07b6b722133002eb659da9701..fc16ebb471b6f01b495a2ac2688ad3e0c7a99aa8 100644 (file)
--- a/EVGEN/AliGenDoubleScan.cxx
+++ b/EVGEN/AliGenDoubleScan.cxx
@@ -15,6 +15,11 @@
 
 /*
 $Log$
+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
 
@@ -55,6 +60,8 @@ AliGenDoubleScan::AliGenDoubleScan(Int_t npart)
     :AliGenScan(npart)
 {
 // Constructor
+    fName = "Double Scan";
+    fTitle= "Particle Generator for two correlated particles on a grid";
 }
 
 //____________________________________________________________

diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx
index e9a83b14ca7c92c3e7167ba947612426051658a7..7a4eb5951b6aaaa207fa259abfdd83f1e545ac98 100644 (file)
--- a/EVGEN/AliGenExtFile.cxx
+++ b/EVGEN/AliGenExtFile.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.18  2001/11/12 14:31:00  morsch
+Memory leaks fixed. (M. Bondila)
+
 Revision 1.17  2001/11/09 09:12:58  morsch
 Generalization by using AliGenReader object to read particles from file.
 
@@ -78,8 +81,6 @@ Introduction of the Copyright and cvs Log
         :AliGenerator(-1)
 {
 //  Constructor
-    fName="ExtFile";
-    fTitle="Primaries from ext. File";
 //
 //  Read all particles
     fNpart  =- 1;

diff --git a/EVGEN/AliGenHijing.cxx b/EVGEN/AliGenHijing.cxx
index 857c17ad0272dfffdd031b46a809f57387920d5c..1094f9739a65671d0737831254ae1a1730d33a49 100644 (file)
--- a/EVGEN/AliGenHijing.cxx
+++ b/EVGEN/AliGenHijing.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.36  2002/01/31 20:17:55  morsch
+Allow for triggered jets with simplified topology: Exact pT, back-to-back
+
 Revision 1.35  2001/12/13 07:56:25  hristov
 Set pointers to zero in the default constructor
 
@@ -160,9 +163,9 @@ AliGenHijing::AliGenHijing()
                  :AliGenMC()
 {
 // Constructor
-  fHijing = 0;
-  fDsigmaDb = 0;
-  fDnDb = 0;
+    fHijing = 0;
+    fDsigmaDb = 0;
+    fDnDb = 0;
 }
 
 AliGenHijing::AliGenHijing(Int_t npart)
@@ -170,6 +173,9 @@ AliGenHijing::AliGenHijing(Int_t npart)
 {
 // Default PbPb collisions at 5. 5 TeV
 //
+    fName = "Hijing";
+    fTitle= "Particle Generator using HIJING";
+
     SetEnergyCMS();
     SetImpactParameterRange();
     SetTarget();

diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx
index ad0646fae749c2ef6f91636917bd2baf8be2f5cd..84340ba899994268f9457a24c27771a20e3f6417 100644 (file)
--- a/EVGEN/AliGenParam.cxx
+++ b/EVGEN/AliGenParam.cxx
@@ -15,6 +15,11 @@
 
 /*
 $Log$
+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
+meaningful y-range.
+
 Revision 1.34  2001/11/27 13:13:07  morsch
 Maximum lifetime for long-lived particles to be put on the stack is parameter.
 It can be set via SetMaximumLifetime(..).
@@ -135,11 +140,15 @@ AliGenParam::AliGenParam()
 // Set random number generator   
     sRandom = fRandom;
     fDecayer = 0;
+
+
 }
 
 AliGenParam::AliGenParam(Int_t npart, AliGenLib * Library,  Int_t param, char* tname):AliGenMC(npart)
 {
 // Constructor using number of particles parameterisation id and library
+    fName = "Param";
+    fTitle= "Particle Generator using pT and y parameterisation";
     
     fPtParaFunc = Library->GetPt(param, tname);
     fYParaFunc  = Library->GetY (param, tname);
@@ -161,7 +170,10 @@ AliGenParam::AliGenParam(Int_t npart, AliGenLib * Library,  Int_t param, char* t
 AliGenParam::AliGenParam(Int_t npart, Int_t param, char* tname):AliGenMC(npart)
 {
 // Constructor using parameterisation id and number of particles
-//      
+//
+    fName = "Param";
+    fTitle= "Particle Generator using pT and y parameterisation";
+      
     AliGenLib* pLibrary = new AliGenMUONlib();
  
     fPtParaFunc = pLibrary->GetPt(param, tname);
@@ -191,6 +203,9 @@ AliGenParam::AliGenParam(Int_t npart, Int_t param,
 {
 // Constructor
 // Gines Martinez 1/10/99 
+    fName = "Param";
+    fTitle= "Particle Generator using pT and y parameterisation";
+
     fPtParaFunc = PtPara; 
     fYParaFunc  = YPara;  
     fIpParaFunc = IpPara;
@@ -306,7 +321,7 @@ void AliGenParam::Generate()
   static TClonesArray *particles;
   //
   if(!particles) particles = new TClonesArray("TParticle",1000);
-
+  
   static TDatabasePDG *pDataBase = new TDatabasePDG();
   if(!pDataBase) pDataBase = new TDatabasePDG();
   //
@@ -330,7 +345,7 @@ void AliGenParam::Generate()
          fChildWeight=(fDecayer->GetPartialBranchingRatio(iPart))*fParentWeight;          
          TParticlePDG *particle = pDataBase->GetParticle(iPart);
          Float_t am = particle->Mass();
-
+         
          Rndm(random,2);
 //
 // phi
@@ -498,14 +513,14 @@ void AliGenParam::Generate()
                                           0, kPDecay, nt, wgtch);
                          pParent[i] = nt;
                          KeepTrack(nt); 
-                     }
-                 }
+                     } // Selected
+                 } // Particle loop 
              }  // Decays by Lujet
-
+             particles->Clear();
              if (pFlag)      delete[] pFlag;
              if (pParent)    delete[] pParent;
              if (pSelected)  delete[] pSelected;          
-             if (trackIt)    delete[] trackIt;     
+             if (trackIt)    delete[] trackIt;
          } // kinematic selection
          else  // nodecay option, so parent will be tracked by GEANT (pions, kaons, eta, omegas, baryons)
          {

diff --git a/EVGEN/AliGenPythia.cxx b/EVGEN/AliGenPythia.cxx
index c6f2026bb94bf9eeba2c2ccdaed9ee4a55340e39..b00d9f56c20876676b9c4124950f661c25dc6d6b 100644 (file)
--- a/EVGEN/AliGenPythia.cxx
+++ b/EVGEN/AliGenPythia.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.48  2001/12/20 11:44:28  morsch
+Add kinematic bias for direct gamma production.
+
 Revision 1.47  2001/12/19 14:45:00  morsch
 Store number of trials in header.
 
@@ -169,6 +172,8 @@ AliGenPythia::AliGenPythia(Int_t npart)
 // semimuonic decay
 // structure function GRVHO
 //
+    fName = "Pythia";
+    fTitle= "Particle Generator using PYTHIA";
     fXsection  = 0.;
     fNucA1=0;
     fNucA2=0;
@@ -243,7 +248,7 @@ void AliGenPythia::Init()
        fParentSelect[1] =   421;
        fParentSelect[2] =   431;
        fParentSelect[3] =  4122;
-       fFlavorSelect    =     4;       
+       fFlavorSelect    =  4;  
        break;
     case kPyBeauty:
        fParentSelect[0]=  511;

diff --git a/EVGEN/AliGenScan.cxx b/EVGEN/AliGenScan.cxx
index bb8ee77796797978f5782fcf750c83b398c48d72..5233667599f014fbfdb533a44d5bde36c3c32c60 100644 (file)
--- a/EVGEN/AliGenScan.cxx
+++ b/EVGEN/AliGenScan.cxx
@@ -15,6 +15,11 @@
 
 /*
 $Log$
+Revision 1.9  2001/07/27 17:09:36  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.8  2000/12/06 15:11:38  morsch
 Correct double declared data members.
 
@@ -62,6 +67,10 @@ AliGenScan::AliGenScan(Int_t npart)
     :AliGenerator(npart)
 {
 // Constructor
+    fName  = "Scan";
+    fTitle = "Generator for particles on a grid";
+
+
     fXCmin=0;
     fXCmax=0;
     fNx=1;