revision of PHOS HLT to get rid of gcc 4.3 warnings (Oystein)

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

diff --git a/STEER/AliAODPid.cxx b/STEER/AliAODPid.cxx
index bf1375a5e516ec6eaf5ac1cfd5960df673d1b1b2..7179247ed895a06b847adbf2bcbd262aca7a6b89 100644 (file)
--- a/STEER/AliAODPid.cxx
+++ b/STEER/AliAODPid.cxx
@@ -38,11 +38,14 @@ AliAODPid::AliAODPid():
 {
   // default constructor
     for(Int_t i=0; i<kSPECIES; i++) fIntTime[i]=0; 
+  
 }
 
 //______________________________________________________________________________
 AliAODPid::~AliAODPid() 
 {
+  delete [] fTRDslices;
+  fTRDslices = 0;
   // destructor
 }
 
@@ -69,43 +72,34 @@ AliAODPid& AliAODPid::operator=(const AliAODPid& pid)
   // Assignment operator
   if(this!=&pid) {
     // copy stuff
-  fITSsignal=pid.fITSsignal; 
-  fTPCsignal=pid.fTPCsignal;
-  fTRDnSlices=pid.fTRDnSlices;
-  for(Int_t i=0; i< fTRDnSlices; i++) fTRDslices[i]=pid.fTRDslices[i];
-  fTOFesdsignal=pid.fTOFesdsignal;
-  fHMPIDsignal=pid.fHMPIDsignal;
-  for(Int_t i=0; i<kSPECIES; i++) fIntTime[i]=pid.fIntTime[i];
+    fITSsignal=pid.fITSsignal; 
+    fTPCsignal=pid.fTPCsignal;
+    
+    if(pid.fTRDnSlices<=0||(fTRDnSlices!=pid.fTRDnSlices)){
+      // only delete if number changed or is 0
+      delete [] fTRDslices;
+      fTRDslices = 0;
+      if(pid.fTRDnSlices>0) fTRDslices = new Double32_t[fTRDnSlices];
+    }
+    fTRDnSlices=pid.fTRDnSlices;
+    
+    for(Int_t i=0; i< fTRDnSlices; i++) fTRDslices[i]=pid.fTRDslices[i];
+    fTOFesdsignal=pid.fTOFesdsignal;
+    fHMPIDsignal=pid.fHMPIDsignal;
+    for(Int_t i=0; i<kSPECIES; i++) fIntTime[i]=pid.fIntTime[i];
   }
 
   return *this;
 }
 //_______________________________________________________________________________
-void AliAODPid::SetDetectorRawSignals(AliESDtrack *track, Double_t timezero)
+void AliAODPid::GetIntegratedTimes(Double_t timeint[kSPECIES])
 {
-//
-//assignment of the detector signals (AliXXXesdPID inspired)
-//
- if(!track){
- AliInfo("no ESD track found. .....exiting");
- return;
- }
-
- fITSsignal=track->GetITSsignal();
- fTPCsignal=track->GetTPCsignal();
- fTRDnSlices=track->GetNumberOfTRDslices()*kTRDnPlanes;
- track->GetIntegratedTimes(fIntTime);
- fTOFesdsignal=track->GetTOFsignal()-timezero; //TO BE FIXED 
- fHMPIDsignal=track->GetHMPIDsignal();
-
- fTRDslices=new Double32_t[fTRDnSlices];  
- for(Int_t iSl =0; iSl < track->GetNumberOfTRDslices(); iSl++) {
-     for(Int_t iPl =0; iPl<kTRDnPlanes; iPl++) fTRDslices[iPl*track->GetNumberOfTRDslices()+iSl] = track->GetTRDslice(iPl,iSl);
-    } 
+ // Returns the array with integrated times for each particle hypothesis
+for(Int_t i=0; i<kSPECIES; i++) timeint[i]=fIntTime[i];
 }
-//________________________________________________________________________________
-void AliAODPid::GetIntegratedTimes(Double_t timeint[5])
+//_______________________________________________________________________________
+void AliAODPid::SetIntegratedTimes(Double_t timeint[kSPECIES])
 {
  // Returns the array with integrated times for each particle hypothesis
-for(Int_t i=0; i<kSPECIES; i++) timeint[i]=fIntTime[i];
+for(Int_t i=0; i<kSPECIES; i++) fIntTime[i]=timeint[i];
 }