X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=JETAN%2FAliFastJetInput.h;h=d24a38dfde6aca6f5cb4383658e483222185072d;hb=019dc90cfce39265d82f8a5dc24e552de0143ab7;hp=17d70af3d40e63d3d4f6f381e5c7c352f89a93f8;hpb=50c7d9f70d9f8c927a05cd996f88dee6b13f9557;p=u%2Fmrichter%2FAliRoot.git

diff --git a/JETAN/AliFastJetInput.h b/JETAN/AliFastJetInput.h
index 17d70af3d40..d24a38dfde6 100644
--- a/JETAN/AliFastJetInput.h
+++ b/JETAN/AliFastJetInput.h
@@ -3,57 +3,59 @@
  
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
-  //---------------------------------------------------------------------
+
+/* $Id$ */
+
+//---------------------------------------------------------------------
 // Class for input particles
 // manages the search for jets 
 // Authors: Elena Bruna elena.bruna@yale.edu
-//         
+//
+// ** 2011 magali.estienne@subatech.in2p3.fr &  alexandre.shabetai@cern.ch             
+// Modified accordingly to reader/finder splitting and new handling of neutral information
 //---------------------------------------------------------------------
 
-//FastJet classes 
-#include "fastjet/PseudoJet.hh"
-#include "fastjet/ClusterSequenceArea.hh"
-#include "fastjet/AreaDefinition.hh"
-#include "fastjet/JetDefinition.hh"
-// get info on how fastjet was configured
-#include "fastjet/config.h"
-#ifdef ENABLE_PLUGIN_SISCONE
-#include "fastjet/SISConePlugin.hh"
+#include <TObject.h>
 
+// FastJet classes 
+#ifndef __CINT__
+# include "fastjet/PseudoJet.hh"
+#else
+namespace fastjet {
+  class PseudoJet;
+}
+#endif
 
-#include<sstream>  // needed for internal io
 #include <vector> 
-#include <cmath> 
-#endif
-class AliJetFinder;
+
+class AliJetCalTrkEvent;
 class AliJetHeader;
-class AliJetReader;
 
+using std::vector;
 
 class AliFastJetInput : public TObject
 {
  public:
-    AliFastJetInput();
-    AliFastJetInput(const AliFastJetInput &input);
-    AliFastJetInput& operator=(const AliFastJetInput& source);
-    virtual ~AliFastJetInput() {;}
-    void SetHeader(AliJetHeader *header)  {fHeader=header;}
-    void SetReader(AliJetReader *reader)  {fReader=reader;}
-    void FillInput();
-    vector<fastjet::PseudoJet> GetInputParticles()   const {return fInputParticles;}
-    vector<fastjet::PseudoJet> GetInputParticlesCh() const {return fInputParticlesCh;}
-
-    Float_t  EtaToTheta(Float_t arg);
-    static Double_t Thermalspectrum(Double_t *x, Double_t *par);
+  AliFastJetInput();
+  AliFastJetInput(const AliFastJetInput &input);
+  AliFastJetInput& operator=(const AliFastJetInput& source);
+  virtual                    ~AliFastJetInput() {;}
+  void                       SetHeader(AliJetHeader *header)            {fHeader=header;}
+  void                       SetCalTrkEvent(AliJetCalTrkEvent *caltrk)  {fCalTrkEvent=caltrk;}
+  void                       FillInput();
+  vector<fastjet::PseudoJet> GetInputParticles()   const                {return fInputParticles;}
+  vector<fastjet::PseudoJet> GetInputParticlesCh() const                {return fInputParticlesCh;}
+  static Double_t            Thermalspectrum(const Double_t *x, const Double_t *par);
 
  private:
-   AliJetReader *fReader;  //! reader 
-   AliJetHeader *fHeader;  //! header 
+  AliJetHeader *fHeader;                        //! header 
+  AliJetCalTrkEvent *fCalTrkEvent;              //! caltrkevent
    
-    vector<fastjet::PseudoJet> fInputParticles;     //! input particles for FastJet
-    vector<fastjet::PseudoJet> fInputParticlesCh;   //! input charged particles for FastJet
+  vector<fastjet::PseudoJet> fInputParticles;   //! input particles for FastJet
+  vector<fastjet::PseudoJet> fInputParticlesCh; //! input charged particles for FastJet
 
-  ClassDef(AliFastJetInput, 1); // Analysis task for standard jet analysis
+  ClassDef(AliFastJetInput, 2)                  //  fills input particles for FASTJET based analysis
+    
 };
  
 #endif