X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCFragment.cxx;h=d59a2d3f7794fcc833493477a416ad83682927f4;hb=c6a8e83808c0e8fd0b26ca68339ff84a3e03478a;hp=19f128e7bbd8b4c292ccbf62b2fbdc253dced928;hpb=43e3307d80edea23c1ac9ed1d125ec702eedb017;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCFragment.cxx b/ZDC/AliZDCFragment.cxx
index 19f128e7bbd..d59a2d3f779 100644
--- a/ZDC/AliZDCFragment.cxx
+++ b/ZDC/AliZDCFragment.cxx
@@ -36,38 +36,45 @@ int comp(const void *i,const void *j) {return *(int *)i - *(int *)j;}
 
 
 //_____________________________________________________________________________
-AliZDCFragment::AliZDCFragment()
+AliZDCFragment::AliZDCFragment():
+  fB(0),
+  fZbAverage(0),
+  fNimf(0),
+  fZmax(0),
+  fTau(0),
+  fNalpha(0),
+  fZtot(0),
+  fNtot(0)
 {
   //
   // Default constructor
   //
-  fB = 0;
 }
 
 //_____________________________________________________________________________
-AliZDCFragment::AliZDCFragment(Float_t b)
-     : TNamed(" "," ")
+AliZDCFragment::AliZDCFragment(Float_t b): 
+  TNamed(" "," "),
+  fB(b),
+  fZbAverage(0),
+  fNimf(0),
+  fZmax(0),
+  fTau(0),
+  fNalpha(0),
+  fZtot(0),
+  fNtot(0)
 {
   //
   // Standard constructor
   //
-  fB = b;
-  fZbAverage = 0;
-  fNimf = 0;
-  fZmax = 0;
-  fTau = 0;
   for(Int_t i=0; i<=99; i++){
      fZZ[i] = 0;
      fNN[i] = 0;
   }
-  fNalpha = 0;
-  fZtot = 0;
-  fNtot = 0;
   
 }
 
 //_____________________________________________________________________________
-void AliZDCFragment::GenerateIMF(Int_t* fZZ, Int_t &fNalpha)
+void AliZDCFragment::GenerateIMF()
 {
 
    // Loop variables
@@ -293,7 +300,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
@@ -356,12 +363,12 @@ void AliZDCFragment::AttachNeutrons(Int_t *fZZ, Int_t *fNN, Int_t &fZtot,Int_t &
 }
 
 //_____________________________________________________________________________
-Float_t AliZDCFragment::DeuteronFraction()
+Float_t AliZDCFragment::DeuteronNumber()
 {
     // Calculates the fraction of deuterum nucleus produced
     //
-    Float_t deuteronProdPar[2] = {1.068,0.0385};
-    Float_t deutFrac = deuteronProdPar[0]-deuteronProdPar[1]*fB;
-    if(deutFrac>1.) deutFrac=1.;
-    return deutFrac;
+    Float_t deuteronProdPar[2] = {-0.068,0.0385};
+    Float_t deutNum = deuteronProdPar[0] + deuteronProdPar[1]*fB;
+    if(deutNum<0.) deutNum = 0.;
+    return deutNum;
 }