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 24fd346b20d59ff30cc714eac55190ab6d2d0c89..ab04cd4579b7354ac0bc60c017ac3db2ef062940 100644 (file)
--- a/EVGEN/AliGenCocktail.cxx
+++ b/EVGEN/AliGenCocktail.cxx
@@ -15,6 +15,12 @@
 
 /*
 $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
 
@@ -59,6 +65,8 @@ AliGenCocktail::AliGenCocktail()
 {
 // Constructor
     fEntries = new TList;
+    flnk1 = 0;
+    flnk2 = 0;
     fNGenerators=0;
 }
 
@@ -78,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);