Coverity fixes.

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

diff --git a/STEER/AliAODJet.cxx b/STEER/AliAODJet.cxx
index b3b2c6e396cc621bdaf68beddd61e7a7ba521edb..264a7127aeffaa3272ef5bb36007a334ddb2655c 100644 (file)
--- a/STEER/AliAODJet.cxx
+++ b/STEER/AliAODJet.cxx
@@ -32,6 +32,7 @@ AliAODJet::AliAODJet() :
     fNeutralFraction(0),
     fTrigger(0),
     fMomentum(0),
+    fVectorAreaCharged(0),
     fRefTracks(new TRefArray())
 {
   // constructor
@@ -47,6 +48,7 @@ AliAODJet::AliAODJet(Double_t px, Double_t py, Double_t pz, Double_t e):
     fNeutralFraction(0),
     fTrigger(0),
     fMomentum(0),
+    fVectorAreaCharged(0),
     fRefTracks(new TRefArray())
 {
   // constructor
@@ -63,6 +65,7 @@ AliAODJet::AliAODJet(TLorentzVector & p):
     fNeutralFraction(0),
     fTrigger(0),
     fMomentum(0),
+    fVectorAreaCharged(0),
     fRefTracks(new TRefArray())
 {
   // constructor
@@ -80,6 +83,7 @@ AliAODJet::~AliAODJet()
 {
   // destructor
     delete fMomentum;
+    delete fVectorAreaCharged;
     delete fRefTracks;
 }
 
@@ -89,6 +93,7 @@ AliAODJet::AliAODJet(const AliAODJet& jet) :
     fNeutralFraction(jet.fNeutralFraction),
     fTrigger(jet.fTrigger),
     fMomentum(0),
+    fVectorAreaCharged(0),
     fRefTracks(0)
 {
   // Copy constructor
@@ -98,7 +103,8 @@ AliAODJet::AliAODJet(const AliAODJet& jet) :
     fEffectiveArea[1] = jet.fEffectiveArea[1];
     fEffectiveAreaError[0] = jet.fEffectiveAreaError[0];
     fEffectiveAreaError[1] = jet.fEffectiveAreaError[1];
-    fMomentum  = new TLorentzVector(*jet.fMomentum);
+    if(jet.fMomentum)fMomentum  = new TLorentzVector(*jet.fMomentum);
+    if(jet.fVectorAreaCharged)fVectorAreaCharged = new TLorentzVector(*jet.fVectorAreaCharged);
     fRefTracks = new TRefArray(*jet.fRefTracks);
 }
 
@@ -116,8 +122,17 @@ AliAODJet& AliAODJet::operator=(const AliAODJet& jet)
     fEffectiveAreaError[1] = jet.fEffectiveAreaError[1];
     fNeutralFraction = jet.fNeutralFraction;
     fTrigger = jet.fTrigger;
-    delete fMomentum;
-    fMomentum  = new TLorentzVector(*jet.fMomentum);
+    
+    
+    if(jet.fMomentum){
+      if(fMomentum)*fMomentum  = *jet.fMomentum;
+      else fMomentum  = new TLorentzVector(*jet.fMomentum);
+    }
+
+    if(jet.fVectorAreaCharged){
+       if(fVectorAreaCharged)*fVectorAreaCharged = *jet.fVectorAreaCharged;
+       else fVectorAreaCharged = new TLorentzVector(*jet.fVectorAreaCharged);
+      }
     delete fRefTracks;
     fRefTracks = new TRefArray(*jet.fRefTracks);    
   }
@@ -170,18 +185,12 @@ Double_t AliAODJet::DeltaR(const AliVParticle* part){
 }
 
 
-Int_t AliAODJet::Compare( const TObject* obj) const {
-
-  // 
-  // see header file for class documentation
-  //
-
-  if (this == obj)
-    return 0;
-  // check type
-  if ( Pt() < ((AliAODJet*)(obj))->Pt())
-    return 1;
-  else
-    return -1;
+void  AliAODJet::AddTrack(TObject *tr) {
+    // Add a track to the list of referenced tracks
+    if (fRefTracks->GetEntries() == 0) {
+       new(fRefTracks) TRefArray(TProcessID::GetProcessWithUID(tr));
+    }
+    
+    fRefTracks->Add(tr);
 }