changed HLT "fastjet" trigger: new set methods in AliFJWrapper using chars.... re...

diff --git a/HLT/CMakelibAliHLTEMCAL.pkg b/HLT/CMakelibAliHLTEMCAL.pkg
index 1fc4134e55f44697375991cea102a8625677db24..712c2d059988689bbb13de3229c74d3d72c1f75a 100644 (file)
--- a/HLT/CMakelibAliHLTEMCAL.pkg
+++ b/HLT/CMakelibAliHLTEMCAL.pkg
@@ -42,6 +42,7 @@ set ( CLASS_HDRS
     AliHLTEMCALGeometry.h
     AliHLTEMCALRecoParamHandler.h
     AliHLTEMCALClusterizerComponentNbyN.h
+    AliFJWrapper.h
     )
 
 string ( REPLACE ".h" ".cxx" MODULE_SRCS "${CLASS_HDRS}" )

diff --git a/HLT/CMakelibAliHLTTrigger.pkg b/HLT/CMakelibAliHLTTrigger.pkg
index 1153b6cbbb62dc6d33969b93a24a77075b7c41cf..93dcb74fa9f3ff045fc754a1f7d8a3e12e98ded1 100644 (file)
--- a/HLT/CMakelibAliHLTTrigger.pkg
+++ b/HLT/CMakelibAliHLTTrigger.pkg
@@ -55,7 +55,7 @@ set ( CLASS_HDRS
     AliHLTTriggerCounterComponent.h
     AliHLTTriggerCounters.h
     AliHLTTriggerEmcalElectron.h
- 
+    AliHLTTriggerFastJet.h      
     )
 
 

diff --git a/HLT/EMCAL/AliFJWrapper.cxx b/HLT/EMCAL/AliFJWrapper.cxx
index eea67079353c308e35bde9a3f5ddd94e658a96dd..2e037b31ef46b5847affe62670aa7affd908a36f 100644 (file)
--- a/HLT/EMCAL/AliFJWrapper.cxx
+++ b/HLT/EMCAL/AliFJWrapper.cxx
@@ -422,3 +422,64 @@ AliFJWrapper::GetJetConstituents(const unsigned int _idx)
   
   return retval;
 }
+
+void AliFJWrapper::SetupAlgorithmfromOpt(const char *option)
+{
+  string opt(option);
+  
+  if (!opt.compare("kt"))                fAlgor_    = fj::kt_algorithm;
+  if (!opt.compare("antikt"))            fAlgor_    = fj::antikt_algorithm;
+  if (!opt.compare("cambridge"))         fAlgor_    = fj::cambridge_algorithm;
+  if (!opt.compare("genkt"))             fAlgor_    = fj::genkt_algorithm;
+  if (!opt.compare("cambridge_passive")) fAlgor_    = fj::cambridge_for_passive_algorithm;
+  if (!opt.compare("genkt_passive"))     fAlgor_    = fj::genkt_for_passive_algorithm;
+  if (!opt.compare("ee_kt"))             fAlgor_    = fj::ee_kt_algorithm;
+  if (!opt.compare("ee_genkt"))          fAlgor_    = fj::ee_genkt_algorithm;
+  if (!opt.compare("plugin"))            fAlgor_    = fj::plugin_algorithm;
+
+
+}
+void AliFJWrapper::SetupStrategyfromOpt(const char *option)
+{
+  string opt(option);
+
+  if (!opt.compare("Best"))            fStrategy_ = fj::Best;
+  if (!opt.compare("N2MinHeapTiled"))  fStrategy_ = fj::N2MinHeapTiled;
+  if (!opt.compare("N2Tiled"))         fStrategy_ = fj::N2Tiled;
+  if (!opt.compare("N2PoorTiled"))     fStrategy_ = fj::N2PoorTiled;
+  if (!opt.compare("N2Plain"))         fStrategy_ = fj::N2Plain;
+  if (!opt.compare("N3Dumb"))          fStrategy_ = fj::N3Dumb;
+  if (!opt.compare("NlnN"))            fStrategy_ = fj::NlnN;
+  if (!opt.compare("NlnN3pi"))         fStrategy_ = fj::NlnN3pi;
+  if (!opt.compare("NlnN4pi"))         fStrategy_ = fj::NlnN4pi;
+  if (!opt.compare("NlnNCam4pi"))      fStrategy_ = fj::NlnNCam4pi;
+  if (!opt.compare("NlnNCam2pi2R"))    fStrategy_ = fj::NlnNCam2pi2R;
+  if (!opt.compare("NlnNCam"))         fStrategy_ = fj::NlnNCam;
+  if (!opt.compare("plugin"))          fStrategy_ = fj::plugin_strategy;
+
+}
+void AliFJWrapper::SetupSchemefromOpt(const char *option)
+{
+  string opt(option);
+
+  if (!opt.compare("BIpt"))   fScheme_   = fj::BIpt_scheme;
+  if (!opt.compare("BIpt2"))  fScheme_   = fj::BIpt2_scheme;
+  if (!opt.compare("E"))      fScheme_   = fj::E_scheme;
+  if (!opt.compare("pt"))     fScheme_   = fj::pt_scheme;
+  if (!opt.compare("pt2"))    fScheme_   = fj::pt2_scheme;
+  if (!opt.compare("Et"))     fScheme_   = fj::Et_scheme;
+  if (!opt.compare("Et2"))    fScheme_   = fj::Et2_scheme;
+
+}
+void AliFJWrapper::SetupAreaTypefromOpt(const char *option)
+{
+  string opt(option);
+
+  if (!opt.compare("active"))                      fAreaType_ = fj::active_area;
+  if (!opt.compare("invalid"))                     fAreaType_ = fj::invalid_area;
+  if (!opt.compare("active_area_explicit_ghosts")) fAreaType_ = fj::active_area_explicit_ghosts;
+  if (!opt.compare("one_ghost_passive"))           fAreaType_ = fj::one_ghost_passive_area;
+  if (!opt.compare("passive"))                     fAreaType_ = fj::passive_area;
+  if (!opt.compare("voronoi"))                     fAreaType_ = fj::voronoi_area;
+
+}

