Fixed EINLUDE

[u/mrichter/AliRoot.git] / EVGEN / AliGenMUONCocktail.cxx

diff --git a/EVGEN/AliGenMUONCocktail.cxx b/EVGEN/AliGenMUONCocktail.cxx
index badde6d5776aa87db43561e59bbb789f78bed13f..89fe4de562b6fd9a6fb432be1040a52418734fc7 100644 (file)
--- a/EVGEN/AliGenMUONCocktail.cxx
+++ b/EVGEN/AliGenMUONCocktail.cxx
@@ -47,49 +47,26 @@ ClassImp(AliGenMUONCocktail)
   
 //________________________________________________________________________
 AliGenMUONCocktail::AliGenMUONCocktail()
-  :AliGenCocktail()
+    :AliGenCocktail(),
+     fFastGlauber (0x0),
+     fTotalRate(0),  
+     fMuonMultiplicity(1),
+     fMuonPtCut(1.),
+     fMuonThetaMinCut(171.), 
+     fMuonThetaMaxCut(178.),
+     fNSucceded(0), 
+     fNGenerated(0), 
+     fLowImpactParameter(0.),
+     fHighImpactParameter(5.),
+     fAverageImpactParameter(0.),
+     fNumberOfCollisions(0.), 
+     fNumberOfParticipants(0.),
+     fHadronicMuons(kTRUE),
+     fInvMassCut (kFALSE),
+     fInvMassMinCut (0.),
+     fInvMassMaxCut (100.)
 {
 // Constructor
-  fFastGlauber =0x0;
-  fTotalRate =0;  
-  fNSucceded=0; 
-  fNGenerated=0; 
-  fMuonMultiplicity=1;
-  fMuonPtCut= 1.;
-  fMuonThetaMinCut=171.; 
-  fMuonThetaMaxCut=178.;
-  fLowImpactParameter = 0.;
-  fHighImpactParameter = 5.;
-  fAverageImpactParameter =0.;
-  fNumberOfCollisions   = 0.; 
-  fNumberOfParticipants = 0.;
-  fHadronicMuons = kTRUE;
-  fInvMassCut = kFALSE;
-  fInvMassMinCut = 0.;
-  fInvMassMaxCut = 100.;
-}
-//_________________________________________________________________________
-AliGenMUONCocktail::AliGenMUONCocktail(const AliGenMUONCocktail & cocktail):
-    AliGenCocktail(cocktail)
-{
-// Copy constructor
-  fFastGlauber =0x0;
-  fTotalRate =0; 
-  fNSucceded=0; 
-  fNGenerated=0; 
-  fMuonMultiplicity=1;
-  fMuonPtCut= 1.;
-  fMuonThetaMinCut=171.; 
-  fMuonThetaMaxCut=178.;  
-  fLowImpactParameter = 0.;
-  fHighImpactParameter = 5.;
-  fAverageImpactParameter =0.;
-  fNumberOfCollisions = 0.; 
-  fNumberOfParticipants = 0.;
-  fHadronicMuons = kTRUE;
-  fInvMassCut = kFALSE;
-  fInvMassMinCut = 0.;
-  fInvMassMaxCut = 100.;
 }
 //_________________________________________________________________________
 AliGenMUONCocktail::~AliGenMUONCocktail()
@@ -105,7 +82,7 @@ void AliGenMUONCocktail::Init()
   Double_t sigmaReaction =   0.072;   // MinBias NN cross section for PbPb LHC energies  http://arxiv.org/pdf/nucl-ex/0302016
 
   // Initialising Fast Glauber object
-  fFastGlauber = new AliFastGlauber();
+  fFastGlauber = AliFastGlauber::Instance();
   fFastGlauber->SetPbPbLHC();
   fFastGlauber->SetNNCrossSection(sigmaReaction*1000.); //Expected NN cross-section in mb at LHC with diffractive part http://arxiv.org/pdf/nucl-ex/0302016 )
   fFastGlauber->Init(1);
@@ -388,7 +365,7 @@ void AliGenMUONCocktail::Generate()
     AliGenCocktailEntry *entry = 0;
     AliGenCocktailEntry *preventry = 0;
     AliGenerator* gen = 0;
-    TObjArray *partArray = gAlice->GetMCApp()->Particles();
+    const TObjArray *partArray = gAlice->GetMCApp()->Particles();
 
 //  Generate the vertex position used by all generators    
     if(fVertexSmear == kPerEvent) Vertex();
@@ -397,10 +374,10 @@ void AliGenMUONCocktail::Generate()
     Bool_t primordialTrigger = kFALSE;
     while(!primordialTrigger) {
                //Reseting stack
-               AliRunLoader * runloader = gAlice->GetRunLoader();
+               AliRunLoader * runloader = AliRunLoader::Instance();
                if (runloader)
                        if (runloader->Stack())
-                               runloader->Stack()->Reset();
+                               runloader->Stack()->Clean();
                // Loop over generators and generate events
                Int_t igen=0;
                Int_t npart =0;
@@ -473,9 +450,3 @@ void AliGenMUONCocktail::Generate()
 
     AliDebug(5,Form("Generated Events are %d and Succeeded Events are %d",fNGenerated,fNSucceded));
 }
-
-
-
-
-
-