Fixes for Coverity warnings

[u/mrichter/AliRoot.git] / ZDC / AliZDCFragment.cxx

diff --git a/ZDC/AliZDCFragment.cxx b/ZDC/AliZDCFragment.cxx
index cf5e6d59999876b44df0415f3c90802e92c73421..5652a3764a242a8a4ad41f2923eced0f2191afaa 100644 (file)
--- a/ZDC/AliZDCFragment.cxx
+++ b/ZDC/AliZDCFragment.cxx
@@ -37,7 +37,14 @@ int comp(const void *i,const void *j) {return *(int *)i - *(int *)j;}
 
 //_____________________________________________________________________________
 AliZDCFragment::AliZDCFragment():
-  fB(0)
+  fB(0),
+  fZbAverage(0),
+  fNimf(0),
+  fZmax(0),
+  fTau(0),
+  fNalpha(0),
+  fZtot(0),
+  fNtot(0)
 {
   //
   // Default constructor
@@ -45,8 +52,8 @@ AliZDCFragment::AliZDCFragment():
 }
 
 //_____________________________________________________________________________
-AliZDCFragment::AliZDCFragment(Float_t b)
-     : TNamed(" "," "),
+AliZDCFragment::AliZDCFragment(Float_t b): 
+  TNamed(" "," "),
   fB(b),
   fZbAverage(0),
   fNimf(0),
@@ -67,7 +74,7 @@ AliZDCFragment::AliZDCFragment(Float_t b)
 }
 
 //_____________________________________________________________________________
-void AliZDCFragment::GenerateIMF(Int_t* fZZ, Int_t &fNalpha)
+void AliZDCFragment::GenerateIMF()
 {
 
    // Loop variables
@@ -78,7 +85,8 @@ void AliZDCFragment::GenerateIMF(Int_t* fZZ, Int_t &fNalpha)
    // Coefficients of polynomial for fluctuations on average number of IMF
    const Float_t  kParamFluctNimf[4]={-0.13176,2.9392,-5.2147,2.3092}; 
    // Coefficients of polynomial for average maximum Z of fragments
-   const Float_t  kParamZmax[4]={0.16899,14.203,-2.8284,65.036}; 
+   //const Float_t  kParamZmax[4]={0.16899,14.203,-2.8284,65.036}; 
+   const Float_t  kParamZmax[4]={0.16899,14.203,-2.8284,70.5}; 
    // Coefficients of polynomial for fluctuations on maximum Z of fragments
    const Float_t  kParamFluctZmax[5]={0.013782,-0.17282,1.5065,1.0654,-2.4317}; 
    // Coefficients of polynomial for exponent tau of fragments Z distribution
@@ -95,11 +103,13 @@ void AliZDCFragment::GenerateIMF(Int_t* fZZ, Int_t &fNalpha)
    // Maximum impact parameter for U [r0*A**(1/3)]
    const Float_t  kbMaxU = 14.87;
    // Maximum impact parameter for Pb [r0*A**(1/3)]
-   const Float_t  kbMaxPb = 14.22;
+   const Float_t  kbMaxPb = 14.22+4*kNuclearThick;
    // Z of the projectile
    const Float_t  kZProj = 82.;
    
    // From b(Pb) to b(U)
+   if(fB>kbMaxPb) fB = 2*kbMaxPb-fB;
+   
    Float_t  bU = fB*kbMaxU/kbMaxPb;
     
    // From b(U) to Zbound(U) 
@@ -116,10 +126,10 @@ void AliZDCFragment::GenerateIMF(Int_t* fZZ, Int_t &fNalpha)
    // Zbound is proportional to b**2 up to b < kbMaxPb-2*kNuclearThick
    // and then it is an increasing exponential, imposing that at 
    // b=kbMaxPb-2kNuclearThick the two functions have the same derivative
-   Float_t bCore = kbMaxPb-2*kNuclearThick;
+   /*Float_t bCore = kbMaxPb-2*kNuclearThick;
    if(fB>bCore){
      fZbAverage=kZProj*(1.-TMath::Exp(-kParamSkinPb[0]*(fB-kParamSkinPb[1])));
-   }
+   }*/
    if(fZbAverage>kZProj) fZbAverage = kZProj;
    Float_t zbNorm = fZbAverage/kZProj;
    Float_t bNorm = fB/kbMaxPb;
@@ -153,7 +163,7 @@ void AliZDCFragment::GenerateIMF(Int_t* fZZ, Int_t &fNalpha)
    fluctZmax = fluctZmax*kZProj/6.;
    Float_t xg = gRandom->Gaus(0.0,1.0);
    fluctZmax = fluctZmax*xg;
-   fZmax = averageZmax+fluctZmax;
+   fZmax = (averageZmax+fluctZmax);
    if(fZmax>kZProj) fZmax = kZProj;
    
 //   printf("\n\n ------------------------------------------------------------");   
@@ -293,7 +303,7 @@ void AliZDCFragment::GenerateIMF(Int_t* fZZ, Int_t &fNalpha)
 }
 
 //_____________________________________________________________________________
-void AliZDCFragment::AttachNeutrons(Int_t *fZZ, Int_t *fNN, Int_t &fZtot,Int_t &fNtot)
+void AliZDCFragment::AttachNeutrons()
 {
 //
 // Prepare nuclear fragment by attaching a suitable number of neutrons