- Create branch for jet event background in AliAnalysisTaskJets (Elena Bruna)

- Includes replaced by fwd declarations. (AM)

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index b34436e68f7f46df7297a62d8d2fb5d1b1e81da0..561ba9ef3a5244d6a0d2ab7e2133658d00492f6e 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -106,7 +106,9 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
       AddAODBranch("TClonesArray",&tca);
       fJetFinder->ConnectAODNonStd(AODEvent(), fNonStdBranch.Data()); 
     }
-  
+  AliAODPWG4JetEventBackground* evBkg = fJetFinder->GetEventBackground();
+  AddAODBranch("AliAODPWG4JetEventBackground",&evBkg);
+
   // Histograms
   OpenFile(1);
   fListOfHistos = new TList();

diff --git a/JETAN/AliAnalysisTaskJetsCDF.cxx b/JETAN/AliAnalysisTaskJetsCDF.cxx
index 2e7c5db02c6f6828f7b37d215efeb70f5ea69bc3..5cca41e2d742116979c2d06a3c03ba7ddbc13c2e 100644 (file)
--- a/JETAN/AliAnalysisTaskJetsCDF.cxx
+++ b/JETAN/AliAnalysisTaskJetsCDF.cxx
@@ -32,6 +32,7 @@
 #include "AliESDInputHandler.h"
 #include "AliMCEvent.h"
 #include "AliStack.h"
+#include "AliJetReader.h"
 
 #include "AliAnalysisTaskJetsCDF.h"
 

diff --git a/JETAN/AliFastJetFinder.cxx b/JETAN/AliFastJetFinder.cxx
index d5e260ff28b37d150f4460383b52f26c77578296..99ce9f8a266c40029baa3669c6b2820ed67d993d 100644 (file)
--- a/JETAN/AliFastJetFinder.cxx
+++ b/JETAN/AliFastJetFinder.cxx
@@ -67,8 +67,7 @@ ClassImp(AliFastJetFinder)
 AliFastJetFinder::AliFastJetFinder():
   AliJetFinder(),
   fInputFJ(0),
-  fJetBkg(0),
-  fAODEvBkg(0)
+  fJetBkg(0)
 {
   // Constructor
 }

diff --git a/JETAN/AliFastJetFinder.h b/JETAN/AliFastJetFinder.h
index 0dae77640f6ebabf6d84673c86b3bae5555ba263..5d55b3b60156f9fd8284838ea9baa812fb1f0e49 100644 (file)
--- a/JETAN/AliFastJetFinder.h
+++ b/JETAN/AliFastJetFinder.h
@@ -57,7 +57,6 @@ class AliFastJetFinder : public AliJetFinder
   AliFastJetFinder& operator = (const AliFastJetFinder& rsfj);
   AliFastJetInput*                fInputFJ;     //! input particles array
   AliJetBkg*                      fJetBkg;      //! pointer to bkg class
-  AliAODPWG4JetEventBackground*   fAODEvBkg;    //! bkg object to be store
   ClassDef(AliFastJetFinder,2)
 };
 

diff --git a/JETAN/AliJetFinder.cxx b/JETAN/AliJetFinder.cxx
index 1f65dbd39e88a1a95e3fec27e55716aa080b3bfc..1c397e757d9b6708294c45b4725aa731d13e6f7f 100644 (file)
--- a/JETAN/AliJetFinder.cxx
+++ b/JETAN/AliJetFinder.cxx
@@ -30,6 +30,9 @@
 #include "AliAODJet.h"
 #include "AliAODEvent.h"
 #include "AliJetUnitArray.h"
+#include "AliJetReaderHeader.h"
+#include "AliJetHeader.h"
+#include "AliJetReader.h"
 
 class TProcessID;
 class TClonesArray;
@@ -40,7 +43,8 @@ AliJetFinder::AliJetFinder():
     fReader(0x0),
     fHeader(0x0),
     fAODjets(0x0),
-    fNAODjets(0)
+    fNAODjets(0),
+    fAODEvBkg(0)
 {
   //
   // Constructor

diff --git a/JETAN/AliJetFinder.h b/JETAN/AliJetFinder.h
index e4bf3f240e2bc9f195126f20c49a58c10c6e868c..63604fa90d4845032d7b44e52d3969f0a4349b4b 100755 (executable)
--- a/JETAN/AliJetFinder.h
+++ b/JETAN/AliJetFinder.h
@@ -17,13 +17,15 @@
 
 #include <TObject.h>
 #include "AliAODJet.h"
-#include "AliJetReader.h"
-#include "AliJetHeader.h"
-#include "AliJetReaderHeader.h"
 
 class TChain;
+class TTree;
 class AliAODJet;
 class AliAODEvent;
+class AliAODPWG4JetEventBackground;
+class AliJetHeader;
+class AliJetReader;
+class AliJetReaderHeader;
 
 class AliJetFinder : public TObject 
 {
@@ -32,11 +34,13 @@ class AliJetFinder : public TObject
   virtual ~AliJetFinder();
 
   // Getters
-  virtual AliJetReader *GetReader() {return fReader;}
-  virtual AliJetHeader *GetHeader() {return fHeader;}
+  virtual AliJetReader *GetReader() const {return fReader;}
+  virtual AliJetHeader *GetHeader() const {return fHeader;}
+  virtual AliAODPWG4JetEventBackground* GetEventBackground() const {return fAODEvBkg;}
   // Setters
   virtual void          SetJetReader(AliJetReader* r) {fReader=r;}
   virtual void          SetJetHeader(AliJetHeader* h) {fHeader=h;}
+  virtual void          SetEventBackground(AliAODPWG4JetEventBackground* bkg) {fAODEvBkg = bkg;}
   // Others
   virtual void          AddJet(AliAODJet jet);
   virtual void          WriteRHeaderToFile();  
@@ -62,6 +66,7 @@ class AliJetFinder : public TObject
   AliJetHeader* fHeader;         //  pointer to header
   TClonesArray* fAODjets;        //! reconstructed jets
   Int_t         fNAODjets;       //! number of reconstructed jets
+  AliAODPWG4JetEventBackground*   fAODEvBkg;    //! bkg object to be store
   ClassDef(AliJetFinder,2)
 };
 

diff --git a/JETAN/AliUA1JetFinderV1.cxx b/JETAN/AliUA1JetFinderV1.cxx
index 48efa0851f83bd14e5564d47aa3920aa33b5c12c..378c8c6d6d7a0502cb980bf38befad725732b139 100644 (file)
--- a/JETAN/AliUA1JetFinderV1.cxx
+++ b/JETAN/AliUA1JetFinderV1.cxx
@@ -33,6 +33,9 @@
 #include "AliUA1JetHeaderV1.h"
 #include "AliJetReaderHeader.h"
 #include "AliJetReader.h"
+#include "AliJetHeader.h"
+
+
 #include "AliAODJet.h"
 #include "AliLog.h"
 

diff --git a/JETAN/AliUA1JetFinderV2.cxx b/JETAN/AliUA1JetFinderV2.cxx
index 69ba62687b5850c1e88665748d0b1168b3724005..c401860be262c6a64fd308ba99f79c672e7bbbfd 100644 (file)
--- a/JETAN/AliUA1JetFinderV2.cxx
+++ b/JETAN/AliUA1JetFinderV2.cxx
@@ -34,6 +34,9 @@
 #include "AliUA1JetFinderV2.h"
 #include "AliUA1JetHeaderV1.h"
 #include "AliJetUnitArray.h"
+#include "AliJetReaderHeader.h"
+#include "AliJetReader.h"
+#include "AliJetHeader.h"
 
 class TArrayF;
 class TFile;