Decayer functionality of AliPythia has been moved to AliDecayerPythia.

Class is now a singleton.

diff --git a/EVGEN/AliPythia.cxx b/EVGEN/AliPythia.cxx
index f0d7f6ccc89586e133baa70b02cdcf13e33b1b6d..5e1626ef74215aa4dda772bf8b1389f7db59810b 100644 (file)
--- a/EVGEN/AliPythia.cxx
+++ b/EVGEN/AliPythia.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.7  2000/06/09 20:34:50  morsch
+All coding rule violations except RS3 corrected
+
 Revision 1.6  1999/11/09 07:38:48  fca
 Changes for compatibility with version 2.23 of ROOT
 
@@ -32,46 +35,13 @@ Introduction of the Copyright and cvs Log
 
 ClassImp(AliPythia)
 
-#ifndef WIN32
-# define lu1ent lu1ent_
-# define type_of_call
-#else
-# define lu1ent LU1ENT
-# define type_of_call _stdcall
-#endif
-
-extern "C" void type_of_call 
-          lu1ent(Int_t&, Int_t&, Float_t&, Float_t&, Float_t&);
-
-
-
 //_____________________________________________________________________________
 
-Int_t AliPythia::fgInit=0;
+AliPythia* AliPythia::fgAliPythia=NULL;
 
 AliPythia::AliPythia()
 {
-// Constructor
-    for (Int_t i=0; i<501; i++) {
-       fGPCode[i][0]=0; 
-       fGPCode[i][1]=0;
-    }
-}
-
-void  AliPythia::Lu1Ent(Int_t flag, Int_t idpart, 
-                     Float_t mom, Float_t theta,Float_t phi)
-{
-// Wrap of Pythia lu1ent subroutine
-  printf("%d %d %f %f %f\n",flag, idpart, mom, theta, phi);
-  lu1ent(flag, idpart, mom, theta, phi);
-
-}
-void AliPythia::DecayParticle(Int_t idpart, 
-                             Float_t mom, Float_t theta,Float_t phi)
-{
-// Decay a particle
-    Lu1Ent(0, idpart, mom, theta, phi);
-    GetPrimaries();
+// Default Constructor
 }
 
 void AliPythia::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfunc)
@@ -81,7 +51,7 @@ void AliPythia::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfun
     fEcms = energy;
     fStrucFunc = strucfunc;
 //  don't decay p0
-    SetMDCY(Lucomp(111),1,0);
+    SetMDCY(Pycomp(111),1,0);
 //  select structure function 
     SetMSTP(52,2);
     SetMSTP(51,strucfunc);
@@ -171,418 +141,30 @@ void AliPythia::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfun
     }
 //
 //  Initialize PYTHIA
-    Initialize("CMS","p","p",fEcms);
-}
-
-Int_t AliPythia::CountProducts(Int_t channel, Int_t particle)
-{
-// Count number of decay products
-    Int_t np=0;
-    for (Int_t i=1; i<=5; i++) {
-       if (TMath::Abs(GetKFDP(channel,i)) == particle) np++;
-    }
-    return np;
-}
-
-void AliPythia::AllowAllDecays()
-{
-// Reset decay flags
-    Int_t i;
-    for (i=1; i<= 2000; i++) {
-       SetMDME(i,1,1);
-    }
-//
-    for (i=0; i<501; i++){
-       fBraPart[i]=1;
-    }
-}
-
-void AliPythia::ForceParticleDecay(Int_t particle, Int_t product, Int_t mult)
-{
-//
-//  force decay of particle into products with multiplicity mult
+    SetMSTP(41,1);
 
-    Int_t kc=Lucomp(particle);
-    SetMDCY(kc,1,1);
-    Int_t ifirst=GetMDCY(kc,2);
-    Int_t ilast=ifirst+GetMDCY(kc,3)-1;
-    fBraPart[kc] = 1;
-//
-//  Loop over decay channels
-    for (Int_t channel=ifirst; channel<=ilast;channel++) {
-       if (CountProducts(channel,product) >= mult) {
-           SetMDME(channel,1,1);
-       } else {
-           SetMDME(channel,1,0);
-           fBraPart[kc]-=GetBRAT(channel);
-       }
-    }
+    Initialize("CMS","p","p",fEcms);
 }
 
