Re-import from release requested by Chiara Oppedisano

[u/mrichter/AliRoot.git] / STEER / AliESDZDC.cxx

diff --git a/STEER/AliESDZDC.cxx b/STEER/AliESDZDC.cxx
index f1bc79bfe0f5f15d886b25deff36767cd1fa77e5..492ea918e146cd2bafaadda67b577242c39ae9c4 100644 (file)
--- a/STEER/AliESDZDC.cxx
+++ b/STEER/AliESDZDC.cxx
@@ -191,113 +191,107 @@ void AliESDZDC::Print(const Option_t *) const
 }
 
 //______________________________________________________________________________
-const Double_t * AliESDZDC::GetZNCCentroidInPbPb(Float_t beamEne) 
+Bool_t AliESDZDC::GetZNCentroidInPbPb(Float_t beamEne, Double_t centrZNC[2], Double_t centrZNA[2]) 
 {
   // Provide coordinates of centroid over ZN (side C) front face
+  if(beamEne==0){
+    printf(" ZDC centroid in PbPb can't be calculated with E_beam = 0 !!!\n");
+    for(Int_t jj=0; jj<2; jj++) fZNCCentrCoord[jj] = 999.;
+    return kFALSE;
+  }
+
   const Float_t x[4] = {-1.75, 1.75, -1.75, 1.75};
   const Float_t y[4] = {-1.75, -1.75, 1.75, 1.75};
-  Float_t numX=0., numY=0., den=0.;
-  Float_t c, w; 
   const Float_t alpha=0.395;
+  Float_t numXZNC=0., numYZNC=0., denZNC=0., cZNC, wZNC; 
+  Float_t numXZNA=0., numYZNA=0., denZNA=0., cZNA, wZNA; 
   //
-  for(Int_t i=0; i<4; i++)
+  for(Int_t i=0; i<4; i++){
     if(fZN1TowerEnergy[i+1]>0.) {
-      w = TMath::Power(fZN1TowerEnergy[i+1], alpha);
-      numX += x[i]*w;
-      numY += y[i]*w;
-      den += w;
+      wZNC = TMath::Power(fZN1TowerEnergy[i+1], alpha);
+      numXZNC += x[i]*wZNC;
+      numYZNC += y[i]*wZNC;
+      denZNC += wZNC;
     }
-  if(den!=0){
-    Float_t nSpecn = fZDCN1Energy/beamEne;
-    c = 1.89358-0.71262/(nSpecn+0.71789);
-    fZNCCentrCoord[0] = c*numX/den;
-    fZNCCentrCoord[1] = c*numY/den;
-  } else {
-    fZNCCentrCoord[0] = fZNCCentrCoord[1] = 0;
-  }
-  return fZNCCentrCoord;
-}
-
-//______________________________________________________________________________
-const Double_t * AliESDZDC::GetZNACentroidInPbPb(Float_t beamEne) 
-{
-  // Provide coordinates of centroid over ZN (side A) front face
-  const Float_t x[4] = {-1.75, 1.75, -1.75, 1.75};
-  const Float_t y[4] = {-1.75, -1.75, 1.75, 1.75};
-  Float_t numX=0., numY=0., den=0.;
-  Float_t c, w;
-  const Float_t alpha=0.395;
-
-  for(Int_t i=0; i<4; i++)
     if(fZN2TowerEnergy[i+1]>0.) {
-      w = TMath::Power(fZN2TowerEnergy[i+1], alpha);
-      numX += x[i]*w;
-      numY += y[i]*w;
-      den += w;
+      wZNA = TMath::Power(fZN1TowerEnergy[i+1], alpha);
+      numXZNA += x[i]*wZNA;
+      numYZNA += y[i]*wZNA;
+      denZNA += wZNA;
     }
+  }
   //
-  if(den!=0){
-    Float_t nSpecn = fZDCN2Energy/beamEne;
-    c = 1.89358-0.71262/(nSpecn+0.71789);
-    fZNACentrCoord[0] = c*numX/den;
-    fZNACentrCoord[1] = c*numY/den;
-  } else {
-    fZNACentrCoord[0] = fZNACentrCoord[1] = 0;
+  if(denZNC!=0){
+    Float_t nSpecnC = fZDCN1Energy/beamEne;
+    cZNC = 1.89358-0.71262/(nSpecnC+0.71789);
+    fZNCCentrCoord[0] = cZNC*numXZNC/denZNC;
+    fZNCCentrCoord[1] = cZNC*numYZNC/denZNC;
+  } 
+  else{
+    fZNCCentrCoord[0] = fZNCCentrCoord[1] = 999.;
   }
-  return fZNACentrCoord;
+  if(denZNA!=0){
+    Float_t nSpecnA = fZDCN1Energy/beamEne;
+    cZNA = 1.89358-0.71262/(nSpecnA+0.71789);
+    fZNCCentrCoord[0] = cZNA*numXZNA/denZNA;
+    fZNCCentrCoord[1] = cZNA*numYZNA/denZNA;
+  } 
+  else{
+    fZNACentrCoord[0] = fZNACentrCoord[1] = 999.;
+  }
+  //
+  for(Int_t il=0; il<2; il++){
+    centrZNC[il] = fZNCCentrCoord[il];
+    centrZNA[il] = fZNACentrCoord[il];
+  }
+  
+  return kTRUE;
 }
 
 //______________________________________________________________________________
-const Double_t * AliESDZDC::GetZNCCentroidInpp() 
+Bool_t AliESDZDC::GetZNCentroidInpp(Double_t centrZNC[2], Double_t centrZNA[2]) 
 {
   // Provide coordinates of centroid over ZN (side C) front face
   const Float_t x[4] = {-1.75, 1.75, -1.75, 1.75};
   const Float_t y[4] = {-1.75, -1.75, 1.75, 1.75};
-  Float_t numX=0., numY=0., den=0.;
   const Float_t alpha=0.5;
-  Float_t w;
+  Float_t numXZNC=0., numYZNC=0., denZNC=0., wZNC; 
+  Float_t numXZNA=0., numYZNA=0., denZNA=0., wZNA; 
   //
-  for(Int_t i=0; i<4; i++)
+  for(Int_t i=0; i<4; i++){
     if(fZN1TowerEnergy[i+1]>0.) {
-      w = TMath::Power(fZN1TowerEnergy[i+1], alpha);
-      numX += x[i]*w;
-      numY += y[i]*w;
-      den += w;
+      wZNC = TMath::Power(fZN1TowerEnergy[i+1], alpha);
+      numXZNC += x[i]*wZNC;
+      numYZNC += y[i]*wZNC;
+      denZNC += wZNC;
     }
-
-  if(den!=0){
-    fZNCCentrCoord[0] = numX/den;
-    fZNCCentrCoord[1] = numY/den;
-  } else {
-    fZNCCentrCoord[0] = fZNCCentrCoord[1] = 0;
-  }
-  return fZNCCentrCoord;
-}
-
-//______________________________________________________________________________
-const Double_t * AliESDZDC::GetZNACentroidInpp() 
-{
-  // Provide coordinates of centroid over ZN (side A) front face
-  const Float_t x[4] = {-1.75, 1.75, -1.75, 1.75};
-  const Float_t y[4] = {-1.75, -1.75, 1.75, 1.75};
-  Float_t numX=0., numY=0., den=0.;
-  const Float_t alpha=0.395;
-  Float_t w;
-
-  for(Int_t i=0; i<4; i++)
     if(fZN2TowerEnergy[i+1]>0.) {
-      w = TMath::Power(fZN2TowerEnergy[i+1], alpha);
-      numX += x[i]*w;
-      numY += y[i]*w;
-      den += w;
+      wZNA = TMath::Power(fZN2TowerEnergy[i+1], alpha);
+      numXZNA += x[i]*wZNA;
+      numYZNA += y[i]*wZNA;
+      denZNA += wZNA;
     }
+  }
+  //
+  if(denZNC!=0){
+    fZNCCentrCoord[0] = numXZNC/denZNC;
+    fZNCCentrCoord[1] = numYZNC/denZNC;
+  } 
+  else{
+    fZNCCentrCoord[0] = fZNCCentrCoord[1] = 999.;
+  }
+  if(denZNA!=0){
+    fZNACentrCoord[0] = numXZNA/denZNA;
+    fZNACentrCoord[1] = numYZNA/denZNA;
+  } 
+  else{
+    fZNACentrCoord[0] = fZNACentrCoord[1] = 999.;
+  }
   //
-  if(den!=0){
-    fZNACentrCoord[0] = numX/den;
-    fZNACentrCoord[1] = numY/den;
-  } else {
-    fZNACentrCoord[0] = fZNACentrCoord[1] = 0;
+  for(Int_t il=0; il<2; il++){
+    centrZNC[il] = fZNCCentrCoord[il];
+    centrZNA[il] = fZNACentrCoord[il];
   }
-    
-  return fZNACentrCoord;
+  
+  return kTRUE;
 }