moving files from PWG4 to PWGCF

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d3e8a2ab8679d41f1465a62717c0795c096b30a..77165e5cc7e9f3a15a480d1676d63f84fc59ec4e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,7 +126,7 @@ set(BINLIBDIRS "-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 
 # Standard Modules
 # ------------------------------
-set(ALIROOTMODULES STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS ACORDE HMPID T0 BCM STRUCT VZERO THijing THbtp EMCAL THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS JETAN HLT STAT TTherminator CORRFW DPMJET TDPMjet PWG0 PWGPP PWG2 PWG3 PWG4 TRIGGER PYTHIA8 TAmpt OADB MFT)
+set(ALIROOTMODULES STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS ACORDE HMPID T0 BCM STRUCT VZERO THijing THbtp EMCAL THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS JETAN HLT STAT TTherminator CORRFW DPMJET TDPMjet PWG0 PWGPP PWG2 PWG3 PWG4 PWG PWGCF TRIGGER PYTHIA8 TAmpt OADB MFT)
 
 if(THydjet)
   list(APPEND ALIROOTMODULES THydjet)

diff --git a/PWG4/Base/AliAnalysisHelperJetTasks.cxx b/PWG/Base/AliAnalysisHelperJetTasks.cxx
similarity index 100%
rename from PWG4/Base/AliAnalysisHelperJetTasks.cxx
rename to PWG/Base/AliAnalysisHelperJetTasks.cxx

diff --git a/PWG4/Base/AliAnalysisHelperJetTasks.h b/PWG/Base/AliAnalysisHelperJetTasks.h
similarity index 100%
rename from PWG4/Base/AliAnalysisHelperJetTasks.h
rename to PWG/Base/AliAnalysisHelperJetTasks.h

diff --git a/PWG4/CMakelibPWG4Base.pkg b/PWG/CMakelibPWGBase.pkg
similarity index 95%
rename from PWG4/CMakelibPWG4Base.pkg
rename to PWG/CMakelibPWGBase.pkg
index b71b776ccb294c4c43715b290d1ea1459a0562c6..e399e641205432433c5d28d85684950796ca973e 100644 (file)
--- a/PWG4/CMakelibPWG4Base.pkg
+++ b/PWG/CMakelibPWGBase.pkg
@@ -32,8 +32,8 @@ set ( SRCS
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
-set ( DHDR  PWG4BaseLinkDef.h)
+set ( DHDR  PWGBaseLinkDef.h)
 
 string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
-set ( EINCLUDE ANALYSIS CORRFW PWG4/Base STEER/AOD STEER/ESD STEER/STEERBase)
+set ( EINCLUDE PWG/Base ANALYSIS CORRFW STEER/AOD STEER/ESD STEER/STEERBase)

diff --git a/PWG4/PWG4BaseLinkDef.h b/PWG/PWGBaseLinkDef.h
similarity index 100%
rename from PWG4/PWG4BaseLinkDef.h
rename to PWG/PWGBaseLinkDef.h

diff --git a/PWG/README b/PWG/README
index 171d850a7a4d0f6f072fbf03d1a7251e03e688e7..02b3aca8e2bd16aa955d0634cc56043e098e82a8 100644 (file)
--- a/PWG/README
+++ b/PWG/README
@@ -1 +1,3 @@
 Analysis code: General purpose and common classes
+
+PWGBase: lightweight base classes which have no dependencies apart from the usual analysis libraries

diff --git a/PWG4/CMakelibPWG4JetTasks.pkg b/PWG4/CMakelibPWG4JetTasks.pkg
index 642245bf41db96894f05efe88c8aa42acdd13bf2..294fa09ef421d86aa6f5c537cfe996af33972731 100644 (file)
--- a/PWG4/CMakelibPWG4JetTasks.pkg
+++ b/PWG4/CMakelibPWG4JetTasks.pkg
@@ -59,4 +59,4 @@ set ( DHDR  PWG4JetTasksLinkDef.h)
 
 string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
-set ( EINCLUDE ANALYSIS JETAN CORRFW PWG4/JetTasks PWG4/Base STEER/AOD STEER/ESD STEER/STEERBase)
+set ( EINCLUDE ANALYSIS JETAN CORRFW PWG4/JetTasks PWG/Base STEER/AOD STEER/ESD STEER/STEERBase)

diff --git a/PWG4/CMakelibPWG4CorrelationsBase.pkg b/PWGCF/CMakelibPWGCFCorrelationsBase.pkg
similarity index 88%
rename from PWG4/CMakelibPWG4CorrelationsBase.pkg
rename to PWGCF/CMakelibPWGCFCorrelationsBase.pkg
index 7f5c5081d23045101231db861e49bfb0f44a0073..0ba062b92c519e2fe2d0908a00221e4767ab665c 100644 (file)
--- a/PWG4/CMakelibPWG4CorrelationsBase.pkg
+++ b/PWGCF/CMakelibPWGCFCorrelationsBase.pkg
@@ -27,16 +27,16 @@
 #--------------------------------------------------------------------------------#
 
 set ( SRCS  
-    CorrelationsBase/AliUEHistograms.cxx
-    CorrelationsBase/AliUEHist.cxx
-    CorrelationsBase/AliAnalyseLeadingTrackUE.cxx
-    CorrelationsBase/AliTHn.cxx 
+    Correlations/Base/AliUEHistograms.cxx
+    Correlations/Base/AliUEHist.cxx
+    Correlations/Base/AliAnalyseLeadingTrackUE.cxx
+    Correlations/Base/AliTHn.cxx 
     )
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
-set ( DHDR  PWG4CorrelationsBaseLinkDef.h)
+set ( DHDR  PWGCFCorrelationsBaseLinkDef.h)
 
 string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
-set ( EINCLUDE ANALYSIS CORRFW PWG4/CorrelationsBase STEER/AOD STEER/ESD STEER/STEERBase)
+set ( EINCLUDE ANALYSIS CORRFW PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase)

diff --git a/PWG4/CMakelibPWG4CorrelationsDPhi.pkg b/PWGCF/CMakelibPWGCFCorrelationsDPhi.pkg
similarity index 85%
rename from PWG4/CMakelibPWG4CorrelationsDPhi.pkg
rename to PWGCF/CMakelibPWGCFCorrelationsDPhi.pkg
index e87fdab7efc4e06b14650e2f59bbc4958759b9ed..4bfdb6cf72693f550f3d0cecd9757f240129b583 100644 (file)
--- a/PWG4/CMakelibPWG4CorrelationsDPhi.pkg
+++ b/PWGCF/CMakelibPWGCFCorrelationsDPhi.pkg
@@ -27,16 +27,16 @@
 #--------------------------------------------------------------------------------#
 
 set ( SRCS  
-    CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.cxx 
-    CorrelationsDPhi/AliPhiCorrelationsQATask.cxx 
-    CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.cxx 
-    CorrelationsDPhi/AliAnalysisTaskMinijet.cxx
+    Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx 
+    Correlations/DPhi/AliPhiCorrelationsQATask.cxx 
+    Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.cxx 
+    Correlations/DPhi/AliAnalysisTaskMinijet.cxx
     )
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
-set ( DHDR  PWG4CorrelationsDPhiLinkDef.h)
+set ( DHDR  PWGCFCorrelationsDPhiLinkDef.h)
 
 string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
-set ( EINCLUDE ANALYSIS CORRFW PWG4/CorrelationsBase PWG4/CorrelationsDPhi PWG4/Base STEER/AOD STEER/ESD STEER/STEERBase)
+set ( EINCLUDE ANALYSIS CORRFW PWGCF/Correlations/Base PWGCF/Correlations/DPhi PWG/Base STEER/AOD STEER/ESD STEER/STEERBase)

diff --git a/PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.cxx b/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx
similarity index 100%
rename from PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.cxx
rename to PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx

diff --git a/PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.h b/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.h
similarity index 100%
rename from PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.h
rename to PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.h

diff --git a/PWG4/CorrelationsBase/AliTHn.cxx b/PWGCF/Correlations/Base/AliTHn.cxx
similarity index 100%
rename from PWG4/CorrelationsBase/AliTHn.cxx
rename to PWGCF/Correlations/Base/AliTHn.cxx

diff --git a/PWG4/CorrelationsBase/AliTHn.h b/PWGCF/Correlations/Base/AliTHn.h
similarity index 100%
rename from PWG4/CorrelationsBase/AliTHn.h
rename to PWGCF/Correlations/Base/AliTHn.h

diff --git a/PWG4/CorrelationsBase/AliUEHist.cxx b/PWGCF/Correlations/Base/AliUEHist.cxx
similarity index 100%
rename from PWG4/CorrelationsBase/AliUEHist.cxx
rename to PWGCF/Correlations/Base/AliUEHist.cxx

diff --git a/PWG4/CorrelationsBase/AliUEHist.h b/PWGCF/Correlations/Base/AliUEHist.h
similarity index 100%
rename from PWG4/CorrelationsBase/AliUEHist.h
rename to PWGCF/Correlations/Base/AliUEHist.h

diff --git a/PWG4/CorrelationsBase/AliUEHistograms.cxx b/PWGCF/Correlations/Base/AliUEHistograms.cxx
similarity index 100%
rename from PWG4/CorrelationsBase/AliUEHistograms.cxx
rename to PWGCF/Correlations/Base/AliUEHistograms.cxx

diff --git a/PWG4/CorrelationsBase/AliUEHistograms.h b/PWGCF/Correlations/Base/AliUEHistograms.h
similarity index 100%
rename from PWG4/CorrelationsBase/AliUEHistograms.h
rename to PWGCF/Correlations/Base/AliUEHistograms.h

diff --git a/PWG4/CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.cxx
similarity index 100%
rename from PWG4/CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.cxx
rename to PWGCF/Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.cxx

diff --git a/PWG4/CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.h b/PWGCF/Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.h
similarity index 100%
rename from PWG4/CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.h
rename to PWGCF/Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.h

diff --git a/PWG4/CorrelationsDPhi/AliAnalysisTaskMinijet.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskMinijet.cxx
similarity index 100%
rename from PWG4/CorrelationsDPhi/AliAnalysisTaskMinijet.cxx
rename to PWGCF/Correlations/DPhi/AliAnalysisTaskMinijet.cxx

diff --git a/PWG4/CorrelationsDPhi/AliAnalysisTaskMinijet.h b/PWGCF/Correlations/DPhi/AliAnalysisTaskMinijet.h
similarity index 100%
rename from PWG4/CorrelationsDPhi/AliAnalysisTaskMinijet.h
rename to PWGCF/Correlations/DPhi/AliAnalysisTaskMinijet.h

diff --git a/PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
similarity index 100%
rename from PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.cxx
rename to PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx

diff --git a/PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.h b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.h
similarity index 100%
rename from PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.h
rename to PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.h

diff --git a/PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.cxx b/PWGCF/Correlations/DPhi/AliPhiCorrelationsQATask.cxx
similarity index 100%
rename from PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.cxx
rename to PWGCF/Correlations/DPhi/AliPhiCorrelationsQATask.cxx

diff --git a/PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.h b/PWGCF/Correlations/DPhi/AliPhiCorrelationsQATask.h
similarity index 100%
rename from PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.h
rename to PWGCF/Correlations/DPhi/AliPhiCorrelationsQATask.h

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/AddTask_cloizide_Dhc.C b/PWGCF/Correlations/DPhi/FourierDecomposition/AddTask_cloizide_Dhc.C
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/AddTask_cloizide_Dhc.C
rename to PWGCF/Correlations/DPhi/FourierDecomposition/AddTask_cloizide_Dhc.C

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/AliDhcTask.cxx b/PWGCF/Correlations/DPhi/FourierDecomposition/AliDhcTask.cxx
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/AliDhcTask.cxx
rename to PWGCF/Correlations/DPhi/FourierDecomposition/AliDhcTask.cxx

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/AliDhcTask.h b/PWGCF/Correlations/DPhi/FourierDecomposition/AliDhcTask.h
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/AliDhcTask.h
rename to PWGCF/Correlations/DPhi/FourierDecomposition/AliDhcTask.h

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/AliDhcTask_opt.cxx b/PWGCF/Correlations/DPhi/FourierDecomposition/AliDhcTask_opt.cxx
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/AliDhcTask_opt.cxx
rename to PWGCF/Correlations/DPhi/FourierDecomposition/AliDhcTask_opt.cxx

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/AliDhcTask_opt.h b/PWGCF/Correlations/DPhi/FourierDecomposition/AliDhcTask_opt.h
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/AliDhcTask_opt.h
rename to PWGCF/Correlations/DPhi/FourierDecomposition/AliDhcTask_opt.h

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/AliPool.cxx.txt b/PWGCF/Correlations/DPhi/FourierDecomposition/AliPool.cxx.txt
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/AliPool.cxx.txt
rename to PWGCF/Correlations/DPhi/FourierDecomposition/AliPool.cxx.txt

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/AliPool.h.txt b/PWGCF/Correlations/DPhi/FourierDecomposition/AliPool.h.txt
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/AliPool.h.txt
rename to PWGCF/Correlations/DPhi/FourierDecomposition/AliPool.h.txt

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/CheckOutput.C b/PWGCF/Correlations/DPhi/FourierDecomposition/CheckOutput.C
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/CheckOutput.C
rename to PWGCF/Correlations/DPhi/FourierDecomposition/CheckOutput.C

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/RunDhcTask.C b/PWGCF/Correlations/DPhi/FourierDecomposition/RunDhcTask.C
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/RunDhcTask.C
rename to PWGCF/Correlations/DPhi/FourierDecomposition/RunDhcTask.C

diff --git a/PWG4/CorrelationsDPhi/FourierDecomposition/rootlogon.C b/PWGCF/Correlations/DPhi/FourierDecomposition/rootlogon.C
similarity index 100%
rename from PWG4/CorrelationsDPhi/FourierDecomposition/rootlogon.C
rename to PWGCF/Correlations/DPhi/FourierDecomposition/rootlogon.C

diff --git a/PWG4/macros/dphicorrelations/correct.C b/PWGCF/Correlations/macros/dphicorrelations/correct.C
similarity index 99%
rename from PWG4/macros/dphicorrelations/correct.C
rename to PWGCF/Correlations/macros/dphicorrelations/correct.C
index 51af2601a18f41141ad824fec47383df9556b157..d2242d2a321e4dd237e3c672e57ff505145689bf 100644 (file)
--- a/PWG4/macros/dphicorrelations/correct.C
+++ b/PWGCF/Correlations/macros/dphicorrelations/correct.C
@@ -320,8 +320,8 @@ void loadlibs()
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");
   gSystem->Load("libCORRFW");
-  gSystem->Load("libPWG4Base");
-  gSystem->Load("libPWG4CorrelationsBase");
+  gSystem->Load("libPWGBase");
+  gSystem->Load("libPWGCFCorrelationsBase");
 }
 
 const char* lastFileName = 0;

diff --git a/PWG4/macros/underlyingevent/GetTrackingEfficiency.C b/PWGCF/Correlations/macros/underlyingevent/GetTrackingEfficiency.C
similarity index 100%
rename from PWG4/macros/underlyingevent/GetTrackingEfficiency.C
rename to PWGCF/Correlations/macros/underlyingevent/GetTrackingEfficiency.C

diff --git a/PWG4/macros/underlyingevent/correct.C b/PWGCF/Correlations/macros/underlyingevent/correct.C
similarity index 100%
rename from PWG4/macros/underlyingevent/correct.C
rename to PWGCF/Correlations/macros/underlyingevent/correct.C

diff --git a/PWG4/macros/underlyingevent/plots.C b/PWGCF/Correlations/macros/underlyingevent/plots.C
similarity index 100%
rename from PWG4/macros/underlyingevent/plots.C
rename to PWGCF/Correlations/macros/underlyingevent/plots.C

diff --git a/PWG4/PWG4CorrelationsBaseLinkDef.h b/PWGCF/PWGCFCorrelationsBaseLinkDef.h
similarity index 100%
rename from PWG4/PWG4CorrelationsBaseLinkDef.h
rename to PWGCF/PWGCFCorrelationsBaseLinkDef.h

diff --git a/PWG4/PWG4CorrelationsDPhiLinkDef.h b/PWGCF/PWGCFCorrelationsDPhiLinkDef.h
similarity index 100%
rename from PWG4/PWG4CorrelationsDPhiLinkDef.h
rename to PWGCF/PWGCFCorrelationsDPhiLinkDef.h