Coding violations corrected.

diff --git a/EVGEN/AliDimuCombinator.cxx b/EVGEN/AliDimuCombinator.cxx
index bbd5152fa0b2e67f16c542e89bfde70c7643ee7e..dde7bbc73be6456a7cf7b9a9c2386f0cdda9f8d3 100644 (file)
--- a/EVGEN/AliDimuCombinator.cxx
+++ b/EVGEN/AliDimuCombinator.cxx
@@ -258,7 +258,7 @@ void AliDimuCombinator::SetSecondRange(Int_t from, Int_t to)
 //                       Selection
 //
 
-Bool_t AliDimuCombinator::Selected(TParticle* part) const
+Bool_t AliDimuCombinator::Selected(const TParticle* part) const
 {
 // Selection cut for single muon 
 //
@@ -271,7 +271,7 @@ Bool_t AliDimuCombinator::Selected(TParticle* part) const
     }
 }
 
-Bool_t AliDimuCombinator::Selected(TParticle* part1, TParticle* part2) const
+Bool_t AliDimuCombinator::Selected(const TParticle* part1, const TParticle* part2) const
 {
 // Selection cut for dimuons
 //
@@ -280,7 +280,7 @@ Bool_t AliDimuCombinator::Selected(TParticle* part1, TParticle* part2) const
 //
 //                       Kinematics
 //
-Float_t AliDimuCombinator::Mass(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::Mass(const TParticle* part1, const TParticle* part2) const
 {
 // Invariant mass
 //
@@ -297,7 +297,7 @@ Float_t AliDimuCombinator::Mass(TParticle* part1, TParticle* part2) const
     }
 }
 
-Float_t AliDimuCombinator::PT(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::PT(const TParticle* part1, const TParticle* part2) const
 {
 // Transverse momentum of dimuons
 //
@@ -307,14 +307,14 @@ Float_t AliDimuCombinator::PT(TParticle* part1, TParticle* part2) const
     return TMath::Sqrt(px*px+py*py);
 }
 
-Float_t AliDimuCombinator::Pz(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::Pz(const TParticle* part1, const TParticle* part2) const
 {
 // Pz of dimuon system
 //
     return part1->Pz()+part2->Pz();
 }
 
-Float_t AliDimuCombinator::Y(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::Y(const TParticle* part1, const TParticle* part2) const
 {
 // Rapidity of dimuon system
 //
@@ -334,7 +334,7 @@ void AliDimuCombinator::SmearGauss(Float_t width, Float_t & value) const
 //              Weighting
 // 
 
-Float_t AliDimuCombinator::DecayProbability(TParticle* part) const
+Float_t AliDimuCombinator::DecayProbability(const TParticle* part) const
 {
 // Calculate decay probability for muons from pion and kaon decays
 // 
@@ -383,7 +383,7 @@ Float_t AliDimuCombinator::DecayProbability(TParticle* part) const
 //End_Html
 
 
-Float_t AliDimuCombinator::Weight(TParticle* part1, TParticle* part2) const
+Float_t AliDimuCombinator::Weight(const TParticle* part1, const TParticle* part2) const
 {
 // Dimuon weight
 
@@ -450,13 +450,13 @@ Indeed the 2 muons come from the same mother so the
 //End_Html
 
 
-Float_t AliDimuCombinator::Weight(TParticle* part) const
+Float_t AliDimuCombinator::Weight(const TParticle* part) const
 {
 // Single muon weight
     return (part->GetWeight())*(Parent(part)->GetWeight())*fRate1;
 }
 
-Bool_t  AliDimuCombinator::Correlated(TParticle* part1, TParticle* part2) const
+Bool_t  AliDimuCombinator::Correlated(const TParticle* part1, const TParticle* part2) const
 {
 // Check if muons are correlated
 //
@@ -468,14 +468,14 @@ Bool_t  AliDimuCombinator::Correlated(TParticle* part1, TParticle* part2) const
     }
 }
 
-TParticle* AliDimuCombinator::Parent(TParticle* part) const
+TParticle* AliDimuCombinator::Parent(const TParticle* part) const
 {
 // Return pointer to parent
 //
     return Particle(part->GetFirstMother());
 }
 
-Int_t AliDimuCombinator::Origin(TParticle* part) const
+Int_t AliDimuCombinator::Origin(const TParticle* part) const
 {
 // Return pointer to primary particle
 //
@@ -493,7 +493,7 @@ Int_t AliDimuCombinator::Origin(TParticle* part) const
     return iparent;
 }
 
-Int_t AliDimuCombinator::Type(TParticle *part)  const
+Int_t AliDimuCombinator::Type(const TParticle *part)  const
 {
 // Return particle type for 
 return part->GetPdgCode();

diff --git a/EVGEN/AliDimuCombinator.h b/EVGEN/AliDimuCombinator.h
index da0cdd38246e0e17f213be6b8efcc2d3481b1c7f..466479a4fb2b8268066c27e7216e7bae7bef7a2b 100644 (file)
--- a/EVGEN/AliDimuCombinator.h
+++ b/EVGEN/AliDimuCombinator.h
@@ -48,32 +48,32 @@ public:
     void SetPtMin(Float_t ptmin) {fPtMin=ptmin;}
     void SetEtaCut(Float_t etamin, Float_t etamax)
        {fEtaMin=etamin; fEtaMax=etamax;}
-    Bool_t Selected(TParticle* part) const;
-    Bool_t Selected(TParticle* part1, TParticle* part2) const;
+    Bool_t Selected(const TParticle* part) const;
+    Bool_t Selected(const TParticle* part1, const TParticle* part2) const;
 // Kinematics
-    Float_t Mass(TParticle* part1, TParticle* part) const;
-    Float_t PT(TParticle* part1, TParticle* part) const;
-    Float_t Pz(TParticle* part1, TParticle* part) const;
-    Float_t Y(TParticle* part1, TParticle* part) const;
+    Float_t Mass(const TParticle* part1, const TParticle* part) const;
+    Float_t PT(const TParticle* part1, const TParticle* part) const;
+    Float_t Pz(const TParticle* part1, const TParticle* part) const;
+    Float_t Y(const TParticle* part1, const TParticle* part) const;
 // Response
     void SmearGauss(Float_t width, Float_t & value) const;
 // Weight
-    Bool_t  Correlated(TParticle* part1, TParticle* part2) const;
+    Bool_t  Correlated(const TParticle* part1, const TParticle* part2) const;
     void    SetRate(Float_t rate) {fRate1=rate;}
     void    SetRate(Float_t rate1, Float_t rate2 ) {fRate1=rate1; fRate2=rate2;}
-    Float_t Weight(TParticle* part) const;
-    Float_t Weight(TParticle* part1, TParticle* part) const;
-    Float_t DecayProbability(TParticle* part) const;
+    Float_t Weight(const TParticle* part) const;
+    Float_t Weight(const TParticle* part1, const TParticle* part) const;
+    Float_t DecayProbability(const TParticle* part) const;
     
  private:
     void FirstPartner();
     void NextPartner();
     void FirstPartnerSelected();
     void NextPartnerSelected();
-    Int_t Origin(TParticle* part) const;
-    TParticle* Parent(TParticle* part) const;
+    Int_t Origin(const TParticle* part) const;
+    TParticle* Parent(const TParticle* part) const;
     TParticle* Partner() const;
-    Int_t Type(TParticle *part) const;
+    Int_t Type(const TParticle *part) const;
     AliDimuCombinator(const AliDimuCombinator &combinator);
     AliDimuCombinator & operator=(const AliDimuCombinator & rhs);
 

diff --git a/EVGEN/AliGenAfterBurnerFlow.cxx b/EVGEN/AliGenAfterBurnerFlow.cxx
index 632d2a39761e00d56bc7371737d849463fb1d329..7ef6e8b21577e71d24489a98eabe6331a72d0c60 100644 (file)
--- a/EVGEN/AliGenAfterBurnerFlow.cxx
+++ b/EVGEN/AliGenAfterBurnerFlow.cxx
@@ -36,6 +36,7 @@
 #include "AliGenAfterBurnerFlow.h"
 #include "AliGenCocktailAfterBurner.h"
 #include "AliMC.h"
+#include "AliRun.h"
 #include "AliCollisionGeometry.h"
 #include "AliGenCocktailEntry.h"
 
@@ -343,7 +344,7 @@ Float_t AliGenAfterBurnerFlow::GetCoefficient(Int_t pdg, Int_t n, Float_t Pt, Fl
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-Float_t AliGenAfterBurnerFlow::GetNpNorm(Int_t npart)
+Float_t AliGenAfterBurnerFlow::GetNpNorm(Int_t npart) const
 {
   //
   // Calculate npart norm.
@@ -367,7 +368,7 @@ Float_t AliGenAfterBurnerFlow::GetNpNorm(Int_t npart)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-Bool_t AliGenAfterBurnerFlow::IsPrimary(Int_t pdg)
+Bool_t AliGenAfterBurnerFlow::IsPrimary(Int_t pdg) const
 {
   if(pdg>=fgkPDG) return kFALSE;
   return fIsPrim[pdg];
@@ -377,6 +378,7 @@ Bool_t AliGenAfterBurnerFlow::IsPrimary(Int_t pdg)
 
 Double_t CalcAngle(Double_t phi, Double_t phi0, Double_t phiRP, Double_t v2, Double_t v1=0.)
 {
+    // Calculate relative angle
   Double_t phi1 = phi-(phi+2*v1*TMath::Sin(phi-phiRP)+v2*TMath::Sin(2*(phi-phiRP))-phi0)/
     (1.+2*v1*TMath::Cos(phi-phiRP)+ 2*v2*TMath::Cos(2*(phi-phiRP)));
   if(TMath::Abs(phi/phi1-1.)<0.00001) return phi1;
@@ -387,6 +389,7 @@ Double_t CalcAngle(Double_t phi, Double_t phi0, Double_t phiRP, Double_t v2, Dou
 
 void AliGenAfterBurnerFlow::InitPrimaries()
 {
+  // Init the primary particle list
   for(Int_t i=0; i<fgkPDG; i++) fIsPrim[i]=kFALSE;
 
   //mesons
@@ -608,6 +611,7 @@ void AliGenAfterBurnerFlow::Generate()
 
 void AliGenAfterBurnerFlow::Rotate(Int_t i, Double_t phi, Bool_t IsPrim)
 {
+  // Rotation
   TParticle*  particle = fStack->Particle(i);
   
   TLorentzVector momentum;

diff --git a/EVGEN/AliGenAfterBurnerFlow.h b/EVGEN/AliGenAfterBurnerFlow.h
index dc5b8fdfd4a4737ff1a448c72c68bb28b63d4008..bb28760b40c009501832ef220e58de6f6ae47d00 100644 (file)
--- a/EVGEN/AliGenAfterBurnerFlow.h
+++ b/EVGEN/AliGenAfterBurnerFlow.h
@@ -32,7 +32,7 @@ class AliGenAfterBurnerFlow : public AliGenerator {
   void      SetEllipticParam(Int_t pdg, Float_t v00, Float_t v10, Float_t v11, Float_t v22);
   void      SetNpParams(Int_t order=-1, Float_t p0=-1, Float_t p1=-1, Float_t p2=-1, Float_t p3=-1);
   void      SetNpDefault() { SetNpParams(2,1,-5e-8,-5e-6); } 
-  Bool_t    IsPrimary(Int_t pdg);
+  Bool_t    IsPrimary(Int_t pdg) const;
   void      Init();
   void      Generate(); 
   void      NeglectFlow(Int_t pdg) {fIsPrim[pdg]=kFALSE;}
@@ -53,7 +53,7 @@ class AliGenAfterBurnerFlow : public AliGenerator {
   AliStack *fStack;            //!
 
   Float_t   GetCoefficient(Int_t pdg, Int_t n, Float_t Pt, Float_t Y) const;
-  Float_t   GetNpNorm(Int_t npart);
+  Float_t   GetNpNorm(Int_t npart) const;
   void      InitPrimaries();
   void      Rotate(Int_t i, Double_t phi, Bool_t IsPrim=kTRUE);
   void      SetFlowParameters(Int_t pdg, Int_t order, Int_t type, Float_t v1, Float_t v2, Float_t v3, Float_t v4);

diff --git a/EVGEN/AliGenBeamGas.cxx b/EVGEN/AliGenBeamGas.cxx
index bfb4f5c9a5c238f0bd8f569bc72a89b94d7f3110..2d3559a3f795cd0b70abe1a6cea30c8a9c946411 100644 (file)
--- a/EVGEN/AliGenBeamGas.cxx
+++ b/EVGEN/AliGenBeamGas.cxx
@@ -23,6 +23,7 @@
 // Author: andreas.morsch@cern.ch
 
 #include "AliGenBeamGas.h"
+#include "AliGenReader.h"
 
 #include <TParticle.h>
 

diff --git a/EVGEN/AliGenCocktailAfterBurner.cxx b/EVGEN/AliGenCocktailAfterBurner.cxx
index 640adfa1eec1be990268eac2f4a399aecb015ce1..947b203b45e1e96e08079236d3a25813590cc1f1 100644 (file)
--- a/EVGEN/AliGenCocktailAfterBurner.cxx
+++ b/EVGEN/AliGenCocktailAfterBurner.cxx
@@ -43,6 +43,7 @@
 #include "AliCollisionGeometry.h"
 #include "AliStack.h"
 #include "AliMC.h"
+#include "AliRun.h"
 
 
 ClassImp(AliGenCocktailAfterBurner)
@@ -51,7 +52,7 @@ ClassImp(AliGenCocktailAfterBurner)
 
     AliGenCocktailAfterBurner::AliGenCocktailAfterBurner():
        fNAfterBurners(0),
-       fAfterBurnerEntries(new TList()),
+       fAfterBurnerEntries(0),
        fGenerationDone(kFALSE),
        fInternalStacks(0),
        fCollisionGeometries(0),
@@ -122,6 +123,8 @@ AddAfterBurner(AliGenerator *AfterBurner, char* Name, Float_t RateExp)
     
     AliGenCocktailEntry *entry = 
        new AliGenCocktailEntry(AfterBurner, Name, RateExp);
+    if (!fAfterBurnerEntries) fAfterBurnerEntries = new TList();
+    
     fAfterBurnerEntries->Add(entry);
     fNAfterBurners++;
 //

diff --git a/EVGEN/AliGenCocktailAfterBurner.h b/EVGEN/AliGenCocktailAfterBurner.h
index 0de0b070b1e32a2eba7bfa044b34aa0196c55f53..0930e19167839aa868598ae6134ebab634101fee 100644 (file)
--- a/EVGEN/AliGenCocktailAfterBurner.h
+++ b/EVGEN/AliGenCocktailAfterBurner.h
@@ -13,7 +13,7 @@
 #include <TMCProcess.h>
 
 #include "AliGenCocktail.h"
-#include "AliRun.h"
+#include "AliRunLoader.h"
 
 class AliGenCocktailEntry;
 class AliStack;

diff --git a/EVGEN/AliGenCocktailEntry.cxx b/EVGEN/AliGenCocktailEntry.cxx
index 8d81bf57a32b894b12b604b05aa4b109ba87fc3e..3442e5274b5533f700d7b48388a6beaa20269f36 100644 (file)
--- a/EVGEN/AliGenCocktailEntry.cxx
+++ b/EVGEN/AliGenCocktailEntry.cxx
@@ -69,7 +69,7 @@ AliGenCocktailEntry::AliGenCocktailEntry(const AliGenCocktailEntry &entry):
 }
 
 
-void AliGenCocktailEntry::PrintInfo()
+void AliGenCocktailEntry::PrintInfo() const
 {
 // Print out information about generator entry
     printf("\n Generator: %s Generated Events: %d First: %d Last: %d",

diff --git a/EVGEN/AliGenCocktailEntry.h b/EVGEN/AliGenCocktailEntry.h
index a7ce86e7c7b85c0491d6c72db71a0b556d34a544..b896f22ace44076d39f86d2ec52b1e73646bcd56 100644 (file)
--- a/EVGEN/AliGenCocktailEntry.h
+++ b/EVGEN/AliGenCocktailEntry.h
@@ -29,7 +29,7 @@ class AliGenCocktailEntry : public TNamed
     Int_t GetFirst() const {return fFirst;}
     Int_t GetLast () const {return fLast;}
     Float_t Rate()   const {return fRate;}
-    void  PrintInfo();
+    void  PrintInfo() const;
     AliGenCocktailEntry & operator =(const AliGenCocktailEntry & rhs);
  protected:
     AliGenerator *fGenerator;   // Pointer to generator

diff --git a/EVGEN/AliGenDeuteron.cxx b/EVGEN/AliGenDeuteron.cxx
index 6c8fa9d9c4d3314b5d5ffeb609b034ed07e7f6b4..19951157be25d65b4ccb36d66ff341fd09b45de5 100644 (file)
--- a/EVGEN/AliGenDeuteron.cxx
+++ b/EVGEN/AliGenDeuteron.cxx
@@ -42,6 +42,7 @@
 #include "TList.h"\r
 #include "TVector3.h"\r
 #include "AliMC.h"\r
+#include "AliRun.h"\r
 #include "TArrayF.h"\r
 #include "AliGenCocktailEventHeader.h"\r
 \r
@@ -202,6 +203,7 @@ void AliGenDeuteron::Generate()
 // create the freeze-out nucleon distribution around the collision vertex\r
 void AliGenDeuteron::FixProductionVertex(TParticle* i)\r
 {\r
+    // Fix for the production vertex\r
        Double_t x,y,z;\r
        \r
        if(fModel == kThermal) // homogeneous volume\r

diff --git a/EVGEN/AliGenDeuteron.h b/EVGEN/AliGenDeuteron.h
index 3b1322444dae0a0f98a31085b4d58e8b8261dbb4..4266ac2536f6d5923c80efd6c34ab17fcf097130 100644 (file)
--- a/EVGEN/AliGenDeuteron.h
+++ b/EVGEN/AliGenDeuteron.h
@@ -47,7 +47,7 @@ class AliGenDeuteron: public AliGenerator
        \r
  private:\r
        \r
-       const Double_t fDeuteronMass;\r
+       const Double_t fDeuteronMass; // Deuteron mass\r
        Double_t fPmax; // Maximum p-n momentum difference (GeV/c)\r
        Double_t fRmax; // Maximum p-n distance (cm)\r
        Double_t fRsrc; // Emitting source radius (cm)\r

diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx
index bc35f381073284fff7bb77af4475d121102f6114..6fd997458dd2ec08e03dd3952109032dbb9af6b7 100644 (file)
--- a/EVGEN/AliGenExtFile.cxx
+++ b/EVGEN/AliGenExtFile.cxx
@@ -36,6 +36,7 @@
 #include "AliHeader.h"
 #include "AliStack.h"
 #include "AliGenEventHeader.h"
+#include "AliGenReader.h"
 
 #include <TParticle.h>
 #include <TFile.h>

diff --git a/EVGEN/AliGenExtFile.h b/EVGEN/AliGenExtFile.h
index b39a8d824e1e9a801c06054ce523e04c988b05e4..230de91cb53bd229014ba892288c9f833ab7c80c 100644 (file)
--- a/EVGEN/AliGenExtFile.h
+++ b/EVGEN/AliGenExtFile.h
@@ -11,7 +11,8 @@
 // Author: andreas.morsch@cern.ch
 
 #include "AliGenMC.h"
-#include "AliGenReader.h"
+class AliGenReader;
+
 
 class TTree;
 

diff --git a/EVGEN/AliGenHIJINGpara.cxx b/EVGEN/AliGenHIJINGpara.cxx
index 3596b4deb8b27d9ca3a4b1b52b6965ea4df7dfa5..e630b8ee74a37b6684af27ea9952ee9d2523e310 100644 (file)
--- a/EVGEN/AliGenHIJINGpara.cxx
+++ b/EVGEN/AliGenHIJINGpara.cxx
@@ -60,7 +60,7 @@ ClassImp(AliGenHIJINGpara)
 
 
 //_____________________________________________________________________________
-static Double_t ptpi(Double_t *px, Double_t *)
+static Double_t ptpi(const Double_t *px, const Double_t *)
 {
   //
   //     PT-PARAMETERIZATION CDF, PRL 61(88) 1819

diff --git a/EVGEN/AliGenHIJINGparaBa.cxx b/EVGEN/AliGenHIJINGparaBa.cxx
index 1079a65dddb93f929e18ef04041ea358cdbc33df..a52398b489defe5937219867267bf333041e9b85 100644 (file)
--- a/EVGEN/AliGenHIJINGparaBa.cxx
+++ b/EVGEN/AliGenHIJINGparaBa.cxx
@@ -35,7 +35,7 @@
 ClassImp(AliGenHIJINGparaBa)
 
 
-static Double_t ptpi(Double_t *px, Double_t *)
+static Double_t ptpi(const Double_t *px, const Double_t *)
 {
   //
   //     PT-PARAMETERIZATION CDF, PRL 61(88) 1819

diff --git a/EVGEN/AliGenHalo.cxx b/EVGEN/AliGenHalo.cxx
index df5dfb754ea250620239e15b8c6f50156a77497c..d7d55249a2f7a1ef7c4c11858fe3f10397069c18 100644 (file)
--- a/EVGEN/AliGenHalo.cxx
+++ b/EVGEN/AliGenHalo.cxx
@@ -392,6 +392,7 @@ void AliGenHalo::SkipEvents()
 }
 void AliGenHalo::CountEvents()
 {
+    // Count total number of events
     Int_t nev = 0;
     Int_t oldID = -1;
     Int_t nc = 1;

diff --git a/EVGEN/AliGenMC.cxx b/EVGEN/AliGenMC.cxx
index 1ce5e58f925ed87c80d574f1bd4fd4169ff69fc4..435d0a050b1ec9222a2fbfdbf1671782d2f80596 100644 (file)
--- a/EVGEN/AliGenMC.cxx
+++ b/EVGEN/AliGenMC.cxx
@@ -31,6 +31,7 @@
 #include "AliGenMC.h"
 #include "AliRun.h"
 #include "AliGeometry.h"
+#include "AliDecayer.h"
 
 ClassImp(AliGenMC)
 
@@ -209,7 +210,7 @@ Bool_t AliGenMC::ChildSelected(Int_t ip) const
     return kFALSE;
 }
 
-Bool_t AliGenMC::KinematicSelection(TParticle *particle, Int_t flag) const
+Bool_t AliGenMC::KinematicSelection(const TParticle *particle, Int_t flag) const
 {
 // Perform kinematic selection
     Double_t pz    = particle->Pz();

diff --git a/EVGEN/AliGenMC.h b/EVGEN/AliGenMC.h
index e9eca7cf0a69e4ab96252980007efcdcbab40275..4ffd264ee72c2a722b7dbd78f867e7e284fd95db 100644 (file)
--- a/EVGEN/AliGenMC.h
+++ b/EVGEN/AliGenMC.h
@@ -19,8 +19,8 @@ class TParticle;
 
 class AliGeometry;
 class AliGenEventHeader;
-#include "AliDecayer.h"
 #include "AliGenerator.h"
+#include "AliDecayer.h"
 
 class AliGenMC : public AliGenerator
 {
@@ -68,7 +68,7 @@ class AliGenMC : public AliGenerator
     // check if particle is selected as child particle
     Bool_t ChildSelected(Int_t ip) const;
     // all kinematic selection cuts go here 
-    Bool_t KinematicSelection(TParticle *particle, Int_t flag) const;
+    Bool_t KinematicSelection(const TParticle *particle, Int_t flag) const;
     Int_t  CheckPDGCode(Int_t pdgcode) const;
 
  protected:

diff --git a/EVGEN/AliGenMUONLMR.cxx b/EVGEN/AliGenMUONLMR.cxx
index 49ddb976b9979a47f546c62ec735b73f677a1ba5..d046a3ce70dde3fcbc9c06e6e3684407feeb3425 100644 (file)
--- a/EVGEN/AliGenMUONLMR.cxx
+++ b/EVGEN/AliGenMUONLMR.cxx
@@ -187,7 +187,7 @@ void AliGenMUONLMR::FinishRun(){
 
 //-----------------------------------------------------------
 
-Double_t AliGenMUONLMR::YDistr(Double_t *px, Double_t *par){ 
+Double_t AliGenMUONLMR::YDistr(const Double_t *px, const Double_t *par){ 
   // function for rapidity distribution: plateau at par[0] +
   // gaussian tails centered at par[1] and with par[2]=sigma  
   Double_t x = TMath::Abs(px[0]);
@@ -202,7 +202,7 @@ Double_t AliGenMUONLMR::YDistr(Double_t *px, Double_t *par){
 
 //-----------------------------------------------------------
 
-Double_t AliGenMUONLMR::PtDistr(Double_t *px, Double_t *par){
+Double_t AliGenMUONLMR::PtDistr(const Double_t *px, const Double_t *par){
   // pt distribution: power law 
   Double_t x = px[0];
   Double_t func = par[0] * x / TMath::Power((1+(x/par[1])*(x/par[1])),par[2]); 
@@ -361,7 +361,7 @@ void AliGenMUONLMR::Generate() {
 
 //------------------------------------------------------------------
 
-void AliGenMUONLMR::Decay2Body(TParticle *mother){ 
+void AliGenMUONLMR::Decay2Body(const TParticle *mother){ 
   // performs decay in two muons of the low mass resonances
   Double_t md1 = fMu[0]->GetMass(); 
   Int_t pdg = mother->GetPdgCode(); 
@@ -453,7 +453,7 @@ void AliGenMUONLMR::DecayPiK(TParticle *mother, Bool_t &hasDecayed){
 
 //-------------------------------------------------------------------
 
-void AliGenMUONLMR::DalitzDecay(TParticle *mother){
+void AliGenMUONLMR::DalitzDecay(const TParticle *mother){
   //
   // perform dalitz decays of eta, omega and etaprime 
   //
@@ -644,7 +644,7 @@ Double_t AliGenMUONLMR::FormFactor(Double_t q2, Int_t decay){
 
 //____________________________________________________________
 
-Double_t AliGenMUONLMR::RhoLineShapeNew(Double_t *x, Double_t* /*para*/){
+Double_t AliGenMUONLMR::RhoLineShapeNew(const Double_t *x, const Double_t* /*para*/){
   //new parameterization implemented by Hiroyuki Sako (GSI)
   Double_t mass = *x;
   double r, GammaTot;

diff --git a/EVGEN/AliGenMUONLMR.h b/EVGEN/AliGenMUONLMR.h
index f4ccf90cc27113ce85b9d6d710b8053d6a775822..d1dc6772472f762eb2e1efcffd9925c08900c14d 100644 (file)
--- a/EVGEN/AliGenMUONLMR.h
+++ b/EVGEN/AliGenMUONLMR.h
@@ -13,10 +13,10 @@ class AliGenMUONLMR : public AliGenMC {
   enum parttype_t {kPionLMR, kKaonLMR, kEtaLMR, kRhoLMR, kOmegaLMR, kPhiLMR, kEtaPrimeLMR};
   AliGenMUONLMR(); 
   ~AliGenMUONLMR(); 
-  static Double_t PtDistr(Double_t *x, Double_t *par); 
-  static Double_t YDistr(Double_t *x, Double_t *par); 
-  virtual void Decay2Body(TParticle *mother);
-  virtual void DalitzDecay(TParticle *mother);
+  static Double_t PtDistr(const Double_t *x, const Double_t *par); 
+  static Double_t YDistr(const Double_t *x, const Double_t *par); 
+  virtual void Decay2Body(const TParticle *mother);
+  virtual void DalitzDecay(const TParticle *mother);
   virtual void DecayPiK(TParticle *mother, Bool_t &hadDecayed);
   virtual Double_t FormFactor(Double_t q2, Int_t decay); 
   virtual void Generate(); 
@@ -24,7 +24,7 @@ class AliGenMUONLMR : public AliGenMC {
   virtual void SetNMuMin(Int_t nmin) {fNMuMin = nmin; }
   virtual void GenerateSingleProcess(Int_t whichproc) { fGenSingleProc = whichproc;}
   virtual void SetScaleMultiplicity(Int_t ipart, Double_t scale) { fScaleMult[ipart] = scale; } 
-  static Double_t RhoLineShapeNew(Double_t *, Double_t *); 
+  static Double_t RhoLineShapeNew(const Double_t *, const Double_t *); 
   virtual void FinishRun(); 
  private:
   AliGenMUONLMR(const AliGenMUONLMR &lmr);

diff --git a/EVGEN/AliGenPromptPhotons.cxx b/EVGEN/AliGenPromptPhotons.cxx
index a76bd5ad059b77f1d3a03fb61d9e7d3207283040..4ffb5adc16a3dbe0901bab0d0bb409a013a6b723 100644 (file)
--- a/EVGEN/AliGenPromptPhotons.cxx
+++ b/EVGEN/AliGenPromptPhotons.cxx
@@ -138,7 +138,7 @@ AliGenPromptPhotons::~AliGenPromptPhotons()
 //_____________________________________________________________________________
 void AliGenPromptPhotons::Init()
 {
-
+  // Initialisation 
   fgDataPt = new TF1("fgDataPt",FitData,fPtMin,fPtMax,1);
   fgDataPt->SetParameter(0,fEnergyCMS);
 
@@ -261,7 +261,7 @@ void AliGenPromptPhotons::SetYRange(Float_t ymin, Float_t ymax) {
 }
 
 //**********************************************************************************
-Double_t AliGenPromptPhotons::FitData(Double_t* x, Double_t* par) {
+Double_t AliGenPromptPhotons::FitData(const Double_t* x, const Double_t* par) {
 //---------------------------------------------------
 // input:
 // x[0] - p_t (GeV).
@@ -294,7 +294,7 @@ Double_t AliGenPromptPhotons::FitData(Double_t* x, Double_t* par) {
 }
 
 //**********************************************************************************
-Double_t AliGenPromptPhotons::WSforNorm(Double_t* x, Double_t* par) {
+Double_t AliGenPromptPhotons::WSforNorm(const Double_t* x, const Double_t* par) {
 //---------------------------------------------------
 // input:
 // x[0] - r (fm)
@@ -316,7 +316,7 @@ Double_t AliGenPromptPhotons::WSforNorm(Double_t* x, Double_t* par) {
 }
 
 //**********************************************************************************
-Double_t AliGenPromptPhotons::WSz(Double_t* x, Double_t* par) {
+Double_t AliGenPromptPhotons::WSz(const Double_t* x, const Double_t* par) {
 //---------------------------------------------------
 // input:
 // x[0] - z (fm)
@@ -336,7 +336,7 @@ Double_t AliGenPromptPhotons::WSz(Double_t* x, Double_t* par) {
 }
 
 //**********************************************************************************
-Double_t AliGenPromptPhotons::TA(Double_t* x, Double_t* par) {
+Double_t AliGenPromptPhotons::TA(const Double_t* x, const Double_t* par) {
 //---------------------------------------------------
 // input:
 // x[0] - b (fm), impact parameter
@@ -354,7 +354,7 @@ Double_t AliGenPromptPhotons::TA(Double_t* x, Double_t* par) {
 }
 
 //**********************************************************************************
-Double_t AliGenPromptPhotons::TB(Double_t* x, Double_t* par) {
+Double_t AliGenPromptPhotons::TB(const Double_t* x, const Double_t* par) {
 //---------------------------------------------------
 // input:
 // x[0] - phi (rad)
@@ -376,7 +376,7 @@ Double_t AliGenPromptPhotons::TB(Double_t* x, Double_t* par) {
 }
 
 //**********************************************************************************
-Double_t AliGenPromptPhotons::TAxTB(Double_t* x, Double_t* par) {
+Double_t AliGenPromptPhotons::TAxTB(const Double_t* x, const Double_t* par) {
 //---------------------------------------------------
 // input:
 // x[0] - s (fm)
@@ -405,7 +405,7 @@ Double_t AliGenPromptPhotons::TAxTB(Double_t* x, Double_t* par) {
 }
 
 // ---------------------------------------------------------------------------------
-Double_t AliGenPromptPhotons::TAB(Double_t* x, Double_t* par) {
+Double_t AliGenPromptPhotons::TAB(const Double_t* x, const Double_t* par) {
 //---------------------------------------------------
 // input:
 // x[0] - b (fm), impact parameter

diff --git a/EVGEN/AliGenPromptPhotons.h b/EVGEN/AliGenPromptPhotons.h
index b138c41d9c4aab2fdb759c5239ddc7126aa68b36..bfa7919e9f7fd84a5dad865eb9f0a7b657362d28 100644 (file)
--- a/EVGEN/AliGenPromptPhotons.h
+++ b/EVGEN/AliGenPromptPhotons.h
@@ -68,13 +68,13 @@ class AliGenPromptPhotons : public AliGenerator
   Float_t fMinImpactParam;  // minimum impact parameter
   Float_t fMaxImpactParam;  // maximum impact parameter        
   
-  static Double_t FitData      (Double_t *xx, Double_t *par);
-  static Double_t WSforNorm    (Double_t *xx, Double_t *par);
-  static Double_t WSz          (Double_t *xx, Double_t *par);
-  static Double_t TA           (Double_t *xx, Double_t *par);
-  static Double_t TB           (Double_t *xx, Double_t *par);
-  static Double_t TAxTB        (Double_t *xx, Double_t *par);
-  static Double_t TAB          (Double_t *xx, Double_t *par);
+  static Double_t FitData      (const Double_t *xx, const Double_t *par);
+  static Double_t WSforNorm    (const Double_t *xx, const Double_t *par);
+  static Double_t WSz          (const Double_t *xx, const Double_t *par);
+  static Double_t TA           (const Double_t *xx, const Double_t *par);
+  static Double_t TB           (const Double_t *xx, const Double_t *par);
+  static Double_t TAxTB        (const Double_t *xx, const Double_t *par);
+  static Double_t TAB          (const Double_t *xx, const Double_t *par);
 
   static TF1 *fgDataPt;             // d^{2}#sigma^{pp}/(dp_t dy) from data fit 
   static TF1 *fgWSzA;               // Wood Saxon parameterisation for nucleus A 

diff --git a/EVGEN/AliGenReaderCwn.cxx b/EVGEN/AliGenReaderCwn.cxx
index 91fbcfaf3e9b506abd761b561bb4db950ba4d737..fb8fee7753b9f013e77f0d3f10595b2c83432074 100644 (file)
--- a/EVGEN/AliGenReaderCwn.cxx
+++ b/EVGEN/AliGenReaderCwn.cxx
@@ -130,7 +130,7 @@ Int_t AliGenReaderCwn::NextEvent()
 
 TParticle* AliGenReaderCwn::NextParticle() 
 {
-//
+// Read next particle
 //  
     Float_t prwn;
     Float_t p[4];

diff --git a/EVGEN/AliGenTHnSparse.cxx b/EVGEN/AliGenTHnSparse.cxx
index 45835c64bbc8e7398843189bd9623ae3253c97f4..3ddbe88b25718c2e2348189a607ceea668ec637a 100644 (file)
--- a/EVGEN/AliGenTHnSparse.cxx
+++ b/EVGEN/AliGenTHnSparse.cxx
@@ -38,6 +38,7 @@
 
 // NEW
 #include "AliRun.h"
+#include "AliLog.h"
 #include "AliGenEventHeader.h"
 //
 
@@ -90,9 +91,8 @@ AliGenTHnSparse::~AliGenTHnSparse()
 //_______________________________________________________________________
 void AliGenTHnSparse::Generate()
 {
-    Int_t naccepted =0;
-
     // Generate Npart of id Ipart
+    Int_t naccepted =0;
     
     Double_t rand[4]; //  z, ptot, r, theta
     Float_t pos[3], phi, ptot, theta, pt, z, r;

diff --git a/EVGEN/AliGenTHnSparse.h b/EVGEN/AliGenTHnSparse.h
index 2581a9cdd36bd57825a6c719f9f609d70aebbb9a..4782ac2ad4edaeb872e75aacb748acfd87eb4dd0 100644 (file)
--- a/EVGEN/AliGenTHnSparse.h
+++ b/EVGEN/AliGenTHnSparse.h
@@ -7,7 +7,6 @@
 // the root file (path and name to be set via the SetTHnSparse method).
 // This class is similar to AliGenFunction.
 
-#include "AliLog.h"
 #include "AliGenerator.h"
 #include "THnSparse.h"
 

diff --git a/EVGEN/AliGenThermalPhotons.cxx b/EVGEN/AliGenThermalPhotons.cxx
index c6ae64104a30253e690284f7fbcceb24da43f822..66b316122989234c0d1e5c1f490ab32e1d5361fe 100644 (file)
--- a/EVGEN/AliGenThermalPhotons.cxx
+++ b/EVGEN/AliGenThermalPhotons.cxx
@@ -86,7 +86,7 @@
 ClassImp(AliGenThermalPhotons)
 
 // -----------------------------------------------------------------------------------------------------
-static Double_t rateQGP(Double_t *x, Double_t *par) {
+static Double_t rateQGP(const Double_t *x, const Double_t *par) {
 //---------------------------------------------------
 // input:
 // x[0] - tau (fm), proper time
@@ -139,7 +139,7 @@ static Double_t rateQGP(Double_t *x, Double_t *par) {
 }   
 
 // -----------------------------------------------------------------------------------------------------
-static Double_t fromQGP(Double_t *x, Double_t *par) {
+static Double_t fromQGP(const Double_t *x, const Double_t *par) {
 //---------------------------------------------------
 // input:
 // x[0] - p_T (GeV), photon p_T
@@ -165,7 +165,7 @@ static Double_t fromQGP(Double_t *x, Double_t *par) {
 }   
          
 // -----------------------------------------------------------------------------------------------------
-static Double_t rateMixQ(Double_t *x, Double_t *par) {
+static Double_t rateMixQ(const Double_t *x, const Double_t *par) {
 //---------------------------------------------------
 // input:
 // x[0] - yprime, space rapidity
@@ -215,7 +215,7 @@ static Double_t rateMixQ(Double_t *x, Double_t *par) {
 }   
 
 // -----------------------------------------------------------------------------------------------------
-static Double_t fromMixQ(Double_t *x, Double_t *par) {
+static Double_t fromMixQ(const Double_t *x, const Double_t *par) {
 //---------------------------------------------------
 // input:
 // x[0] - p_T (GeV), photon p_T
@@ -239,7 +239,7 @@ static Double_t fromMixQ(Double_t *x, Double_t *par) {
 }   
          
 // -----------------------------------------------------------------------------------------------------
-static Double_t rateMixH(Double_t *x, Double_t *par) {
+static Double_t rateMixH(const Double_t *x, const Double_t *par) {
 //---------------------------------------------------
 // input:
 // x[0] - yprime, space rapidity
@@ -297,7 +297,7 @@ static Double_t rateMixH(Double_t *x, Double_t *par) {
 }   
 
 // -----------------------------------------------------------------------------------------------------
-static Double_t fromMixH(Double_t *x, Double_t *par) {
+static Double_t fromMixH(const Double_t *x, const Double_t *par) {
 //---------------------------------------------------
 // input:
 // x[0] - p_T (GeV), photon p_T
@@ -321,7 +321,7 @@ static Double_t fromMixH(Double_t *x, Double_t *par) {
 }   
          
 // -----------------------------------------------------------------------------------------------------
-static Double_t rateHHG(Double_t *x, Double_t *par) {
+static Double_t rateHHG(const Double_t *x, const Double_t *par) {
 //---------------------------------------------------
 // input:
 // x[0] - tau (fm), proper time
@@ -380,7 +380,7 @@ static Double_t rateHHG(Double_t *x, Double_t *par) {
 }   
 
 // -----------------------------------------------------------------------------------------------------
-static Double_t fromHHG(Double_t *x, Double_t *par) {
+static Double_t fromHHG(const Double_t *x, const Double_t *par) {
 // Thermal photon spectrum from Hot Hadron Gas (HHG)
 //  F.D.Steffen, nucl-th/9909035
 //  T.Peitzmann and M.H.Thoma, Phys.Rep., 364, 175 (2002), section 2.2.2 
@@ -407,7 +407,7 @@ static Double_t fromHHG(Double_t *x, Double_t *par) {
 }   
 
 // -----------------------------------------------------------------------------------------------------
-static Double_t fOverlapAB(Double_t *x, Double_t *par)
+static Double_t fOverlapAB(const Double_t *x, const Double_t *par)
 {
 //-------------------------------------------------------------------------
 // overlap area at the impact parameter b
@@ -499,7 +499,7 @@ AliGenThermalPhotons::~AliGenThermalPhotons()
 //_____________________________________________________________________________
 void AliGenThermalPhotons::Init()
 {
-
+    // Initialisation
   const Double_t step=0.1; 
   Int_t nPt=Int_t((fPtMax-fPtMin)/step);