Fix for Coverity defect 10859: FORWARD_NULL

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

diff --git a/STEER/AliAODCaloCells.cxx b/STEER/AliAODCaloCells.cxx
index 67764e16bb58de7f7ad482c10a1dddd4d2460d9f..7a6ce924f546c1f3cd0d72ce909298357778d6e0 100644 (file)
--- a/STEER/AliAODCaloCells.cxx
+++ b/STEER/AliAODCaloCells.cxx
@@ -24,18 +24,19 @@
 
 ClassImp(AliAODCaloCells)
 
-AliAODCaloCells::AliAODCaloCells() : TNamed(), fNCells(0), fCellNumber(0), fAmplitude(0), fIsSorted(kTRUE), fType(kUndef)
+AliAODCaloCells::AliAODCaloCells() : AliVCaloCells(), fNCells(0), fCellNumber(0), fAmplitude(0), fIsSorted(kTRUE), fType(kUndef)
 {
   // default constructor
 }
 
-AliAODCaloCells::AliAODCaloCells(const char* name, const char* title, AODCells_t ttype) : TNamed(name, title), fNCells(0), fCellNumber(0), fAmplitude(0), fIsSorted(kTRUE), fType(ttype)
+AliAODCaloCells::AliAODCaloCells(const char* name, const char* title, VCells_t ttype) :
+    AliVCaloCells(name, title), fNCells(0), fCellNumber(0), fAmplitude(0), fIsSorted(kTRUE), fType(ttype)
 {
-  // TNamed constructor
+  //constructor
 }
 
 AliAODCaloCells::AliAODCaloCells(const AliAODCaloCells& cells) :
-    TNamed(cells),
+    AliVCaloCells(cells),
     fNCells(cells.fNCells),
     fCellNumber(0),
     fAmplitude(0),
@@ -43,27 +44,27 @@ AliAODCaloCells::AliAODCaloCells(const AliAODCaloCells& cells) :
     fType(cells.fType)
 {
 // Copy constructor
-
-    fCellNumber = new Short_t[fNCells];
-    fAmplitude =  new Double32_t[fNCells];
-
-    for (Int_t i = 0; i < fNCells; i++) {
-       fCellNumber[i]    = cells.fCellNumber[i];
-       fAmplitude[i]     = cells.fAmplitude[i];
-    }
+  fCellNumber = new Short_t[fNCells];
+  fAmplitude  = new Double32_t[fNCells]; 
+  
+  for (Int_t i = 0; i < fNCells; i++) {
+    fCellNumber[i]    = cells.fCellNumber[i];
+    fAmplitude[i]     = cells.fAmplitude[i];
+  }
 }
 
 AliAODCaloCells& AliAODCaloCells::operator=(const AliAODCaloCells& cells)
 {
-// Assignment operator
-    if(&cells == this) return *this;
-    TNamed::operator=(cells);
-    fNCells = cells.fNCells;
-    for (Int_t i = 0; i < fNCells; i++) {
-       fCellNumber[i]    = cells.fCellNumber[i];
-       fAmplitude[i]     = cells.fAmplitude[i];
-    }
-    return *this;
+    // Assignment operator
+  if(&cells == this) return *this;
+  fNCells = cells.fNCells;
+  for (Int_t i = 0; i < fNCells; i++) {
+    fCellNumber[i]    = cells.fCellNumber[i];
+    fAmplitude[i]     = cells.fAmplitude[i];
+  }
+  SetName(cells.GetName()) ; 
+  SetTitle(cells.GetTitle()) ; 
+  return *this;
 }
 
 AliAODCaloCells::~AliAODCaloCells()
@@ -73,6 +74,47 @@ AliAODCaloCells::~AliAODCaloCells()
   DeleteContainer();
 }
 
+void AliAODCaloCells::Clear(const Option_t*)
+{
+  // clear
+  
+  DeleteContainer();
+}
+
+void AliAODCaloCells::Copy(TObject &obj) const {
+  
+  // this overwrites the virtual TOBject::Copy()
+  // to allow run time copying without casting
+  // in AliESDEvent
+  
+  if(this==&obj)return;
+  AliAODCaloCells *robj = dynamic_cast<AliAODCaloCells*>(&obj);
+  if(!robj)return; // not an AliAODCaloCells
+  *robj = *this;
+  
+}
+
+AliVCaloCells *AliAODCaloCells::CopyCaloCells(Bool_t all = kTRUE) const {
+  
+  // copy the calo cells into a new object. If option all=FALSE, just the object type, 
+  // for mixing
+  
+  AliVCaloCells *obj =  new AliAODCaloCells();
+  
+  if(all){
+    obj->SetName (GetName()) ; 
+    obj->SetTitle(GetTitle()) ; 
+    obj->SetType (GetType()) ; 
+  
+    obj->SetNumberOfCells(fNCells);
+    for (Short_t i = 0; i < fNCells; i++) 
+      obj->SetCell(i,fCellNumber[i],fAmplitude[i],-1);
+  }
+  
+  return obj;
+  
+}
+
 void AliAODCaloCells::CreateContainer(Short_t nCells)
 {
   // function that creates container to store calorimeter cell data
@@ -87,7 +129,12 @@ void AliAODCaloCells::CreateContainer(Short_t nCells)
   fNCells = nCells;
 
   fCellNumber = new Short_t[fNCells];
-  fAmplitude = new Double32_t[fNCells];
+  fAmplitude  = new Double32_t[fNCells];
+
+  // set to zero
+  for(int i = 0;i<fNCells;++i){
+    fAmplitude[i] = fCellNumber[i] = 0 ;
+  }
 }
 
 void AliAODCaloCells::DeleteContainer()
@@ -97,15 +144,15 @@ void AliAODCaloCells::DeleteContainer()
   if (fCellNumber)
   {
     delete[] fCellNumber;
-    fCellNumber = 0;
+    fCellNumber = NULL;
   }
 
   if (fAmplitude)
   {
     delete[] fAmplitude;
-    fAmplitude = 0;
+    fAmplitude = NULL;
   }
-
+  
   fNCells = 0;
   fIsSorted = kFALSE;
 }
@@ -117,29 +164,29 @@ void AliAODCaloCells::Sort()
   Int_t *idxArray = new Int_t[fNCells];
   TMath::Sort(fNCells,fCellNumber,idxArray,kFALSE);
   
-  Short_t *newIndex = new Short_t[fNCells];
+  Short_t    *newIndex     = new Short_t[fNCells];
   Double32_t *newAmplitude = new Double32_t[fNCells];
   for (Int_t i=0; i < fNCells; i++) {
-    newIndex[i] = fCellNumber[idxArray[i]];
+    newIndex[i]     = fCellNumber[idxArray[i]];
     newAmplitude[i] = fAmplitude[idxArray[i]];
   }
   delete [] fCellNumber;
   delete [] fAmplitude;
   fCellNumber = newIndex;
-  fAmplitude = newAmplitude;
+  fAmplitude  = newAmplitude;
   
   delete [] idxArray;
   
   fIsSorted = kTRUE;
 } 
 
-Bool_t AliAODCaloCells::SetCell(Short_t pos, Short_t cellNumber, Double32_t amplitude)
+Bool_t AliAODCaloCells::SetCell(Short_t pos, Short_t cellNumber, Double32_t amplitude, Double32_t /*time*/)
 {
   // Sets a cell at the given position
 
   if (pos>=0 && pos < fNCells) {
     fCellNumber[pos] = cellNumber;
-    fAmplitude[pos] = amplitude;
+    fAmplitude[pos]  = amplitude;
     fIsSorted = kFALSE;
     return kTRUE;
   } else {