Call fDecayer->ForceDecay() at the beginning of Generate().

diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx
index b43b53967b07fb235265c6ac6cc6c690b40f5091..ed86d4d5c5e7597218c5f4ab5c8f4fbb56eba1f4 100644 (file)
--- a/EVGEN/AliGenParam.cxx
+++ b/EVGEN/AliGenParam.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.21  2000/09/08 15:39:01  morsch
+Handle the case fForceDecay=all during the generation, i.e. select all secondaries.
+
 Revision 1.20  2000/09/06 14:35:44  morsch
 Use AliDecayerPythia for particle decays.
 
@@ -228,9 +231,9 @@ void AliGenParam::Init()
     }
 //
 // particle decay related initialization
+    fDecayer->SetForceDecay(fForceDecay);
     fDecayer->Init();
-// semimuonic decays of charm and beauty
-    fDecayer->ForceDecay(fForceDecay);
+
 //
     switch (fForceDecay) 
     {
@@ -273,7 +276,7 @@ void AliGenParam::Generate()
 // setting fForceDecay = nodecay (SetForceDecay(nodecay)) 
 //
 
-
+    fDecayer->ForceDecay();
   Float_t polar[3]= {0,0,0};  // Polarisation of the parent particle (for GEANT tracking)
   Float_t origin0[3];         // Origin of the generated parent particle (for GEANT tracking)
   Float_t pt, pl, ptot;       // Transverse, logitudinal and total momenta of the parent particle

diff --git a/EVGEN/AliGenPythia.cxx b/EVGEN/AliGenPythia.cxx
index 919d090861fe23a6404004cd7871ecca4d1a9e8b..fd6b5589d8e233ead527ddfa66f624c1f5628ed8 100644 (file)
--- a/EVGEN/AliGenPythia.cxx
+++ b/EVGEN/AliGenPythia.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.20  2000/09/06 14:29:33  morsch
+Use AliPythia for event generation an AliDecayPythia for decays.
+Correct handling of "nodecay" option
+
 Revision 1.19  2000/07/11 18:24:56  fca
 Coding convention corrections + few minor bug fixes
 
@@ -105,9 +109,10 @@ void AliGenPythia::Init()
     //    gSystem->Exec("ln -s $ALICE_ROOT/data/Decay.table fort.1");
     //    fPythia->Pyupda(2,1);    
     //    gSystem->Exec("rm fort.1");
-    
+
+    fDecayer->SetForceDecay(fForceDecay);    
     fDecayer->Init();
-    fDecayer->ForceDecay(fForceDecay);
+
 
     fPythia->SetCKIN(3,fPtHardMin);
     fPythia->SetCKIN(4,fPtHardMax);    
@@ -181,7 +186,7 @@ void AliGenPythia::Init()
 void AliGenPythia::Generate()
 {
 // Generate one event
-  fDecayer->ForceDecay(fForceDecay);
+    fDecayer->ForceDecay();
 
     Float_t polar[3] =   {0,0,0};
     Float_t origin[3]=   {0,0,0};