X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenMC.cxx;h=63872c8f7e4641cc375410e7fef7f16d4e81efb6;hb=21f7f426b6b94b8f1ffefd028bd0bbc58acd2339;hp=a3ff1e849bc36348609928f47b692026d2b9dc78;hpb=56d4723979f163f5fdb63c66bdaf9e2da058e8dc;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenMC.cxx b/EVGEN/AliGenMC.cxx
index a3ff1e849bc..63872c8f7e4 100644
--- a/EVGEN/AliGenMC.cxx
+++ b/EVGEN/AliGenMC.cxx
@@ -21,60 +21,116 @@
 // decay products and particle selection.
 // andreas.morsch@cern.ch
 
+#include <TClonesArray.h>
 #include <TMath.h>
 #include <TPDGCode.h>
 #include <TParticle.h>
 
 #include "AliGenMC.h"
+#include "AliGeometry.h"
 
 ClassImp(AliGenMC)
 
 AliGenMC::AliGenMC()
-    :AliGenerator()
+    :AliGenerator(),
+     fParticles(0),
+     fParentSelect(8),
+     fChildSelect(8),
+     fCutOnChild(0),
+     fChildPtMin(0.),
+     fChildPtMax(1.e10),
+     fChildPMin(0.),
+     fChildPMax(1.e10),
+     fChildPhiMin(0.),
+     fChildPhiMax(2. * TMath::Pi()),
+     fChildThetaMin(0.),
+     fChildThetaMax(TMath::Pi()),
+     fChildYMin(-12.),
+     fChildYMax(12.),
+     fXingAngleX(0.),
+     fXingAngleY(0.),
+     fForceDecay(kAll),
+     fMaxLifeTime(1.e-15),
+     fAProjectile(1),
+     fZProjectile(1),
+     fATarget(1),
+     fZTarget(1),
+     fProjectile("P"),
+     fTarget("P"),    
+     fDyBoost(0.),
+     fGeometryAcceptance(0),
+     fPdgCodeParticleforAcceptanceCut(0),
+     fNumberOfAcceptedParticles(2)
 {
 // Default Constructor
-    SetCutOnChild();
-    SetChildMomentumRange();
-    SetChildPtRange();
-    SetChildPhiRange();
-    SetChildThetaRange(); 
-    SetChildYRange(); 
-    SetMaximumLifetime();
-    SetGeometryAcceptance();
-    SetPdgCodeParticleforAcceptanceCut();
-    SetNumberOfAcceptedParticles();
-    SetTarget();
-    SetProjectile();
-    fParentSelect.Set(8);
-    fChildSelect.Set(8);
-    fForceDecay = kAll;
 }
 
 AliGenMC::AliGenMC(Int_t npart)
-    :AliGenerator(npart)
+    :AliGenerator(npart),
+     fParticles(0),
+     fParentSelect(8),
+     fChildSelect(8),
+     fCutOnChild(0),
+     fChildPtMin(0.),
+     fChildPtMax(1.e10),
+     fChildPMin(0.),
+     fChildPMax(1.e10),
+     fChildPhiMin(0.),
+     fChildPhiMax(2. * TMath::Pi()),
+     fChildThetaMin(0.),
+     fChildThetaMax(TMath::Pi()),
+     fChildYMin(-12.),
+     fChildYMax(12.),
+     fXingAngleX(0.),
+     fXingAngleY(0.),
+     fForceDecay(kAll),
+     fMaxLifeTime(1.e-15),
+     fAProjectile(1),
+     fZProjectile(1),
+     fATarget(1),
+     fZTarget(1),
+     fProjectile("P"),
+     fTarget("P"),    
+     fDyBoost(0.),
+     fGeometryAcceptance(0),
+     fPdgCodeParticleforAcceptanceCut(0),
+     fNumberOfAcceptedParticles(2)
 {
 //  Constructor
-    SetCutOnChild();
-    SetChildMomentumRange();
-    SetChildPtRange();
-    SetChildPhiRange();
-    SetChildThetaRange();
-    SetChildYRange(); 
 // 
-    fParentSelect.Set(8);
-    fChildSelect.Set(8);
     for (Int_t i=0; i<8; i++) fParentSelect[i]=fChildSelect[i]=0;
-    SetMaximumLifetime();
-    SetGeometryAcceptance();
-    SetPdgCodeParticleforAcceptanceCut();
-    SetNumberOfAcceptedParticles();
-    SetTarget();
-    SetProjectile();
-    fForceDecay = kAll;
 }
 
 AliGenMC::AliGenMC(const AliGenMC & mc):
-    AliGenerator(mc)
+    AliGenerator(mc),
+    fParticles(0),
+    fParentSelect(8),
+    fChildSelect(8),
+    fCutOnChild(0),
+    fChildPtMin(0.),
+    fChildPtMax(1.e10),
+    fChildPMin(0.),
+    fChildPMax(1.e10),
+    fChildPhiMin(0.),
+    fChildPhiMax(2. * TMath::Pi()),
+    fChildThetaMin(0.),
+    fChildThetaMax(TMath::Pi()),
+    fChildYMin(-12.),
+    fChildYMax(12.),
+    fXingAngleX(0.),
+    fXingAngleY(0.),
+    fForceDecay(kAll),
+    fMaxLifeTime(1.e-15),
+    fAProjectile(1),
+    fZProjectile(1),
+    fATarget(1),
+    fZTarget(1),
+    fProjectile("P"),
+    fTarget("P"),    
+    fDyBoost(0.),
+    fGeometryAcceptance(0),
+    fPdgCodeParticleforAcceptanceCut(0),
+    fNumberOfAcceptedParticles(2)
 {
 // Copy constructor
     mc.Copy(*this);
@@ -103,8 +159,13 @@ void AliGenMC::Init()
     case kBPsiPrimeDiMuon:
     case kPiToMu:
     case kKaToMu:
+    case kWToMuon:
+    case kWToCharmToMuon:
+    case kZDiMuon:
 	fChildSelect[0]=kMuonMinus;
 	break;
+    case kWToCharm:
+	break;
     case kHadronicD:
 	fChildSelect[0]=kPiPlus;
 	fChildSelect[1]=kKPlus;