AliFastGlauber is a singleton.

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

diff --git a/EVGEN/AliGenMUONCocktail.cxx b/EVGEN/AliGenMUONCocktail.cxx
index 5968c647c4d96a2120fbf04ba62e05b09b9a1ee6..dd263e502a381cd6379faefae7f84ed1dc1c45a1 100644 (file)
--- a/EVGEN/AliGenMUONCocktail.cxx
+++ b/EVGEN/AliGenMUONCocktail.cxx
@@ -68,30 +68,6 @@ AliGenMUONCocktail::AliGenMUONCocktail()
 {
 // Constructor
 }
-//_________________________________________________________________________
-AliGenMUONCocktail::AliGenMUONCocktail(const AliGenMUONCocktail & cocktail):
-    AliGenCocktail(cocktail),
-    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.)
-{
-// Copy constructor
-}
-
 //_________________________________________________________________________
 AliGenMUONCocktail::~AliGenMUONCocktail()
 {
@@ -106,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);
@@ -389,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();
@@ -401,7 +377,7 @@ void AliGenMUONCocktail::Generate()
                AliRunLoader * runloader = gAlice->GetRunLoader();
                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;
@@ -474,19 +450,3 @@ void AliGenMUONCocktail::Generate()
 
     AliDebug(5,Form("Generated Events are %d and Succeeded Events are %d",fNGenerated,fNSucceded));
 }
-
-
-AliGenMUONCocktail& AliGenMUONCocktail::operator=(const  AliGenMUONCocktail& rhs)
-{
-// Assignment operator
-    rhs.Copy(*this);
-    return *this;
-}
-
-void AliGenMUONCocktail::Copy(TObject &) const
-{
-    Fatal("Copy","Not implemented!\n");
-}
-
-
-