Corrected EINCLUDE, compilation with Root 6

diff --git a/PWGHF/CMakelibPWGHFbase.pkg b/PWGHF/CMakelibPWGHFbase.pkg
index b9588aeb53c6bde82746a2963a094a7170d1b125..5d39fe079fa44a85795db583c383c86028fcbcf2 100644 (file)
--- a/PWGHF/CMakelibPWGHFbase.pkg
+++ b/PWGHF/CMakelibPWGHFbase.pkg
@@ -37,4 +37,4 @@ string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
 set ( DHDR  PWGHFbaseLinkDef.h)
 
-set ( EINCLUDE  PWGHF/base STEER/STEERBase)
+set ( EINCLUDE  PWGHF/base STEER/STEERBase ANALYSIS)

diff --git a/PWGHF/CMakelibPWGHFcorrelationHF.pkg b/PWGHF/CMakelibPWGHFcorrelationHF.pkg
index 47a6841bf2348a3dcd80b8e148a65831a2c75008..bb3abe15f26a464c39b54609c01ef685d92a24dc 100644 (file)
--- a/PWGHF/CMakelibPWGHFcorrelationHF.pkg
+++ b/PWGHF/CMakelibPWGHFcorrelationHF.pkg
@@ -51,7 +51,7 @@ set ( MODULE_HDRS     ${CLASS_HDRS})
 
 set ( MODULE_DHDR )
 
-set ( EINCLUDE  PWGHF/vertexingHF PWGHF/hfe include)
+set ( EINCLUDE  PWGHF/vertexingHF PWGHF/hfe CORRFW ANALYSIS STEER/ESD STEER/AOD STEER/STEERBase)
 
 set ( ELIBS  
     PWGHFhfe

diff --git a/PWGHF/CMakelibPWGHFhfe.pkg b/PWGHF/CMakelibPWGHFhfe.pkg
index e30e41236bc220af588abd06f25f5a53a52c6866..5e3828d18c77cd4890f9fc037c5627d00205116d 100644 (file)
--- a/PWGHF/CMakelibPWGHFhfe.pkg
+++ b/PWGHF/CMakelibPWGHFhfe.pkg
@@ -104,4 +104,4 @@ string (REPLACE ".cxx" ".h" HDRS "${SRCS}")
 
 set ( DHDR  PWGHFhfeLinkDef.h)
 
-set ( EINCLUDE PWG/muon PWGHF/hfe TPC CORRFW STEER/STEERBase PWG/FLOW/Base PWG/FLOW/Tasks)
+set ( EINCLUDE PWG/muon PWGHF/hfe TPC CORRFW STEER/STEERBase PWG/FLOW/Base PWG/FLOW/Tasks ANALYSIS)

diff --git a/PWGHF/CMakelibPWGHFvertexingHF.pkg b/PWGHF/CMakelibPWGHFvertexingHF.pkg
index 2b6eb1eada487452c917bf3998f528e38dd50dfd..7208df0a59ed9f92dacbc781e50eb87db0426075 100644 (file)
--- a/PWGHF/CMakelibPWGHFvertexingHF.pkg
+++ b/PWGHF/CMakelibPWGHFvertexingHF.pkg
@@ -89,7 +89,7 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 set ( DHDR  PWGHFvertexingHFLinkDef.h)
 
-set ( EINCLUDE   PWGHF/vertexingHF CORRFW STEER/AOD STEER/ESD STEER/STEERBase PWG/FLOW/Base PWG/FLOW/Tasks)
+set ( EINCLUDE   PWGHF/vertexingHF CORRFW STEER/AOD STEER/ESD STEER/STEERBase PWG/FLOW/Base PWG/FLOW/Tasks ANALYSIS)
 
 install ( FILES vertexingHF/AliAODRecoDecayHF.h 
          vertexingHF/AliAODRecoDecayHF2Prong.h

diff --git a/PWGHF/PWGHFhfeLinkDef.h b/PWGHF/PWGHFhfeLinkDef.h
index d348e6f64991fd2a75c8f83950b713c77ea4b8f1..d930b556f3e49c9c2545d9e4faf70befb6da131b 100644 (file)
--- a/PWGHF/PWGHFhfeLinkDef.h
+++ b/PWGHF/PWGHFhfeLinkDef.h
@@ -58,7 +58,10 @@
 #pragma link C++ class  AliHFEefficiency+;
 
 #pragma link C++ class  AliHFEOADBThresholdsTRD+;
+#if ROOT_VERSION_CODE < 0x56300 // ROOT_VERSION(5,99,0)
+// Private sub-class
 #pragma link C++ class  AliHFEOADBThresholdsTRD::AliHFEthresholdParamsTRD+;
+#endif
 #pragma link C++ class  AliHFEbayesPIDqa+;
 #pragma link C++ class  AliHFEpidBayes+;
 

diff --git a/PWGHF/hfe/AliHFEV0info.h b/PWGHF/hfe/AliHFEV0info.h
index 522ed659fc55c13b01e73147380f2a6f3f37ff91..7eb8b98a6316a7e76354601850e7932c0a6c0820 100644 (file)
--- a/PWGHF/hfe/AliHFEV0info.h
+++ b/PWGHF/hfe/AliHFEV0info.h
@@ -16,7 +16,7 @@
 // Stores aditional information about the V0 candidates
 // author: M.Fasel@gsi.de
 //
-#ifndef ALIHFEV0INF0_H
+#ifndef ALIHFEV0INFO_H
 #define ALIHFEV0INFO_H
 
 #ifndef ROOT_TObject