Fix for Savannah bug report 59287

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

diff --git a/STEER/AliESDZDC.cxx b/STEER/AliESDZDC.cxx
index 8b57c6171a7b3d7b727f97e2d89d662a96141ec6..f1bc79bfe0f5f15d886b25deff36767cd1fa77e5 100644 (file)
--- a/STEER/AliESDZDC.cxx
+++ b/STEER/AliESDZDC.cxx
@@ -21,7 +21,7 @@
 //   Origin: Christian Klein-Boesing, CERN, Christian.Klein-Boesing@cern.ch 
 //-------------------------------------------------------------------------
 
-
+#include <TMath.h>
 
 #include "AliESDZDC.h"
 
@@ -53,6 +53,7 @@ AliESDZDC::AliESDZDC() :
   for(Int_t i=0; i<2; i++){
     fZNACentrCoord[i] = fZNCCentrCoord[i] = 0.;
   }
+  for(Int_t i=0; i<32; i++) fVMEScaler[i]=0;
 }
 
 //______________________________________________________________________________
@@ -87,6 +88,7 @@ AliESDZDC::AliESDZDC(const AliESDZDC& zdc) :
     fZNACentrCoord[i] = zdc.fZNACentrCoord[i];
     fZNCCentrCoord[i] = zdc.fZNCCentrCoord[i];
   }
+  for(Int_t i=0; i<32; i++) fVMEScaler[i] = zdc.fVMEScaler[i];
 }
 
 //______________________________________________________________________________
@@ -125,6 +127,7 @@ AliESDZDC& AliESDZDC::operator=(const AliESDZDC&zdc)
     }
     //
     fESDQuality = zdc.fESDQuality;
+    for(Int_t i=0; i<32; i++) fVMEScaler[i] = zdc.fVMEScaler[i];
   } 
   return *this;
 }
@@ -170,6 +173,7 @@ void AliESDZDC::Reset()
        fZNACentrCoord[i] = fZNCCentrCoord[i] = 0.;
   }
   fESDQuality=0;
+  for(Int_t i=0; i<32; i++) fVMEScaler[i] = 0;
 }
 
 //______________________________________________________________________________
@@ -180,54 +184,120 @@ void AliESDZDC::Print(const Option_t *) const
   " E_{ZEM} = %f GeV, Npart = %d, b = %1.2f fm\n",
   fZDCN1Energy/1000.,fZDCP1Energy/1000.,fZDCN2Energy/1000.,fZDCP2Energy/1000.,
   fZDCEMEnergy+fZDCEMEnergy1, fZDCParticipants,fImpactParameter);
+  //
+  printf(" ### fVMEScaler: \n");
+  for(Int_t i=0; i<32; i++) printf("\t datum %d: %d \n",i,fVMEScaler[i]);
+  printf("\n");
 }
 
 //______________________________________________________________________________
-Double32_t * AliESDZDC::GetZNCCentroid() 
+const Double_t * AliESDZDC::GetZNCCentroidInPbPb(Float_t beamEne) 
 {
   // Provide coordinates of centroid over ZN (side C) front face
-  Float_t x[4] = {-1.75, 1.75, -1.75, 1.75};
-  Float_t y[4] = {-1.75, -1.75, 1.75, 1.75};
+  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, alpha=0.395, w;
+  Float_t c, w; 
+  const Float_t alpha=0.395;
   //
-  for(Int_t i=0; i<4; i++){
-    if(fZN1TowerEnergy[i+1]<0.) fZN1TowerEnergy[i+1]=0.;
-    w = TMath::Power(fZN1TowerEnergy[i+1], alpha);
-    numX += x[i]*w;
-    numY += y[i]*w;
-    den += w;
-  }
+  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;
+    }
   if(den!=0){
-    // ATTENTION! Needs to be changed if E_beam(A-A) != 2.76 A TeV !!!!
-    c = fZDCN1Energy/2760.;
+    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;
 }
 
 //______________________________________________________________________________
-Double32_t * AliESDZDC::GetZNACentroid() 
+const Double_t * AliESDZDC::GetZNACentroidInPbPb(Float_t beamEne) 
 {
   // Provide coordinates of centroid over ZN (side A) front face
-  Float_t x[4] = {-1.75, 1.75, -1.75, 1.75};
-  Float_t y[4] = {-1.75, -1.75, 1.75, 1.75};
+  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, alpha=0.395, w;
-  for(Int_t i=0; i<4; i++){
-      if(fZN2TowerEnergy[i+1]<0.) fZN2TowerEnergy[i+1]=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;
-  }
+    }
   //
   if(den!=0){
-    // ATTENTION! Needs to be changed if E_beam(A-A) != 2.76 A TeV !!!!
-    c = fZDCN2Energy/2760.;
+    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;
+  }
+  return fZNACentrCoord;
+}
+
+//______________________________________________________________________________
+const Double_t * AliESDZDC::GetZNCCentroidInpp() 
+{
+  // 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;
+  //
+  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;
+    }
+
+  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;
+    }
+  //
+  if(den!=0){
+    fZNACentrCoord[0] = numX/den;
+    fZNACentrCoord[1] = numY/den;
+  } else {
+    fZNACentrCoord[0] = fZNACentrCoord[1] = 0;
   }
+    
   return fZNACentrCoord;
 }