X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenParam.h;h=4b978ba8bb7ea65b21c0df27e757eab259f75692;hb=4dbd531e66ed63dc9e08ec98875823a33dd86903;hp=54244f471ee3cbae752a171622aee60ea15e391c;hpb=5c3fd7ea762232b455d7b59c4a255ffd99cc9867;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenParam.h b/EVGEN/AliGenParam.h
index 54244f471ee..4b978ba8bb7 100644
--- a/EVGEN/AliGenParam.h
+++ b/EVGEN/AliGenParam.h
@@ -5,81 +5,68 @@
 
 /* $Id$ */
 
-#include "AliGenerator.h"
-#include "GenTypeDefs.h"
-#include <TArrayI.h>
+//
+// Class to generate particles from using parametrized pT and y distributions.
+// Distributions are obtained from pointer to object of type AliGenLib.
+// (For example AliGenMUONlib)
+//
+// andreas.morsch@cern.ch
+//
+
+#include "AliGenMC.h"
 
 class AliPythia;
 class TParticle;
+class AliGenLib;
 class TF1;
 
+typedef enum { kAnalog, kNonAnalog} Weighting_t;
 //-------------------------------------------------------------
-class AliGenParam : public AliGenerator
+class AliGenParam : public AliGenMC
 {
  public:
     AliGenParam();
-    AliGenParam(Int_t npart, Param_t param);
-    AliGenParam(Int_t npart, Param_t param,
+    AliGenParam(Int_t npart, AliGenLib * Library, Int_t param, char* tname = 0);
+    AliGenParam(Int_t npart, Int_t param, const char* tname = 0, const char* name = 0);
+    AliGenParam(Int_t npart, Int_t param,
 		Double_t (*PtPara)(Double_t*, Double_t*),
 		Double_t (*YPara )(Double_t*, Double_t*),
-		Int_t    (*IpPara)()                      );
-    AliGenParam(const AliGenParam &Param);
+		Int_t    (*IpPara)(TRandom*)           );
      
     virtual ~AliGenParam();
     virtual void Generate();
     virtual void Init();
     // select particle type
-    virtual void SetParam(Param_t param=jpsi_p) {fParam=param;}
+    virtual void SetParam(Int_t param) {fParam = param;}
     // force decay type
-    virtual void SetForceDecay(Decay_t decay=dimuon) {fForceDecay=decay;}
-    virtual void SetWeighting(Weighting_t flag=analog) {fAnalog=flag;}	
-    virtual void SetCutOnChild(Int_t flag=0) {fCutOnChild=flag;}
-    virtual void SetChildMomentumRange(Float_t pmin=0, Float_t pmax=1.e10)
-	{fChildPMin = pmin; fChildPMax = pmax;}
-    virtual void SetChildPtRange(Float_t ptmin=0, Float_t ptmax=20.)
-	{fChildPtMin = ptmin; fChildPtMax = ptmax;}
-    virtual void SetChildPhiRange(Float_t phimin=-180., Float_t phimax=180)
-	{fChildPhiMin = TMath::Pi()*phimin/180;
-	fChildPhiMax = TMath::Pi()*phimax/180;}
-    virtual void SetChildThetaRange(Float_t thetamin=0, Float_t thetamax=180)
-	{fChildThetaMin = TMath::Pi()*thetamin/180;
-	fChildThetaMax = TMath::Pi()*thetamax/180;}
-    virtual void SetDeltaPt(Float_t delta=0.01) {fDeltaPt=delta;}
-    
-    AliGenParam & operator=(const AliGenParam & rhs);
+    virtual void SetWeighting(Weighting_t flag = kAnalog) {fAnalog = flag;}	
+    virtual void SetDeltaPt(Float_t delta=0.01) {fDeltaPt = delta;}
+    virtual void SetDecayer(AliDecayer* decayer) {fDecayer = decayer;}
+    virtual void Draw(const char * opt);
+    TF1 *  GetPt() { return fPtPara;}
+    TF1 *  GetY() {return fYPara;}
+    Float_t GetRelativeArea(Float_t ptMin, Float_t ptMax, Float_t yMin, Float_t yMax, Float_t phiMin, Float_t phiMax);
+
  protected:
     Double_t (*fPtParaFunc)(Double_t*, Double_t*); //! Pointer to Pt parametrisation function
     Double_t (*fYParaFunc )(Double_t*, Double_t*); //! Pointer to Y parametrisation function
-    Int_t    (*fIpParaFunc )();    //! Pointer to particle type parametrisation function
+    Int_t    (*fIpParaFunc )(TRandom*);    //! Pointer to particle type parametrisation function
     TF1* fPtPara;              // Transverse momentum parameterisation
     TF1* fYPara;               // Rapidity parameterisation
-    Param_t     fParam;        // Parameterisation type 
+    Int_t       fParam;        // Parameterisation type 
     Float_t     fdNdy0;        // central multiplicity per event
     Float_t     fYWgt;         // Y-weight
     Float_t     fPtWgt;        // Pt-weight
-    Weighting_t fAnalog;       // Flag for anolog or pt-weighted generation
     Float_t     fBias;         // Biasing factor
     Int_t       fTrials;       // Number of trials
-    Decay_t     fForceDecay;   // Decay channel forced
-    Int_t       fCutOnChild;   // Cuts on decay products (children)  are enabled/disabled
-    Float_t     fChildPtMin;   // Children minimum pT
-    Float_t     fChildPtMax;   // Children maximum pT
-    Float_t     fChildPMin;    // Children minimum p
-    Float_t     fChildPMax;    // Children maximum p
-    Float_t     fChildPhiMin;  // Children minimum phi
-    Float_t     fChildPhiMax;  // Children maximum phi
-    Float_t     fChildThetaMin;// Children minimum theta
-    Float_t     fChildThetaMax;// Children maximum theta
     Float_t     fDeltaPt;      // pT sampling in steps of fDeltaPt
-    TArrayI     fChildSelect;  // Children to be selected from decay products
-    AliPythia   *fPythia;      // Pointer to pythia object for decays
+    AliDecayer  *fDecayer;     // ! Pointer to pythia object for decays
+
  private:
-    // check if particle is selected as child
-    Bool_t ChildSelected(Int_t ip);
-    // all kinematic selection goes here
-    Bool_t KinematicSelection(TParticle *particle);
+    AliGenParam(const AliGenParam &Param);
+    AliGenParam & operator=(const AliGenParam & rhs);
 
-  ClassDef(AliGenParam,1) // Generator using parameterised pt- and y-distribution
+    ClassDef(AliGenParam,1) // Generator using parameterised pt- and y-distribution
 };
 #endif