made abstract functions in AliVVvertex non-abstract, becasue AliFlatESDVertex does...

[u/mrichter/AliRoot.git] / PHOS / AliPHOSDigit.cxx

diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx
index e86b5d543d76d5063709415885eb9d634793f9ce..e0ed9957ecfa88ca09c2770b5eb921e036ce5a6d 100644 (file)
--- a/PHOS/AliPHOSDigit.cxx
+++ b/PHOS/AliPHOSDigit.cxx
@@ -56,6 +56,7 @@ ClassImp(AliPHOSDigit)
 //____________________________________________________________________________
 AliPHOSDigit::AliPHOSDigit() :
   AliDigitNew(),
+  fIsLG(0),
   fNprimary(0),  
   fPrimary(0x0),
   fEnergy(0.),
@@ -71,6 +72,7 @@ AliPHOSDigit::AliPHOSDigit() :
 
 //____________________________________________________________________________
 AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t time, Int_t index) :
+  fIsLG(0),
   fNprimary(0),
   fPrimary(0),
   fEnergy(0.f),
@@ -89,6 +91,7 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t tim
   fTimeR       = fTime ;
   fId          = id ;
   fIndexInList = index ; 
+
   if( primary != -1){
     fNprimary    = 1 ; 
     fPrimary = new Int_t[fNprimary] ;
@@ -102,6 +105,7 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t tim
 
 //____________________________________________________________________________
 AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Float_t energy, Float_t time, Int_t index) :
+  fIsLG(0),
   fNprimary(0),
   fPrimary(0),
   fEnergy(0.f),
@@ -134,6 +138,7 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Float_t energy, Float_t time
 //____________________________________________________________________________
 AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : 
   AliDigitNew(digit),
+  fIsLG(digit.fIsLG),
   fNprimary(digit.fNprimary),
   fPrimary(0),
   fEnergy(digit.fEnergy),
@@ -157,6 +162,12 @@ AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) :
   fIndexInList = digit.fIndexInList ; 
 }
 
+//____________________________________________________________________________
+AliPHOSDigit & AliPHOSDigit::operator = (const AliPHOSDigit &)
+{
+  Fatal("operator =", "not implemented");
+  return *this;
+}
 //____________________________________________________________________________
 AliPHOSDigit::~AliPHOSDigit() 
 {
@@ -167,6 +178,16 @@ AliPHOSDigit::~AliPHOSDigit()
   if (fSamplesLG) delete [] fSamplesLG;
 }
 
+//____________________________________________________________________________
+void AliPHOSDigit::Clear(const Option_t*) 
+{
+  // Delete array of primaries if any
+  delete[] fSamplesHG; fSamplesHG = NULL ;
+  delete[] fSamplesLG; fSamplesLG = NULL ;
+  delete[] fPrimary;   fPrimary   = NULL ;
+
+}
+
 //____________________________________________________________________________
 Int_t AliPHOSDigit::Compare(const TObject * obj) const
 {
@@ -207,6 +228,7 @@ Int_t AliPHOSDigit::GetPrimary(Int_t index) const
 void AliPHOSDigit::SetALTROSamplesHG(Int_t nSamplesHG, Int_t *samplesHG)
 {
   fNSamplesHG = nSamplesHG;
+  if (fSamplesHG) delete [] fSamplesHG;
   fSamplesHG = new UShort_t[fNSamplesHG];
   UShort_t i;
   for (i=0; i<fNSamplesHG; i++) {
@@ -217,6 +239,7 @@ void AliPHOSDigit::SetALTROSamplesHG(Int_t nSamplesHG, Int_t *samplesHG)
 void AliPHOSDigit::SetALTROSamplesLG(Int_t nSamplesLG, Int_t *samplesLG)
 {
   fNSamplesLG = nSamplesLG;
+  if (fSamplesLG) delete [] fSamplesLG;
   fSamplesLG = new UShort_t[fNSamplesLG];
   UShort_t i;
   for (i=0; i<fNSamplesLG; i++) {
@@ -336,6 +359,9 @@ AliPHOSDigit& AliPHOSDigit::operator+=(AliPHOSDigit const & digit)
      for (i=0; i<fNSamplesLG; i++)
        fSamplesLG[i] = TMath::Max(1023,fSamplesLG[i] + (digit.fSamplesLG)[i]);
    }
+   
+   //If at least one digit in LG, then sum also
+   fIsLG=fIsLG||digit.fIsLG ;
 
    return *this ;
 }