Eta and omega added.

diff --git a/EVGEN/AliGenMUONlib.cxx b/EVGEN/AliGenMUONlib.cxx
index 1b55475..a1d6145 100644 (file)
--- a/EVGEN/AliGenMUONlib.cxx
+++ b/EVGEN/AliGenMUONlib.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.13  2001/03/27 11:01:04  morsch
+Charm pt-distribution corrected. More realistic y-distribution for pi and K.
+
 Revision 1.12  2001/03/09 13:01:41  morsch
 - enum constants for paramterisation type (particle family) moved to AliGen*lib.h
 - use AliGenGSIlib::kUpsilon, AliGenPHOSlib::kEtaPrime to access the constants
@@ -267,7 +270,60 @@ Double_t AliGenMUONlib::YPhi( Double_t *px, Double_t *dummy)
 Int_t AliGenMUONlib::IpPhi(TRandom *)
 {
 // Phi composition
-    return 41;
+    return 333;
+}
+
+//
+//                        omega
+//
+//
+//    pt-distribution (by scaling of pion distribution)
+//____________________________________________________________
+Double_t AliGenMUONlib::PtOmega( Double_t *px, Double_t *dummy)
+{
+// Omega pT
+  return PtScal(*px,5);
+}
+//    y-distribution
+Double_t AliGenMUONlib::YOmega( Double_t *px, Double_t *dummy)
+{
+// Omega y
+    Double_t *dum=0;
+    return YJpsi(px,dum);
+}
+//                 particle composition
+//
+Int_t AliGenMUONlib::IpOmega(TRandom *)
+{
+// Omega composition
+    return 223;
+}
+
+
+//
+//                        Eta
+//
+//
+//    pt-distribution (by scaling of pion distribution)
+//____________________________________________________________
+Double_t AliGenMUONlib::PtEta( Double_t *px, Double_t *dummy)
+{
+// Eta pT
+  return PtScal(*px,3);
+}
+//    y-distribution
+Double_t AliGenMUONlib::YEta( Double_t *px, Double_t *dummy)
+{
+// Eta y
+    Double_t *dum=0;
+    return YJpsi(px,dum);
+}
+//                 particle composition
+//
+Int_t AliGenMUONlib::IpEta(TRandom *)
+{
+// Eta composition
+    return 221;
 }
 
 //
@@ -371,6 +427,12 @@ GenFunc AliGenMUONlib::GetPt(Int_t param,  const char* tname)
     case kPhi:
        func=PtPhi;
        break;
+    case kOmega:
+       func=PtOmega;
+       break;
+    case kEta:
+       func=PtEta;
+       break;
     case kJpsi:
        func=PtJpsi;
        break;
@@ -405,6 +467,12 @@ GenFunc AliGenMUONlib::GetY(Int_t param, const char* tname)
     case kPhi:
        func=YPhi;
        break;
+    case kEta:
+       func=YEta;
+       break;
+    case kOmega:
+       func=YOmega;
+       break;
     case kJpsi:
        func=YJpsi;
        break;
@@ -439,6 +507,12 @@ GenFuncIp AliGenMUONlib::GetIp(Int_t param,  const char* tname)
     case kPhi:
        func=IpPhi;
        break;
+    case kEta:
+       func=IpEta;
+       break;
+    case kOmega:
+       func=IpOmega;
+       break;
     case kJpsi:
        func=IpJpsi;
        break;

diff --git a/EVGEN/AliGenMUONlib.h b/EVGEN/AliGenMUONlib.h
index 48ee53b..5500104 100644 (file)
--- a/EVGEN/AliGenMUONlib.h
+++ b/EVGEN/AliGenMUONlib.h
@@ -11,7 +11,7 @@ class AliGenMUONlib :
   public AliGenLib
 {
  public:
-    enum constants{kPhi, kJpsi, kUpsilon, kCharm, kBeauty, kPion, kKaon};
+    enum constants{kPhi, kOmega, kEta, kJpsi, kUpsilon, kCharm, kBeauty, kPion, kKaon};
     
     
 // pions
@@ -27,6 +27,14 @@ class AliGenMUONlib :
     static Double_t PtPhi( Double_t *px, Double_t *dummy);
     static Double_t YPhi( Double_t *px, Double_t *dummy);
     static Int_t    IpPhi(TRandom *ran);
+// Omega
+    static Double_t PtOmega( Double_t *px, Double_t *dummy);
+    static Double_t YOmega( Double_t *px, Double_t *dummy);
+    static Int_t    IpOmega(TRandom *ran);
+// Eta
+    static Double_t PtEta( Double_t *px, Double_t *dummy);
+    static Double_t YEta( Double_t *px, Double_t *dummy);
+    static Int_t    IpEta(TRandom *ran);
 // J/Psi     
     static Double_t PtJpsi( Double_t *px, Double_t *dummy);
     static Double_t YJpsi(Double_t *py, Double_t *dummy);