EffC++ warnings corrected.

[u/mrichter/AliRoot.git] / PYTHIA6 / AliPythia.h

diff --git a/PYTHIA6/AliPythia.h b/PYTHIA6/AliPythia.h
index 3bc3bdb10632e71115234777849fd57f9bfd2ec8..708e877c1ef46a3e80215d22fb6f370d510cba2d 100644 (file)
--- a/PYTHIA6/AliPythia.h
+++ b/PYTHIA6/AliPythia.h
@@ -8,31 +8,17 @@
 #include <TPythia6.h>
 #include <AliRndm.h>
 #include <AliStructFuncType.h>
+
 typedef enum
 {kPyCharm, kPyBeauty, kPyCharmUnforced, kPyBeautyUnforced,
  kPyJpsi, kPyJpsiChi, kPyMb, kPyMbNonDiffr, kPyJets, kPyDirectGamma,
- kPyCharmPbPbMNR, kPyD0PbPbMNR, kPyDPlusPbPbMNR, kPyBeautyPbPbMNR,
- kPyCharmpPbMNR, kPyD0pPbMNR, kPyDPluspPbMNR, kPyBeautypPbMNR,
- kPyCharmppMNR, kPyD0ppMNR, kPyDPlusppMNR, kPyBeautyppMNR}
+ kPyCharmPbPbMNR, kPyD0PbPbMNR, kPyDPlusPbPbMNR, kPyDPlusStrangePbPbMNR, kPyBeautyPbPbMNR,
+ kPyCharmpPbMNR, kPyD0pPbMNR, kPyDPluspPbMNR, kPyDPlusStrangepPbMNR, kPyBeautypPbMNR,
+ kPyCharmppMNR, kPyCharmppMNRwmi, kPyD0ppMNR, kPyDPlusppMNR, kPyDPlusStrangeppMNR, 
+ kPyBeautyppMNR, kPyBeautyppMNRwmi, kPyW, kPyZ, kPyMbMSEL1,
+ kPyOldUEQ2ordered, kPyOldUEQ2ordered2, kPyOldPopcorn}
 Process_t;
-/*
-typedef enum
-{
-    kDOSet1     = 1006,
-    kGRVLO      = 5005,
-    kGRVHO      = 5006,
-    kMRSDminus  = 3031,
-    kMRSD0      = 3030,
-    kMRSG       = 3041,
-    kCTEQ2pM    = 4024,
-    kCTEQ4L     = 4032,
-    kCTEQ4M     = 4034,
-    kMRSTcgLO   = 3072,
-    kCTEQ5L     = 4046,
-    kGRVLO98    = 5012
-}
-StrucFunc_t;
-*/
+
 class AliFastGlauber;
 class AliQuenchingWeights;
 
@@ -52,27 +38,37 @@ class AliPythia : public TPythia6, public AliRndm
     virtual void PrintParticles();
     virtual void ResetDecayTable();
     virtual void SetDecayTable();
+    virtual void Pyevnw();
     virtual void Pycell(Int_t& nclus);
     virtual void Pyclus(Int_t& nclus);
     virtual void Pyshow(Int_t ip1, Int_t ip2, Double_t qmax);
     virtual void Pyrobo(Int_t imi, Int_t ima, Double_t the, Double_t phi, Double_t bex, Double_t bey, Double_t bez);
-    virtual void InitQuenching(Float_t bmin, Float_t bmax, Float_t qTransport, Float_t maxLength, Int_t iECMethod);
-    
+    virtual void InitQuenching(Float_t bmin, Float_t bmax, Float_t k, Int_t iECMethod);
+    virtual void Pyquen(Double_t a, Int_t ibf, Double_t b);
+    virtual void GetQuenchingParameters(Double_t& xp, Double_t& yp, Double_t z[4]);
     // return instance of the singleton
     static  AliPythia* Instance();
     virtual void Quench();
+    // Assignment Operator
+    AliPythia & operator=(const AliPythia & rhs);
+    void Copy(TObject&) const;
  protected:
     Process_t             fProcess;           // Process type
     Float_t               fEcms;              // Centre of mass energy
     StrucFunc_t           fStrucFunc;         // Structure function
     Int_t                 fDefMDCY[501];      //  ! Default decay switches per particle
     Int_t                 fDefMDME[2001];     //  ! Default decay switches per mode
+    Double_t              fZQuench[4];        //  ! Quenching fractions for this even
+    Double_t              fXJet;              //  ! Jet production point X
+    Double_t              fYJet;              //  ! Jet production point Y
     AliFastGlauber*       fGlauber;           //  ! The Glauber model
     AliQuenchingWeights*  fQuenchingWeights;  //  ! The Quenching Weights model
     static AliPythia*     fgAliPythia;        // Pointer to single instance
  private: 
     AliPythia();
-
+    AliPythia(const AliPythia& pythia);
+    void ConfigHeavyFlavor();
+    void AtlasTuning();
     ClassDef(AliPythia,1) //ALICE UI to PYTHIA
 };
 
@@ -81,3 +77,4 @@ class AliPythia : public TPythia6, public AliRndm
 
 
 
+