Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / PWGJE / CMakelibPWGJEEMCALJetTasks.pkg

diff --git a/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg b/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
index 6842ece1fee3ed012c8c566b29e5a9df90ae25cb..86ff5b907c563931dc787a3049f2e8b62e7aa5c9 100644 (file)
--- a/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
+++ b/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
@@ -26,46 +26,81 @@
 #--------------------------------------------------------------------------------#
 
 set ( SRCS 
+ EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx
  EMCALJetTasks/AliAnalysisTaskEmcalJet.cxx
- EMCALJetTasks/AliAnalysisTaskRhoBase.cxx
+ EMCALJetTasks/AliAnalysisTaskEmcalJetSample.cxx
  EMCALJetTasks/AliAnalysisTaskRho.cxx
- EMCALJetTasks/AliAnalysisTaskRhoFlow.cxx
  EMCALJetTasks/AliAnalysisTaskRhoAverage.cxx
- EMCALJetTasks/AliAnalysisTaskDeltaPt.cxx
+ EMCALJetTasks/AliAnalysisTaskRhoBase.cxx
+ EMCALJetTasks/AliAnalysisTaskRhoFlow.cxx
+ EMCALJetTasks/AliAnalysisTaskRhoSparse.cxx
+ EMCALJetTasks/AliAnalysisTaskLocalRho.cxx
  EMCALJetTasks/AliAnalysisTaskScale.cxx
  EMCALJetTasks/AliEmcalJet.cxx
- EMCALJetTasks/AliEmcalJetTask.cxx
- EMCALJetTasks/AliHadCorrTask.cxx
- EMCALJetTasks/AliJetEmbeddingTask.cxx
+ EMCALJetTasks/AliJetConstituentTagCopier.cxx
+ EMCALJetTasks/AliJetContainer.cxx
  EMCALJetTasks/AliJetEmbeddingFromGenTask.cxx
+ EMCALJetTasks/AliJetEmbeddingFromPYTHIATask.cxx
+ EMCALJetTasks/AliJetEmbeddingTask.cxx
  EMCALJetTasks/AliJetModelBaseTask.cxx
+ EMCALJetTasks/AliJetModelMergeBranches.cxx
  EMCALJetTasks/AliJetRandomizerTask.cxx
  EMCALJetTasks/AliJetResponseMaker.cxx
  EMCALJetTasks/AliRhoParameter.cxx
+ EMCALJetTasks/AliLocalRhoParameter.cxx
+ EMCALJetTasks/AliJetTriggerSelectionTask.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskCLQA.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskDeltaPtJEmb.cxx        
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalBadCells.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetBase.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.cxx
  EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHMEC.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadCorQA.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadEPpid.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMass.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMassBkg.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetMassResponse.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetPatchTriggerQA.cxx
  EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectra.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTagger.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTriggerQA.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalTriggerInfoQA.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskHJetEmbed.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskRhoVnModulation.cxx
+ EMCALJetTasks/UserTasks/AliAnalysisTaskJetMatching.cxx
  EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
  EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.cxx
  EMCALJetTasks/UserTasks/AliAnalysisTaskSOH.cxx
- EMCALJetTasks/UserTasks/AliAnalysisTaskFullppJet.cxx
 )
 
+# Add code that needs fastjet or FJWrapper here
+if (FASTJET_FOUND)
+  LIST(APPEND SRCS
+   EMCALJetTasks/AliFJWrapper.cxx
+   EMCALJetTasks/AliEmcalJetTask.cxx
+   EMCALJetTasks/AliEmcalJetFinder.cxx
+   EMCALJetTasks/AliJetEmbeddingFromAODTask.cxx
+   EMCALJetTasks/UserTasks/AliAnalysisTaskFullpAJets.cxx
+   EMCALJetTasks/UserTasks/AliAnalysisTaskFullppJet.cxx
+   EMCALJetTasks/UserTasks/AliAnalysisTaskHJetDphi.cxx
+  )
+  set ( CINTFLAGS ${CINTFLAGS} ${FASTJET_DEFINITIONS})
+endif(FASTJET_FOUND)
+
 set ( DHDR  PWGJEEMCALJetTasksLinkDef.h)
 
 string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
-set ( SRCS ${SRCS}  EMCALJetTasks/AliFJWrapper.cxx )
-
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
-set ( HDRS ${HDRS}  EMCALJetTasks/FJ_includes.h )
-
-set ( FASTJET_ROOT $ENV{FASTJET_ROOT} )
-
-if(FASTJET_ROOT)
-  set ( EDEFINE -isystem${FASTJET_ROOT}/include )
+if(FASTJET_FOUND)
+  set ( EDEFINE -isystem${FASTJET_INCLUDE_DIR})
+  set ( EINCLUDE ${FASTJET_INCLUDE_DIR} PWGJE/EMCALJetTasks PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS)
+  set ( HDRS ${HDRS}  EMCALJetTasks/FJ_includes.h )
 else()
-  set ( EDEFINE -isystem${ALICE_ROOT}/JETAN/fastjet )
-endif(FASTJET_ROOT)
+  set ( EINCLUDE PWGJE/EMCALJetTasks PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS)
+endif(FASTJET_FOUND)
 
-set ( EINCLUDE JETAN/fastjet PWGJE/EMCALJetTasks PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase )