Added const where compiler told me to

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

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index beaba6657720201e114884a07da638896c4ec1bf..ab04cd4579b7354ac0bc60c017ac3db2ef062940 100644 (file)
--- a/EVGEN/AliGenCocktail.cxx
+++ b/EVGEN/AliGenCocktail.cxx
@@ -15,6 +15,18 @@
 
 /*
 $Log$
+Revision 1.12  2001/06/18 13:07:30  morsch
+Forward kinematic ranges to entries only if not set by user.
+
+Revision 1.11  2001/01/30 09:23:12  hristov
+Streamers removed (R.Brun)
+
+Revision 1.10  2001/01/26 19:55:49  hristov
+Major upgrade of AliRoot code
+
+Revision 1.9  2000/12/21 16:24:06  morsch
+Coding convention clean-up
+
 Revision 1.8  2000/10/27 13:53:29  morsch
 AddGenerator: check testbit before setting the pT and momentum range
 (D.Y. Peressounko)
@@ -53,6 +65,8 @@ AliGenCocktail::AliGenCocktail()
 {
 // Constructor
     fEntries = new TList;
+    flnk1 = 0;
+    flnk2 = 0;
     fNGenerators=0;
 }
 
@@ -72,18 +86,19 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
 {
 //
 //  Forward parameters to the new generator
-    if(TestBit(kPtRange)) 
-    Generator->SetPtRange(fPtMin,fPtMax);
-    if(TestBit(kMomentumRange))
-    Generator->SetMomentumRange(fPMin,fPMax);
-
-    Generator->SetYRange(fYMin,fYMax);
-    Generator->
-       SetPhiRange(fPhiMin*180/TMath::Pi(),fPhiMax*180/TMath::Pi());
-    Generator->
-       SetThetaRange(fThetaMin*180/TMath::Pi(),fThetaMax*180/TMath::Pi());
-    Generator->
-       SetOrigin(fOrigin[0], fOrigin[1], fOrigin[2]);
+    if(TestBit(kPtRange) && !(Generator->TestBit(kPtRange)) && !(Generator->TestBit(kMomentumRange))) 
+       Generator->SetPtRange(fPtMin,fPtMax);
+    if(TestBit(kMomentumRange) && !(Generator->TestBit(kPtRange)) && !(Generator->TestBit(kMomentumRange)))
+       Generator->SetMomentumRange(fPMin,fPMax);
+    
+    if (!(Generator->TestBit(kYRange)))    
+       Generator->SetYRange(fYMin,fYMax);
+    if (!(Generator->TestBit(kPhiRange)))   
+       Generator->SetPhiRange(fPhiMin*180/TMath::Pi(),fPhiMax*180/TMath::Pi());
+    if (!(Generator->TestBit(kThetaRange))) 
+       Generator->SetThetaRange(fThetaMin*180/TMath::Pi(),fThetaMax*180/TMath::Pi());
+    if (!(Generator->TestBit(kVertexRange))) 
+       Generator->SetOrigin(fOrigin[0], fOrigin[1], fOrigin[2]);
     Generator->
        SetSigma(fOsigma[0], fOsigma[1], fOsigma[2]);
     Generator->SetVertexSmear(fVertexSmear);
@@ -117,7 +132,7 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
     AliGenCocktailEntry *entry;
     AliGenCocktailEntry *e1;
     AliGenCocktailEntry *e2;
-    TClonesArray *partArray = gAlice->Particles();
+    TObjArray *partArray = gAlice->Particles();
     //
     // Loop over generators and generate events
     Int_t igen=0;
@@ -205,37 +220,6 @@ NextGeneratorPair(AliGenCocktailEntry*& e1, AliGenCocktailEntry*& e2)
     }
 }
 
-/*
-void AliGenCocktail::Streamer(TBuffer &R__b)
-{
-    // Stream an object of class AliGenCocktail.
-
-    AliGenCocktailEntry *entry;
-    
-    if (R__b.IsReading()) {
-       Version_t R__v = R__b.ReadVersion(); if (R__v) { }
-       AliGenerator::Streamer(R__b);
-       R__b >> fNGenerators;
-       R__b >> fEntries;
-       TIter next(fEntries);
-// Stream generation related information
-       while((entry = (AliGenCocktailEntry*)next())) {
-           entry->Streamer(R__b);
-       }  
-    } else {
-       R__b.WriteVersion(AliGenCocktail::IsA());
-       AliGenerator::Streamer(R__b);
-       R__b << fNGenerators;
-       R__b << fEntries;
-       TIter next(fEntries); 
-// Stream generation related information
-       while((entry = (AliGenCocktailEntry*)next())) {
-           entry->Streamer(R__b);
-       }  
-    }
-}
-*/
-
 AliGenCocktail& AliGenCocktail::operator=(const  AliGenCocktail& rhs)
 {
 // Assignment operator