Fixes for Coverity warnings - M. Sitta

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

diff --git a/STEER/AliESDRun.cxx b/STEER/AliESDRun.cxx
index 7bcc515b495acda0e5da92f3a20d72de9291dd69..ea42ff59e317021ed368b466583383927cb5f03d 100644 (file)
--- a/STEER/AliESDRun.cxx
+++ b/STEER/AliESDRun.cxx
@@ -37,6 +37,8 @@ AliESDRun::AliESDRun() :
   fCurrentDip(0),
   fBeamEnergy(0),
   fMagneticField(0),
+  fDiamondZ(0),
+  fDiamondSig2Z(0),
   fPeriodNumber(0),
   fRunNumber(0),
   fRecoVersion(0),
@@ -49,6 +51,7 @@ AliESDRun::AliESDRun() :
   fDiamondCovXY[0]=fDiamondCovXY[2]=3.*3.;
   fDiamondCovXY[1]=0.;
   fTriggerClasses.SetOwner(kTRUE);
+  fMeanBeamInt[0][0]=fMeanBeamInt[0][1]=fMeanBeamInt[1][0]=fMeanBeamInt[1][1]=-1;
   for (Int_t m=0; m<kNPHOSMatrix; m++) fPHOSMatrix[m]=NULL;
   for (Int_t sm=0; sm<kNEMCALMatrix; sm++) fEMCALMatrix[sm]=NULL;
 }
@@ -60,6 +63,8 @@ AliESDRun::AliESDRun(const AliESDRun &esd) :
   fCurrentDip(0),
   fBeamEnergy(0),
   fMagneticField(esd.fMagneticField),
+  fDiamondZ(esd.fDiamondZ),
+  fDiamondSig2Z(esd.fDiamondSig2Z),
   fPeriodNumber(esd.fPeriodNumber),
   fRunNumber(esd.fRunNumber),
   fRecoVersion(esd.fRecoVersion),
@@ -83,7 +88,9 @@ AliESDRun::AliESDRun(const AliESDRun &esd) :
     else
       fPHOSMatrix[m]=NULL;
   }
-       
+  
+  for (int ib=2;ib--;) for (int it=2;it--;) fMeanBeamInt[ib][it] = esd.fMeanBeamInt[ib][it];
+
   for(Int_t sm=0; sm<kNEMCALMatrix; sm++){
        if(esd.fEMCALMatrix[sm])
                fEMCALMatrix[sm]=new TGeoHMatrix(*(esd.fEMCALMatrix[sm])) ;
@@ -102,6 +109,8 @@ AliESDRun& AliESDRun::operator=(const AliESDRun &esd)
     fPeriodNumber=esd.fPeriodNumber;
     fRecoVersion=esd.fRecoVersion;
     fMagneticField=esd.fMagneticField;
+    fDiamondZ=esd.fDiamondZ;
+    fDiamondSig2Z=esd.fDiamondSig2Z;
     fBeamType = esd.fBeamType;
     fCurrentL3  = esd.fCurrentL3;
     fCurrentDip = esd.fCurrentDip;
@@ -117,6 +126,8 @@ AliESDRun& AliESDRun::operator=(const AliESDRun &esd)
     fDetInDAQ   = esd.fDetInDAQ;
     fDetInReco  = esd.fDetInReco;
 
+    for (int ib=2;ib--;) for (int it=2;it--;) fMeanBeamInt[ib][it] = esd.fMeanBeamInt[ib][it];
+
     for(Int_t m=0; m<kNPHOSMatrix; m++){
       if(esd.fPHOSMatrix[m])
        fPHOSMatrix[m]=new TGeoHMatrix(*(esd.fPHOSMatrix[m])) ;
@@ -166,11 +177,13 @@ void AliESDRun::SetDiamond(const AliESDVertex *vertex) {
   // set the interaction diamond
   fDiamondXY[0]=vertex->GetXv();
   fDiamondXY[1]=vertex->GetYv();
+  fDiamondZ=vertex->GetZv();
   Double32_t cov[6];
   vertex->GetCovMatrix(cov);
   fDiamondCovXY[0]=cov[0];
   fDiamondCovXY[1]=cov[1];
   fDiamondCovXY[2]=cov[2];
+  fDiamondSig2Z=cov[5];
 }
 
 
@@ -178,8 +191,8 @@ void AliESDRun::SetDiamond(const AliESDVertex *vertex) {
 void AliESDRun::Print(const Option_t *) const
 {
   // Print some data members
-  printf("Mean vertex in RUN %d: X=%.4f Y=%.4f cm\n",
-        GetRunNumber(),GetDiamondX(),GetDiamondY());
+  printf("Mean vertex in RUN %d: X=%.4f Y=%.4f Z=%.4f cm\n",
+        GetRunNumber(),GetDiamondX(),GetDiamondY(),GetDiamondZ());
   printf("Beam Type: %s, Energy: %.1f GeV\n",fBeamType.IsNull() ? "N/A":fBeamType.Data(),fBeamEnergy);
   printf("Magnetic field in IP= %f T | Currents: L3:%+.1f Dipole:%+.1f %s\n",
         GetMagneticField(),fCurrentL3,fCurrentDip,TestBit(kUniformBMap) ? "(Uniform)":"");
@@ -190,6 +203,8 @@ void AliESDRun::Print(const Option_t *) const
     TNamed *str = (TNamed *)((fTriggerClasses).At(i));
     if (str) printf("%s ",str->GetName());
   }
+  printf("Mean intenstity for interacting   : beam1:%+.3e beam2:%+.3e\n",fMeanBeamInt[0][0],fMeanBeamInt[1][0]);
+  printf("Mean intenstity for non-intecting : beam1:%+.3e beam2:%+.3e\n",fMeanBeamInt[0][1],fMeanBeamInt[1][1]);
   printf("\n");
 }
 
@@ -208,6 +223,8 @@ void AliESDRun::Reset()
   for (Int_t i=0; i<2; i++) fDiamondXY[i]=0.;
   fDiamondCovXY[0]=fDiamondCovXY[2]=3.*3.;
   fDiamondCovXY[1]=0.;
+  fDiamondZ=0.;
+  fDiamondSig2Z=10.*10.;
   fTriggerClasses.Clear();
   fDetInDAQ   = 0;
   fDetInReco  = 0;