Fixing array size

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

diff --git a/STEER/AliESDZDC.cxx b/STEER/AliESDZDC.cxx
index bf0dc943f36ec23e7a9bb29188a4d79a5ab8068f..492ea918e146cd2bafaadda67b577242c39ae9c4 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,57 +184,114 @@ 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() 
+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
-  Float_t x[4] = {-1.75, 1.75, -1.75, 1.75};
-  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;
+  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};
+  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++){
-    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;
+    if(fZN1TowerEnergy[i+1]>0.) {
+      wZNC = TMath::Power(fZN1TowerEnergy[i+1], alpha);
+      numXZNC += x[i]*wZNC;
+      numYZNC += y[i]*wZNC;
+      denZNC += wZNC;
+    }
+    if(fZN2TowerEnergy[i+1]>0.) {
+      wZNA = TMath::Power(fZN1TowerEnergy[i+1], alpha);
+      numXZNA += x[i]*wZNA;
+      numYZNA += y[i]*wZNA;
+      denZNA += wZNA;
+    }
   }
-  if(den!=0){
-    // ATTENTION! Needs to be changed if E_beam(A-A) != 2.76 A TeV !!!!
-    Float_t nSpecn = fZDCN1Energy/2760.;
-    c = 1.89358-0.71262/(nSpecn+0.71789);
-    fZNCCentrCoord[0] = c*numX/den;
-    fZNCCentrCoord[1] = c*numY/den;
+  //
+  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.;
+  }
+  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 fZNCCentrCoord;
+  
+  return kTRUE;
 }
 
 //______________________________________________________________________________
-Double32_t * AliESDZDC::GetZNACentroid() 
+Bool_t AliESDZDC::GetZNCentroidInpp(Double_t centrZNC[2], Double_t centrZNA[2]) 
 {
-  // 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};
-  Float_t numX=0., numY=0., den=0.;
-  Float_t c, alpha=0.395, w;
-
+  // 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};
+  const Float_t alpha=0.5;
+  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++){
-    if(fZN2TowerEnergy[i+1]<0.) fZN2TowerEnergy[i+1]=0.;
-    w = TMath::Power(fZN2TowerEnergy[i+1], alpha);
-    numX += x[i]*w;
-    numY += y[i]*w;
-    den += w;
+    if(fZN1TowerEnergy[i+1]>0.) {
+      wZNC = TMath::Power(fZN1TowerEnergy[i+1], alpha);
+      numXZNC += x[i]*wZNC;
+      numYZNC += y[i]*wZNC;
+      denZNC += wZNC;
+    }
+    if(fZN2TowerEnergy[i+1]>0.) {
+      wZNA = TMath::Power(fZN2TowerEnergy[i+1], alpha);
+      numXZNA += x[i]*wZNA;
+      numYZNA += y[i]*wZNA;
+      denZNA += wZNA;
+    }
   }
   //
-  if(den!=0){
-    // ATTENTION! Needs to be changed if E_beam(A-A) != 2.76 A TeV !!!!
-    Float_t nSpecn = fZDCN2Energy/2760.;
-    c = 1.89358-0.71262/(nSpecn+0.71789);
-    fZNACentrCoord[0] = c*numX/den;
-    fZNACentrCoord[1] = c*numY/den;
+  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.;
   }
-  return fZNACentrCoord;
+  //
+  for(Int_t il=0; il<2; il++){
+    centrZNC[il] = fZNCCentrCoord[il];
+    centrZNA[il] = fZNACentrCoord[il];
+  }
+  
+  return kTRUE;
 }