-void AliPythia::ForceDecay(Decay_t decay)
+Int_t AliPythia::CheckedLuComp(Int_t kf)
 {
-// Force a particle decay mode
-    fDecay=decay;
-//
-// Make clean
-// AllowAllDecays();
-//
-// select mode    
-
-    switch (decay) 
-    {
-    case semimuonic:
-       if (fProcess==charm || fProcess == charm_unforced) {
-           ForceParticleDecay(  411,13,1); // D+/-     
-           ForceParticleDecay(  421,13,1); // D0     
-           ForceParticleDecay(  431,13,1); // D_s     
-           ForceParticleDecay( 4122,13,1); // Lambda_c     
-       }
-       if (fProcess==beauty || fProcess == beauty_unforced) {
-           ForceParticleDecay(  511,13,1); // B0     
-           ForceParticleDecay(  521,13,1); // B+/-     
-           ForceParticleDecay(  531,13,1); // B_s     
-           ForceParticleDecay( 5122,13,1); // Lambda_b    
-       }
-    break;
-    case dimuon:
-       ForceParticleDecay(   41,13,2); // phi
-       ForceParticleDecay(  443,13,2); // J/Psi
-       ForceParticleDecay(30443,13,2); // Psi'
-       ForceParticleDecay(  553,13,2); // Upsilon
-       ForceParticleDecay(30553,13,2); // Upsilon'
-       break;
-    case semielectronic:
-       
-       ForceParticleDecay(  411,11,1); // D+/-     
-       ForceParticleDecay(  421,11,1); // D0     
-       ForceParticleDecay(  431,11,1); // D_s     
-       ForceParticleDecay( 4122,11,1); // Lambda_c     
-       
-       ForceParticleDecay(  511,11,1); // B0     
-       ForceParticleDecay(  521,11,1); // B+/-     
-       ForceParticleDecay(  531,11,1); // B_s     
-       ForceParticleDecay( 5122,11,1); // Lambda_b     
-       break;
-    case dielectron:
-
-       ForceParticleDecay(   41,11,2); // phi
-       ForceParticleDecay(  443,11,2); // J/Psi
-       ForceParticleDecay(30443,11,2); // Psi'
-       ForceParticleDecay(  553,11,2); // Upsilon
-       ForceParticleDecay(30553,11,2); // Upsilon'
-       break;
-    case b_jpsi_dimuon:
-       ForceParticleDecay(  511,443,1); // B0     
-       ForceParticleDecay(  521,443,1); // B+/-     
-       ForceParticleDecay(  531,443,1); // B_s     
-       ForceParticleDecay( 5122,443,1); // Lambda_b
-       ForceParticleDecay(  443,13,2);  // J/Psi    
-       break;
-    case b_psip_dimuon:
-       ForceParticleDecay(  511,30443,1); // B0     
-       ForceParticleDecay(  521,30443,1); // B+/-     
-       ForceParticleDecay(  531,30443,1); // B_s     
-       ForceParticleDecay( 5122,30443,1); // Lambda_b 
-       ForceParticleDecay(30443,13,2);    // Psi'   
-       break;
-    case b_jpsi_dielectron:
-       ForceParticleDecay(  511,443,1); // B0     
-       ForceParticleDecay(  521,443,1); // B+/-     
-       ForceParticleDecay(  531,443,1); // B_s     
-       ForceParticleDecay( 5122,443,1); // Lambda_b
-       ForceParticleDecay(  443,11,2);  // J/Psi    
-       break;
-    case b_psip_dielectron:
-       ForceParticleDecay(  511,30443,1); // B0     
-       ForceParticleDecay(  521,30443,1); // B+/-     
-       ForceParticleDecay(  531,30443,1); // B_s     
-       ForceParticleDecay( 5122,30443,1); // Lambda_b 
-       ForceParticleDecay(30443,11,2);    // Psi'   
-       break;
-    case pitomu:
-       ForceParticleDecay(211,13,1); // pi->mu     
-       break;
-    case katomu:
-       ForceParticleDecay(321,13,1); // K->mu     
-       break;
-    case all:
-    case nodecay:
-       break;
-    }
+// Check Lund particle code (for debugging)
+    Int_t kc=Pycomp(kf);
+    printf("\n Lucomp kf,kc %d %d",kf,kc);
+    return kc;
 }
 
