re-activate contrib code

diff --git a/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx b/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
index 17f55eaf846106e263f90e469ef76a7f76995d08..d3aed41471a1c7917469ada151b876a915d45590 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
+++ b/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
@@ -437,7 +437,7 @@ void AliEmcalJetTask::FindJets()
 
     //do generic subtraction if requested
     if(fDoGenericSubtraction) {
-#ifdef FASTJET_CONTRIB
+#ifdef FASTJET_VERSION
       std::vector<fastjet::contrib::GenericSubtractorInfo> jetMassInfo = fjw.GetGenSubtractorInfoJetMass();
       UInt_t n = (UInt_t)jetMassInfo.size();
       if(n>ij && n>0) {
@@ -608,7 +608,7 @@ void AliEmcalJetTask::FindJets()
 
   //run constituent subtractor if requested
   if(fDoConstituentSubtraction) {
-#ifdef FASTJET_CONTRIB
+#ifdef FASTJET_VERSION
     if(!fJetsSub) AliWarning(Form("No jet branch to write to for subtracted jets. fJetsSubName: %s",fJetsSubName.Data()));
     else {
       std::vector<fastjet::PseudoJet> jets_sub;

diff --git a/PWGJE/EMCALJetTasks/AliFJWrapper.h b/PWGJE/EMCALJetTasks/AliFJWrapper.h
index df9ecbe9f5582145fccb0fcdd459def79253cf37..533ad0b312b89e3ad5590331dcfd250e659f50aa 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliFJWrapper.h
+++ b/PWGJE/EMCALJetTasks/AliFJWrapper.h
@@ -36,7 +36,7 @@ class AliFJWrapper
   Double_t                                GetJetSubtractedPt (UInt_t idx) const;
   virtual std::vector<double>             GetSubtractedJetsPts(Double_t median_pt = -1, Bool_t sorted = kFALSE);
   Bool_t                                  GetLegacyMode()            { return fLegacyMode; }
-#ifdef FASTJET_CONTRIB
+#ifdef FASTJET_VERSION
   const std::vector<fastjet::contrib::GenericSubtractorInfo> GetGenSubtractorInfoJetMass() const {return fGenSubtractorInfoJetMass;}
   const std::vector<fastjet::PseudoJet>   GetConstituentSubtrJets() const { return fConstituentSubtrJets;  }
 #endif
@@ -98,8 +98,7 @@ class AliFJWrapper
   Bool_t                                 fUseArea4Vector;     //!
 #ifdef FASTJET_VERSION
   fastjet::JetMedianBackgroundEstimator   *fBkrdEstimator;        //!
-#endif
-#ifdef FASTJET_CONTRIB
+  //from contrib package
   fastjet::contrib::GenericSubtractor     *fGenSubtractor;        //!
   std::vector<fastjet::contrib::GenericSubtractorInfo> fGenSubtractorInfoJetMass;    //!
 #endif
@@ -159,8 +158,6 @@ AliFJWrapper::AliFJWrapper(const char *name, const char *title)
   , fUseArea4Vector    (kFALSE)
 #ifdef FASTJET_VERSION
   , fBkrdEstimator     (0)
-#endif
-#ifdef FASTJET_CONTRIB
   , fGenSubtractor     (0)
   , fGenSubtractorInfoJetMass ( )
 #endif
@@ -186,8 +183,6 @@ AliFJWrapper::~AliFJWrapper()
   delete fClustSeq;
 #ifdef FASTJET_VERSION
   if (fBkrdEstimator)     delete fBkrdEstimator;
-#endif
-#ifdef FASTJET_CONTRIB
   if (fGenSubtractor)     delete fGenSubtractor;
 #endif
 }
@@ -238,8 +233,6 @@ void AliFJWrapper::Clear(const Option_t */*opt*/)
   delete fClustSeq;        fClustSeq        = 0;
 #ifdef FASTJET_VERSION
   if (fBkrdEstimator)     delete fBkrdEstimator     ;  fBkrdEstimator     = 0;
-#endif
-#ifdef FASTJET_CONTRIB
   if (fGenSubtractor)     delete fGenSubtractor     ;  fGenSubtractor     = 0;
 #endif
 }
@@ -535,7 +528,7 @@ void AliFJWrapper::SubtractBackground(Double_t median_pt)
 //_________________________________________________________________________________________________
 Int_t AliFJWrapper::DoGenericSubtractionJetMass() {
   //Do generic subtraction for jet mass
-#ifdef FASTJET_CONTRIB
+#ifdef FASTJET_VERSION
   if(fUseExternalBkg)   fGenSubtractor     = new fj::contrib::GenericSubtractor(fRho,fRhom);
   else                  fGenSubtractor     = new fj::contrib::GenericSubtractor(fBkrdEstimator);
 
@@ -558,7 +551,7 @@ Int_t AliFJWrapper::DoGenericSubtractionJetMass() {
 //_________________________________________________________________________________________________
 Int_t AliFJWrapper::DoConstituentSubtraction() {
   //Do constituent subtraction
-#ifdef FASTJET_CONTRIB
+#ifdef FASTJET_VERSION
   fj::contrib::ConstituentSubtractor *subtractor;
   if(fUseExternalBkg)
     subtractor     = new fj::contrib::ConstituentSubtractor(fRho,fRhom,kFALSE,kTRUE);

diff --git a/PWGJE/EMCALJetTasks/FJ_includes.h b/PWGJE/EMCALJetTasks/FJ_includes.h
index 6dce4390a35ba42b6b83414e68d826dde3998953..d4561d959d8b50bdf7fb53cd4593c7669c7c3e7a 100644 (file)
--- a/PWGJE/EMCALJetTasks/FJ_includes.h
+++ b/PWGJE/EMCALJetTasks/FJ_includes.h
@@ -21,12 +21,11 @@
 #include <fastjet/tools/JetMedianBackgroundEstimator.hh>
 #include <fastjet/tools/BackgroundEstimatorBase.hh>
 #include <fastjet/tools/Subtractor.hh>
-#ifdef FASTJET_CONTRIB
+//from contrib package
 #include <fastjet/contrib/GenericSubtractor.hh>
 #include <fastjet/contrib/ShapeWithComponents.hh>
 #include <fastjet/contrib/ConstituentSubtractor.hh>
 #endif
 #endif
-#endif
 
 #endif