diff --git a/HLT/EMCAL/AliFJWrapper.h b/HLT/EMCAL/AliFJWrapper.h
index 68112b9f61d96c6c74d1b423767bfa1667de1a20..0e74d23f5c2378b6559c4a467c6aba733e8297bf 100644 (file)
--- a/HLT/EMCAL/AliFJWrapper.h
+++ b/HLT/EMCAL/AliFJWrapper.h
@@ -37,6 +37,11 @@ class AliFJWrapper : public TNamed
   void SetRecombScheme (const fastjet::RecombinationScheme _scheme) { fScheme_   = _scheme; }
   void SetAreaType     (const fastjet::AreaType _atype)             { fAreaType_ = _atype;  }
 
+  void SetupAlgorithmfromOpt (const char *option);
+  void SetupStrategyfromOpt  (const char *option);
+  void SetupSchemefromOpt    (const char *option);
+  void SetupAreaTypefromOpt  (const char *option);
+
   void SetNRepeats      (const int    _nrepeat) { fNGhostRepeats_ = _nrepeat; }
   void SetGhostArea     (const double _gharea)  { fGhostArea_     = _gharea;  }
   void SetMaxRap        (const double _maxrap)  { fMaxRap_        = _maxrap;  }

diff --git a/HLT/trigger/AliHLTTriggerFastJet.cxx b/HLT/trigger/AliHLTTriggerFastJet.cxx
index 263e3ebb73d3d350d5101c9dbb058bd5dc52fe2c..1bda57a3b5f8b3fc611385b2c0898d667d4ecfe9 100644 (file)
--- a/HLT/trigger/AliHLTTriggerFastJet.cxx
+++ b/HLT/trigger/AliHLTTriggerFastJet.cxx
@@ -1,19 +1,3 @@
-//**************************************************************************                        
-//* This file is property of and copyright by the ALICE HLT Project        *                        
-//* ALICE Experiment at CERN, All rights reserved.                         *                        
-//*                                                                        *                        
-//* Primary Authors: leonidas.xaplanteris@gmail.com                        *                        
-//*                  for The ALICE HLT Project.                            *                        
-//*                                                                        *                        
-//* Permission to use, copy, modify and distribute this software and its   *                        
-//* documentation strictly for non-commercial purposes is hereby granted   *                        
-//* without fee, provided that the above copyright notice appears in all   *                        
-//* copies and that both the copyright notice and this permission notice   *                        
-//* appear in the supporting documentation. The authors make no claims     *                        
-//* about the suitability of this software for any purpose. It is          *                        
-//* provided "as is" without express or implied warranty.                  *                        
-//**************************************************************************   
-
 #include "AliHLTTriggerFastJet.h"
 #include "AliESDEvent.h"
 #include "AliESDtrackCuts.h"
@@ -26,10 +10,6 @@
 #include "TString.h"
 #include "TMap.h"
 
-#include <fastjet/PseudoJet.hh>
-#include <fastjet/JetDefinition.hh>
-#include <fastjet/AreaDefinition.hh>
-
 #include "AliFJWrapper.h"
 
 
@@ -134,10 +114,10 @@ Int_t AliHLTTriggerFastJet::DoTrigger() {
     
   }
   
-  fFastJetWrapper->SetStrategy(fastjet::Best);
-  fFastJetWrapper->SetAlgorithm(fastjet::antikt_algorithm);
-  fFastJetWrapper->SetRecombScheme(fastjet::BIpt_scheme);
-  fFastJetWrapper->SetAreaType(fastjet::active_area);
+  fFastJetWrapper->SetupStrategyfromOpt("Best");
+  fFastJetWrapper->SetupAlgorithmfromOpt("antikt");
+  fFastJetWrapper->SetupSchemefromOpt("BIpt");
+  fFastJetWrapper->SetupAreaTypefromOpt("active");
   fFastJetWrapper->SetNRepeats(1);
   fFastJetWrapper->SetGhostArea(0.01);
   fFastJetWrapper->SetMaxRap(0.9);