-
-    void AliPythia::DefineParticles()
+AliPythia* AliPythia::Instance()
 {
-// Define new particles
-    if (fgInit) return;
-    fgInit=1;
-    
-    Float_t mass;
-    Float_t tlife;
-    Int_t kc, nkc, i;
-//
-//
-// Some particles cloned for rare decays     
-//
-//  phi-> mu+mu- and phi -> e+e-
-//  clone the original phi
-    kc  = Lucomp(333);
-    nkc = 41;
-    
-    for (i=1;i<=3;i++) {
-       SetKCHG(nkc,i,GetKCHG(kc,i));
-    }
-    
-    for (i=1;i<=4;i++) {
-       SetPMAS(nkc,i,GetPMAS(kc,i));
+    if (fgAliPythia) {
+       return fgAliPythia;
+    } else {
+       fgAliPythia = new AliPythia();
+       return fgAliPythia;
     }
-    SetCHAF(nkc,GetCHAF(kc));
-    fBraPart[kc]=1;
-//    
-//  decay
-    SetMDCY(nkc,1,1);
-    SetMDCY(nkc,2,993);
-    SetMDCY(nkc,3,2);
-//
-//  phi-> e+e-
-    SetMDME(993,1,1);
-    SetMDME(993,2,0);
-    SetBRAT(993,2.99e-4);
-    SetKFDP(993,1,+11);
-    SetKFDP(993,2,-11);
-    SetKFDP(993,3,0);
-    SetKFDP(993,4,0);
-    SetKFDP(993,5,0);
-//
-//  phi-> mu+mu-
-    SetMDME(994,1,1);
-    SetMDME(994,2,0);
-    SetBRAT(994,2.5e-4);
-    SetKFDP(994,1,+13);
-    SetKFDP(994,2,-13);
-    SetKFDP(994,3,0);
-    SetKFDP(994,4,0);
-    SetKFDP(994,5,0);
-//
-//          Vector mesons
-//
-// phi clone for dilepton decay-channel
-    kc=Lucomp(41);         
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(113,"Phi",3,mass,0,tlife);
-    fGPCode[kc][0]=113;
-    fGPCode[kc][1]=113;
-    // J/Psi  
-    kc=Lucomp(443);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(114,"J/Psi",3,mass,0,tlife);
-    fGPCode[kc][0]=114;
-    fGPCode[kc][1]=114;
-    // psi prime
-    kc=Lucomp(30443);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(115,"Psi'",3,mass,0,tlife);
-    fGPCode[kc][0]=115;
-    fGPCode[kc][1]=115;
-    // upsilon(1s) 
-    kc=Lucomp(553);    
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(116,"Upsilon",3,mass,0,tlife);
-    fGPCode[kc][0]=116;
-    fGPCode[kc][1]=116;
-    // upsilon(2s)     
-    kc=Lucomp(30553);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(117,"Upsilon'",3,mass,0,tlife);
-    fGPCode[kc][0]=117;
-    fGPCode[kc][1]=117;
-    // upsilon(3s)     
-    kc=Lucomp(30553);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(118,"Upsilon''",3,mass,0,tlife);
-    fGPCode[kc][0]=118;
-    fGPCode[kc][1]=118;
-//
-// charmed mesons
-//
-    //  D^+/-
-    kc=Lucomp(411);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(119,"D^+",3,mass, 1,tlife);
-    gMC->Gspart(120,"D^-",3,mass,-1,tlife);
-    fGPCode[kc][0]=119;
-    fGPCode[kc][1]=120;
-    // D^0
-    kc=Lucomp(421);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(121,"D^0",3,mass,0,tlife);
-    gMC->Gspart(122,"D^0bar",3,mass,0,tlife);
-    fGPCode[kc][0]=121;
-    fGPCode[kc][1]=122;
-    // D_s
-    kc=Lucomp(431);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(123,"D_s^+",3,mass, 1,tlife);
-    gMC->Gspart(124,"D_s^-",3,mass,-1,tlife);
-    fGPCode[kc][0]=123;
-    fGPCode[kc][1]=124;
-    // Lambda_c
-    kc=Lucomp(4122);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(125,"Lambda_c+",3,mass, 1,tlife);
-    gMC->Gspart(126,"Lambda_c-",3,mass,-1,tlife);
-    fGPCode[kc][0]=125;
-    fGPCode[kc][1]=126;
-    //
-    //  beauty mesons
-    // B_0
-    kc=Lucomp(511);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(127,"B^0",3,mass, 0,tlife);
-    gMC->Gspart(128,"B^0bar",3,mass, 0,tlife);
-    fGPCode[kc][0]=127;
-    fGPCode[kc][1]=128;
-    // B^+-
-    kc=Lucomp(521);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(129,"B^+",3,mass, 1,tlife);
-    gMC->Gspart(130,"B^-",3,mass,-1,tlife);
-    fGPCode[kc][0]=129;
-    fGPCode[kc][1]=130;
-    // B_s
-    kc=Lucomp(531);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(131,"B_s",3,mass, 0,tlife);
-    gMC->Gspart(132,"B_s^bar",3,mass,0,tlife);
-    fGPCode[kc][0]=131;
-    fGPCode[kc][1]=132;
-    // Lambda_b
-    kc=Lucomp(5122);
-    mass =GetPMAS(kc,1);
-    tlife=GetPMAS(kc,4);
-    gMC->Gspart(133,"Lambda_b",3,mass, 0,tlife);
-    gMC->Gspart(134,"Lambda_b^bar",3,mass,0,tlife);
-    fGPCode[kc][0]=133;
-    fGPCode[kc][1]=134;
-//
-//          set up correspondance between standard GEANT particle codes
-//          and PYTHIA kf
-
-    kc=Lucomp(22);  // gamma
-    fGPCode[kc][0]=1;
-    fGPCode[kc][1]=1;
-    
-    kc=Lucomp(11);  // positron
-    fGPCode[kc][0]=2;
-    fGPCode[kc][1]=3;
-    
-    kc=Lucomp(12);  // neutrino
-    fGPCode[kc][0]=4;
-    fGPCode[kc][1]=4;
-
-    kc=Lucomp(13);  // muon
-    fGPCode[kc][0]=5;
-    fGPCode[kc][1]=6;
-    
-    kc=Lucomp(111); // pi0
-    fGPCode[kc][0]=7;
-    fGPCode[kc][1]=7;
-
-    kc=Lucomp(211); // pi+
-    fGPCode[kc][0]=8;
-    fGPCode[kc][1]=9;
-
-    kc=Lucomp(130); // K0 short
-    fGPCode[kc][0]=10;
-    fGPCode[kc][1]=10;
-
-    kc=Lucomp(321); // K+/-
-    fGPCode[kc][0]=11;
-    fGPCode[kc][1]=12;
-
-    kc=Lucomp(2112); // neutron/anti-neutron
-    fGPCode[kc][0]=13;
-    fGPCode[kc][1]=25;
-    
-    kc=Lucomp(2212); // proton/anti-proton
-    fGPCode[kc][0]=14;
-    fGPCode[kc][1]=15;
-    
-    kc=Lucomp(310);  // K0 short
-    fGPCode[kc][0]=16; 
-    fGPCode[kc][1]=16;
-
-    kc=Lucomp(221);  // eta
-    fGPCode[kc][0]=17;
-    fGPCode[kc][1]=17;
-
-    kc=Lucomp(3122); // lambda
-    fGPCode[kc][0]=18;
-    fGPCode[kc][1]=18;
-
-    kc=Lucomp(3222); // sigma+/antisigma+
-    fGPCode[kc][0]=19;
-    fGPCode[kc][1]=29;
-
-    kc=Lucomp(3212); // sigma0/antisigma0
-    fGPCode[kc][0]=20;
-    fGPCode[kc][1]=28;
-
-    kc=Lucomp(3112); // sigma-/antisigma-
-    fGPCode[kc][0]=21;
-    fGPCode[kc][1]=27;
-
-    kc=Lucomp(3322); // xsi0-/antixsi0
-    fGPCode[kc][0]=22;
-    fGPCode[kc][1]=30;
-
-    kc=Lucomp(3312); // xsi-/antixsi+
-    fGPCode[kc][0]=23;
-    fGPCode[kc][1]=31;
-
-    kc=Lucomp(3334); // omega/antiomega
-    fGPCode[kc][0]=24;
-    fGPCode[kc][1]=32;
-}
-
-
-    
-Int_t  AliPythia::GetGeantCode(Int_t kf)
-{
-// Get geant code
-    Int_t kc=Lucomp(TMath::Abs(kf));
-    return (kf > 0) ? fGPCode[kc][0] : fGPCode[kc][1];
-}
-    
-Float_t  AliPythia::GetBraPart(Int_t kf)
-{
-// Get branching ratio
-    Int_t kc=Lucomp(TMath::Abs(kf));
-    return fBraPart[kc];
 }
+void AliPythia::Streamer(TBuffer &R__b) {} 
 
-Int_t AliPythia::CheckedLuComp(Int_t kf)
-{
-// Check Lund particle code (for debugging)
-    Int_t kc=Lucomp(kf);
-    printf("\n Lucomp kf,kc %d %d",kf,kc);
-    return kc;
-}
 
 
 

diff --git a/EVGEN/AliPythia.h b/EVGEN/AliPythia.h
index e0c148bb607b3178a3265f1400a794c19fef8dcb..d1fca32e2d7b7c59249c27203051a65cee27d537 100644 (file)
--- a/EVGEN/AliPythia.h
+++ b/EVGEN/AliPythia.h
@@ -5,60 +5,27 @@
 
 /* $Id$ */
 
-#include <TPythia.h>
+#include <TPythia6.h>
 #include "GenTypeDefs.h"
 
-class AliPythia:public TPythia
+class AliPythia:public TPythia6
 {
  public:
-    AliPythia();
     virtual ~AliPythia(){;}
     // convert to compressed code and print result (for debugging only)
     virtual Int_t CheckedLuComp(Int_t kf);
-    // entry to the corresponding lujet function
-    virtual void Lu1Ent(int flag, int idpart, 
-                       float mom, float theta,float phi);
-    // Decay a Particle
-    virtual void DecayParticle
-       (Int_t idpart, Float_t mom, Float_t theta,Float_t phi);
-    //
     // Pythia initialisation for selected processes
     virtual void ProcInit
        (Process_t process, Float_t energy, StrucFunc_t strucfunc);
-    //
-    // Count decay products
-    virtual Int_t CountProducts(Int_t channel, Int_t particle);
-    
-    //
-    // Force decay modes
-    //
-    // select type and multiplicity of the decay product
-    virtual void ForceParticleDecay(Int_t particle,Int_t product,Int_t mult);
-    //
-    // force a particular decy-type
-    virtual void ForceDecay(Decay_t  decay);
-    // don't force any decay
-    virtual void AllowAllDecays();
-    
-    //
-    // Define heavy mesons to GEANT and make correspondance
-    // GEANT - Pythia particle code
-    virtual void DefineParticles();
-    //
-    // Convert from Pythia to Geant particle code
-    virtual Int_t  GetGeantCode(Int_t kf);
-    //
-    // Get sum of branching ratios for forced decays
-    virtual Float_t GetBraPart(Int_t kf);
+    static  AliPythia* Instance();
+
  protected:
-    Process_t     fProcess;         // Process type
-    Decay_t       fDecay;           // Decay channel 
-    Float_t       fEcms;            // Centre of mass energy
-    StrucFunc_t   fStrucFunc;       // Structure function
-    Int_t         fGPCode[501][2];  // Particle codes
-    Float_t       fBraPart[501];    // Branching ratios
-    static        Int_t fgInit;     // Make sure that only one object of type
-                                    // AliPythia is ceated
+    Process_t     fProcess;           // Process type
+    Float_t       fEcms;              // Centre of mass energy
+    StrucFunc_t   fStrucFunc;         // Structure function
+    static AliPythia*    fgAliPythia; // Pointer to single instance
+ private: 
+    AliPythia();
 
     ClassDef(AliPythia,1) //ALICE UI to PYTHIA
 };