Removed dependency on the PWG0

(Jacek)

diff --git a/PWG1/AliComparisonRes.cxx b/PWG1/AliComparisonRes.cxx
index e0293d32e203d76b7c3902eb6971575ea43b0d37..d56fd9aa484883212bff1e8b89ccdb3f92130d49 100644 (file)
--- a/PWG1/AliComparisonRes.cxx
+++ b/PWG1/AliComparisonRes.cxx
@@ -13,7 +13,9 @@
 /*
  
   // after running comparison task, read the file, and get component
-  gSystem->Load("libPWG1.so");
+  gROOT->LoadMacro("$ALICE_ROOT/PWG1/Macros/LoadMyLibs.C");
+  LoadMyLibs();
+
   TFile f("Output.root");
   AliComparisonRes * compObj = (AliComparisonRes*)f.Get("AliComparisonRes");
 

diff --git a/PWG1/AliRecInfoCuts.h b/PWG1/AliRecInfoCuts.h
index 872925d8acc57028657ce95c9021dc0e5a44cdba..361b74e6c5361333d3afd752168fbc806a4800b7 100644 (file)
--- a/PWG1/AliRecInfoCuts.h
+++ b/PWG1/AliRecInfoCuts.h
@@ -7,7 +7,7 @@
 // Author: J.Otwinowski 04/02/2008 
 //------------------------------------------------------------------------------
 
-#include "esdTrackCuts/AliESDtrackCuts.h"
+#include "AliESDtrackCuts.h"
 
 class AliRecInfoCuts : public AliESDtrackCuts
 {

diff --git a/PWG1/Macros/LoadMyLibs.C b/PWG1/Macros/LoadMyLibs.C
index 73ea761eb1b41bdad58906f3e7df48b1ff55b189..5102b52f90a8b81cee41939f32ed5cbedf6ec8da 100644 (file)
--- a/PWG1/Macros/LoadMyLibs.C
+++ b/PWG1/Macros/LoadMyLibs.C
@@ -17,13 +17,12 @@ void LoadMyLibs() {
   CheckLoadLibrary("libESD");
   CheckLoadLibrary("libSTEER");
   CheckLoadLibrary("libANALYSIS");
+  CheckLoadLibrary("libANALYSISalice");
   CheckLoadLibrary("libTPCbase");
   CheckLoadLibrary("libTPCsim");
   CheckLoadLibrary("libTRDbase");
   CheckLoadLibrary("libTPCrec");
   CheckLoadLibrary("libTRDrec");
-  CheckLoadLibrary("libPWG0base");
-  CheckLoadLibrary("libPWG0dep");
   CheckLoadLibrary("libPWG1");
 }
 

diff --git a/PWG1/Macros/RunMakers.C b/PWG1/Macros/RunMakers.C
index 72dd1221b7aa55c786b0e82283c96f4eb1d155f4..8ca65e29a692857f54cbaf19a8bffe336fc4be6d 100644 (file)
--- a/PWG1/Macros/RunMakers.C
+++ b/PWG1/Macros/RunMakers.C
@@ -1,12 +1,11 @@
 // Run this macro to correlate MC and reconstruction information (PWG1 library).
 // Macro must be run in directory containing MC and ESD trees
 //
-
 RunMakers()
 {
 // load AliRoot libraries
 gSystem->Load("libANALYSIS.so");
-gSystem->Load("libPWG0base.so");
+gSystem->Load("libANALYSISalice.so");
 gSystem->Load("libPWG1.so");
 
 // collect MC information

diff --git a/PWG1/doc/comparison/userguide.tex b/PWG1/doc/comparison/userguide.tex
index 3592f29a05e6f099de2d2ebcbfb42dc17a8b43aa..da094a024ce4c954141a46efde0aeec8d4f902a1 100644 (file)
--- a/PWG1/doc/comparison/userguide.tex
+++ b/PWG1/doc/comparison/userguide.tex
@@ -51,8 +51,8 @@ information for ITS, TPC, TRD and TOF detectors. They can be run locally/batch.
 One has to implement the following classes to run its own analysis using PWG1 library:
 
 \begin{itemize}
-\item[1.] Implement comparison object which contains control histograms and its own cut object (if needed). 
-\item[2.] Implement (if needed) cut object which contains all cuts which will be applied while filling comparison object. It is recommended to use $IsSelected(TObject*)$ method of the cut object while applying the cuts.
+\item[1.] Implement comparison object which contains control histograms and its own cut object (ex: $PWG1/AliComparisonDCA.h$) 
+\item[2.] Implement (if needed) cut object which contains all cuts which will be applied while filling comparison object. It is recommended to use $IsSelected(TObject*)$ method of the cut object while applying the cuts (ex: $PWG1/AliMCInfoCuts.h$).
 \end{itemize}
  
 \subsection{Quick Start}

diff --git a/PWG1/libPWG1.pkg b/PWG1/libPWG1.pkg
index 8ffbd0699b0c4e3d96705c8482291f5ee98af308..1ad90b4b33c4160479c203ce9fa2a204ea944876 100644 (file)
--- a/PWG1/libPWG1.pkg
+++ b/PWG1/libPWG1.pkg
@@ -23,4 +23,4 @@ HDRS:= $(SRCS:.cxx=.h)
 
 DHDR:= PWG1LinkDef.h
 
-EINCLUDE:= STEER TPC ITS TRD PWG0
+EINCLUDE:= STEER TPC ITS TRD