Fix for par files compilation (Philippe)
authordainese <dainese@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 28 Oct 2010 18:33:57 +0000 (18:33 +0000)
committerdainese <dainese@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 28 Oct 2010 18:33:57 +0000 (18:33 +0000)
PWG3/Makefile
PWG3/PROOF-INF.PWG3base/SETUP.C
PWG3/PROOF-INF.PWG3hfe/SETUP.C
PWG3/PROOF-INF.PWG3muon/SETUP.C
PWG3/PROOF-INF.PWG3muondep/SETUP.C
PWG3/PROOF-INF.PWG3vertexingHF/SETUP.C

index 9368b12..3026706 100644 (file)
@@ -24,7 +24,9 @@ ifneq ($(ESD_INCLUDE),)
        ifneq ($(CORRFW_INCLUDE),)
                ALICEINC += -I../$(CORRFW_INCLUDE)
        endif
-        ALICEINC += -I../PWG3base/base
+       ifneq ($(PWG3base_INCLUDE),)
+               ALICEINC += -I../$(PWG3base_INCLUDE)
+       endif
 else
   ifneq ($(ALICE_ROOT),)
     ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/PWG3/base -I$(ALICE_ROOT)/MUON -I$(ALICE_ROOT)/MUON/mapping
index 405a2da..38560df 100644 (file)
@@ -15,10 +15,10 @@ void SETUP()
 
 
    // Set the include paths
-   gROOT->ProcessLine(".include PWG3base");
+   gROOT->ProcessLine(".include PWG3base/base");
 
    // Set our location, so that other packages can find us
-   gSystem->Setenv("PWG3base_INCLUDE", "PWG3base");
+   gSystem->Setenv("PWG3base_INCLUDE", "PWG3base/base");
 }
 
 Int_t CheckLoadLibrary(const char* library)
index 38c6912..c39dfd4 100644 (file)
@@ -1,5 +1,5 @@
 {
   gSystem->Load("libPWG3hfe.so");
   // Set the include paths
-  gROOT->ProcessLine(".include PWG3hfe");
+  gROOT->ProcessLine(".include PWG3hfe/hfe");
 }
index 9633c92..65bdf21 100644 (file)
@@ -11,14 +11,15 @@ void SETUP()
     CheckLoadLibrary("libESD");
     CheckLoadLibrary("libAOD");
     CheckLoadLibrary("libANALYSISalice");
+    CheckLoadLibrary("libPWG3base");
     CheckLoadLibrary("libPWG3muon");
 
 
    // Set the include paths
-   gROOT->ProcessLine(".include PWG3muon");
+   gROOT->ProcessLine(".include PWG3muon/muon");
 
    // Set our location, so that other packages can find us
-   gSystem->Setenv("PWG3muon_INCLUDE", "PWG3muon");
+   gSystem->Setenv("PWG3muon_INCLUDE", "PWG3muon/muon");
 }
 
 Int_t CheckLoadLibrary(const char* library)
index 28063db..9b29388 100644 (file)
@@ -34,10 +34,10 @@ void SETUP()
     CheckLoadLibrary("libPWG3muondep");
 
    // Set the include paths
-   gROOT->ProcessLine(".include PWG3muondep");
+   gROOT->ProcessLine(".include PWG3muondep/muondep");
 
    // Set our location, so that other packages can find us
-   gSystem->Setenv("PWG3muondep_INCLUDE", "PWG3muondep");
+   gSystem->Setenv("PWG3muondep_INCLUDE", "PWG3muondep/muondep");
 }
 
 Int_t CheckLoadLibrary(const char* library)
index 1516070..9649ccc 100644 (file)
@@ -13,13 +13,14 @@ void SETUP()
     CheckLoadLibrary("libAOD");
     CheckLoadLibrary("libCORRFW");
     CheckLoadLibrary("libANALYSISalice");
+    CheckLoadLibrary("libPWG3base");
     CheckLoadLibrary("libPWG3vertexingHF");
 
    // Set the include paths
-   gROOT->ProcessLine(".include PWG3vertexingHF");
+   gROOT->ProcessLine(".include PWG3vertexingHF/vertexingHF");
 
    // Set our location, so that other packages can find us
-   gSystem->Setenv("PWG3base_INCLUDE", "PWG3vertexingHF");
+   gSystem->Setenv("PWG3vertexingHF_INCLUDE", "PWG3vertexingHF/vertexingHF");
 }
 
 Int_t CheckLoadLibrary(const char* library)