Centrality task now compiled in PWG1 library

diff --git a/PWG1/CMakelibPWG1.pkg b/PWG1/CMakelibPWG1.pkg
index 6c2d219fe16237e9efcb19f2cd9ed5ab225b0d05..34cb4654845fba96b71c6ae32cb2364433d7af56 100644 (file)
--- a/PWG1/CMakelibPWG1.pkg
+++ b/PWG1/CMakelibPWG1.pkg
@@ -36,14 +36,15 @@ file (GLOB SRCS8 "TPC/*.cxx" )
 file (GLOB SRCS9 "TOF/*.cxx" )
 file (GLOB SRCS10 "TRD/info/*.cxx" )
 file (GLOB SRCS11 "background/*.cxx" )
+file (GLOB SRCS12 "Centrality/*.cxx" )
 
-list(APPEND SRCS ${SRCS1} ${SRCS2} ${SRCS3} ${SRCS4} ${SRCS5} ${SRCS6} ${SRCS7} ${SRCS8} ${SRCS9} ${SRCS10} ${SRCS11})
+list(APPEND SRCS ${SRCS1} ${SRCS2} ${SRCS3} ${SRCS4} ${SRCS5} ${SRCS6} ${SRCS7} ${SRCS8} ${SRCS9} ${SRCS10} ${SRCS11} ${SRCS12)
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 set ( DHDR  PWG1LinkDef.h)
 
-set ( EINCLUDE  STEER TPC ITS TRD TOF TRD/Cal ANALYSIS/Tender ANALYSIS PWG1/comparison PWG1/cosmic PWG1/global PWG1/tender PWG1/ITS PWG1/TPC PWG1/TOF PWG1/TRD PWG1/TRD/info PWG1/background)
+set ( EINCLUDE  STEER TPC ITS TRD TOF TRD/Cal ANALYSIS/Tender ANALYSIS PWG1/comparison PWG1/cosmic PWG1/global PWG1/tender PWG1/ITS PWG1/TPC PWG1/TOF PWG1/TRD PWG1/TRD/info PWG1/background PWG1/Centrality)
 
   if( ALICE_TARGET STREQUAL "win32gcc")
        

diff --git a/PWG1/PWG1LinkDef.h b/PWG1/PWG1LinkDef.h
index b36ac51fd6529c29bc904724a0e7df818b2d3fbb..dfb4ea54b9a5027d5d49eef3761e65769debf7ae 100644 (file)
--- a/PWG1/PWG1LinkDef.h
+++ b/PWG1/PWG1LinkDef.h
@@ -125,5 +125,9 @@
 #pragma link C++ class  AliHistoListWrapper+;
 // CDB connect
 #pragma link C++ class  AliTaskCDBconnect+;
+// Centrality classes
+#pragma link C++ class  AliMultiplicityCorrelations+;
+#pragma link C++ class  AliAnalysisTaskHIMultCorr+;
+
 
 #endif

diff --git a/PWG1/PilotTrain/PilotAnalysis.C b/PWG1/PilotTrain/PilotAnalysis.C
index e49f897e8c011f3978f025db544461789f699865..fdc17bf7af56c650e8dbbffc0eb504b99119e42c 100644 (file)
--- a/PWG1/PilotTrain/PilotAnalysis.C
+++ b/PWG1/PilotTrain/PilotAnalysis.C
@@ -185,11 +185,7 @@ void AddAnalysisTasks()
   // Centrality (J. Thaeder)
   //
   if (doCentrality) {
-     TFile::Cp(gSystem->ExpandPathName("$ALICE_ROOT/PWG1/AliMultiplicityCorrelations.cxx"), "AliMultiplicityCorrelations.cxx");
-     TFile::Cp(gSystem->ExpandPathName("$ALICE_ROOT/PWG1/AliAnalysisTaskHIMultCorr.cxx"), "AliAnalysisTaskHIMultCorr.cxx");
-     gROOT->LoadMacro("AliMultiplicityCorrelations.cxx+g");
-     gROOT->LoadMacro("AliAnalysisTaskHIMultCorr.cxx+g");
-     gROOT->LoadMacro("$ALICE_ROOT/PWG1/macros/AddTaskHIMultCorr.C");
+     gROOT->LoadMacro("$ALICE_ROOT/PWG1/Centrality/AddTaskHIMultCorr.C");
      AliAnalysisTaskHIMultCorr *taskHIcentrality = AddTaskHIMultCorr();
   }   
   
@@ -358,7 +354,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    plugin->SetJobTag(job_tag);
    plugin->SetNtestFiles(5);
    plugin->SetCheckCopy(kFALSE);
-   plugin->SetOneStageMerging(kTRUE);
+//   plugin->SetOneStageMerging(kTRUE);
 // Set versions of used packages
    plugin->SetAPIVersion("V1.1x");
    plugin->SetROOTVersion(root_version);
@@ -398,13 +394,11 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
 // using ACLiC on the worker nodes.
 // Declare all libraries (other than the default ones for the framework. These will be
 // loaded by the generated analysis macro. Add all extra files (task .cxx/.h) here.
-   plugin->AddIncludePath("-I. -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/ITS -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG1");
-   plugin->SetAnalysisSource("AliMultiplicityCorrelations.cxx AliAnalysisTaskHIMultCorr.cxx");
+   plugin->AddIncludePath("-I. -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/ITS -I$ALICE_ROOT/TRD");
    
    plugin->SetAdditionalLibs("libCORRFW.so libTENDER.so libPWG0base.so libPWG0dep.so libPWG0selectors.so libPWG1.so libPWG2.so \
                               libPWG2forward.so libEMCALUtils.so libPWG4PartCorrBase.so libPWG4PartCorrDep.so \
-                              libPWG3base.so libPWG3muon.so libPWG3muondep.so \
-                              AliAnalysisTaskHIMultCorr.cxx AliAnalysisTaskHIMultCorr.h AliMultiplicityCorrelations.cxx AliMultiplicityCorrelations.h");
+                              libPWG3base.so libPWG3muon.so libPWG3muondep.so");
      
 // Declare the output file names separated by blancs.
 // (can be like: file.root or file.root@ALICE::Niham::File)

diff --git a/PWG1/libPWG1.pkg b/PWG1/libPWG1.pkg
index 97b88237850f09f4588a7050669a1f791f48aa6f..14e6870c2436be2b45d1f561097d9df54efb6044 100644 (file)
--- a/PWG1/libPWG1.pkg
+++ b/PWG1/libPWG1.pkg
@@ -11,12 +11,13 @@ ORGSRCS  += $(wildcard PWG1/TPC/*.cxx)
 ORGSRCS  += $(wildcard PWG1/TOF/*.cxx)
 ORGSRCS  += $(wildcard PWG1/TRD/info/*.cxx)
 ORGSRCS  += $(wildcard PWG1/background/*.cxx)
+ORGSRCS  += $(wildcard PWG1/Centrality/*.cxx)
 
 SRCS:= $(patsubst PWG1/%, %, ${ORGSRCS})
 HDRS:= $(SRCS:.cxx=.h)
 DHDR:= PWG1LinkDef.h
 
-EINCLUDE:= STEER TPC ITS TRD TRD/Cal TOF ANALYSIS/Tender ANALYSIS PWG1/comparison PWG1/cosmic PWG1/global PWG1/tender PWG1/ITS PWG1/TPC PWG1/TRD PWG1/TRD/info PWG1/background
+EINCLUDE:= STEER TPC ITS TRD TRD/Cal TOF ANALYSIS/Tender ANALYSIS PWG1/comparison PWG1/cosmic PWG1/global PWG1/tender PWG1/ITS PWG1/TPC PWG1/TRD PWG1/TRD/info PWG1/background PWG1/Centrality
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \