Typo fixed, and removing unused variable.

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

diff --git a/STEER/AliAODJet.cxx b/STEER/AliAODJet.cxx
index 5641940e2c351b11ab281f503d9d9b8147fc0ac4..83fc5f57d1c0ee8bbd411977839718d7954b1a74 100644 (file)
--- a/STEER/AliAODJet.cxx
+++ b/STEER/AliAODJet.cxx
@@ -28,7 +28,9 @@ ClassImp(AliAODJet)
 
 //______________________________________________________________________________
 AliAODJet::AliAODJet() :
-    AliVirtualParticle(),
+    AliVParticle(),
+    fNeutralFraction(0),
+    fTrigger(0),
     fMomentum(0),
     fRefTracks(new TRefArray())
 {
@@ -37,32 +39,39 @@ AliAODJet::AliAODJet() :
     fBackgEnergy[1]   = 0.;
     fEffectiveArea[0] = 0.;   
     fEffectiveArea[1] = 0.;   
+    fEffectiveAreaError[0] = fEffectiveAreaError[1] = 0;
 }
 
 AliAODJet::AliAODJet(Double_t px, Double_t py, Double_t pz, Double_t e):
-    AliVirtualParticle(),
+    AliVParticle(),
+    fNeutralFraction(0),
+    fTrigger(0),
     fMomentum(0),
     fRefTracks(new TRefArray())
 {
   // constructor
-    fMomentum = new TLorentzVector(px, py, pz, e);
     fBackgEnergy[0]   = 0.;     
     fBackgEnergy[1]   = 0.;
     fEffectiveArea[0] = 0.;   
-    fEffectiveArea[1] = 0.;   
+    fEffectiveArea[1] = 0.;
+    fEffectiveAreaError[0] = fEffectiveAreaError[1] = 0;   
+    fMomentum = new TLorentzVector(px, py, pz, e);
 }
 
 AliAODJet::AliAODJet(TLorentzVector & p):
-    AliVirtualParticle(),
+    AliVParticle(),
+    fNeutralFraction(0),
+    fTrigger(0),
     fMomentum(0),
     fRefTracks(new TRefArray())
 {
   // constructor
-    fMomentum = new TLorentzVector(p);
     fBackgEnergy[0]   = 0.;     
     fBackgEnergy[1]   = 0.;
     fEffectiveArea[0] = 0.;   
-    fEffectiveArea[1] = 0.;   
+    fEffectiveArea[1] = 0.;
+    fEffectiveAreaError[0] = fEffectiveAreaError[1] = 0;    
+    fMomentum = new TLorentzVector(p);
 }
 
 
@@ -76,16 +85,21 @@ AliAODJet::~AliAODJet()
 
 //______________________________________________________________________________
 AliAODJet::AliAODJet(const AliAODJet& jet) :
-    AliVirtualParticle(jet),
-    fMomentum(0)
+    AliVParticle(jet),
+    fNeutralFraction(jet.fNeutralFraction),
+    fTrigger(jet.fTrigger),
+    fMomentum(0),
+    fRefTracks(0)
 {
   // Copy constructor
-    fMomentum  = new TLorentzVector(*jet.fMomentum);
-    fRefTracks = new TRefArray(*jet.fRefTracks);
     fBackgEnergy[0]   = jet.fBackgEnergy[0];
     fBackgEnergy[1]   = jet.fBackgEnergy[1];
     fEffectiveArea[0] = jet.fEffectiveArea[0];
     fEffectiveArea[1] = jet.fEffectiveArea[1];
+    fEffectiveAreaError[0] = jet.fEffectiveAreaError[0];
+    fEffectiveAreaError[1] = jet.fEffectiveAreaError[1];
+    fMomentum  = new TLorentzVector(*jet.fMomentum);
+    fRefTracks = new TRefArray(*jet.fRefTracks);
 }
 
 //______________________________________________________________________________
@@ -93,6 +107,19 @@ AliAODJet& AliAODJet::operator=(const AliAODJet& jet)
 {
   // Assignment operator
   if(this!=&jet) {
+
+    fBackgEnergy[0]   = jet.fBackgEnergy[0];
+    fBackgEnergy[1]   = jet.fBackgEnergy[1];
+    fEffectiveArea[0] = jet.fEffectiveArea[0];
+    fEffectiveArea[1] = jet.fEffectiveArea[1];
+    fEffectiveAreaError[0] = jet.fEffectiveAreaError[0];
+    fEffectiveAreaError[1] = jet.fEffectiveAreaError[1];
+    fNeutralFraction = jet.fNeutralFraction;
+    fTrigger = jet.fTrigger;
+    delete fMomentum;
+    fMomentum  = new TLorentzVector(*jet.fMomentum);
+    delete fRefTracks;
+    fRefTracks = new TRefArray(*jet.fRefTracks);    
   }
 
   return *this;
@@ -114,3 +141,41 @@ void AliAODJet::Print(Option_t* /*option*/) const
   printf("Charged:  %13.3f\n", EffectiveAreaCharged());
   printf("Neutral:  %13.3f\n", EffectiveAreaNeutral());
 }
+
+void  AliAODJet::SetPxPyPzE(Double_t px, Double_t py, Double_t pz, Double_t e){
+  // 
+  // Set the four Momentum from outside
+  // MomentumVector()->SetPxPyPzE() cannot be used since pointer can be 0x0
+  //
+
+  if(!fMomentum){
+    fMomentum = new TLorentzVector(px,py,pz,e);
+  }
+  else{
+    fMomentum->SetPxPyPzE(px,py,pz,e);
+  }
+}
+
+Double_t AliAODJet::DeltaR(const AliVParticle* part){
+
+  // Helper function to calculate the distance between two jets
+  // or a jet and particle
+
+  Double_t dPhi = Phi() - part->Phi(); 
+  if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
+  if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();
+  Double_t dEta = Eta() - part->Eta(); 
+  Double_t dR = TMath::Sqrt(dPhi*dPhi+dEta*dEta);
+  return dR;
+}
+
+
+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);
+}
+