Moving/split PWG2/FLOW to PWGCF/FLOW, PWG/FLOW/Base, PWG/FLOW/Tasks, PWG/Glauber
authoriseliouj <iseliouj@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 31 Jan 2012 23:57:28 +0000 (23:57 +0000)
committeriseliouj <iseliouj@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 31 Jan 2012 23:57:28 +0000 (23:57 +0000)
223 files changed:
PWG/CMakelibPWGflowBase.pkg [moved from PWG2/CMakelibPWG2flowCommon.pkg with 60% similarity]
PWG/CMakelibPWGflowTasks.pkg [moved from PWG2/CMakelibPWG2flowTools.pkg with 62% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithCumulants.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithCumulants.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithCumulants.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithCumulants.h with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithFittingQDistribution.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithFittingQDistribution.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithFittingQDistribution.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithFittingQDistribution.h with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithLYZEventPlane.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithLYZEventPlane.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.h with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithLeeYangZeros.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithLeeYangZeros.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.h with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithMCEventPlane.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithMCEventPlane.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithMCEventPlane.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithMCEventPlane.h with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithMixedHarmonics.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithMixedHarmonics.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithMixedHarmonics.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithMixedHarmonics.h with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithNestedLoops.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithNestedLoops.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithNestedLoops.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithNestedLoops.h with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithQCumulants.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithQCumulants.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithScalarProduct.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowAnalysisWithScalarProduct.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.h with 100% similarity]
PWG/FLOW/Base/AliFlowCommonConstants.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowCommonConstants.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowCommonConstants.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowCommonConstants.h with 100% similarity]
PWG/FLOW/Base/AliFlowCommonHist.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowCommonHist.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h with 100% similarity]
PWG/FLOW/Base/AliFlowCommonHistResults.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowCommonHistResults.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowCommonHistResults.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowCommonHistResults.h with 100% similarity]
PWG/FLOW/Base/AliFlowEventSimple.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowEventSimple.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowEventSimple.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowEventSimple.h with 100% similarity]
PWG/FLOW/Base/AliFlowEventSimpleMakerOnTheFly.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowEventSimpleMakerOnTheFly.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowEventSimpleMakerOnTheFly.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowEventSimpleMakerOnTheFly.h with 100% similarity]
PWG/FLOW/Base/AliFlowEventStar.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowEventStar.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowEventStar.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowEventStar.h with 100% similarity]
PWG/FLOW/Base/AliFlowLYZConstants.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowLYZConstants.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowLYZConstants.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowLYZConstants.h with 100% similarity]
PWG/FLOW/Base/AliFlowLYZEventPlane.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowLYZEventPlane.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowLYZEventPlane.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowLYZEventPlane.h with 100% similarity]
PWG/FLOW/Base/AliFlowLYZHist1.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowLYZHist1.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowLYZHist1.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowLYZHist1.h with 100% similarity]
PWG/FLOW/Base/AliFlowLYZHist2.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowLYZHist2.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowLYZHist2.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowLYZHist2.h with 100% similarity]
PWG/FLOW/Base/AliFlowTrackSimple.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowTrackSimple.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowTrackSimple.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowTrackSimple.h with 100% similarity]
PWG/FLOW/Base/AliFlowTrackSimpleCuts.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowTrackSimpleCuts.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.h with 100% similarity]
PWG/FLOW/Base/AliFlowVector.cxx [moved from PWG2/FLOW/AliFlowCommon/AliFlowVector.cxx with 100% similarity]
PWG/FLOW/Base/AliFlowVector.h [moved from PWG2/FLOW/AliFlowCommon/AliFlowVector.h with 100% similarity]
PWG/FLOW/Base/AliStarEvent.cxx [moved from PWG2/FLOW/AliFlowCommon/AliStarEvent.cxx with 100% similarity]
PWG/FLOW/Base/AliStarEvent.h [moved from PWG2/FLOW/AliFlowCommon/AliStarEvent.h with 100% similarity]
PWG/FLOW/Base/AliStarEventCuts.cxx [moved from PWG2/FLOW/AliFlowCommon/AliStarEventCuts.cxx with 100% similarity]
PWG/FLOW/Base/AliStarEventCuts.h [moved from PWG2/FLOW/AliFlowCommon/AliStarEventCuts.h with 100% similarity]
PWG/FLOW/Base/AliStarEventReader.cxx [moved from PWG2/FLOW/AliFlowCommon/AliStarEventReader.cxx with 100% similarity]
PWG/FLOW/Base/AliStarEventReader.h [moved from PWG2/FLOW/AliFlowCommon/AliStarEventReader.h with 100% similarity]
PWG/FLOW/Base/AliStarTrack.cxx [moved from PWG2/FLOW/AliFlowCommon/AliStarTrack.cxx with 100% similarity]
PWG/FLOW/Base/AliStarTrack.h [moved from PWG2/FLOW/AliFlowCommon/AliStarTrack.h with 100% similarity]
PWG/FLOW/Base/AliStarTrackCuts.cxx [moved from PWG2/FLOW/AliFlowCommon/AliStarTrackCuts.cxx with 100% similarity]
PWG/FLOW/Base/AliStarTrackCuts.h [moved from PWG2/FLOW/AliFlowCommon/AliStarTrackCuts.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskCumulants.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskCumulants.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskCumulants.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskCumulants.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskFittingQDistribution.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFittingQDistribution.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskFittingQDistribution.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFittingQDistribution.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskFlowEvent.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFlowEvent.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskFlowEvent.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFlowEvent.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskFlowEventforRP.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFlowEventforRP.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskFlowEventforRP.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFlowEventforRP.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskFlowK0Candidates.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFlowK0Candidates.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskFlowK0Candidates.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFlowK0Candidates.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskLYZEventPlane.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskLYZEventPlane.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskLeeYangZeros.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskLeeYangZeros.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskMCEventPlane.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskMCEventPlane.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskMixedHarmonics.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMixedHarmonics.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskMixedHarmonics.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMixedHarmonics.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskNestedLoops.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskNestedLoops.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskNestedLoops.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskNestedLoops.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskPIDflowQA.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskPIDflowQA.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskQAPmdflow.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQAPmdflow.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskQAPmdflow.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQAPmdflow.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskQAflow.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQAflow.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskQAflow.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQAflow.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskQCumulants.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskQCumulants.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskScalarProduct.cxx [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.cxx with 100% similarity]
PWG/FLOW/Tasks/AliAnalysisTaskScalarProduct.h [moved from PWG2/FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.h with 100% similarity]
PWG/FLOW/Tasks/AliFlowBayesianPID.cxx [moved from PWG2/FLOW/AliFlowTasks/AliFlowBayesianPID.cxx with 100% similarity]
PWG/FLOW/Tasks/AliFlowBayesianPID.h [moved from PWG2/FLOW/AliFlowTasks/AliFlowBayesianPID.h with 100% similarity]
PWG/FLOW/Tasks/AliFlowCandidateTrack.cxx [moved from PWG2/FLOW/AliFlowTasks/AliFlowCandidateTrack.cxx with 100% similarity]
PWG/FLOW/Tasks/AliFlowCandidateTrack.h [moved from PWG2/FLOW/AliFlowTasks/AliFlowCandidateTrack.h with 100% similarity]
PWG/FLOW/Tasks/AliFlowEvent.cxx [moved from PWG2/FLOW/AliFlowTasks/AliFlowEvent.cxx with 100% similarity]
PWG/FLOW/Tasks/AliFlowEvent.h [moved from PWG2/FLOW/AliFlowTasks/AliFlowEvent.h with 100% similarity]
PWG/FLOW/Tasks/AliFlowEventCuts.cxx [moved from PWG2/FLOW/AliFlowTasks/AliFlowEventCuts.cxx with 100% similarity]
PWG/FLOW/Tasks/AliFlowEventCuts.h [moved from PWG2/FLOW/AliFlowTasks/AliFlowEventCuts.h with 100% similarity]
PWG/FLOW/Tasks/AliFlowEventSimpleMaker.cxx [moved from PWG2/FLOW/AliFlowTasks/AliFlowEventSimpleMaker.cxx with 100% similarity]
PWG/FLOW/Tasks/AliFlowEventSimpleMaker.h [moved from PWG2/FLOW/AliFlowTasks/AliFlowEventSimpleMaker.h with 100% similarity]
PWG/FLOW/Tasks/AliFlowTrack.cxx [moved from PWG2/FLOW/AliFlowTasks/AliFlowTrack.cxx with 100% similarity]
PWG/FLOW/Tasks/AliFlowTrack.h [moved from PWG2/FLOW/AliFlowTasks/AliFlowTrack.h with 100% similarity]
PWG/FLOW/Tasks/AliFlowTrackCuts.cxx [moved from PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.cxx with 100% similarity]
PWG/FLOW/Tasks/AliFlowTrackCuts.h [moved from PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.h with 100% similarity]
PWG/Glauber/AliGlauberMC.cxx [moved from PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx with 100% similarity]
PWG/Glauber/AliGlauberMC.h [moved from PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.h with 100% similarity]
PWG/Glauber/AliGlauberNucleon.cxx [moved from PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberNucleon.cxx with 100% similarity]
PWG/Glauber/AliGlauberNucleon.h [moved from PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberNucleon.h with 100% similarity]
PWG/Glauber/AliGlauberNucleus.cxx [moved from PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberNucleus.cxx with 100% similarity]
PWG/Glauber/AliGlauberNucleus.h [moved from PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberNucleus.h with 100% similarity]
PWG/PROOF-INF.PWGflowBase/BUILD.sh [new file with mode: 0755]
PWG/PROOF-INF.PWGflowBase/SETUP.C [moved from PWG2/PROOF-INF.PWG2flowCommon/SETUP.C with 52% similarity]
PWG/PROOF-INF.PWGflowTasks/BUILD.sh [new file with mode: 0755]
PWG/PROOF-INF.PWGflowTasks/SETUP.C [moved from PWG2/PROOF-INF.PWG2flowTools/SETUP.C with 51% similarity]
PWG/PWGGlauberLinkDef.h [moved from PWG2/PWG2flowToolsLinkDef.h with 100% similarity]
PWG/PWGflowBaseLinkDef.h [moved from PWG2/PWG2flowCommonLinkDef.h with 100% similarity]
PWG/PWGflowTasksLinkDef.h [moved from PWG2/PWG2flowTasksLinkDef.h with 100% similarity]
PWG2/CMakelibPWG2flowTasks.pkg [deleted file]
PWG2/Makefile
PWG2/PROOF-INF.PWG2flowCommon/BUILD.sh [deleted file]
PWG2/PROOF-INF.PWG2flowTasks/BUILD.sh [deleted file]
PWG2/PROOF-INF.PWG2flowTasks/SETUP.C [deleted file]
PWG2/PROOF-INF.PWG2flowTools/BUILD.sh [deleted file]
PWGCF/FLOW/Attic/AliFlowAnalyser.cxx [moved from PWG2/FLOW/Attic/AliFlowAnalyser.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliFlowAnalyser.h [moved from PWG2/FLOW/Attic/AliFlowAnalyser.h with 100% similarity]
PWGCF/FLOW/Attic/AliFlowConstants.cxx [moved from PWG2/FLOW/Attic/AliFlowConstants.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliFlowConstants.h [moved from PWG2/FLOW/Attic/AliFlowConstants.h with 100% similarity]
PWGCF/FLOW/Attic/AliFlowEvent.cxx [moved from PWG2/FLOW/Attic/AliFlowEvent.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliFlowEvent.h [moved from PWG2/FLOW/Attic/AliFlowEvent.h with 100% similarity]
PWGCF/FLOW/Attic/AliFlowKineMaker.cxx [moved from PWG2/FLOW/Attic/AliFlowKineMaker.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliFlowKineMaker.h [moved from PWG2/FLOW/Attic/AliFlowKineMaker.h with 100% similarity]
PWGCF/FLOW/Attic/AliFlowMaker.cxx [moved from PWG2/FLOW/Attic/AliFlowMaker.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliFlowMaker.h [moved from PWG2/FLOW/Attic/AliFlowMaker.h with 100% similarity]
PWGCF/FLOW/Attic/AliFlowSelection.cxx [moved from PWG2/FLOW/Attic/AliFlowSelection.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliFlowSelection.h [moved from PWG2/FLOW/Attic/AliFlowSelection.h with 100% similarity]
PWGCF/FLOW/Attic/AliFlowTrack.cxx [moved from PWG2/FLOW/Attic/AliFlowTrack.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliFlowTrack.h [moved from PWG2/FLOW/Attic/AliFlowTrack.h with 100% similarity]
PWGCF/FLOW/Attic/AliFlowV0.cxx [moved from PWG2/FLOW/Attic/AliFlowV0.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliFlowV0.h [moved from PWG2/FLOW/Attic/AliFlowV0.h with 100% similarity]
PWGCF/FLOW/Attic/AliFlowWeighter.cxx [moved from PWG2/FLOW/Attic/AliFlowWeighter.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliFlowWeighter.h [moved from PWG2/FLOW/Attic/AliFlowWeighter.h with 100% similarity]
PWGCF/FLOW/Attic/AliSelectorFoF.cxx [moved from PWG2/FLOW/Attic/AliSelectorFoF.cxx with 100% similarity]
PWGCF/FLOW/Attic/AliSelectorFoF.h [moved from PWG2/FLOW/Attic/AliSelectorFoF.h with 100% similarity]
PWGCF/FLOW/Documentation/FLOW.pdf [moved from PWG2/FLOW/Documentation/FLOW.pdf with 100% similarity]
PWGCF/FLOW/Documentation/FLOW.tex [moved from PWG2/FLOW/Documentation/FLOW.tex with 100% similarity]
PWGCF/FLOW/Documentation/README.txt [moved from PWG2/FLOW/Documentation/README.txt with 100% similarity]
PWGCF/FLOW/Documentation/chapters/FitQDistribution.tex [moved from PWG2/FLOW/Documentation/chapters/FitQDistribution.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/FlowEvent.tex [moved from PWG2/FLOW/Documentation/chapters/FlowEvent.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/FrontMatter.tex [moved from PWG2/FLOW/Documentation/chapters/FrontMatter.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/GeneratingFunctionCumulants.tex [moved from PWG2/FLOW/Documentation/chapters/GeneratingFunctionCumulants.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/Introduction.tex [moved from PWG2/FLOW/Documentation/chapters/Introduction.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/LeeYangZeros.tex [moved from PWG2/FLOW/Documentation/chapters/LeeYangZeros.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/LeeYangZerosEP.tex [moved from PWG2/FLOW/Documentation/chapters/LeeYangZerosEP.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/Methods.tex [moved from PWG2/FLOW/Documentation/chapters/Methods.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/MonteCarlo.tex [moved from PWG2/FLOW/Documentation/chapters/MonteCarlo.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/Program.tex [moved from PWG2/FLOW/Documentation/chapters/Program.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/QVectorCumulants.tex [moved from PWG2/FLOW/Documentation/chapters/QVectorCumulants.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/QuickStart.tex [moved from PWG2/FLOW/Documentation/chapters/QuickStart.tex with 97% similarity]
PWGCF/FLOW/Documentation/chapters/ScalarProduct.tex [moved from PWG2/FLOW/Documentation/chapters/ScalarProduct.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/Summary.tex [moved from PWG2/FLOW/Documentation/chapters/Summary.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/appendix1.tex [moved from PWG2/FLOW/Documentation/chapters/appendix1.tex with 100% similarity]
PWGCF/FLOW/Documentation/chapters/bibliography.tex [moved from PWG2/FLOW/Documentation/chapters/bibliography.tex with 100% similarity]
PWGCF/FLOW/Documentation/commands.tex [moved from PWG2/FLOW/Documentation/commands.tex with 100% similarity]
PWGCF/FLOW/Documentation/examples/PBS/submitTheJobs.sh [moved from PWG2/FLOW/Documentation/examples/PBS/submitTheJobs.sh with 100% similarity]
PWGCF/FLOW/Documentation/examples/PBS/theNodeScript.sh [moved from PWG2/FLOW/Documentation/examples/PBS/theNodeScript.sh with 100% similarity]
PWGCF/FLOW/Documentation/examples/plotGlauberCenVars.C [moved from PWG2/FLOW/Documentation/examples/plotGlauberCenVars.C with 100% similarity]
PWGCF/FLOW/Documentation/examples/plotGlauberMCexample.C [moved from PWG2/FLOW/Documentation/examples/plotGlauberMCexample.C with 100% similarity]
PWGCF/FLOW/Documentation/examples/runFlowOnTheFlyExample.C [moved from PWG2/FLOW/Documentation/examples/runFlowOnTheFlyExample.C with 98% similarity]
PWGCF/FLOW/Documentation/examples/runFlowOnTheFlyGlauber.C [moved from PWG2/FLOW/Documentation/examples/runFlowOnTheFlyGlauber.C with 98% similarity]
PWGCF/FLOW/Documentation/examples/runFlowReaderExample.C [moved from PWG2/FLOW/Documentation/examples/runFlowReaderExample.C with 98% similarity]
PWGCF/FLOW/Documentation/examples/runFlowTaskExample.C [moved from PWG2/FLOW/Documentation/examples/runFlowTaskExample.C with 99% similarity]
PWGCF/FLOW/Documentation/examples/runGlauberMC.C [moved from PWG2/FLOW/Documentation/examples/runGlauberMC.C with 97% similarity]
PWGCF/FLOW/Documentation/examples/runGlauberMCexample.C [moved from PWG2/FLOW/Documentation/examples/runGlauberMCexample.C with 68% similarity]
PWGCF/FLOW/Documentation/figs/daVinci.png [moved from PWG2/FLOW/Documentation/figs/daVinci.png with 100% similarity]
PWGCF/FLOW/Documentation/otherdocs/EventPlaneMethod_ScalarProduct/FlowMethodsPV.pdf [moved from PWG2/FLOW/Documentation/otherdocs/EventPlaneMethod_ScalarProduct/FlowMethodsPV.pdf with 100% similarity]
PWGCF/FLOW/Documentation/otherdocs/FlowPackage.pdf [moved from PWG2/FLOW/Documentation/otherdocs/FlowPackage.pdf with 100% similarity]
PWGCF/FLOW/Documentation/otherdocs/GFCumulants/Borghini_GFCumulants_PracticalGuide.pdf [moved from PWG2/FLOW/Documentation/otherdocs/GFCumulants/Borghini_GFCumulants_PracticalGuide.pdf with 100% similarity]
PWGCF/FLOW/Documentation/otherdocs/LeeYangZeroes/Borghini_LYZ_PracticalGuide.pdf [moved from PWG2/FLOW/Documentation/otherdocs/LeeYangZeroes/Borghini_LYZ_PracticalGuide.pdf with 100% similarity]
PWGCF/FLOW/Documentation/otherdocs/LeeYangZeroesEP/LYZ_RP.pdf [moved from PWG2/FLOW/Documentation/otherdocs/LeeYangZeroesEP/LYZ_RP.pdf with 100% similarity]
PWGCF/FLOW/Documentation/otherdocs/OnTheFlyDoc.pdf [moved from PWG2/FLOW/Documentation/otherdocs/OnTheFlyDoc.pdf with 100% similarity]
PWGCF/FLOW/Documentation/otherdocs/QCumulants/QCpaperdraft.pdf [moved from PWG2/FLOW/Documentation/otherdocs/QCumulants/QCpaperdraft.pdf with 100% similarity]
PWGCF/FLOW/macros/AddTaskFlow.C [moved from PWG2/FLOW/macros/AddTaskFlow.C with 100% similarity]
PWGCF/FLOW/macros/AddTaskFlowCentrality.C [moved from PWG2/FLOW/macros/AddTaskFlowCentrality.C with 100% similarity]
PWGCF/FLOW/macros/AddTaskFlowCentralityBayesian.C [moved from PWG2/FLOW/macros/AddTaskFlowCentralityBayesian.C with 100% similarity]
PWGCF/FLOW/macros/AddTaskFlowCentralityPID.C [moved from PWG2/FLOW/macros/AddTaskFlowCentralityPID.C with 100% similarity]
PWGCF/FLOW/macros/AddTaskPIDflowQA.C [moved from PWG2/FLOW/macros/AddTaskPIDflowQA.C with 100% similarity]
PWGCF/FLOW/macros/AddTaskTenderFlow.C [moved from PWG2/FLOW/macros/AddTaskTenderFlow.C with 100% similarity]
PWGCF/FLOW/macros/AddTaskTenderTOF.C [moved from PWG2/FLOW/macros/AddTaskTenderTOF.C with 100% similarity]
PWGCF/FLOW/macros/CreateAlienHandler.C [moved from PWG2/FLOW/macros/CreateAlienHandler.C with 97% similarity]
PWGCF/FLOW/macros/compareFlowResults.C [moved from PWG2/FLOW/macros/compareFlowResults.C with 98% similarity]
PWGCF/FLOW/macros/fqd.C [moved from PWG2/FLOW/macros/fqd.C with 93% similarity]
PWGCF/FLOW/macros/makeWeights.C [moved from PWG2/FLOW/macros/makeWeights.C with 95% similarity]
PWGCF/FLOW/macros/mergeOutput.C [moved from PWG2/FLOW/macros/mergeOutput.C with 94% similarity]
PWGCF/FLOW/macros/mergeOutputOnGrid.C [moved from PWG2/FLOW/macros/mergeOutputOnGrid.C with 98% similarity]
PWGCF/FLOW/macros/parity/plotMH.C [moved from PWG2/FLOW/macros/parity/plotMH.C with 99% similarity]
PWGCF/FLOW/macros/parity/plotMHCentrality.C [moved from PWG2/FLOW/macros/parity/plotMHCentrality.C with 99% similarity]
PWGCF/FLOW/macros/plotCumulants.C [moved from PWG2/FLOW/macros/plotCumulants.C with 98% similarity]
PWGCF/FLOW/macros/plotQAflow.C [moved from PWG2/FLOW/macros/plotQAflow.C with 100% similarity]
PWGCF/FLOW/macros/readStarEvents.C [moved from PWG2/FLOW/macros/readStarEvents.C with 98% similarity]
PWGCF/FLOW/macros/readStarEventsSimple.C [moved from PWG2/FLOW/macros/readStarEventsSimple.C with 97% similarity]
PWGCF/FLOW/macros/redoFinish.C [moved from PWG2/FLOW/macros/redoFinish.C with 99% similarity]
PWGCF/FLOW/macros/runFlowAnalysis.C [moved from PWG2/FLOW/macros/runFlowAnalysis.C with 87% similarity]
PWGCF/FLOW/macros/runFlowAnalysisOnTheFly.C [moved from PWG2/FLOW/macros/runFlowAnalysisOnTheFly.C with 93% similarity]
PWGCF/FLOW/macros/runFlowTask.C [moved from PWG2/FLOW/macros/runFlowTask.C with 95% similarity]
PWGCF/FLOW/macros/runFlowTaskCentralityPIDTrain.C [moved from PWG2/FLOW/macros/runFlowTaskCentralityPIDTrain.C with 95% similarity]
PWGCF/FLOW/macros/runFlowTaskCentralityTrain.C [moved from PWG2/FLOW/macros/runFlowTaskCentralityTrain.C with 95% similarity]
PWGCF/FLOW/macros/runFlowTaskCentralityTrain4Candidates.C [moved from PWG2/FLOW/macros/runFlowTaskCentralityTrain4Candidates.C with 96% similarity]
PWGCF/FLOW/macros/runStarFlowAnalysis.C [moved from PWG2/FLOW/macros/runStarFlowAnalysis.C with 99% similarity]
PWGCF/FLOW/macros/showSpread.C [moved from PWG2/FLOW/macros/showSpread.C with 91% similarity]
PWGCF/FLOW/papers/PRL105_252302/dataNch.root [moved from PWG2/FLOW/papers/PRL105_252302/dataNch.root with 100% similarity]
PWGCF/FLOW/papers/PRL105_252302/figure1.pdf [moved from PWG2/FLOW/papers/PRL105_252302/figure1.pdf with 100% similarity]
PWGCF/FLOW/papers/PRL105_252302/figure2.C [moved from PWG2/FLOW/papers/PRL105_252302/figure2.C with 100% similarity]
PWGCF/FLOW/papers/PRL105_252302/figure2.pdf [moved from PWG2/FLOW/papers/PRL105_252302/figure2.pdf with 100% similarity]
PWGCF/FLOW/papers/PRL105_252302/figure3.C [moved from PWG2/FLOW/papers/PRL105_252302/figure3.C with 100% similarity]
PWGCF/FLOW/papers/PRL105_252302/figure3.pdf [moved from PWG2/FLOW/papers/PRL105_252302/figure3.pdf with 100% similarity]
PWGCF/FLOW/papers/PRL105_252302/figure4.pdf [moved from PWG2/FLOW/papers/PRL105_252302/figure4.pdf with 100% similarity]
PWGCF/FLOW/papers/PRL105_252302/plotCen2.C [moved from PWG2/FLOW/papers/PRL105_252302/plotCen2.C with 100% similarity]
PWGCF/FLOW/papers/PRL105_252302/setFlowStyle.C [moved from PWG2/FLOW/papers/PRL105_252302/setFlowStyle.C with 100% similarity]
PWGCF/FLOW/papers/PRL105_252302/v2edepAlice.C [moved from PWG2/FLOW/papers/PRL105_252302/v2edepAlice.C with 100% similarity]
PWGCF/FLOW/papers/PRL107_032301/Fig1.pdf [moved from PWG2/FLOW/papers/PRL107_032301/Fig1.pdf with 100% similarity]
PWGCF/FLOW/papers/PRL107_032301/Fig2.pdf [moved from PWG2/FLOW/papers/PRL107_032301/Fig2.pdf with 100% similarity]
PWGCF/FLOW/papers/PRL107_032301/Fig3.pdf [moved from PWG2/FLOW/papers/PRL107_032301/Fig3.pdf with 100% similarity]
PWGCF/FLOW/papers/PRL107_032301/Fig4.pdf [moved from PWG2/FLOW/papers/PRL107_032301/Fig4.pdf with 100% similarity]
PWGCF/FLOW/papers/PRL107_032301/fig1ab.C [moved from PWG2/FLOW/papers/PRL107_032301/fig1ab.C with 100% similarity]
PWGCF/FLOW/papers/PRL107_032301/fig2.C [moved from PWG2/FLOW/papers/PRL107_032301/fig2.C with 100% similarity]
PWGCF/FLOW/papers/PRL107_032301/fig3abc.C [moved from PWG2/FLOW/papers/PRL107_032301/fig3abc.C with 100% similarity]
PWGCF/FLOW/papers/PRL107_032301/fig4.C [moved from PWG2/FLOW/papers/PRL107_032301/fig4.C with 100% similarity]

similarity index 60%
rename from PWG2/CMakelibPWG2flowCommon.pkg
rename to PWG/CMakelibPWGflowBase.pkg
index 015c057..66aa147 100644 (file)
@@ -1,6 +1,6 @@
 #--------------------------------------------------------------------------------#
-# Package File for PWG2flowCommon                                                #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
+# Package File for PWGflowBase                                                   #
+# Author : Mikolaj Krzewicki (mikolaj.krzewicki@cern.ch)                         #
 # Variables Defined :                                                            #
 #                                                                                #
 # SRCS - C++ source files                                                        #
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( SRCS  FLOW/AliFlowCommon/AliFlowEventSimple.cxx FLOW/AliFlowCommon/AliFlowTrackSimple.cxx FLOW/AliFlowCommon/AliStarTrack.cxx FLOW/AliFlowCommon/AliStarEvent.cxx FLOW/AliFlowCommon/AliStarTrackCuts.cxx FLOW/AliFlowCommon/AliStarEventCuts.cxx FLOW/AliFlowCommon/AliFlowEventStar.cxx FLOW/AliFlowCommon/AliStarEventReader.cxx FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.cxx FLOW/AliFlowCommon/AliFlowVector.cxx FLOW/AliFlowCommon/AliFlowCommonConstants.cxx FLOW/AliFlowCommon/AliFlowLYZConstants.cxx FLOW/AliFlowCommon/AliFlowEventSimpleMakerOnTheFly.cxx FLOW/AliFlowCommon/AliFlowCommonHist.cxx FLOW/AliFlowCommon/AliFlowCommonHistResults.cxx FLOW/AliFlowCommon/AliFlowLYZHist1.cxx FLOW/AliFlowCommon/AliFlowLYZHist2.cxx FLOW/AliFlowCommon/AliFlowLYZEventPlane.cxx FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx FLOW/AliFlowCommon/AliFlowAnalysisWithMCEventPlane.cxx FLOW/AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.cxx FLOW/AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.cxx FLOW/AliFlowCommon/AliFlowAnalysisWithCumulants.cxx FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx FLOW/AliFlowCommon/AliFlowAnalysisWithFittingQDistribution.cxx FLOW/AliFlowCommon/AliFlowAnalysisWithMixedHarmonics.cxx FLOW/AliFlowCommon/AliFlowAnalysisWithNestedLoops.cxx)
+set ( SRCS 
+      FLOW/Base/AliFlowEventSimple.cxx 
+      FLOW/Base/AliFlowTrackSimple.cxx 
+      FLOW/Base/AliStarTrack.cxx 
+      FLOW/Base/AliStarEvent.cxx 
+      FLOW/Base/AliStarTrackCuts.cxx 
+      FLOW/Base/AliStarEventCuts.cxx 
+      FLOW/Base/AliFlowEventStar.cxx 
+      FLOW/Base/AliStarEventReader.cxx 
+      FLOW/Base/AliFlowTrackSimpleCuts.cxx 
+      FLOW/Base/AliFlowVector.cxx 
+      FLOW/Base/AliFlowCommonConstants.cxx 
+      FLOW/Base/AliFlowLYZConstants.cxx 
+      FLOW/Base/AliFlowEventSimpleMakerOnTheFly.cxx 
+      FLOW/Base/AliFlowCommonHist.cxx 
+      FLOW/Base/AliFlowCommonHistResults.cxx 
+      FLOW/Base/AliFlowLYZHist1.cxx 
+      FLOW/Base/AliFlowLYZHist2.cxx 
+      FLOW/Base/AliFlowLYZEventPlane.cxx 
+      FLOW/Base/AliFlowAnalysisWithScalarProduct.cxx 
+      FLOW/Base/AliFlowAnalysisWithMCEventPlane.cxx 
+      FLOW/Base/AliFlowAnalysisWithLYZEventPlane.cxx 
+      FLOW/Base/AliFlowAnalysisWithLeeYangZeros.cxx 
+      FLOW/Base/AliFlowAnalysisWithCumulants.cxx 
+      FLOW/Base/AliFlowAnalysisWithQCumulants.cxx 
+      FLOW/Base/AliFlowAnalysisWithFittingQDistribution.cxx 
+      FLOW/Base/AliFlowAnalysisWithMixedHarmonics.cxx 
+      FLOW/Base/AliFlowAnalysisWithNestedLoops.cxx
+)
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
-set ( DHDR PWG2flowCommonLinkDef.h)
+set ( DHDR PWGflowBaseLinkDef.h)
 
 set ( EXPORT )
 
-set ( EINCLUDE  PWG2/FLOW/AliFlowCommon)
+set ( EINCLUDE  PWG/FLOW/Base)
 
 if( ALICE_TARGET STREQUAL "win32gcc")
        
similarity index 62%
rename from PWG2/CMakelibPWG2flowTools.pkg
rename to PWG/CMakelibPWGflowTasks.pkg
index 844e245..c85bed5 100644 (file)
@@ -1,6 +1,7 @@
+# -*- mode: CMake -*-
 #--------------------------------------------------------------------------------#
-# Package File for PWG2AOD                                                       #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
+# Package File for PWGflowTasks                                                  #
+# Author : Mikolaj Krzewicki (mikolaj.krzewicki@cern.ch)                         #
 # Variables Defined :                                                            #
 #                                                                                #
 # SRCS - C++ source files                                                        #
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( SRCS  FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx FLOW/AliFlowTools/glauberMC/AliGlauberNucleus.cxx FLOW/AliFlowTools/glauberMC/AliGlauberNucleon.cxx )
-
+set ( SRCS  
+    FLOW/Tasks/AliFlowEventSimpleMaker.cxx 
+    FLOW/Tasks/AliFlowEvent.cxx 
+    FLOW/Tasks/AliFlowEventCuts.cxx 
+    FLOW/Tasks/AliFlowTrack.cxx 
+    FLOW/Tasks/AliFlowCandidateTrack.cxx 
+    FLOW/Tasks/AliFlowTrackCuts.cxx 
+    FLOW/Tasks/AliAnalysisTaskScalarProduct.cxx 
+    FLOW/Tasks/AliAnalysisTaskMCEventPlane.cxx 
+    FLOW/Tasks/AliAnalysisTaskLYZEventPlane.cxx 
+    FLOW/Tasks/AliAnalysisTaskCumulants.cxx 
+    FLOW/Tasks/AliAnalysisTaskQCumulants.cxx 
+    FLOW/Tasks/AliAnalysisTaskLeeYangZeros.cxx 
+    FLOW/Tasks/AliAnalysisTaskFittingQDistribution.cxx 
+    FLOW/Tasks/AliAnalysisTaskFlowEvent.cxx 
+    FLOW/Tasks/AliAnalysisTaskFlowK0Candidates.cxx 
+    FLOW/Tasks/AliAnalysisTaskFlowEventforRP.cxx 
+    FLOW/Tasks/AliAnalysisTaskMixedHarmonics.cxx 
+    FLOW/Tasks/AliAnalysisTaskNestedLoops.cxx 
+    FLOW/Tasks/AliAnalysisTaskQAflow.cxx 
+    FLOW/Tasks/AliAnalysisTaskPIDflowQA.cxx 
+    FLOW/Tasks/AliAnalysisTaskQAPmdflow.cxx 
+    FLOW/Tasks/AliFlowBayesianPID.cxx
+    )
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
-set ( DHDR PWG2flowToolsLinkDef.h)
+set ( DHDR PWGflowTasksLinkDef.h)
 
 set ( EXPORT )
 
-set ( EINCLUDE  PWG2/FLOW/AliFlowCommon PWG2/FLOW/AliFlowTasks PWG2/FLOW/AliFlowTools/glauberMC )
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-       set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEERBase -lESD -lAOD -lANALYSIS -lANALYSISalice -lCORRFW -L${ROOTLIBDIR} -lEG )
-
-endif( ALICE_TARGET STREQUAL "win32gcc" )
+set ( EINCLUDE TOF PWG/FLOW/Base PWG/FLOW/Tasks STEER/ESD STEER/STEERBase)
diff --git a/PWG/PROOF-INF.PWGflowBase/BUILD.sh b/PWG/PROOF-INF.PWGflowBase/BUILD.sh
new file mode 100755 (executable)
index 0000000..6ef5a0d
--- /dev/null
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+touch libPWGflowBase.pkg
+
+make libPWGflowBase.so
similarity index 52%
rename from PWG2/PROOF-INF.PWG2flowCommon/SETUP.C
rename to PWG/PROOF-INF.PWGflowBase/SETUP.C
index fd172ac..6061991 100644 (file)
@@ -3,12 +3,12 @@ void SETUP() {
   TString dypath = gSystem->GetDynamicPath();
   dypath.Prepend(".:");
   gSystem->SetDynamicPath(dypath);
-  gSystem->Load("libPWG2flowCommon");
+  gSystem->Load("libPWGflowBase");
 
   // Set the include paths
-  gROOT->ProcessLine(".include PWG2flowCommon/FLOW/AliFlowCommon");
+  gROOT->ProcessLine(".include PWGflowBase/FLOW/Base");
 
   // Set our location, so that other packages can find us
-  gSystem->Setenv("PWG2flowCommon_INCLUDE", "PWG2flowCommon/FLOW/AliFlowCommon");
+  gSystem->Setenv("PWGflowBase_INCLUDE", "PWGflowBase/FLOW/Base");
 }
 
diff --git a/PWG/PROOF-INF.PWGflowTasks/BUILD.sh b/PWG/PROOF-INF.PWGflowTasks/BUILD.sh
new file mode 100755 (executable)
index 0000000..cd48123
--- /dev/null
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+touch libPWGflowTasks.pkg
+
+make libPWGflowTasks.so
similarity index 51%
rename from PWG2/PROOF-INF.PWG2flowTools/SETUP.C
rename to PWG/PROOF-INF.PWGflowTasks/SETUP.C
index c5b3216..7869d6b 100644 (file)
@@ -1,15 +1,15 @@
 void SETUP() {
 
-
   TString dypath = gSystem->GetDynamicPath();
   dypath.Prepend(".:");
   gSystem->SetDynamicPath(dypath);
-  gSystem->Load("libPWG2flowTools");
+  gSystem->Load("libPWGflowCommon");
+  gSystem->Load("libPWGflowTasks");
   
   // Set the include paths
-  gROOT->ProcessLine(".include PWG2flowTools/FLOW/AliFlowTools/glauberMC");
+  gROOT->ProcessLine(".include PWGflowTasks/FLOW/Tasks");
 
   // Set our location, so that other packages can find us
-  gSystem->Setenv("PWG2flowTools_INCLUDE", "PWG2flowTools/FLOW/AliFlowTools");
+  gSystem->Setenv("PWGflowTasks_INCLUDE", "PWGflowTasks/FLOW/Tasks");
 }
 
diff --git a/PWG2/CMakelibPWG2flowTasks.pkg b/PWG2/CMakelibPWG2flowTasks.pkg
deleted file mode 100644 (file)
index ba229be..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for PWG2flowTasks                                                 #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS  
-    FLOW/AliFlowTasks/AliFlowEventSimpleMaker.cxx 
-    FLOW/AliFlowTasks/AliFlowEvent.cxx 
-    FLOW/AliFlowTasks/AliFlowEventCuts.cxx 
-    FLOW/AliFlowTasks/AliFlowTrack.cxx 
-    FLOW/AliFlowTasks/AliFlowCandidateTrack.cxx 
-    FLOW/AliFlowTasks/AliFlowTrackCuts.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskCumulants.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskFittingQDistribution.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskFlowEvent.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskFlowK0Candidates.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskFlowEventforRP.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskMixedHarmonics.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskNestedLoops.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskQAflow.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.cxx 
-    FLOW/AliFlowTasks/AliAnalysisTaskQAPmdflow.cxx 
-    FLOW/AliFlowTasks/AliFlowBayesianPID.cxx
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR PWG2flowTasksLinkDef.h)
-
-set ( EXPORT )
-
-set ( EINCLUDE  TOF PWG2/FLOW/AliFlowCommon PWG2/FLOW/AliFlowTasks STEER/ESD STEER/STEERBase)
index 58b649c..f57b7c8 100644 (file)
@@ -45,18 +45,6 @@ ifneq ($(PWG2femtoscopyUser_INCLUDE),)
      endif
 endif
 
-ifneq ($(PWG2flowCommon_INCLUDE),)
-  ALICEINC += -I../$(PWG2flowCommon_INCLUDE)
-endif
-
-ifneq ($(PWG2flowTasks_INCLUDE),)
-  ALICEINC += -I../$(PWG2flowTasks_INCLUDE)
- else
-    ifneq ($(ALICE_ROOT),)
-       ALICEINC += -I$(ALICE_ROOT)/PWG2/FLOW/AliFlowCommon
-     endif
-endif
-
 ifneq ($(PWG2resonances_INCLUDE),)
   ALICEINC += -I../$(PWG2resonances_INCLUDE)
  else
diff --git a/PWG2/PROOF-INF.PWG2flowCommon/BUILD.sh b/PWG2/PROOF-INF.PWG2flowCommon/BUILD.sh
deleted file mode 100755 (executable)
index 4ee8e84..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-touch libPWG2flowCommon.pkg
-
-make libPWG2flowCommon.so
diff --git a/PWG2/PROOF-INF.PWG2flowTasks/BUILD.sh b/PWG2/PROOF-INF.PWG2flowTasks/BUILD.sh
deleted file mode 100755 (executable)
index 8cf538a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-touch libPWG2flowTasks.pkg
-
-make libPWG2flowTasks.so
diff --git a/PWG2/PROOF-INF.PWG2flowTasks/SETUP.C b/PWG2/PROOF-INF.PWG2flowTasks/SETUP.C
deleted file mode 100644 (file)
index 2e3c097..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-void SETUP() {
-
-  TString dypath = gSystem->GetDynamicPath();
-  dypath.Prepend(".:");
-  gSystem->SetDynamicPath(dypath);
-  gSystem->Load("libPWG2flowCommon");
-  gSystem->Load("libPWG2flowTasks");
-  
-  // Set the include paths
-  gROOT->ProcessLine(".include PWG2flowTasks/FLOW/AliFlowTasks");
-
-  // Set our location, so that other packages can find us
-  gSystem->Setenv("PWG2flowTasks_INCLUDE", "PWG2flowTasks/FLOW/AliFlowTasks");
-}
-
diff --git a/PWG2/PROOF-INF.PWG2flowTools/BUILD.sh b/PWG2/PROOF-INF.PWG2flowTools/BUILD.sh
deleted file mode 100755 (executable)
index fb98506..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-touch libPWG2flowTools.pkg
-
-make libPWG2flowTools.so
similarity index 97%
rename from PWG2/FLOW/Documentation/chapters/QVectorCumulants.tex
rename to PWGCF/FLOW/Documentation/chapters/QVectorCumulants.tex
index aaaa2c8ea53f3ef6e1caae1b713aaf67ed3a9d32..725ed5445face0066d076c33c6b73c188f43024a 100644 (file)
@@ -14,13 +14,13 @@ In this section we explain the main pieces of that macro.
 \begin{enumerate}
 \item
 To use the flow code the flow library needs to be loaded. In  \textit{AliRoot}:\\
-\texttt{gSystem->Load("libPWG2flowCommon");}\\
+\texttt{gSystem->Load("libPWGflowBase");}\\
 In  \textit{root} additional libraries need to be loaded: \\
 \texttt{gSystem->Load("libGeom");}\\
 \texttt{gSystem->Load("libVMC");}\\
 \texttt{gSystem->Load("libXMLIO");}\\
 \texttt{gSystem->Load("libPhysics");}\\
-\texttt{gSystem->Load("libPWG2flowCommon");}\\
+\texttt{gSystem->Load("libPWGflowBase");}\\
 \item
 We need to instantiate the flow analysis methods which we want to use. In this example we will
 instantiate two methods: the first  which calculates the flow versus the reaction plane of the Monte Carlo, which is our reference value (see section \ref{MC}), 
similarity index 98%
rename from PWG2/FLOW/Documentation/examples/plotGlauberMCexample.C
rename to PWGCF/FLOW/Documentation/examples/plotGlauberMCexample.C
index 15ccda152906fb3a3b1e6a6f38330cbd0732993a..c82130f498cd3031b42f4e0b5d014bf52469b439 100644 (file)
@@ -13,7 +13,7 @@ int runFlowOnTheFlyExample(Int_t nEvts=200, Int_t mult=500, Float_t v2=0.05, Int
   gSystem->Load("libVMC");
   gSystem->Load("libXMLIO");
   gSystem->Load("libPhysics");
-  gSystem->Load("libPWG2flowCommon");
+  gSystem->Load("libPWGflowBase");
 
   fMyTRandom3 = new TRandom3(iseed);   
   gRandom->SetSeed(fMyTRandom3->Integer(65539));
similarity index 98%
rename from PWG2/FLOW/Documentation/examples/runFlowOnTheFlyExample.C
rename to PWGCF/FLOW/Documentation/examples/runFlowOnTheFlyExample.C
index 3dbb5cd927673266e06dfbb6d0de3d5c800c8334..dc177e3736ba46f15006e39cfd91b8df20a816db 100644 (file)
@@ -8,8 +8,8 @@ int runFlowOnTheFlyGlauber(Int_t nevents=100000, Int_t iseed=1)
     gSystem->Load("libVMC");
     gSystem->Load("libXMLIO");
     gSystem->Load("libPhysics");
-    gSystem->Load("libPWG2flowCommon");
-    gSystem->Load("libPWG2flowTools");
+    gSystem->Load("libPWGflowBase");
+    gSystem->Load("libPWGGlauber");
     
     fMyTRandom3 = new TRandom3(iseed);   
     gRandom->SetSeed(iseed);
similarity index 98%
rename from PWG2/FLOW/Documentation/examples/runFlowOnTheFlyGlauber.C
rename to PWGCF/FLOW/Documentation/examples/runFlowOnTheFlyGlauber.C
index fffdd761584c9452182692c1c00c544f12923817..bdead18b265a8a772e0f8ae08834617dc59fc940 100644 (file)
@@ -3,7 +3,7 @@ void  runFlowReaderExample( Int_t maxNumberOfEvents = 1000, const char* inputDat
   gSystem->Load("libTree.so");
   gSystem->Load("libVMC.so");
   gSystem->Load("libPhysics.so");
-  gSystem->Load("libPWG2flowCommon");
+  gSystem->Load("libPWGflowBase");
 
   TStopwatch timer;
   timer.Start();
similarity index 99%
rename from PWG2/FLOW/Documentation/examples/runFlowReaderExample.C
rename to PWGCF/FLOW/Documentation/examples/runFlowReaderExample.C
index 52596ec9d05834879447888f940fee7e82021dbc..8127ae197df57f381e3fe792389a45016155485a 100644 (file)
@@ -30,8 +30,8 @@ void runFlowTaskExample(Int_t nRuns = 2,
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");
   gSystem->Load("libCORRFW");
-  gSystem->Load("libPWG2flowCommon");
-  gSystem->Load("libPWG2flowTasks");
+  gSystem->Load("libPWGflowBase");
+  gSystem->Load("libPWGflowTasks");
 
 
   if (type!="AOD") { TChain* chain = CreateESDChain(dataDir, nRuns, offset);}
similarity index 97%
rename from PWG2/FLOW/Documentation/examples/runFlowTaskExample.C
rename to PWGCF/FLOW/Documentation/examples/runFlowTaskExample.C
index 42675929dc5f5c90fe25da108346ed62217f752a..c55dd8f648f78a04cfd6e4e9e1e8a2796440e4f0 100644 (file)
@@ -4,7 +4,7 @@ void runGlauberMC()
   gSystem->Load("libVMC");
   gSystem->Load("libPhysics");
   gSystem->Load("libTree");
-  gSystem->Load("libPWG2flowTools");
+  gSystem->Load("libPWGGlauber");
 
   //set the random seed from current time
   TTimeStamp time;
similarity index 68%
rename from PWG2/FLOW/Documentation/examples/runGlauberMC.C
rename to PWGCF/FLOW/Documentation/examples/runGlauberMC.C
index 25d935cf4ee5243e015174ca453d546c05dcc97f..71a2bba5f0212152327fadf11d30e4b13bb09c97 100644 (file)
@@ -1,10 +1,10 @@
 {
   //load libraries
- gSystem->Load("libPWG2flowTools");
+ gSystem->Load("libPWGGlauber");
  //  gSystem->SetBuildDir("/tmp");
- //  gROOT->LoadMacro("$ALICE_ROOT/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberNucleon.cxx+");
- //  gROOT->LoadMacro("$ALICE_ROOT/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberNucleus.cxx+");
- //  gROOT->LoadMacro("$ALICE_ROOT/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx+");
+ //  gROOT->LoadMacro("$ALICE_ROOT/PWG/Glauber/AliGlauberNucleon.cxx+");
+ //  gROOT->LoadMacro("$ALICE_ROOT/PWG/Glauber/AliGlauberNucleus.cxx+");
+ //  gROOT->LoadMacro("$ALICE_ROOT/PWG/Glauber/AliGlauberMC.cxx+");
 
   //set the random seed from current time
   TTimeStamp time;
similarity index 97%
rename from PWG2/FLOW/Documentation/otherdocs/OnTheFlyDoc.pdf
rename to PWGCF/FLOW/Documentation/otherdocs/OnTheFlyDoc.pdf
index 5897f6234fa05e8f03aec981de0f8a927ac7e8ef..99b218b9744e2ee17476b96e99454fa2d1300147 100644 (file)
@@ -59,7 +59,7 @@ AliAnalysisGrid* CreateAlienHandler(Bool_t bUseParFiles=kFALSE) {
                               "libSTEER.so libTPCbase.so libTOFbase.so libTOFrec.so "
                               "libTRDbase.so libVZERObase.so libVZEROrec.so libT0base.so "
                               "libT0rec.so libTENDER.so libTENDERSupplies.so "
-                              "libPWG2flowCommon.so libPWG2flowTasks.so");
+                              "libPWGflowBase.so libPWGflowTasks.so");
   } 
   else // load libs via par files
   { 
@@ -68,8 +68,8 @@ AliAnalysisGrid* CreateAlienHandler(Bool_t bUseParFiles=kFALSE) {
                               "libSTEER.so libTPCbase.so libTOFbase.so libTOFrec.so "
                               "libTRDbase.so libVZERObase.so libVZEROrec.so libT0base.so "
                               "libT0rec.so libTENDER.so libTENDERSupplies.so");
-    plugin->EnablePackage("PWG2flowCommon.par");
-    plugin->EnablePackage("PWG2flowTasks.par");
+    plugin->EnablePackage("PWGflowBase.par");
+    plugin->EnablePackage("PWGflowTasks.par");
   }
   // Do not specify your outputs by hand anymore:
   plugin->SetDefaultOutputs(kTRUE);
similarity index 98%
rename from PWG2/FLOW/Documentation/otherdocs/QCumulants/QCpaperdraft.pdf
rename to PWGCF/FLOW/Documentation/otherdocs/QCumulants/QCpaperdraft.pdf
index 3161ea87a0211c445e9dd1d02953a6465e2f56b1..6aeb2a84fe78ba880cafec8e1e73fc3493b5e73f 100644 (file)
@@ -1689,8 +1689,8 @@ void LoadLibrariesCFR(const libModes analysisMode) {
     // for AliRoot
     gSystem->AddIncludePath("-I$ALICE_ROOT/include");
     gSystem->Load("libANALYSIS");
-    gSystem->Load("libPWG2flowCommon");
-    //cerr<<"libPWG2flowCommon loaded ..."<<endl;
+    gSystem->Load("libPWGflowBase");
+    //cerr<<"libPWGflowBase loaded ..."<<endl;
     
   }
   
@@ -1699,20 +1699,20 @@ void LoadLibrariesCFR(const libModes analysisMode) {
     // In root inline compile
    
    // Constants  
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonConstants.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZConstants.cxx+");
     
     // Flow event
-    gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+    gROOT->LoadMacro("BaseAliFlowVector.cxx+"); 
+    gROOT->LoadMacro("BaseAliFlowTrackSimple.cxx+");    
+    gROOT->LoadMacro("BaseAliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("BaseAliFlowEventSimple.cxx+");
     
     // Output histosgrams
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist1.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist2.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonHist.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonHistResults.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZHist1.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZHist2.cxx+");
     
     cout << "finished loading macros!" << endl;  
     
similarity index 93%
rename from PWG2/FLOW/macros/AddTaskFlow.C
rename to PWGCF/FLOW/macros/AddTaskFlow.C
index f1a2e67782fa575f5d2b1b04b63720cc1587a9d1..db0b639b109f08a751d31a5edf867a63c3e230f2 100644 (file)
@@ -256,8 +256,8 @@ void LoadLibrariesFQD(const libModes mode) {
   // for AliRoot
   gSystem->AddIncludePath("-I$ALICE_ROOT/include");
   gSystem->Load("libANALYSIS.so");
-  gSystem->Load("libPWG2flowCommon.so");
-  cerr<<"libPWG2flowCommon.so loaded ..."<<endl;
+  gSystem->Load("libPWGflowBase.so");
+  cerr<<"libPWGflowBase.so loaded ..."<<endl;
   
   }
   
@@ -266,20 +266,20 @@ void LoadLibrariesFQD(const libModes mode) {
     // In root inline compile
   
     // Constants  
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonConstants.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZConstants.cxx+");
     
     // Flow event
-    gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+    gROOT->LoadMacro("BaseAliFlowVector.cxx+"); 
+    gROOT->LoadMacro("BaseAliFlowTrackSimple.cxx+");    
+    gROOT->LoadMacro("BaseAliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("BaseAliFlowEventSimple.cxx+");
     
     // Output histosgrams
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist1.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist2.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonHist.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonHistResults.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZHist1.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZHist2.cxx+");
        
     cout << "finished loading macros!" << endl;  
     
similarity index 95%
rename from PWG2/FLOW/macros/AddTaskFlowCentrality.C
rename to PWGCF/FLOW/macros/AddTaskFlowCentrality.C
index 9bf3081325fb797d1b22ede0dcec0d8290773f30..f425cd1cec22b13fccff11dae56385b8583b1268 100644 (file)
@@ -397,8 +397,8 @@ void LoadLibrariesMW(const libModes mode) {
     // for AliRoot
     gSystem->AddIncludePath("-I$ALICE_ROOT/include");
     gSystem->Load("libANALYSIS");
-    gSystem->Load("libPWG2flowCommon");
-    //cerr<<"libPWG2flowCommon loaded ..."<<endl;
+    gSystem->Load("libPWGflowBase");
+    //cerr<<"libPWGflowBase loaded ..."<<endl;
     
   }
   
@@ -407,20 +407,20 @@ void LoadLibrariesMW(const libModes mode) {
     // In root inline compile
    
    // Constants  
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonConstants.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZConstants.cxx+");
     
     // Flow event
-    gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+    gROOT->LoadMacro("BaseAliFlowVector.cxx+"); 
+    gROOT->LoadMacro("BaseAliFlowTrackSimple.cxx+");    
+    gROOT->LoadMacro("BaseAliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("BaseAliFlowEventSimple.cxx+");
     
     // Output histosgrams
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist1.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist2.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonHist.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonHistResults.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZHist1.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZHist2.cxx+");
     
     cout << "finished loading macros!" << endl;  
     
similarity index 94%
rename from PWG2/FLOW/macros/AddTaskFlowCentralityBayesian.C
rename to PWGCF/FLOW/macros/AddTaskFlowCentralityBayesian.C
index 3ed8f5adfe0d831e7c2ed4866da9cbc837e0e298..30aecc6956474a5edeb2ceae8a1ac39444f86d97 100644 (file)
@@ -281,8 +281,8 @@ void LoadLibrariesMO(const libModes mode) {
   // for AliRoot
   gSystem->AddIncludePath("-I$ALICE_ROOT/include");
   gSystem->Load("libANALYSIS");
-  gSystem->Load("libPWG2flowCommon");
-  //cerr<<"libPWG2flowCommon loaded ..."<<endl;
+  gSystem->Load("libPWGflowBase");
+  //cerr<<"libPWGflowBase loaded ..."<<endl;
   
   }
   
@@ -291,20 +291,20 @@ void LoadLibrariesMO(const libModes mode) {
     // In root inline compile
   
     // Constants  
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonConstants.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZConstants.cxx+");
     
     // Flow event
-    gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+    gROOT->LoadMacro("BaseAliFlowVector.cxx+"); 
+    gROOT->LoadMacro("BaseAliFlowTrackSimple.cxx+");    
+    gROOT->LoadMacro("BaseAliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("BaseAliFlowEventSimple.cxx+");
     
     // Output histosgrams
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist1.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist2.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonHist.cxx+");
+    gROOT->LoadMacro("BaseAliFlowCommonHistResults.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZHist1.cxx+");
+    gROOT->LoadMacro("BaseAliFlowLYZHist2.cxx+");
        
     cout << "finished loading macros!" << endl;  
     
similarity index 98%
rename from PWG2/FLOW/macros/AddTaskFlowCentralityPID.C
rename to PWGCF/FLOW/macros/AddTaskFlowCentralityPID.C
index 6eaf66db1222cabe08304ddb4bd4087972243618..0e0e8ef94e5132a9341ba004765f86a2694a408e 100644 (file)
@@ -29,8 +29,8 @@ void mergeOutputOnGrid(const char* gridPath = "/alice/cern.ch/user/a/abilandz/si
  // Load needed flow libraries:
  gSystem->AddIncludePath("-I$ROOTSYS/include");
  gSystem->AddIncludePath("-I$ALICE_ROOT/include");
- gSystem->Load("libPWG2flowCommon");
- //cerr<<"Library \"libPWG2flowCommon\" loaded ...."<<endl;
+ gSystem->Load("libPWGflowBase");
+ //cerr<<"Library \"libPWGflowBase\" loaded ...."<<endl;
  // Connect to the GRID:
  TGrid::Connect("alien://");  
  // Query the file catalog and get a TGridResult:
similarity index 99%
rename from PWG2/FLOW/macros/AddTaskPIDflowQA.C
rename to PWGCF/FLOW/macros/AddTaskPIDflowQA.C
index ef526367d7b5db7efbe1e91ee2ad59c32704b9f1..ab18f5ea63d053349e58744d6dc4ae824ef4abf0 100644 (file)
@@ -23,7 +23,7 @@ void plotMH(const char* filename = "AnalysisResults.root",
   
   gSystem->AddIncludePath("-I$ALICE_ROOT/include");
   gSystem->Load("libANALYSIS");
-  gSystem->Load("libPWG2flowCommon");
+  gSystem->Load("libPWGflowBase");
 
   //----------------------------------------------------------
   // >>>>>>>>>>> Open file - Get objects <<<<<<<<<<<<<< 
similarity index 99%
rename from PWG2/FLOW/macros/AddTaskTenderFlow.C
rename to PWGCF/FLOW/macros/AddTaskTenderFlow.C
index 576424edf332a5e8ec563bf262b2064c1b0595b5..333650a39badef9b0bd0725b04415b52d8bbeef0 100644 (file)
@@ -27,7 +27,7 @@ void plotMHCentrality(const char* filename = "AnalysisResults.root",
   
   gSystem->AddIncludePath("-I$ALICE_ROOT/include");
   gSystem->Load("libANALYSIS");
-  gSystem->Load("libPWG2flowCommon");
+  gSystem->Load("libPWGflowBase");
 
   //----------------------------------------------------------
   // >>>>>>>>>>> Open file - Get objects <<<<<<<<<<<<<< 
similarity index 98%
rename from PWG2/FLOW/macros/AddTaskTenderTOF.C
rename to PWGCF/FLOW/macros/AddTaskTenderTOF.C
index 1d147daba1351511cf50de8cad61b519acf79b11..feffc47604e71cac9896b2f7a5a3bdd5c383bd57 100644 (file)
@@ -1135,8 +1135,8 @@ void LoadLibrariesPC(const libModes analysisMode) {
     // for AliRoot
     gSystem->AddIncludePath("-I$ALICE_ROOT/include");
     //gSystem->Load("libANALYSIS");
-    gSystem->Load("libPWG2flowCommon");
-    //cerr<<"libPWG2flowCommon loaded ..."<<endl;
+    gSystem->Load("libPWGflowBase");
+    //cerr<<"libPWGflowBase loaded ..."<<endl;
     
   }
   
@@ -1145,20 +1145,20 @@ void LoadLibrariesPC(const libModes analysisMode) {
     // In root inline compile
    
     // Constants  
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonConstants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZConstants.cxx+");
     
     // Flow event
-    gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+    gROOT->LoadMacro("Base/AliFlowVector.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowTrackSimple.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowEventSimple.cxx+");
    
     // Output histosgrams
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist1.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist2.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonHist.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonHistResults.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZHist1.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZHist2.cxx+");
     
     cout << "finished loading macros!" << endl;  
     
similarity index 98%
rename from PWG2/FLOW/macros/compareFlowResults.C
rename to PWGCF/FLOW/macros/compareFlowResults.C
index a661c14ebf219c5a799d60f1bb561287495d62e4..516125bcbd21464edbc5f1941886bf86c3d601da 100644 (file)
@@ -15,7 +15,7 @@ void  readStarEvents()
   gSystem->Load("libTree.so");
   gSystem->Load("libVMC.so");
   gSystem->Load("libPhysics.so");
-  gSystem->Load("libPWG2flowCommon");
+  gSystem->Load("libPWGflowBase");
 
   Long64_t EventCounter = 0 ;
   Int_t    TrackCounter = 0 ;
similarity index 97%
rename from PWG2/FLOW/macros/fqd.C
rename to PWGCF/FLOW/macros/fqd.C
index b0ac50c34b2b74b862cd8a8403f4000af2fe17c3..79547055326cf007898f896f3efad2805c32c23c 100644 (file)
@@ -7,7 +7,7 @@ void  readStarEventsSimple()
   gSystem->Load("libTree.so");
   gSystem->Load("libVMC.so");
   gSystem->Load("libPhysics.so");
-  gSystem->Load("libPWG2flowCommon");
+  gSystem->Load("libPWGflowBase");
 
   Int_t maxNumberOfEvents = 1000;
 
similarity index 99%
rename from PWG2/FLOW/macros/makeWeights.C
rename to PWGCF/FLOW/macros/makeWeights.C
index 9ed963adfc020dc6404ade8bcd70db65ed1c5a38..188ce628fbc98a0eddc15169814e87977827d82f 100644 (file)
@@ -218,8 +218,8 @@ void LoadLibraries()
   // for AliRoot
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");
-  gSystem->Load("libPWG2flowCommon");
-  gSystem->Load("libPWG2flowTasks");
+  gSystem->Load("libPWGflowBase");
+  gSystem->Load("libPWGflowTasks");
 } // end of void LoadLibrariesRF(const libModes mode)
 
 
similarity index 87%
rename from PWG2/FLOW/macros/mergeOutput.C
rename to PWGCF/FLOW/macros/mergeOutput.C
index f818ed3773d7fb6852ee7d317e41578b76a5cc40..854785d894ab794ca94cbf2f97b7a82d9461f7bb 100644 (file)
@@ -5,29 +5,29 @@
 #include <TRandom3.h>
 #include <TTimeStamp.h>
 
-#include <AliFlowCommon/AliFlowCommonConstants.h>
-#include <AliFlowCommon/AliFlowLYZConstants.h>
-#include <AliFlowCommon/AliFlowCumuConstants.h>
-#include <AliFlowCommon/AliFlowVector.h>
-#include <AliFlowCommon/AliFlowTrackSimple.h>
-#include <AliFlowCommon/AliFlowEvent.h>
-#include <AliFlowCommon/AliFlowEventSimple.h>
-#include <AliFlowCommon/AliFlowTrackSimpleCuts.h>
-#include <AliFlowCommon/AliFlowCommonHist.h>
-#include <AliFlowCommon/AliFlowCommonHistResults.h>
-#include <AliFlowCommon/AliFlowLYZHist1.h>
-#include <AliFlowCommon/AliFlowLYZHist2.h>
-#include <AliFlowCommon/AliCumulantsFunctions.h>
-#include <AliFlowCommon/AliFlowLYZEventPlane.h>
-#include <AliFlowCommon/AliFlowAnalysisWithMCEventPlane.h>
-#include <AliFlowCommon/AliFlowAnalysisWithScalarProduct.h>
-#include <AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.h>
-#include <AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.h>
-#include <AliFlowCommon/AliFlowAnalysisWithCumulants.h>
-#include <AliFlowCommon/AliFlowAnalysisWithQCumulants.h>
-#include <AliFlowCommon/AliFlowAnalysisWithFittingQDistribution.h>
-#include <AliFlowCommon/AliFlowAnalysisWithMixedHarmonics.h>
-#include <AliFlowCommon/AliFlowAnalysisWithNestedLoops.h>
+#include <Base/AliFlowCommonConstants.h>
+#include <Base/AliFlowLYZConstants.h>
+#include <Base/AliFlowCumuConstants.h>
+#include <Base/AliFlowVector.h>
+#include <Base/AliFlowTrackSimple.h>
+#include <Base/AliFlowEvent.h>
+#include <Base/AliFlowEventSimple.h>
+#include <Base/AliFlowTrackSimpleCuts.h>
+#include <Base/AliFlowCommonHist.h>
+#include <Base/AliFlowCommonHistResults.h>
+#include <Base/AliFlowLYZHist1.h>
+#include <Base/AliFlowLYZHist2.h>
+#include <Base/AliCumulantsFunctions.h>
+#include <Base/AliFlowLYZEventPlane.h>
+#include <Base/AliFlowAnalysisWithMCEventPlane.h>
+#include <Base/AliFlowAnalysisWithScalarProduct.h>
+#include <Base/AliFlowAnalysisWithLYZEventPlane.h>
+#include <Base/AliFlowAnalysisWithLeeYangZeros.h>
+#include <Base/AliFlowAnalysisWithCumulants.h>
+#include <Base/AliFlowAnalysisWithQCumulants.h>
+#include <Base/AliFlowAnalysisWithFittingQDistribution.h>
+#include <Base/AliFlowAnalysisWithMixedHarmonics.h>
+#include <Base/AliFlowAnalysisWithNestedLoops.h>
 
 //--------------------------------------------------------------------------------------
 // Run flow analysis on local data with custom FlowEvent maker
@@ -571,10 +571,10 @@ void LoadLibraries(const anaModes mode) {
     gSystem->Load("libANALYSISalice");
     gSystem->Load("libCORRFW");
     cerr<<"libCORRFW loaded..."<<endl;
-    gSystem->Load("libPWG2flowCommon");
-    cerr<<"libPWG2flowCommon loaded..."<<endl;
-    gSystem->Load("libPWG2flowTasks");
-    cerr<<"libPWG2flowTasks loaded..."<<endl;
+    gSystem->Load("libPWGflowBase");
+    cerr<<"libPWGflowBase loaded..."<<endl;
+    gSystem->Load("libPWGflowTasks");
+    cerr<<"libPWGflowTasks loaded..."<<endl;
   }
   
   else if (mode == mLocalPAR) {
@@ -590,10 +590,10 @@ void LoadLibraries(const anaModes mode) {
     SetupPar("ANALYSISalice");
     SetupPar("PWG2AOD");
     SetupPar("CORRFW");
-    SetupPar("PWG2flowCommon");
-    cerr<<"PWG2flowCommon.par loaded..."<<endl;
-    SetupPar("PWG2flowTasks");
-    cerr<<"PWG2flowTasks.par loaded..."<<endl;
+    SetupPar("PWGflowBase");
+    cerr<<"PWGflowBase.par loaded..."<<endl;
+    SetupPar("PWGflowTasks");
+    cerr<<"PWGflowTasks.par loaded..."<<endl;
   }
   
   //---------------------------------------------------------
@@ -605,35 +605,35 @@ void LoadLibraries(const anaModes mode) {
 
    
     // Constants  
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonConstants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZConstants.cxx+");
     
     // Flow event
-    gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+    gROOT->LoadMacro("Base/AliFlowVector.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowTrackSimple.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowEventSimple.cxx+");
       
     // Output histosgrams
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist1.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist2.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonHist.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonHistResults.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZHist1.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZHist2.cxx+");
     
     // Functions needed for various methods
-    gROOT->LoadMacro("AliFlowCommon/AliCumulantsFunctions.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZEventPlane.cxx+");
+    gROOT->LoadMacro("Base/AliCumulantsFunctions.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZEventPlane.cxx+");
     
     // Flow Analysis code for various methods
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithMCEventPlane.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithCumulants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithFittingQDistribution.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithMixedHarmonics.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithNestedLoops.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithMCEventPlane.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithScalarProduct.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithLYZEventPlane.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithLeeYangZeros.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithCumulants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithQCumulants.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithFittingQDistribution.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithMixedHarmonics.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithNestedLoops.cxx+");
     
     cout << "finished loading macros!" << endl;  
     
similarity index 93%
rename from PWG2/FLOW/macros/mergeOutputOnGrid.C
rename to PWGCF/FLOW/macros/mergeOutputOnGrid.C
index ce072a3c46d9d6746ba12b93062908c45bc2bbe9..35178a0ea4d73f0310362f7cdac53a30165bad23 100644 (file)
@@ -673,10 +673,10 @@ void LoadLibraries(const anaModes mode) {
     gSystem->Load("libANALYSISalice");
     gSystem->Load("libCORRFW");
     cerr<<"libCORRFW loaded..."<<endl;
-    gSystem->Load("libPWG2flowCommon");
-    cerr<<"libPWG2flowCommon loaded..."<<endl;
-    gSystem->Load("libPWG2flowTasks");
-    cerr<<"libPWG2flowTasks loaded..."<<endl;
+    gSystem->Load("libPWGflowBase");
+    cerr<<"libPWGflowBase loaded..."<<endl;
+    gSystem->Load("libPWGflowTasks");
+    cerr<<"libPWGflowTasks loaded..."<<endl;
   }
   
   else if (mode == mLocalPAR) {
@@ -692,10 +692,10 @@ void LoadLibraries(const anaModes mode) {
     SetupPar("ANALYSISalice");
     SetupPar("PWG2AOD");
     SetupPar("CORRFW");
-    SetupPar("PWG2flowCommon");
-    cerr<<"PWG2flowCommon.par loaded..."<<endl;
-    SetupPar("PWG2flowTasks");
-    cerr<<"PWG2flowTasks.par loaded..."<<endl;
+    SetupPar("PWGflowBase");
+    cerr<<"PWGflowBase.par loaded..."<<endl;
+    SetupPar("PWGflowTasks");
+    cerr<<"PWGflowTasks.par loaded..."<<endl;
   }
   
   //---------------------------------------------------------
@@ -706,38 +706,38 @@ void LoadLibraries(const anaModes mode) {
     // In root inline compile
 
     // Constants  
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonConstants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZConstants.cxx+");
     
     // Flow event
-    gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+    gROOT->LoadMacro("Base/AliFlowVector.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowTrackSimple.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowEventSimple.cxx+");
     
     // Output histosgrams
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist1.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist2.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonHist.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonHistResults.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZHist1.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZHist2.cxx+");
     
     // Functions needed for various methods
-    gROOT->LoadMacro("AliFlowCommon/AliCumulantsFunctions.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZEventPlane.cxx+");
+    gROOT->LoadMacro("Base/AliCumulantsFunctions.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZEventPlane.cxx+");
     
     // Flow Analysis code for various methods
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithMCEventPlane.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithCumulants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithFittingQDistribution.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithMixedHarmonics.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithNestedLoops.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithMCEventPlane.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithScalarProduct.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithLYZEventPlane.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithLeeYangZeros.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithCumulants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithQCumulants.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithFittingQDistribution.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithMixedHarmonics.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithNestedLoops.cxx+");
     
     // Class to fill the FlowEvent on the fly (generate Monte Carlo events)
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimpleMakerOnTheFly.cxx+");   
+    gROOT->LoadMacro("Base/AliFlowEventSimpleMakerOnTheFly.cxx+");   
     
     cout << "finished loading macros!" << endl;  
     
similarity index 95%
rename from PWG2/FLOW/macros/parity/plotMH.C
rename to PWGCF/FLOW/macros/parity/plotMH.C
index db82aebd80e0b19bad72247fc741a011360e8013..21aa129355859bea7219e0cd2c967e1134e95e9e 100644 (file)
@@ -80,7 +80,7 @@ void runFlowTask(Int_t mode = mGrid,
   }
 
   //Add the TOF tender
-  //gROOT->LoadMacro("$ALICE_ROOT/PWG2/FLOW/macros/AddTaskTenderFlow.C");
+  //gROOT->LoadMacro("$ALICE_ROOT/PWG/FLOW/macros/AddTaskTenderFlow.C");
   //AddTaskTenderFlow();
 
   // Setup analysis and usage of centrality bins
@@ -167,13 +167,13 @@ void LoadLibraries(const anaModes mode, Bool_t useFlowParFiles )
 
     if (useFlowParFiles)
     {
-      AliAnalysisAlien::SetupPar("PWG2flowCommon");
-      AliAnalysisAlien::SetupPar("PWG2flowTasks");
+      AliAnalysisAlien::SetupPar("PWGflowBase");
+      AliAnalysisAlien::SetupPar("PWGflowTasks");
     }
     else
     {
-      gSystem->Load("libPWG2flowCommon");
-      gSystem->Load("libPWG2flowTasks");
+      gSystem->Load("libPWGflowBase");
+      gSystem->Load("libPWGflowTasks");
     }
   }
   else if (mode==mPROOF)
@@ -183,9 +183,9 @@ void LoadLibraries(const anaModes mode, Bool_t useFlowParFiles )
     if (useFlowParFiles)
       list->Add(new TNamed("ALIROOT_EXTRA_LIBS", "ANALYSIS:ANALYSISalice:TENDER:TENDERSupplies"));
     else
-      list->Add(new TNamed("ALIROOT_EXTRA_LIBS", "ANALYSIS:ANALYSISalice:TENDER:TENDERSupplies:PWG2flowCommon:PWG2flowTasks"));
+      list->Add(new TNamed("ALIROOT_EXTRA_LIBS", "ANALYSIS:ANALYSISalice:TENDER:TENDERSupplies:PWGflowBase:PWGflowTasks"));
 
-    //list->Add(new TNamed("ALIROOT_EXTRA_INCLUDES","PWG2/FLOW/AliFlowCommon:PWG2/FLOW/AliFlowTasks"));
+    //list->Add(new TNamed("ALIROOT_EXTRA_INCLUDES","PWG/FLOW/Base:PWG/FLOW/Tasks"));
 
     // Connect to proof
     printf("*** Connect to PROOF ***\n");
@@ -203,8 +203,8 @@ void LoadLibraries(const anaModes mode, Bool_t useFlowParFiles )
 
     if (useFlowParFiles)
     {
-      gProof->UploadPackage("PWG2flowCommon.par");
-      gProof->UploadPackage("PWG2flowTasks.par");
+      gProof->UploadPackage("PWGflowBase.par");
+      gProof->UploadPackage("PWGflowTasks.par");
     }
 
     // Show enables Packages
similarity index 95%
rename from PWG2/FLOW/macros/parity/plotMHCentrality.C
rename to PWGCF/FLOW/macros/parity/plotMHCentrality.C
index c871992a55476de34719ba0eefba43455d10d56a..75093144513b3ff240be8cdbdc422177aa189236 100644 (file)
@@ -65,7 +65,7 @@ void runFlowTaskCentralityPIDTrain( Int_t mode = mGrid,
   AliAnalysisTaskPIDResponse* pidresponsetask = AddTaskPIDResponse(!DATA)
 
   //Add the TOF tender
-  gROOT->LoadMacro("$ALICE_ROOT/PWG2/FLOW/macros/AddTaskTenderTOF.C");
+  gROOT->LoadMacro("$ALICE_ROOT/PWG/FLOW/macros/AddTaskTenderTOF.C");
   AddTaskTenderTOF();
 
   // Setup analysis per centrality bin:
@@ -225,13 +225,13 @@ void LoadLibraries(const anaModes mode, Bool_t useFlowParFiles )
 
     if (useFlowParFiles)
     {
-      AliAnalysisAlien::SetupPar("PWG2flowCommon");
-      AliAnalysisAlien::SetupPar("PWG2flowTasks");
+      AliAnalysisAlien::SetupPar("PWGflowBase");
+      AliAnalysisAlien::SetupPar("PWGflowTasks");
     }
     else
     {
-      gSystem->Load("libPWG2flowCommon");
-      gSystem->Load("libPWG2flowTasks");
+      gSystem->Load("libPWGflowBase");
+      gSystem->Load("libPWGflowTasks");
     }
   }
   else if (mode==mPROOF)
@@ -241,9 +241,9 @@ void LoadLibraries(const anaModes mode, Bool_t useFlowParFiles )
     if (useFlowParFiles)
       list->Add(new TNamed("ALIROOT_EXTRA_LIBS", "ANALYSIS:ANALYSISalice:TENDER:TENDERSupplies"));
     else
-      list->Add(new TNamed("ALIROOT_EXTRA_LIBS", "ANALYSIS:ANALYSISalice:TENDER:TENDERSupplies:PWG2flowCommon:PWG2flowTasks"));
+      list->Add(new TNamed("ALIROOT_EXTRA_LIBS", "ANALYSIS:ANALYSISalice:TENDER:TENDERSupplies:PWGflowBase:PWGflowTasks"));
 
-    //list->Add(new TNamed("ALIROOT_EXTRA_INCLUDES","PWG2/FLOW/AliFlowCommon:PWG2/FLOW/AliFlowTasks"));
+    //list->Add(new TNamed("ALIROOT_EXTRA_INCLUDES","PWG/FLOW/Base:PWG/FLOW/Tasks"));
 
     // Connect to proof
     printf("*** Connect to PROOF ***\n");
@@ -261,8 +261,8 @@ void LoadLibraries(const anaModes mode, Bool_t useFlowParFiles )
 
     if (useFlowParFiles)
     {
-      gProof->UploadPackage("PWG2flowCommon.par");
-      gProof->UploadPackage("PWG2flowTasks.par");
+      gProof->UploadPackage("PWGflowBase.par");
+      gProof->UploadPackage("PWGflowTasks.par");
     }
 
     // Show enables Packages
similarity index 95%
rename from PWG2/FLOW/macros/plotCumulants.C
rename to PWGCF/FLOW/macros/plotCumulants.C
index 0e73b86afebc83b81c41789ffcde8565731a1691..f836107a2e01e52a64528b6e4310602b8b30904e 100644 (file)
@@ -77,7 +77,7 @@ void runFlowTaskCentralityTrain( Int_t mode = mPROOF,
   if (useTender)
   {
     //Add the tenders
-    gROOT->LoadMacro("$ALICE_ROOT/PWG2/FLOW/macros/AddTaskTenderFlow.C");
+    gROOT->LoadMacro("$ALICE_ROOT/PWG/FLOW/macros/AddTaskTenderFlow.C");
     AddTaskTenderFlow();
   }
 
@@ -170,13 +170,13 @@ void LoadLibraries(const anaModes mode, Bool_t useFlowParFiles )
 
     if (useFlowParFiles)
     {
-      AliAnalysisAlien::SetupPar("PWG2flowCommon");
-      AliAnalysisAlien::SetupPar("PWG2flowTasks");
+      AliAnalysisAlien::SetupPar("PWGflowBase");
+      AliAnalysisAlien::SetupPar("PWGflowTasks");
     }
     else
     {
-      gSystem->Load("libPWG2flowCommon");
-      gSystem->Load("libPWG2flowTasks");
+      gSystem->Load("libPWGflowBase");
+      gSystem->Load("libPWGflowTasks");
     }
   }
   else if (mode==mPROOF)
@@ -186,9 +186,9 @@ void LoadLibraries(const anaModes mode, Bool_t useFlowParFiles )
     if (useFlowParFiles)
       list->Add(new TNamed("ALIROOT_EXTRA_LIBS", "ANALYSIS:ANALYSISalice:TENDER:TENDERSupplies"));
     else
-      list->Add(new TNamed("ALIROOT_EXTRA_LIBS", "ANALYSIS:ANALYSISalice:TENDER:TENDERSupplies:PWG2flowCommon:PWG2flowTasks"));
+      list->Add(new TNamed("ALIROOT_EXTRA_LIBS", "ANALYSIS:ANALYSISalice:TENDER:TENDERSupplies:PWGflowBase:PWGflowTasks"));
 
-    //list->Add(new TNamed("ALIROOT_EXTRA_INCLUDES","PWG2/FLOW/AliFlowCommon:PWG2/FLOW/AliFlowTasks"));
+    //list->Add(new TNamed("ALIROOT_EXTRA_INCLUDES","PWG/FLOW/Base:PWG/FLOW/Tasks"));
 
     // Connect to proof
     printf("*** Connect to PROOF ***\n");
@@ -206,8 +206,8 @@ void LoadLibraries(const anaModes mode, Bool_t useFlowParFiles )
 
     if (useFlowParFiles)
     {
-      gProof->UploadPackage("PWG2flowCommon.par");
-      gProof->UploadPackage("PWG2flowTasks.par");
+      gProof->UploadPackage("PWGflowBase.par");
+      gProof->UploadPackage("PWGflowTasks.par");
     }
 
     // Show enables Packages
similarity index 96%
rename from PWG2/FLOW/macros/plotQAflow.C
rename to PWGCF/FLOW/macros/plotQAflow.C
index 1fe5a34a579868607106e97517d5f4c0ad948441..3abb1985ecdaf497270fe2f282778542275a8f47 100644 (file)
@@ -159,13 +159,13 @@ void LoadLibraries(const anaModes mode)
 
     if (mode == mLocal || mode == mGrid)
     {
-      gSystem->Load("libPWG2flowCommon"); 
-      gSystem->Load("libPWG2flowTasks"); 
+      gSystem->Load("libPWGflowBase"); 
+      gSystem->Load("libPWGflowTasks"); 
     }
     if (mode == mLocalPAR || mode == mGridPAR )
     {
-      AliAnalysisAlien::SetupPar("PWG2flowCommon");
-      AliAnalysisAlien::SetupPar("PWG2flowTasks");
+      AliAnalysisAlien::SetupPar("PWGflowBase");
+      AliAnalysisAlien::SetupPar("PWGflowTasks");
     }
   }
   
@@ -197,8 +197,8 @@ void LoadLibraries(const anaModes mode)
     //gProof->ClearPackage("ANALYSISalice.par");
     //gProof->ClearPackage("CORRFW.par");
     
-    gProof->ClearPackage("PWG2flowCommon");
-    gProof->ClearPackage("PWG2flowTasks");
+    gProof->ClearPackage("PWGflowBase");
+    gProof->ClearPackage("PWGflowTasks");
     
     // Upload the Packages
     //gProof->UploadPackage("STEERBase.par");
@@ -208,8 +208,8 @@ void LoadLibraries(const anaModes mode)
     //gProof->UploadPackage("ANALYSIS.par"); 
     //gProof->UploadPackage("ANALYSISalice.par");
     gProof->UploadPackage("CORRFW.par");
-    gProof->UploadPackage("PWG2flowCommon.par");
-    gProof->UploadPackage("PWG2flowTasks.par");
+    gProof->UploadPackage("PWGflowBase.par");
+    gProof->UploadPackage("PWGflowTasks.par");
     gProof->UploadPackage("ALIRECO.par");
 
     // Enable the Packages 
@@ -221,8 +221,8 @@ void LoadLibraries(const anaModes mode)
     //gProof->EnablePackage("ANALYSIS");
     //gProof->EnablePackage("ANALYSISalice");
     //gProof->EnablePackage("CORRFW");
-    gProof->EnablePackage("PWG2flowCommon");
-    gProof->EnablePackage("PWG2flowTasks");
+    gProof->EnablePackage("PWGflowBase");
+    gProof->EnablePackage("PWGflowTasks");
 
     // Show enables Packages
     gProof->ShowEnabledPackages();
similarity index 99%
rename from PWG2/FLOW/macros/readStarEvents.C
rename to PWGCF/FLOW/macros/readStarEvents.C
index f599bfde0aa93dc64f0ccb8d95bc4d9582623bc8..656c292ddea1cc9d79b6baa0b7f601d6eae80ea9 100644 (file)
@@ -35,7 +35,7 @@ void  runStarFlowAnalysis(const char* inputDataFiles="/Users/snelling/alice_data
   gSystem->Load("libTree.so");
   gSystem->Load("libVMC.so");
   gSystem->Load("libPhysics.so");
-  gSystem->Load("libPWG2flowCommon");
+  gSystem->Load("libPWGflowBase");
 
   Int_t maxNumberOfEvents = 1000000;
 
similarity index 91%
rename from PWG2/FLOW/macros/readStarEventsSimple.C
rename to PWGCF/FLOW/macros/readStarEventsSimple.C
index f21af0ba13c6b7b7c7940a0114d07dab87a57a6f..277699704cb9b1f6328d4b9cad484732df2058e0 100644 (file)
@@ -441,8 +441,8 @@ void LoadLibrariesSS(const libModes mode) {
   // for AliRoot
   gSystem->AddIncludePath("-I$ALICE_ROOT/include");
   gSystem->Load("libANALYSIS");
-  gSystem->Load("libPWG2flowCommon");
-  //cerr<<"libPWG2flowCommon loaded ..."<<endl;
+  gSystem->Load("libPWGflowBase");
+  //cerr<<"libPWGflowBase loaded ..."<<endl;
   
   }
   
@@ -451,35 +451,35 @@ void LoadLibrariesSS(const libModes mode) {
     // In root inline compile
   
     // Constants  
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonConstants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZConstants.cxx+");
         
     // Flow event
-    gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+    gROOT->LoadMacro("Base/AliFlowVector.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowTrackSimple.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowEventSimple.cxx+");
         
     // Output histograms
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist1.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist2.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonHist.cxx+");
+    gROOT->LoadMacro("Base/AliFlowCommonHistResults.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZHist1.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZHist2.cxx+");
     
     // Functions needed for various methods
-    gROOT->LoadMacro("AliFlowCommon/AliCumulantsFunctions.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowLYZEventPlane.cxx+");
+    gROOT->LoadMacro("Base/AliCumulantsFunctions.cxx+");
+    gROOT->LoadMacro("Base/AliFlowLYZEventPlane.cxx+");
     
     // Flow Analysis code for various methods
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithMCEventPlane.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithCumulants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithFittingQDistribution.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithMixedHarmonics.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithNestedLoops.cxx+");          
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithMCEventPlane.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithScalarProduct.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithLYZEventPlane.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithLeeYangZeros.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithCumulants.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithQCumulants.cxx+"); 
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithFittingQDistribution.cxx+");
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithMixedHarmonics.cxx+");    
+    gROOT->LoadMacro("Base/AliFlowAnalysisWithNestedLoops.cxx+");          
     
     cout << "finished loading macros!" << endl;