Fixed warnings and coding conventions (Ludmila)

diff --git a/TUHKMgen/TUHKMgen.cxx b/TUHKMgen/TUHKMgen.cxx
index e59e3ae5a812aca82941a8e59b16b59d5174b6d4..47361a82dbe789856e2caa6941a5441750357a1d 100755 (executable)
--- a/TUHKMgen/TUHKMgen.cxx
+++ b/TUHKMgen/TUHKMgen.cxx
@@ -283,7 +283,7 @@ Int_t TUHKMgen::ImportParticles(TClonesArray *particles, const Option_t* option)
   Int_t nump = 0;
   LPIT_t it,e;
   
-  //  cout << "TUHKMgen::ImportParticles() option(All or Sec) = " << option << endl;
+    cout << "TUHKMgen::ImportParticles() option(All or Sec) = " << option << endl;
   for(it = fSecondariesList.begin(), e = fSecondariesList.end(); it != e; ++it) {
     //!!! for(Int_t pp=0;pp<100;pp++) {
        //      cout << "TUHKMgen::ImportParticles() import particle pdg(" << it->Encoding() << ")" << endl;

diff --git a/TUHKMgen/UHKM/DatabasePDG.cxx b/TUHKMgen/UHKM/DatabasePDG.cxx
index 313fca6b56aa5c669a560ecabf0e6c976de0359f..9d187c496c98be6065aba57cb18111e2086601fc 100644 (file)
--- a/TUHKMgen/UHKM/DatabasePDG.cxx
+++ b/TUHKMgen/UHKM/DatabasePDG.cxx
@@ -65,7 +65,7 @@ Bool_t DatabasePDG::LoadParticles() {
   particleFile.open(fParticleFilename);
   if(!particleFile) {
     cout << "ERROR in DatabasePDG::LoadParticles() : The ASCII file containing the PDG particle list (\""
-         << fParticleFilename << "\") was not found !! Aborting..." << endl;
+         << fParticleFilename << "\") was not found !! Exiting..." << endl;
     return kFALSE;
   }
   

diff --git a/TUHKMgen/UHKM/InitialStateHydjet.cxx b/TUHKMgen/UHKM/InitialStateHydjet.cxx
index 5a43fe3fee81d7c6a9572760a1d41ccbb851d335..a16f3fa80aec25503be6a56643b0ac91eb357a3a 100644 (file)
--- a/TUHKMgen/UHKM/InitialStateHydjet.cxx
+++ b/TUHKMgen/UHKM/InitialStateHydjet.cxx
@@ -86,20 +86,14 @@ void InitialStateHydjet::Initialize(List_t &source, ParticleAllocator & allocato
   PYQPAR.ienglu = fParams.fIenglu;
   PYQPAR.ianglu = fParams.fIanglu;
 
-  //  cout<<"in InitialStateHydjet::Initialize nhsel"<<fParams.fNhsel<<endl;
-
   // run a HYDJET event
   hyevnt_(); 
-  //  std::cout<<"in InitialStateHydjet after hyevnt"<<std::endl;
    
   //get number of particles in jets
-  Int_t numbJetPart = HYPART.njp;  //
-  Double_t  Bgen = HYFPAR.bgen;
-  Int_t  Njet = HYJPAR.njet;
-  Int_t  Nbcol = HYFPAR.nbcol;
-  
-  //  std::cout<<"in InitialStateHydjet::Initialize bgen "<<Bgen<<" njet "<<Njet<<" "<<" Nbcol "<<Nbcol<<std::endl;
-  //  std::cout<<"in InitialStateHydjet::Initialize numb jet part"<<numbJetPart<<std::endl;
+  //Int_t numbJetPart = HYPART.njp;  
+  //Double_t  Bgen = HYFPAR.bgen;
+  //Int_t  Njet = HYJPAR.njet;
+  //Int_t  Nbcol = HYFPAR.nbcol;
 
   if(fParams.fNhsel != 0) {   
     Int_t numbJetPart = HYPART.njp;
@@ -154,15 +148,13 @@ void InitialStateHydjet::Initialize(List_t &source, ParticleAllocator & allocato
     // get impact parameter    
     //    Double_t impactParameter = HYFPAR.bgen;
 
-
-    //    cout<<"in HYDRO part 1"<<endl;
     
     //effective volume for central     
     double dYl= 2 * fParams.fYlmax; //uniform distr. [-Ylmax; Ylmax]  
     if(fParams.fEtaType >0) dYl = TMath::Sqrt(2 * TMath::Pi()) * fParams.fYlmax ;  //Gaussian distr. 
-    Double_t volEffcent = 2 * TMath::Pi() * fParams.fTau * dYl * (fParams.fR * fParams.fR)/TMath::Power((fParams.fUmax),2)*((fParams.fUmax)*TMath::SinH((fParams.fUmax))-TMath::CosH((fParams.fUmax))+ 1);
-  
-    //    cout<<"in HYDRO part 2"<<HYFPAR.npart<<" " <<HYFPAR.npart0<<endl;
+    Double_t volEffcent = 2 * TMath::Pi() * fParams.fTau * dYl * 
+    (fParams.fR * fParams.fR)/TMath::Power((fParams.fUmax),2)*
+    ((fParams.fUmax)*TMath::SinH((fParams.fUmax))-TMath::CosH((fParams.fUmax))+ 1);
  
     //effective volume for non-central Simpson2 
     Double_t volEffnoncent = fParams.fTau * dYl * SimpsonIntegrator2(0., 2.*TMath::Pi());
@@ -172,12 +164,8 @@ void InitialStateHydjet::Initialize(List_t &source, ParticleAllocator & allocato
     Double_t coeffR1 = HYFPAR.npart/HYFPAR.npart0;
     coeffR1 = TMath::Power(coeffR1, 0.333333);
 
-    //    std::cout<<"HYFPAR.npart"<<HYFPAR.npart<<std::endl;
-
     double veff=fVolEff;
 
-    //    std::cout<<"veff "<<veff<<std::endl;
-   
     //------------------------------------
     //cycle on particles types
     for(Int_t i = 0; i < fParams.fNPartTypes; ++i) {
@@ -241,9 +229,6 @@ void InitialStateHydjet::Initialize(List_t &source, ParticleAllocator & allocato
            n1.SetXYZT(0.,0.,TMath::SinH(etaF),TMath::CosH(etaF));  
            if(TMath::Abs(etaF)>5.)continue;
            
-           //old
-           //    double rBold = fParams.fR * TMath::Sqrt(1-fParams.fEpsilon);
-           
            rB = fParams.fR * coeffRB * coeffR1;
                
            Double_t rho = TMath::Sqrt(gRandom->Rndm());
@@ -267,9 +252,6 @@ void InitialStateHydjet::Initialize(List_t &source, ParticleAllocator & allocato
          
            Double_t rhou = fParams.fUmax * r / rB;
 
-           //double_t rold= r/coeffRB;
-           //Double_t rhou_old = fParams.fUmax * rold / rBold;
-           //std::cout<<"rhou"<<rhou<<"rhou_old"<<rhou_old<<std::endl;
         
            Double_t uxf = TMath::SinH(rhou)*TMath::Sqrt(1+fParams.fDelta)*TMath::Cos(phiF); 
            Double_t uyf = TMath::SinH(rhou)*TMath::Sqrt(1-fParams.fDelta)*TMath::Sin(phiF);

diff --git a/TUHKMgen/UHKM/Particle.h b/TUHKMgen/UHKM/Particle.h
index 42ffa5eab5e0e2d627885b7cc9b470fe98476bbb..aa1b4b8420311b283dafef39e904a9c3e337bcff 100644 (file)
--- a/TUHKMgen/UHKM/Particle.h
+++ b/TUHKMgen/UHKM/Particle.h
@@ -150,6 +150,7 @@ typedef std::list<Particle>::iterator LPIT_t;
 
 class ParticleAllocator {
  public:
+  ParticleAllocator() : fFreeNodes(0) {};
   void AddParticle(const Particle & particle, List_t & list);
   void FreeListNode(List_t & list, LPIT_t it);
   void FreeList(List_t & list);