Merge branch 'master' of http://git.cern.ch/pub/AliRoot

[u/mrichter/AliRoot.git] / JETAN / AliUA1JetFinder.h

diff --git a/JETAN/AliUA1JetFinder.h b/JETAN/AliUA1JetFinder.h
old mode 100755 (executable)
new mode 100644 (file)
index afae577..00f72eb
--- a/JETAN/AliUA1JetFinder.h
+++ b/JETAN/AliUA1JetFinder.h
@@ -1,48 +1,55 @@
 #ifndef ALIUA1JETFINDER_H
 #define ALIUA1JETFINDER_H
- 
+
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
- 
- 
+
+/* $Id$ */
+
 //---------------------------------------------------------------------
-// UA1 Jet finder 
-// manages the search for jets 
-// Author: jgcn@mda.cinvestav.mx
-// (code adapted from EMCAL directory)
+// UA1 Cone Algorithm Finder 
+// manages the search for jets
+// Author: Rafael.Diaz.Valdes@cern.ch
+// (version in c++)
+// ** 2011
+// Modified accordingly to reader/finder splitting and new handling of neutral information
+// Versions V1 and V2 merged
 //---------------------------------------------------------------------
 
 #include "AliJetFinder.h"
-class AliUA1JetHeader;
+
 class TH2F;
+class AliJetBkg;
 
-class AliUA1JetFinder : public AliJetFinder 
+class AliUA1JetFinder : public AliJetFinder
 {
  public:
 
   AliUA1JetFinder();
   ~AliUA1JetFinder();
 
-  // getters
-
-  // setters
-  void SetJetHeader(AliUA1JetHeader* h) {fHeader= h;}
   // others
-  void FindJetsTPC();
   void FindJets();
+  void RunAlgoritm(Float_t EtbgTotal, Double_t dEtTotal, Int_t& nJets,
+                  Float_t* const etJet,Float_t* const etaJet, Float_t* const phiJet,
+                  Float_t* const etallJet, Int_t* const ncellsJet);
+
   void Reset();
   void Init();
-  void WriteJHeaderToFile();
+  void WriteJHeaderToFile() const;
+
+  enum {kMaxJets = 60};
 
  protected:
+  AliUA1JetFinder(const AliUA1JetFinder& rJetF1);
+  AliUA1JetFinder& operator = (const AliUA1JetFinder& rhsf);
+
+  TH2F*       fLego;          //  Lego Histo
 
-  AliUA1JetFinder(const AliUA1JetFinder& rUA1Finder);
-  AliUA1JetFinder& operator = (const AliUA1JetFinder& ruaf);
+  AliJetBkg*  fJetBkg;        //! pointer to bkg class
 
-  AliUA1JetHeader* fHeader;         // pointer to jet header
-  TH2F           * fLego;           //! Lego Histo
+  ClassDef(AliUA1JetFinder,3) //  UA1 jet finder
 
-  ClassDef(AliUA1JetFinder,1)
 };
 
 #endif