bugfix: corrected calculation of slice and partition from track point Id

[u/mrichter/AliRoot.git] / TOF / AliTOFLvHvDataPoints.cxx

diff --git a/TOF/AliTOFLvHvDataPoints.cxx b/TOF/AliTOFLvHvDataPoints.cxx
index 29d90a5f09a5a47811c19020dd80000d9e75538a..d190bc842b1759d84e6f98fd9a2a0d135e543ddd 100644 (file)
--- a/TOF/AliTOFLvHvDataPoints.cxx
+++ b/TOF/AliTOFLvHvDataPoints.cxx
@@ -131,15 +131,10 @@ AliTOFLvHvDataPoints::AliTOFLvHvDataPoints(const AliTOFLvHvDataPoints & data):
   for(int i=0;i<kNsectors;i++)
     for(int j=0;j<kNplates;j++)
       fAliasNamesXHVmap[i][j]=data.fAliasNamesXHVmap[i][j];
- 
-
-  if (fLVDataPoints)
-    for (Int_t ii=0; ii<kNmaxDataPoints; ii++) if (fLVDataPoints[ii]) fLVDataPoints[ii]->Delete();
-  if (fHVDataPoints)
-    for (Int_t ii=0; ii<kNmaxDataPoints; ii++) if (fHVDataPoints[ii]) fHVDataPoints[ii]->Delete();
-  if (fMap)
-    for (Int_t ii=0; ii<kNmaxDataPoints; ii++) if (fMap[ii]) fMap[ii]->Delete();
 
+  for (Int_t ii=0; ii<kNmaxDataPoints; ii++) fLVDataPoints[ii]= data.fLVDataPoints[ii];
+  for (Int_t ii=0; ii<kNmaxDataPoints; ii++) fHVDataPoints[ii]= data.fLVDataPoints[ii];
+  for (Int_t ii=0; ii<kNmaxDataPoints; ii++) fMap[ii]= data.fMap[ii];
 
 }
 //---------------------------------------------------------------
@@ -176,6 +171,10 @@ AliTOFLvHvDataPoints& AliTOFLvHvDataPoints:: operator=(const AliTOFLvHvDataPoint
 
   fNSecondsBeforeEOR=data.fNSecondsBeforeEOR;
 
+  for (Int_t ii=0; ii<kNmaxDataPoints; ii++) fLVDataPoints[ii]= data.fLVDataPoints[ii];
+  for (Int_t ii=0; ii<kNmaxDataPoints; ii++) fHVDataPoints[ii]= data.fLVDataPoints[ii];
+  for (Int_t ii=0; ii<kNmaxDataPoints; ii++) fMap[ii]= data.fMap[ii];
+
   return *this;
 }
 //---------------------------------------------------------------
@@ -186,6 +185,13 @@ AliTOFLvHvDataPoints::~AliTOFLvHvDataPoints() {
   delete fStartingLVmap;
   delete fStartingHVmap;
 
+  for (Int_t ii=0; ii<kNmaxDataPoints; ii++)
+    if (fLVDataPoints[ii]) fLVDataPoints[ii]->Delete();
+  for (Int_t ii=0; ii<kNmaxDataPoints; ii++)
+    if (fHVDataPoints[ii]) fHVDataPoints[ii]->Delete();
+  for (Int_t ii=0; ii<kNmaxDataPoints; ii++)
+    if (fMap[ii]) fMap[ii]->Delete();
+
 }
 
 //---------------------------------------------------------------
@@ -257,7 +263,7 @@ Bool_t AliTOFLvHvDataPoints::MergeMaps() {
               fNumberOfHVdataPoints, fNumberOfLVdataPoints, fNumberOfHVandLVmaps));
 
 
-  Int_t *controller = new Int_t[fNumberOfHVandLVmaps];
+  Int_t *controller = new Int_t[sizeof(Int_t)*fNumberOfHVandLVmaps]; // fix for coverity
   for (Int_t ii=0; ii<fNumberOfHVandLVmaps; ii++) controller[ii]=-1;
   TMath::Sort(fNumberOfHVandLVmaps,timeMaps,controller,kFALSE); // increasing order