From 73af21b916ab8c694979fa1a6efd1e72b97ceb76 Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 23 Jan 2012 22:14:18 +0000 Subject: [PATCH] Transition PWG4 --> PWGGA PWG4/PartCorrBase -> PWG/CaloTrackCorrBase PWG4/PartCorrDep -> PWGGA/CaloTrackCorrelations PWG4/GammaConv -> PWGGA/GammaConv PWG4/UserTasks needs to be split (the PWGGA relevant parts are mentioned below) PWG4/UserTasks/CaloCellQA -> PWGGA/PHOSTasks/CaloCellQA PWG4/UserTasks/PHOS_embedding -> PWGGA/PHOSTasks/PHOS_embedding PWG4/UserTasks/PHOS_PbPbQA -> PWGGA/PHOSTasks/PHOS_PbPbQA PWG4/UserTasks/PHOS_pp_pi0 -> PWGGA/PHOSTasks/PHOS_pp_pi0 into one library PWGGAPHOSTask.pkg Also PWG4/omega3pi -> PWGGA/PHOSTasks/omega3pi should be included there as it is only one task. PWG4/UserTasks/EmcalTasks -> PWGGA/EMCALTasks into one library PWGGAEMCALTask.pkg Split of PWG4/CaloCalib -> PWGGA/EMCALTasks for all classes except AliAnalysisTaskCaloFilter which goes into a new library CaloTasks which is a library for calorimeter classes that involve EMCAL and PHOS, and that can depend on GammaConv. Constantin and Gustavo --- CMakeLists.txt | 2 +- .../CMakelibPWGCaloTrackCorrBase.pkg | 40 ++++++------- .../AliAnaCaloTrackCorrBaseClass.cxx | 0 .../AliAnaCaloTrackCorrBaseClass.h | 0 .../AliAnaCaloTrackCorrMaker.cxx | 0 .../AliAnaCaloTrackCorrMaker.h | 0 .../CaloTrackCorrBase}/AliAnaScale.cxx | 0 .../CaloTrackCorrBase}/AliAnaScale.h | 0 .../AliAnalysisTaskCaloTrackCorrelation.cxx | 0 .../AliAnalysisTaskCaloTrackCorrelation.h | 0 .../AliAnalysisTaskCaloTrackCorrelationM.cxx | 0 .../AliAnalysisTaskCaloTrackCorrelationM.h | 0 .../AliAnalysisTaskCounter.cxx | 0 .../AliAnalysisTaskCounter.h | 0 .../CaloTrackCorrBase}/AliCaloPID.cxx | 0 .../CaloTrackCorrBase}/AliCaloPID.h | 0 .../AliCaloTrackAODReader.cxx | 0 .../AliCaloTrackAODReader.h | 0 .../AliCaloTrackESDReader.cxx | 0 .../AliCaloTrackESDReader.h | 0 .../AliCaloTrackMCReader.cxx | 0 .../CaloTrackCorrBase}/AliCaloTrackMCReader.h | 0 .../CaloTrackCorrBase}/AliCaloTrackReader.cxx | 0 .../CaloTrackCorrBase}/AliCaloTrackReader.h | 0 .../AliCalorimeterUtils.cxx | 0 .../CaloTrackCorrBase}/AliCalorimeterUtils.h | 0 .../CaloTrackCorrBase}/AliFiducialCut.cxx | 0 .../CaloTrackCorrBase}/AliFiducialCut.h | 0 .../CaloTrackCorrBase}/AliHistogramRanges.cxx | 0 .../CaloTrackCorrBase}/AliHistogramRanges.h | 0 .../CaloTrackCorrBase}/AliIsolationCut.cxx | 0 .../CaloTrackCorrBase}/AliIsolationCut.h | 0 .../CaloTrackCorrBase}/AliMCAnalysisUtils.cxx | 0 .../CaloTrackCorrBase}/AliMCAnalysisUtils.h | 0 .../AliNeutralMesonSelection.cxx | 0 .../AliNeutralMesonSelection.h | 0 .../PROOF-INF.PWGCaloTrackCorrBase}/BUILD.sh | 0 PWG/PROOF-INF.PWGCaloTrackCorrBase/SETUP.C | 15 +++++ .../PWGCaloTrackCorrBaseLinkDef.h | 0 PWG4/CMakelibPWG4UserTasks.pkg | 56 ------------------- PWG4/PROOF-INF.PWG4CaloCalib/SETUP.C | 15 ----- PWG4/PROOF-INF.PWG4GammaConv/SETUP.C | 13 ----- PWG4/PROOF-INF.PWG4PartCorrBase/SETUP.C | 15 ----- PWG4/PROOF-INF.PWG4PartCorrDep/SETUP.C | 15 ----- PWG4/PROOF-INF.PWG4UserTasks/SETUP.C | 14 ----- PWG4/PROOF-INF.PWG4omega3pi/SETUP.C | 13 ----- PWG4/PWG4CaloCalibLinkDef.h | 11 ---- .../CMakelibPWGGACaloTasks.pkg | 12 ++-- PWGGA/CMakelibPWGGACaloTrackCorrelations.pkg | 54 ++++++++++++++++++ .../CMakelibPWGGAEMCALTasks.pkg | 23 +++++--- .../CMakelibPWGGAGammaConv.pkg | 6 +- .../CMakelibPWGGAPHOSTasks.pkg | 39 ++++++------- .../CaloTasks}/AliAnalysisTaskCaloFilter.cxx | 0 .../CaloTasks}/AliAnalysisTaskCaloFilter.h | 0 .../AliAnaCalorimeterQA.cxx | 0 .../AliAnaCalorimeterQA.h | 0 .../AliAnaChargedParticles.cxx | 0 .../AliAnaChargedParticles.h | 0 .../CaloTrackCorrelations}/AliAnaElectron.cxx | 0 .../CaloTrackCorrelations}/AliAnaElectron.h | 0 .../AliAnaInsideClusterInvariantMass.cxx | 0 .../AliAnaInsideClusterInvariantMass.h | 0 .../AliAnaOmegaToPi0Gamma.cxx | 0 .../AliAnaOmegaToPi0Gamma.h | 0 .../AliAnaParticleHadronCorrelation.cxx | 0 .../AliAnaParticleHadronCorrelation.h | 0 .../AliAnaParticleIsolation.cxx | 0 .../AliAnaParticleIsolation.h | 0 .../AliAnaParticleJetFinderCorrelation.cxx | 0 .../AliAnaParticleJetFinderCorrelation.h | 0 ...liAnaParticleJetLeadingConeCorrelation.cxx | 0 .../AliAnaParticleJetLeadingConeCorrelation.h | 0 .../AliAnaParticlePartonCorrelation.cxx | 0 .../AliAnaParticlePartonCorrelation.h | 0 .../CaloTrackCorrelations}/AliAnaPhoton.cxx | 0 .../CaloTrackCorrelations}/AliAnaPhoton.h | 0 .../AliAnaPhotonConvInCalo.cxx | 0 .../AliAnaPhotonConvInCalo.h | 0 .../CaloTrackCorrelations}/AliAnaPi0.cxx | 0 .../CaloTrackCorrelations}/AliAnaPi0.h | 0 .../CaloTrackCorrelations}/AliAnaPi0EbE.cxx | 0 .../CaloTrackCorrelations}/AliAnaPi0EbE.h | 0 .../AliAnaShowerParameter.cxx | 0 .../AliAnaShowerParameter.h | 0 .../AliAnalysisTaskTaggedPhotons.cxx | 0 .../AliAnalysisTaskTaggedPhotons.h | 0 .../AliAnalysisTaskEMCALClusterize.cxx | 0 .../AliAnalysisTaskEMCALClusterize.h | 0 .../AliAnalysisTaskEMCALClusterizeFast.cxx | 0 .../AliAnalysisTaskEMCALClusterizeFast.h | 0 .../AliAnalysisTaskEMCALPi0CalibSelection.cxx | 0 .../AliAnalysisTaskEMCALPi0CalibSelection.h | 0 .../AliAnalysisTaskEMCALPi0PbPb.cxx | 0 .../EMCALTasks}/AliAnalysisTaskEMCALPi0PbPb.h | 0 .../AliAnalysisTaskEMCALTriggerQA.cxx | 0 .../AliAnalysisTaskEMCALTriggerQA.h | 0 .../EMCALTasks}/AliEmcalEsdTpcTrackTask.cxx | 0 .../EMCALTasks}/AliEmcalEsdTpcTrackTask.h | 0 .../EMCALTasks}/AliEmcalPhysicsSelection.cxx | 0 .../EMCALTasks}/AliEmcalPhysicsSelection.h | 0 .../AliEmcalPhysicsSelectionTask.cxx | 0 .../AliEmcalPhysicsSelectionTask.h | 0 .../EMCALTasks}/AliEmcalSetupTask.cxx | 0 .../EMCALTasks}/AliEmcalSetupTask.h | 0 .../AliEmcalTrackPropagatorTask.cxx | 0 .../EMCALTasks}/AliEmcalTrackPropagatorTask.h | 0 .../EMCALTasks}/AliEsdSkimTask.cxx | 0 .../EMCALTasks}/AliEsdSkimTask.h | 0 .../EMCALTasks}/AliEsdTrackExt.cxx | 0 .../EMCALTasks}/AliEsdTrackExt.h | 0 .../EMCALTasks}/macros/AddTaskCaloFilter.C | 0 .../EMCALTasks}/macros/AddTaskClusterizerFW.C | 0 .../macros/AddTaskEMCALClusterize.C | 0 .../macros/AddTaskEMCALTriggerQA.C | 0 .../macros/AddTaskEmcalPhysicsSelection.C | 0 .../EMCALTasks}/macros/ConfigCaloFilter.C | 0 .../macros/ConfigEMCALClusterize.C | 0 .../macros/ConfigureEMCALRecoUtils.C | 0 .../EMCALTasks}/macros/anaCaloFilter.C | 0 .../EMCALTasks}/macros/anaEMCALCalib.C | 0 .../EMCALTasks}/macros/emcalReclusterize.C | 0 .../GammaConv/AliAODConversionMother.cxx | 0 .../GammaConv/AliAODConversionMother.h | 0 .../GammaConv/AliAODConversionParticle.cxx | 0 .../GammaConv/AliAODConversionParticle.h | 0 .../GammaConv/AliAODConversionPhoton.cxx | 0 .../GammaConv/AliAODConversionPhoton.h | 0 .../GammaConv/AliAnalysisTaskCaloConv.cxx | 0 .../GammaConv/AliAnalysisTaskCaloConv.h | 0 .../AliAnalysisTaskGCPartToPWG4Part.cxx | 0 .../AliAnalysisTaskGCPartToPWG4Part.h | 0 .../AliAnalysisTaskGammaConvDalitz.cxx | 0 .../AliAnalysisTaskGammaConvDalitz.h | 0 .../AliAnalysisTaskGammaConversion.cxx | 0 .../AliAnalysisTaskGammaConversion.h | 0 .../GammaConv/AliAnalysisTaskdPhi.cxx | 0 .../GammaConv/AliAnalysisTaskdPhi.h | 0 .../GammaConv/AliConversionCuts.cxx | 0 {PWG4 => PWGGA}/GammaConv/AliConversionCuts.h | 0 .../GammaConv/AliConversionPhotonBase.cxx | 0 .../GammaConv/AliConversionPhotonBase.h | 0 .../GammaConv/AliGammaConversionBGHandler.cxx | 0 .../GammaConv/AliGammaConversionBGHandler.h | 0 .../AliGammaConversionHistograms.cxx | 0 .../GammaConv/AliGammaConversionHistograms.h | 0 .../GammaConv/AliKFConversionMother.cxx | 0 .../GammaConv/AliKFConversionMother.h | 0 .../GammaConv/AliKFConversionPhoton.cxx | 0 .../GammaConv/AliKFConversionPhoton.h | 0 {PWG4 => PWGGA}/GammaConv/AliV0Reader.cxx | 0 {PWG4 => PWGGA}/GammaConv/AliV0Reader.h | 0 .../ConvCorrelations/AliAnaConvCorrBase.cxx | 0 .../ConvCorrelations/AliAnaConvCorrBase.h | 0 .../ConvCorrelations/AliAnaConvCorrPhoton.cxx | 0 .../ConvCorrelations/AliAnaConvCorrPhoton.h | 0 .../AliAnaConvCorrPhotonJet.cxx | 0 .../AliAnaConvCorrPhotonJet.h | 0 .../ConvCorrelations/AliAnaConvCorrPion.cxx | 0 .../ConvCorrelations/AliAnaConvCorrPion.h | 0 .../AliAnaConvCorrPionJet.cxx | 0 .../ConvCorrelations/AliAnaConvCorrPionJet.h | 0 .../ConvCorrelations/AliAnaConvIsolation.cxx | 0 .../ConvCorrelations/AliAnaConvIsolation.h | 0 .../ConvCorrelations/macros/ConfigGammaJet.C | 0 .../GammaConv/macros/Cuts_Events_new.C | 0 .../GammaConv/macros/ExtractSignal.C | 0 .../macros/Extract_IntegratedPi0Yield.C | 0 .../macros/Extract_Pi0_Characteristics.C | 0 {PWG4 => PWGGA}/GammaConv/macros/MakeCutLog.C | 0 .../macros/Photon_Characteristics_Events.C | 0 .../GammaConv/macros/Photon_Resolution.C | 0 .../macros/Plot_IntegratedPi0Yield.C | 0 .../macros/Plot_Mapping_Histos_Events.C | 0 .../macros/Plot_Pi0_Characteristics.C | 0 .../PlottingGammaConversionAdditional.h | 0 .../macros/PlottingGammaConversionHistos.h | 0 .../GammaConv/macros/PlottingMeson.h | 0 {PWG4 => PWGGA}/GammaConv/macros/printCuts.C | 0 .../GammaConv/macros/start_Analysis.sh | 0 .../macros/start_GammaConversionAnalysis.sh | 0 .../GammaConv/macros/start_Resolution.sh | 0 .../CaloCellQA/AliAnalysisTaskCaloCellsQA.cxx | 0 .../CaloCellQA/AliAnalysisTaskCaloCellsQA.h | 0 .../PHOSTasks}/CaloCellQA/AliCaloCellsQA.cxx | 0 .../PHOSTasks}/CaloCellQA/AliCaloCellsQA.h | 0 .../CaloCellQA/macros/AddTaskCaloCellsQA.C | 0 .../CaloCellQA/macros/AddTaskPHOSQA.C | 0 .../CaloCellQA/macros/ExtractPHOSCellQA.C | 0 .../CaloCellQA/macros/ana_example.C | 0 .../CaloCellQA/macros/getCellsRunsQA.C | 0 .../CaloCellQA/macros/getCellsRunsQAPHOS.C | 0 .../PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.cxx | 0 .../PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.h | 0 .../PHOSTasks}/PHOS_PbPbQA/README.PbPbQA | 0 .../PHOS_PbPbQA/macros/AddTaskPHOSPbPb.C | 0 .../PHOS_PbPbQA/macros/ExtractPHOSPbPbQA.C | 0 .../PHOS_PbPbQA/macros/MakeMmixPi0.C | 0 .../PHOSTasks}/PHOS_PbPbQA/macros/PHOSPbPb.C | 0 .../AliAnalysisTaskPi0DiffEfficiency.cxx | 0 .../AliAnalysisTaskPi0DiffEfficiency.h | 0 .../AliAnalysisTaskPi0Efficiency.cxx | 0 .../AliAnalysisTaskPi0Efficiency.h | 0 .../PHOS_embedding/AliPHOSEmbedding.cxx | 0 .../PHOS_embedding/AliPHOSEmbedding.h | 0 .../PHOSTasks}/PHOS_embedding/Analyze.C | 0 .../PHOSTasks}/PHOS_embedding/AnalyzeDiff.C | 0 .../PHOSTasks}/PHOS_embedding/Config.C | 0 .../PHOSTasks}/PHOS_embedding/CreateAOD.C | 0 .../PHOSTasks}/PHOS_embedding/Embedding.C | 0 .../PHOSTasks}/PHOS_embedding/Readme | 0 .../PHOSTasks}/PHOS_embedding/rec.C | 0 .../PHOSTasks}/PHOS_embedding/sim.C | 0 .../PHOSTasks}/PHOS_embedding/simrun.C | 0 .../PHOS_pp_pi0/AliAnalysisTaskPi0.cxx | 0 .../PHOS_pp_pi0/AliAnalysisTaskPi0.h | 0 .../PHOSTasks}/PHOS_pp_pi0/AliCaloPhoton.cxx | 0 .../PHOSTasks}/PHOS_pp_pi0/AliCaloPhoton.h | 0 .../omega3pi/AliAnalysisTaskOmegaPi0PiPi.cxx | 0 .../omega3pi/AliAnalysisTaskOmegaPi0PiPi.h | 0 .../omega3pi/grid/AnaTaskOmega3pi.C | 0 .../PHOSTasks}/omega3pi/grid/Omega.jdl | 0 .../PHOSTasks}/omega3pi/grid/README | 0 .../PHOSTasks}/omega3pi/grid/ana.sh | 0 .../PHOSTasks}/omega3pi/grid/list.txt | 0 .../PHOSTasks}/omega3pi/grid/submit.sh | 0 .../PROOF-INF.PWGGACaloTasks}/BUILD.sh | 0 PWGGA/PROOF-INF.PWGGACaloTasks/SETUP.C | 13 +++++ .../BUILD.sh | 0 .../SETUP.C | 15 +++++ .../PROOF-INF.PWGGAEMCALTasks}/BUILD.sh | 0 PWGGA/PROOF-INF.PWGGAEMCALTasks/SETUP.C | 15 +++++ .../PROOF-INF.PWGGAGammaConv}/BUILD.sh | 0 PWGGA/PROOF-INF.PWGGAGammaConv/SETUP.C | 13 +++++ .../PROOF-INF.PWGGAPHOSTasks}/BUILD.sh | 0 PWGGA/PROOF-INF.PWGGAPHOSTasks/SETUP.C | 14 +++++ .../PWGGACaloTasksLinkDef.h | 2 +- .../PWGGACaloTrackCorrelationsLinkDef.h | 0 .../PWGGAEMCALTasksLinkDef.h | 18 +----- .../PWGGAGammaConvLinkDef.h | 0 PWGGA/PWGGAPHOSTasksLinkDef.h | 26 +++++++++ 240 files changed, 231 insertions(+), 228 deletions(-) rename PWG4/CMakelibPWG4PartCorrBase.pkg => PWG/CMakelibPWGCaloTrackCorrBase.pkg (68%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnaCaloTrackCorrBaseClass.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnaCaloTrackCorrBaseClass.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnaCaloTrackCorrMaker.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnaCaloTrackCorrMaker.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnaScale.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnaScale.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnalysisTaskCaloTrackCorrelation.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnalysisTaskCaloTrackCorrelation.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnalysisTaskCaloTrackCorrelationM.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnalysisTaskCaloTrackCorrelationM.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnalysisTaskCounter.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliAnalysisTaskCounter.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloPID.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloPID.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloTrackAODReader.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloTrackAODReader.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloTrackESDReader.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloTrackESDReader.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloTrackMCReader.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloTrackMCReader.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloTrackReader.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCaloTrackReader.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCalorimeterUtils.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliCalorimeterUtils.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliFiducialCut.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliFiducialCut.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliHistogramRanges.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliHistogramRanges.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliIsolationCut.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliIsolationCut.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliMCAnalysisUtils.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliMCAnalysisUtils.h (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliNeutralMesonSelection.cxx (100%) rename {PWG4/PartCorrBase => PWG/CaloTrackCorrBase}/AliNeutralMesonSelection.h (100%) rename {PWG4/PROOF-INF.PWG4CaloCalib => PWG/PROOF-INF.PWGCaloTrackCorrBase}/BUILD.sh (100%) create mode 100755 PWG/PROOF-INF.PWGCaloTrackCorrBase/SETUP.C rename PWG4/PWG4PartCorrBaseLinkDef.h => PWG/PWGCaloTrackCorrBaseLinkDef.h (100%) delete mode 100644 PWG4/CMakelibPWG4UserTasks.pkg delete mode 100755 PWG4/PROOF-INF.PWG4CaloCalib/SETUP.C delete mode 100644 PWG4/PROOF-INF.PWG4GammaConv/SETUP.C delete mode 100755 PWG4/PROOF-INF.PWG4PartCorrBase/SETUP.C delete mode 100755 PWG4/PROOF-INF.PWG4PartCorrDep/SETUP.C delete mode 100644 PWG4/PROOF-INF.PWG4UserTasks/SETUP.C delete mode 100755 PWG4/PROOF-INF.PWG4omega3pi/SETUP.C delete mode 100644 PWG4/PWG4CaloCalibLinkDef.h rename PWG4/CMakelibPWG4omega3pi.pkg => PWGGA/CMakelibPWGGACaloTasks.pkg (88%) create mode 100644 PWGGA/CMakelibPWGGACaloTrackCorrelations.pkg rename PWG4/CMakelibPWG4CaloCalib.pkg => PWGGA/CMakelibPWGGAEMCALTasks.pkg (73%) rename PWG4/CMakelibPWG4GammaConv.pkg => PWGGA/CMakelibPWGGAGammaConv.pkg (94%) rename PWG4/CMakelibPWG4PartCorrDep.pkg => PWGGA/CMakelibPWGGAPHOSTasks.pkg (66%) rename {PWG4/CaloCalib => PWGGA/CaloTasks}/AliAnalysisTaskCaloFilter.cxx (100%) rename {PWG4/CaloCalib => PWGGA/CaloTasks}/AliAnalysisTaskCaloFilter.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaCalorimeterQA.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaCalorimeterQA.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaChargedParticles.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaChargedParticles.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaElectron.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaElectron.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaInsideClusterInvariantMass.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaInsideClusterInvariantMass.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaOmegaToPi0Gamma.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaOmegaToPi0Gamma.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticleHadronCorrelation.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticleHadronCorrelation.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticleIsolation.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticleIsolation.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticleJetFinderCorrelation.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticleJetFinderCorrelation.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticleJetLeadingConeCorrelation.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticleJetLeadingConeCorrelation.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticlePartonCorrelation.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaParticlePartonCorrelation.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaPhoton.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaPhoton.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaPhotonConvInCalo.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaPhotonConvInCalo.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaPi0.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaPi0.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaPi0EbE.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaPi0EbE.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaShowerParameter.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnaShowerParameter.h (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnalysisTaskTaggedPhotons.cxx (100%) rename {PWG4/PartCorrDep => PWGGA/CaloTrackCorrelations}/AliAnalysisTaskTaggedPhotons.h (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALClusterize.cxx (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALClusterize.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALClusterizeFast.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALClusterizeFast.h (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALPi0CalibSelection.cxx (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALPi0CalibSelection.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALPi0PbPb.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALPi0PbPb.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALTriggerQA.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliAnalysisTaskEMCALTriggerQA.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalEsdTpcTrackTask.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalEsdTpcTrackTask.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalPhysicsSelection.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalPhysicsSelection.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalPhysicsSelectionTask.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalPhysicsSelectionTask.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalSetupTask.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalSetupTask.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalTrackPropagatorTask.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEmcalTrackPropagatorTask.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEsdSkimTask.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEsdSkimTask.h (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEsdTrackExt.cxx (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/AliEsdTrackExt.h (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/macros/AddTaskCaloFilter.C (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/macros/AddTaskClusterizerFW.C (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/macros/AddTaskEMCALClusterize.C (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/macros/AddTaskEMCALTriggerQA.C (100%) rename {PWG4/UserTasks/EmcalTasks => PWGGA/EMCALTasks}/macros/AddTaskEmcalPhysicsSelection.C (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/macros/ConfigCaloFilter.C (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/macros/ConfigEMCALClusterize.C (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/macros/ConfigureEMCALRecoUtils.C (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/macros/anaCaloFilter.C (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/macros/anaEMCALCalib.C (100%) rename {PWG4/CaloCalib => PWGGA/EMCALTasks}/macros/emcalReclusterize.C (100%) rename {PWG4 => PWGGA}/GammaConv/AliAODConversionMother.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliAODConversionMother.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliAODConversionParticle.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliAODConversionParticle.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliAODConversionPhoton.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliAODConversionPhoton.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskCaloConv.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskCaloConv.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskGCPartToPWG4Part.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskGCPartToPWG4Part.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskGammaConvDalitz.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskGammaConvDalitz.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskGammaConversion.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskGammaConversion.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskdPhi.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliAnalysisTaskdPhi.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliConversionCuts.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliConversionCuts.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliConversionPhotonBase.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliConversionPhotonBase.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliGammaConversionBGHandler.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliGammaConversionBGHandler.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliGammaConversionHistograms.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliGammaConversionHistograms.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliKFConversionMother.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliKFConversionMother.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliKFConversionPhoton.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliKFConversionPhoton.h (100%) rename {PWG4 => PWGGA}/GammaConv/AliV0Reader.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/AliV0Reader.h (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrBase.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrBase.h (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.h (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrPion.h (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.h (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvIsolation.cxx (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/AliAnaConvIsolation.h (100%) rename {PWG4 => PWGGA}/GammaConv/ConvCorrelations/macros/ConfigGammaJet.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/Cuts_Events_new.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/ExtractSignal.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/Extract_IntegratedPi0Yield.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/Extract_Pi0_Characteristics.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/MakeCutLog.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/Photon_Characteristics_Events.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/Photon_Resolution.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/Plot_IntegratedPi0Yield.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/Plot_Mapping_Histos_Events.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/Plot_Pi0_Characteristics.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/PlottingGammaConversionAdditional.h (100%) rename {PWG4 => PWGGA}/GammaConv/macros/PlottingGammaConversionHistos.h (100%) rename {PWG4 => PWGGA}/GammaConv/macros/PlottingMeson.h (100%) rename {PWG4 => PWGGA}/GammaConv/macros/printCuts.C (100%) rename {PWG4 => PWGGA}/GammaConv/macros/start_Analysis.sh (100%) rename {PWG4 => PWGGA}/GammaConv/macros/start_GammaConversionAnalysis.sh (100%) rename {PWG4 => PWGGA}/GammaConv/macros/start_Resolution.sh (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/AliAnalysisTaskCaloCellsQA.cxx (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/AliAnalysisTaskCaloCellsQA.h (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/AliCaloCellsQA.cxx (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/AliCaloCellsQA.h (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/macros/AddTaskCaloCellsQA.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/macros/AddTaskPHOSQA.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/macros/ExtractPHOSCellQA.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/macros/ana_example.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/macros/getCellsRunsQA.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/CaloCellQA/macros/getCellsRunsQAPHOS.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.cxx (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.h (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_PbPbQA/README.PbPbQA (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_PbPbQA/macros/AddTaskPHOSPbPb.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_PbPbQA/macros/ExtractPHOSPbPbQA.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_PbPbQA/macros/MakeMmixPi0.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_PbPbQA/macros/PHOSPbPb.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.h (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/AliAnalysisTaskPi0Efficiency.cxx (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/AliAnalysisTaskPi0Efficiency.h (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/AliPHOSEmbedding.cxx (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/AliPHOSEmbedding.h (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/Analyze.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/AnalyzeDiff.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/Config.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/CreateAOD.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/Embedding.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/Readme (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/rec.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/sim.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_embedding/simrun.C (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_pp_pi0/AliAnalysisTaskPi0.cxx (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_pp_pi0/AliAnalysisTaskPi0.h (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_pp_pi0/AliCaloPhoton.cxx (100%) rename {PWG4/UserTasks => PWGGA/PHOSTasks}/PHOS_pp_pi0/AliCaloPhoton.h (100%) rename {PWG4 => PWGGA/PHOSTasks}/omega3pi/AliAnalysisTaskOmegaPi0PiPi.cxx (100%) rename {PWG4 => PWGGA/PHOSTasks}/omega3pi/AliAnalysisTaskOmegaPi0PiPi.h (100%) rename {PWG4 => PWGGA/PHOSTasks}/omega3pi/grid/AnaTaskOmega3pi.C (100%) rename {PWG4 => PWGGA/PHOSTasks}/omega3pi/grid/Omega.jdl (100%) rename {PWG4 => PWGGA/PHOSTasks}/omega3pi/grid/README (100%) rename {PWG4 => PWGGA/PHOSTasks}/omega3pi/grid/ana.sh (100%) rename {PWG4 => PWGGA/PHOSTasks}/omega3pi/grid/list.txt (100%) rename {PWG4 => PWGGA/PHOSTasks}/omega3pi/grid/submit.sh (100%) rename {PWG4/PROOF-INF.PWG4GammaConv => PWGGA/PROOF-INF.PWGGACaloTasks}/BUILD.sh (100%) create mode 100755 PWGGA/PROOF-INF.PWGGACaloTasks/SETUP.C rename {PWG4/PROOF-INF.PWG4PartCorrBase => PWGGA/PROOF-INF.PWGGACaloTrackCorrelations}/BUILD.sh (100%) create mode 100755 PWGGA/PROOF-INF.PWGGACaloTrackCorrelations/SETUP.C rename {PWG4/PROOF-INF.PWG4PartCorrDep => PWGGA/PROOF-INF.PWGGAEMCALTasks}/BUILD.sh (100%) create mode 100755 PWGGA/PROOF-INF.PWGGAEMCALTasks/SETUP.C rename {PWG4/PROOF-INF.PWG4omega3pi => PWGGA/PROOF-INF.PWGGAGammaConv}/BUILD.sh (100%) create mode 100644 PWGGA/PROOF-INF.PWGGAGammaConv/SETUP.C rename {PWG4/PROOF-INF.PWG4UserTasks => PWGGA/PROOF-INF.PWGGAPHOSTasks}/BUILD.sh (100%) create mode 100644 PWGGA/PROOF-INF.PWGGAPHOSTasks/SETUP.C rename PWG4/PWG4omega3piLinkDef.h => PWGGA/PWGGACaloTasksLinkDef.h (69%) rename PWG4/PWG4PartCorrDepLinkDef.h => PWGGA/PWGGACaloTrackCorrelationsLinkDef.h (100%) rename PWG4/PWG4UserTasksLinkDef.h => PWGGA/PWGGAEMCALTasksLinkDef.h (66%) rename PWG4/PWG4GammaConvLinkDef.h => PWGGA/PWGGAGammaConvLinkDef.h (100%) create mode 100644 PWGGA/PWGGAPHOSTasksLinkDef.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d904543dc54..d58f09a1dba 100644 --- 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 PWG PWGCF PWGHF 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 PWGGA PWGHF TRIGGER PYTHIA8 TAmpt OADB MFT) if(THydjet) list(APPEND ALIROOTMODULES THydjet) diff --git a/PWG4/CMakelibPWG4PartCorrBase.pkg b/PWG/CMakelibPWGCaloTrackCorrBase.pkg similarity index 68% rename from PWG4/CMakelibPWG4PartCorrBase.pkg rename to PWG/CMakelibPWGCaloTrackCorrBase.pkg index 22d981d5d5d..f41935acd41 100644 --- a/PWG4/CMakelibPWG4PartCorrBase.pkg +++ b/PWG/CMakelibPWGCaloTrackCorrBase.pkg @@ -1,6 +1,6 @@ # -*- mode: CMake -*- #--------------------------------------------------------------------------------# -# Package File for PWG4PartCorrBase # +# Package File for PWGCaloTrackCorrBase # # Author : Johny Jose (johny.jose@cern.ch) # # Variables Defined : # # # @@ -27,29 +27,29 @@ #--------------------------------------------------------------------------------# set ( SRCS - PartCorrBase/AliNeutralMesonSelection.cxx - PartCorrBase/AliFiducialCut.cxx - PartCorrBase/AliCaloPID.cxx - PartCorrBase/AliMCAnalysisUtils.cxx - PartCorrBase/AliIsolationCut.cxx - PartCorrBase/AliAnaScale.cxx - PartCorrBase/AliCaloTrackReader.cxx - PartCorrBase/AliCaloTrackESDReader.cxx - PartCorrBase/AliCaloTrackAODReader.cxx - PartCorrBase/AliCaloTrackMCReader.cxx - PartCorrBase/AliCalorimeterUtils.cxx - PartCorrBase/AliAnalysisTaskCounter.cxx - PartCorrBase/AliAnaCaloTrackCorrMaker.cxx - PartCorrBase/AliAnaCaloTrackCorrBaseClass.cxx - PartCorrBase/AliAnalysisTaskCaloTrackCorrelation.cxx - PartCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx - PartCorrBase/AliHistogramRanges.cxx + CaloTrackCorrBase/AliNeutralMesonSelection.cxx + CaloTrackCorrBase/AliFiducialCut.cxx + CaloTrackCorrBase/AliCaloPID.cxx + CaloTrackCorrBase/AliMCAnalysisUtils.cxx + CaloTrackCorrBase/AliIsolationCut.cxx + CaloTrackCorrBase/AliAnaScale.cxx + CaloTrackCorrBase/AliCaloTrackReader.cxx + CaloTrackCorrBase/AliCaloTrackESDReader.cxx + CaloTrackCorrBase/AliCaloTrackAODReader.cxx + CaloTrackCorrBase/AliCaloTrackMCReader.cxx + CaloTrackCorrBase/AliCalorimeterUtils.cxx + CaloTrackCorrBase/AliAnalysisTaskCounter.cxx + CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.cxx + CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.cxx + CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelation.cxx + CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx + CaloTrackCorrBase/AliHistogramRanges.cxx ) string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) -set ( DHDR PWG4PartCorrBaseLinkDef.h) +set ( DHDR PWGCaloTrackCorrBaseLinkDef.h) -set ( EINCLUDE PWG4/PartCorrBase EMCAL STEER/AOD STEER/ESD STEER/STEERBase) +set ( EINCLUDE PWG/CaloTrackCorrBase EMCAL STEER/AOD STEER/ESD STEER/STEERBase) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) diff --git a/PWG4/PartCorrBase/AliAnaCaloTrackCorrBaseClass.cxx b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.cxx similarity index 100% rename from PWG4/PartCorrBase/AliAnaCaloTrackCorrBaseClass.cxx rename to PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.cxx diff --git a/PWG4/PartCorrBase/AliAnaCaloTrackCorrBaseClass.h b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.h similarity index 100% rename from PWG4/PartCorrBase/AliAnaCaloTrackCorrBaseClass.h rename to PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrBaseClass.h diff --git a/PWG4/PartCorrBase/AliAnaCaloTrackCorrMaker.cxx b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.cxx similarity index 100% rename from PWG4/PartCorrBase/AliAnaCaloTrackCorrMaker.cxx rename to PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.cxx diff --git a/PWG4/PartCorrBase/AliAnaCaloTrackCorrMaker.h b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.h similarity index 100% rename from PWG4/PartCorrBase/AliAnaCaloTrackCorrMaker.h rename to PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.h diff --git a/PWG4/PartCorrBase/AliAnaScale.cxx b/PWG/CaloTrackCorrBase/AliAnaScale.cxx similarity index 100% rename from PWG4/PartCorrBase/AliAnaScale.cxx rename to PWG/CaloTrackCorrBase/AliAnaScale.cxx diff --git a/PWG4/PartCorrBase/AliAnaScale.h b/PWG/CaloTrackCorrBase/AliAnaScale.h similarity index 100% rename from PWG4/PartCorrBase/AliAnaScale.h rename to PWG/CaloTrackCorrBase/AliAnaScale.h diff --git a/PWG4/PartCorrBase/AliAnalysisTaskCaloTrackCorrelation.cxx b/PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelation.cxx similarity index 100% rename from PWG4/PartCorrBase/AliAnalysisTaskCaloTrackCorrelation.cxx rename to PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelation.cxx diff --git a/PWG4/PartCorrBase/AliAnalysisTaskCaloTrackCorrelation.h b/PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelation.h similarity index 100% rename from PWG4/PartCorrBase/AliAnalysisTaskCaloTrackCorrelation.h rename to PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelation.h diff --git a/PWG4/PartCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx b/PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx similarity index 100% rename from PWG4/PartCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx rename to PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.cxx diff --git a/PWG4/PartCorrBase/AliAnalysisTaskCaloTrackCorrelationM.h b/PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.h similarity index 100% rename from PWG4/PartCorrBase/AliAnalysisTaskCaloTrackCorrelationM.h rename to PWG/CaloTrackCorrBase/AliAnalysisTaskCaloTrackCorrelationM.h diff --git a/PWG4/PartCorrBase/AliAnalysisTaskCounter.cxx b/PWG/CaloTrackCorrBase/AliAnalysisTaskCounter.cxx similarity index 100% rename from PWG4/PartCorrBase/AliAnalysisTaskCounter.cxx rename to PWG/CaloTrackCorrBase/AliAnalysisTaskCounter.cxx diff --git a/PWG4/PartCorrBase/AliAnalysisTaskCounter.h b/PWG/CaloTrackCorrBase/AliAnalysisTaskCounter.h similarity index 100% rename from PWG4/PartCorrBase/AliAnalysisTaskCounter.h rename to PWG/CaloTrackCorrBase/AliAnalysisTaskCounter.h diff --git a/PWG4/PartCorrBase/AliCaloPID.cxx b/PWG/CaloTrackCorrBase/AliCaloPID.cxx similarity index 100% rename from PWG4/PartCorrBase/AliCaloPID.cxx rename to PWG/CaloTrackCorrBase/AliCaloPID.cxx diff --git a/PWG4/PartCorrBase/AliCaloPID.h b/PWG/CaloTrackCorrBase/AliCaloPID.h similarity index 100% rename from PWG4/PartCorrBase/AliCaloPID.h rename to PWG/CaloTrackCorrBase/AliCaloPID.h diff --git a/PWG4/PartCorrBase/AliCaloTrackAODReader.cxx b/PWG/CaloTrackCorrBase/AliCaloTrackAODReader.cxx similarity index 100% rename from PWG4/PartCorrBase/AliCaloTrackAODReader.cxx rename to PWG/CaloTrackCorrBase/AliCaloTrackAODReader.cxx diff --git a/PWG4/PartCorrBase/AliCaloTrackAODReader.h b/PWG/CaloTrackCorrBase/AliCaloTrackAODReader.h similarity index 100% rename from PWG4/PartCorrBase/AliCaloTrackAODReader.h rename to PWG/CaloTrackCorrBase/AliCaloTrackAODReader.h diff --git a/PWG4/PartCorrBase/AliCaloTrackESDReader.cxx b/PWG/CaloTrackCorrBase/AliCaloTrackESDReader.cxx similarity index 100% rename from PWG4/PartCorrBase/AliCaloTrackESDReader.cxx rename to PWG/CaloTrackCorrBase/AliCaloTrackESDReader.cxx diff --git a/PWG4/PartCorrBase/AliCaloTrackESDReader.h b/PWG/CaloTrackCorrBase/AliCaloTrackESDReader.h similarity index 100% rename from PWG4/PartCorrBase/AliCaloTrackESDReader.h rename to PWG/CaloTrackCorrBase/AliCaloTrackESDReader.h diff --git a/PWG4/PartCorrBase/AliCaloTrackMCReader.cxx b/PWG/CaloTrackCorrBase/AliCaloTrackMCReader.cxx similarity index 100% rename from PWG4/PartCorrBase/AliCaloTrackMCReader.cxx rename to PWG/CaloTrackCorrBase/AliCaloTrackMCReader.cxx diff --git a/PWG4/PartCorrBase/AliCaloTrackMCReader.h b/PWG/CaloTrackCorrBase/AliCaloTrackMCReader.h similarity index 100% rename from PWG4/PartCorrBase/AliCaloTrackMCReader.h rename to PWG/CaloTrackCorrBase/AliCaloTrackMCReader.h diff --git a/PWG4/PartCorrBase/AliCaloTrackReader.cxx b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx similarity index 100% rename from PWG4/PartCorrBase/AliCaloTrackReader.cxx rename to PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx diff --git a/PWG4/PartCorrBase/AliCaloTrackReader.h b/PWG/CaloTrackCorrBase/AliCaloTrackReader.h similarity index 100% rename from PWG4/PartCorrBase/AliCaloTrackReader.h rename to PWG/CaloTrackCorrBase/AliCaloTrackReader.h diff --git a/PWG4/PartCorrBase/AliCalorimeterUtils.cxx b/PWG/CaloTrackCorrBase/AliCalorimeterUtils.cxx similarity index 100% rename from PWG4/PartCorrBase/AliCalorimeterUtils.cxx rename to PWG/CaloTrackCorrBase/AliCalorimeterUtils.cxx diff --git a/PWG4/PartCorrBase/AliCalorimeterUtils.h b/PWG/CaloTrackCorrBase/AliCalorimeterUtils.h similarity index 100% rename from PWG4/PartCorrBase/AliCalorimeterUtils.h rename to PWG/CaloTrackCorrBase/AliCalorimeterUtils.h diff --git a/PWG4/PartCorrBase/AliFiducialCut.cxx b/PWG/CaloTrackCorrBase/AliFiducialCut.cxx similarity index 100% rename from PWG4/PartCorrBase/AliFiducialCut.cxx rename to PWG/CaloTrackCorrBase/AliFiducialCut.cxx diff --git a/PWG4/PartCorrBase/AliFiducialCut.h b/PWG/CaloTrackCorrBase/AliFiducialCut.h similarity index 100% rename from PWG4/PartCorrBase/AliFiducialCut.h rename to PWG/CaloTrackCorrBase/AliFiducialCut.h diff --git a/PWG4/PartCorrBase/AliHistogramRanges.cxx b/PWG/CaloTrackCorrBase/AliHistogramRanges.cxx similarity index 100% rename from PWG4/PartCorrBase/AliHistogramRanges.cxx rename to PWG/CaloTrackCorrBase/AliHistogramRanges.cxx diff --git a/PWG4/PartCorrBase/AliHistogramRanges.h b/PWG/CaloTrackCorrBase/AliHistogramRanges.h similarity index 100% rename from PWG4/PartCorrBase/AliHistogramRanges.h rename to PWG/CaloTrackCorrBase/AliHistogramRanges.h diff --git a/PWG4/PartCorrBase/AliIsolationCut.cxx b/PWG/CaloTrackCorrBase/AliIsolationCut.cxx similarity index 100% rename from PWG4/PartCorrBase/AliIsolationCut.cxx rename to PWG/CaloTrackCorrBase/AliIsolationCut.cxx diff --git a/PWG4/PartCorrBase/AliIsolationCut.h b/PWG/CaloTrackCorrBase/AliIsolationCut.h similarity index 100% rename from PWG4/PartCorrBase/AliIsolationCut.h rename to PWG/CaloTrackCorrBase/AliIsolationCut.h diff --git a/PWG4/PartCorrBase/AliMCAnalysisUtils.cxx b/PWG/CaloTrackCorrBase/AliMCAnalysisUtils.cxx similarity index 100% rename from PWG4/PartCorrBase/AliMCAnalysisUtils.cxx rename to PWG/CaloTrackCorrBase/AliMCAnalysisUtils.cxx diff --git a/PWG4/PartCorrBase/AliMCAnalysisUtils.h b/PWG/CaloTrackCorrBase/AliMCAnalysisUtils.h similarity index 100% rename from PWG4/PartCorrBase/AliMCAnalysisUtils.h rename to PWG/CaloTrackCorrBase/AliMCAnalysisUtils.h diff --git a/PWG4/PartCorrBase/AliNeutralMesonSelection.cxx b/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.cxx similarity index 100% rename from PWG4/PartCorrBase/AliNeutralMesonSelection.cxx rename to PWG/CaloTrackCorrBase/AliNeutralMesonSelection.cxx diff --git a/PWG4/PartCorrBase/AliNeutralMesonSelection.h b/PWG/CaloTrackCorrBase/AliNeutralMesonSelection.h similarity index 100% rename from PWG4/PartCorrBase/AliNeutralMesonSelection.h rename to PWG/CaloTrackCorrBase/AliNeutralMesonSelection.h diff --git a/PWG4/PROOF-INF.PWG4CaloCalib/BUILD.sh b/PWG/PROOF-INF.PWGCaloTrackCorrBase/BUILD.sh similarity index 100% rename from PWG4/PROOF-INF.PWG4CaloCalib/BUILD.sh rename to PWG/PROOF-INF.PWGCaloTrackCorrBase/BUILD.sh diff --git a/PWG/PROOF-INF.PWGCaloTrackCorrBase/SETUP.C b/PWG/PROOF-INF.PWGCaloTrackCorrBase/SETUP.C new file mode 100755 index 00000000000..2187a4abb48 --- /dev/null +++ b/PWG/PROOF-INF.PWGCaloTrackCorrBase/SETUP.C @@ -0,0 +1,15 @@ +void SETUP() +{ + + // Load the ESD library + //gSystem->Load("libPWGGACaloTrackCorrBase"); + TString ocwd = gSystem->WorkingDirectory(); + gSystem->Load(ocwd+"/libPWGGACaloTrackCorrBase.so"); + + // Set the Include paths + gSystem->SetIncludePath("-I$ROOTSYS/include -IPWGGACaloTrackCorrBase"); + gROOT->ProcessLine(".include PWGGACaloTrackCorrBase/CaloTrackCorrBase"); + + // Set our location, so that other packages can find us + gSystem->Setenv("PWGGACaloTrackCorrBase_INCLUDE", "PWGGACaloTrackCorrBase/CaloTrackCorrBase"); +} diff --git a/PWG4/PWG4PartCorrBaseLinkDef.h b/PWG/PWGCaloTrackCorrBaseLinkDef.h similarity index 100% rename from PWG4/PWG4PartCorrBaseLinkDef.h rename to PWG/PWGCaloTrackCorrBaseLinkDef.h diff --git a/PWG4/CMakelibPWG4UserTasks.pkg b/PWG4/CMakelibPWG4UserTasks.pkg deleted file mode 100644 index 07271ac3f05..00000000000 --- a/PWG4/CMakelibPWG4UserTasks.pkg +++ /dev/null @@ -1,56 +0,0 @@ -# -*- mode: Makefile -*- -#--------------------------------------------------------------------------------# -# Package File for PWG4UserTask # -# Author : Yuri Kharlov # -# 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 - UserTasks/PHOS_pp_pi0/AliCaloPhoton.cxx - UserTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.cxx - UserTasks/PHOS_embedding/AliPHOSEmbedding.cxx - UserTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.cxx - UserTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx - UserTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.cxx - UserTasks/CaloCellQA/AliCaloCellsQA.cxx - UserTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.cxx - UserTasks/EmcalTasks/AliAnalysisTaskEMCALClusterizeFast.cxx - UserTasks/EmcalTasks/AliAnalysisTaskEMCALPi0PbPb.cxx - UserTasks/EmcalTasks/AliAnalysisTaskEMCALTriggerQA.cxx - UserTasks/EmcalTasks/AliEmcalEsdTpcTrackTask.cxx - UserTasks/EmcalTasks/AliEmcalPhysicsSelection.cxx - UserTasks/EmcalTasks/AliEmcalPhysicsSelectionTask.cxx - UserTasks/EmcalTasks/AliEmcalSetupTask.cxx - UserTasks/EmcalTasks/AliEmcalTrackPropagatorTask.cxx - UserTasks/EmcalTasks/AliEsdSkimTask.cxx - UserTasks/EmcalTasks/AliEsdTrackExt.cxx -) - -string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) - -set ( DHDR PWG4UserTasksLinkDef.h) - -string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) - -set ( EINCLUDE PWG4/UserTasks/PHOS_pp_pi0 PWG4/UserTasks/CaloCellQA PWG4/UserTasks/EmcalTasks EMCAL PHOS STEER/ESD STEER/STEERBase) diff --git a/PWG4/PROOF-INF.PWG4CaloCalib/SETUP.C b/PWG4/PROOF-INF.PWG4CaloCalib/SETUP.C deleted file mode 100755 index d799937740b..00000000000 --- a/PWG4/PROOF-INF.PWG4CaloCalib/SETUP.C +++ /dev/null @@ -1,15 +0,0 @@ -void SETUP() -{ - - // Load the ESD library - //gSystem->Load("libPWG4CaloCalib"); - TString ocwd = gSystem->WorkingDirectory(); - gSystem->Load(ocwd+"/libPWG4CaloCalib.so"); - - // Set the Include paths - gSystem->SetIncludePath("-I$ROOTSYS/include -IPWG4CaloCalib"); - gROOT->ProcessLine(".include PWG4CaloCalib/CaloCalib"); - - // Set our location, so that other packages can find us - gSystem->Setenv("PWG4CaloCalib_INCLUDE", "PWG4CaloCalib/CaloCalib"); -} diff --git a/PWG4/PROOF-INF.PWG4GammaConv/SETUP.C b/PWG4/PROOF-INF.PWG4GammaConv/SETUP.C deleted file mode 100644 index ef6b6aea250..00000000000 --- a/PWG4/PROOF-INF.PWG4GammaConv/SETUP.C +++ /dev/null @@ -1,13 +0,0 @@ -void SETUP() -{ - - // Load the ESD library - gSystem->Load("libPWG4GammaConv"); - - // Set the Include paths - gSystem->SetIncludePath("-I$ROOTSYS/include -IPWG4GammaConv"); - gROOT->ProcessLine(".include PWG4GammaConv/GammaConv"); - - // Set our location, so that other packages can find us - gSystem->Setenv("PWG4GammaConv_INCLUDE", "PWG4GammaConv/GammaConv"); -} diff --git a/PWG4/PROOF-INF.PWG4PartCorrBase/SETUP.C b/PWG4/PROOF-INF.PWG4PartCorrBase/SETUP.C deleted file mode 100755 index 9b36c37bb3e..00000000000 --- a/PWG4/PROOF-INF.PWG4PartCorrBase/SETUP.C +++ /dev/null @@ -1,15 +0,0 @@ -void SETUP() -{ - - // Load the ESD library - //gSystem->Load("libPWG4PartCorrBase"); - TString ocwd = gSystem->WorkingDirectory(); - gSystem->Load(ocwd+"/libPWG4PartCorrBase.so"); - - // Set the Include paths - gSystem->SetIncludePath("-I$ROOTSYS/include -IPWG4PartCorrBase"); - gROOT->ProcessLine(".include PWG4PartCorrBase/PartCorrBase"); - - // Set our location, so that other packages can find us - gSystem->Setenv("PWG4PartCorrBase_INCLUDE", "PWG4PartCorrBase/PartCorrBase"); -} diff --git a/PWG4/PROOF-INF.PWG4PartCorrDep/SETUP.C b/PWG4/PROOF-INF.PWG4PartCorrDep/SETUP.C deleted file mode 100755 index 6b3886ee7f9..00000000000 --- a/PWG4/PROOF-INF.PWG4PartCorrDep/SETUP.C +++ /dev/null @@ -1,15 +0,0 @@ -void SETUP() -{ - - // Load the ESD library - //gSystem->Load("libPWG4PartCorrDep"); - TString ocwd = gSystem->WorkingDirectory(); - gSystem->Load(ocwd+"/libPWG4PartCorrDep.so"); - - // Set the Include paths - gSystem->SetIncludePath("-I$ROOTSYS/include -IPWG4PartCorrDep"); - gROOT->ProcessLine(".include PWG4PartCorrDep/PartCorrDep"); - - // Set our location, so that other packages can find us - gSystem->Setenv("PWG4PartCorrDep_INCLUDE", "PWG4PartCorrDep/PartCorrDep"); -} diff --git a/PWG4/PROOF-INF.PWG4UserTasks/SETUP.C b/PWG4/PROOF-INF.PWG4UserTasks/SETUP.C deleted file mode 100644 index 812cb8deb2d..00000000000 --- a/PWG4/PROOF-INF.PWG4UserTasks/SETUP.C +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -void SETUP() -{ - TString ocwd = gSystem->WorkingDirectory(); - gSystem->Load(ocwd+"/libPWG4UserTasks.so"); - - // Set the Include paths - gSystem->SetIncludePath("-I$ROOTSYS/include -IPWG4UserTasks"); - gROOT->ProcessLine(".include PWG4UserTasks/UserTasks"); - - // Set our location, so that other packages can find us - gSystem->Setenv("PWG4UserTasks_INCLUDE", "PWG4UserTasks/UserTasks"); -} diff --git a/PWG4/PROOF-INF.PWG4omega3pi/SETUP.C b/PWG4/PROOF-INF.PWG4omega3pi/SETUP.C deleted file mode 100755 index 0a1912ead8f..00000000000 --- a/PWG4/PROOF-INF.PWG4omega3pi/SETUP.C +++ /dev/null @@ -1,13 +0,0 @@ -void SETUP() -{ - - // Load the ESD library - gSystem->Load("libPWG4omega3pi"); - - // Set the Include paths - gSystem->SetIncludePath("-I$ROOTSYS/include -IPWG4omega3pi"); - gROOT->ProcessLine(".include PWG4omega3pi/omega3pi"); - - // Set our location, so that other packages can find us - gSystem->Setenv("PWG4omega3pi_INCLUDE", "PWG4omega3pi/omega3pi"); -} diff --git a/PWG4/PWG4CaloCalibLinkDef.h b/PWG4/PWG4CaloCalibLinkDef.h deleted file mode 100644 index 332a0621337..00000000000 --- a/PWG4/PWG4CaloCalibLinkDef.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifdef __CINT__ - -#pragma link off all globals; -#pragma link off all classes; -#pragma link off all functions; - -#pragma link C++ class AliAnalysisTaskCaloFilter+; -#pragma link C++ class AliAnalysisTaskEMCALPi0CalibSelection+; -#pragma link C++ class AliAnalysisTaskEMCALClusterize+; - -#endif diff --git a/PWG4/CMakelibPWG4omega3pi.pkg b/PWGGA/CMakelibPWGGACaloTasks.pkg similarity index 88% rename from PWG4/CMakelibPWG4omega3pi.pkg rename to PWGGA/CMakelibPWGGACaloTasks.pkg index 9c900bac7c2..9a6c0365bcf 100644 --- a/PWG4/CMakelibPWG4omega3pi.pkg +++ b/PWGGA/CMakelibPWGGACaloTasks.pkg @@ -1,6 +1,6 @@ -# -*- mode: CMake -*- +# -*- mode: Makefile -*- #--------------------------------------------------------------------------------# -# Package File for PWG4omega3pi # +# Package File for PWGGACaloTasks # # Author : Johny Jose (johny.jose@cern.ch) # # Variables Defined : # # # @@ -26,12 +26,14 @@ # SHLIBS - Shared Libraries and objects for linking (Executables only) # #--------------------------------------------------------------------------------# -set ( SRCS omega3pi/AliAnalysisTaskOmegaPi0PiPi.cxx) +set ( SRCS + CaloTasks/AliAnalysisTaskCaloFilter.cxx +) string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) -set ( DHDR PWG4omega3piLinkDef.h) +set ( DHDR PWGGACaloTasksLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set ( EINCLUDE ANALYSIS PWG4/omega3pi PHOS STEER/STEERBase) +set ( EINCLUDE PWGGA/CaloTasks EMCAL PHOS STEER/STEER STEER/AOD STEER/CDB STEER/STEERBase) diff --git a/PWGGA/CMakelibPWGGACaloTrackCorrelations.pkg b/PWGGA/CMakelibPWGGACaloTrackCorrelations.pkg new file mode 100644 index 00000000000..32f019c44a8 --- /dev/null +++ b/PWGGA/CMakelibPWGGACaloTrackCorrelations.pkg @@ -0,0 +1,54 @@ +# -*- mode: CMake -*- +#--------------------------------------------------------------------------------# +# Package File for PWGGACaloTrackCorrelations # +# 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 + CaloTrackCorrelations/AliAnaParticleIsolation.cxx + CaloTrackCorrelations/AliAnaParticlePartonCorrelation.cxx + CaloTrackCorrelations/AliAnaParticleHadronCorrelation.cxx + CaloTrackCorrelations/AliAnaParticleJetFinderCorrelation.cxx + CaloTrackCorrelations/AliAnaParticleJetLeadingConeCorrelation.cxx + CaloTrackCorrelations/AliAnaPhoton.cxx + CaloTrackCorrelations/AliAnaElectron.cxx + CaloTrackCorrelations/AliAnaPi0.cxx + CaloTrackCorrelations/AliAnaPi0EbE.cxx + CaloTrackCorrelations/AliAnaChargedParticles.cxx + CaloTrackCorrelations/AliAnaCalorimeterQA.cxx + CaloTrackCorrelations/AliAnaShowerParameter.cxx + CaloTrackCorrelations/AliAnalysisTaskTaggedPhotons.cxx + CaloTrackCorrelations/AliAnaOmegaToPi0Gamma.cxx + CaloTrackCorrelations/AliAnaPhotonConvInCalo.cxx + CaloTrackCorrelations/AliAnaInsideClusterInvariantMass.cxx + ) + +string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) + +set ( DHDR PWGGACaloTrackCorrelationsLinkDef.h) + +string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) + +set ( EINCLUDE ANALYSIS EMCAL PHOS PWG/CaloTrackCorrBase PWGGA/CaloTrackCorrelations STEER/AOD STEER/STEERBase) diff --git a/PWG4/CMakelibPWG4CaloCalib.pkg b/PWGGA/CMakelibPWGGAEMCALTasks.pkg similarity index 73% rename from PWG4/CMakelibPWG4CaloCalib.pkg rename to PWGGA/CMakelibPWGGAEMCALTasks.pkg index 24b8e732e19..28cb312d563 100644 --- a/PWG4/CMakelibPWG4CaloCalib.pkg +++ b/PWGGA/CMakelibPWGGAEMCALTasks.pkg @@ -1,7 +1,7 @@ # -*- mode: Makefile -*- #--------------------------------------------------------------------------------# -# Package File for PWG4CaloCalib # -# Author : Johny Jose (johny.jose@cern.ch) # +# Package File for PWGGAUserTask # +# Author : Yuri Kharlov # # Variables Defined : # # # # SRCS - C++ source files # @@ -27,15 +27,24 @@ #--------------------------------------------------------------------------------# set ( SRCS - CaloCalib/AliAnalysisTaskCaloFilter.cxx - CaloCalib/AliAnalysisTaskEMCALPi0CalibSelection.cxx - CaloCalib/AliAnalysisTaskEMCALClusterize.cxx + EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.cxx + EMCALTasks/AliAnalysisTaskEMCALPi0PbPb.cxx + EMCALTasks/AliAnalysisTaskEMCALTriggerQA.cxx + EMCALTasks/AliEmcalEsdTpcTrackTask.cxx + EMCALTasks/AliEmcalPhysicsSelection.cxx + EMCALTasks/AliEmcalPhysicsSelectionTask.cxx + EMCALTasks/AliEmcalSetupTask.cxx + EMCALTasks/AliEmcalTrackPropagatorTask.cxx + EMCALTasks/AliEsdSkimTask.cxx + EMCALTasks/AliEsdTrackExt.cxx + EMCALTasks/AliAnalysisTaskEMCALPi0CalibSelection.cxx + EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx ) string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) -set ( DHDR PWG4CaloCalibLinkDef.h) +set ( DHDR PWGGAEMCALTasksLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set ( EINCLUDE PWG4/CaloCalib EMCAL PHOS STEER/STEER STEER/AOD STEER/CDB STEER/STEERBase) +set ( EINCLUDE PWGGA/EMCALTasks EMCAL STEER/ESD STEER/STEERBase) diff --git a/PWG4/CMakelibPWG4GammaConv.pkg b/PWGGA/CMakelibPWGGAGammaConv.pkg similarity index 94% rename from PWG4/CMakelibPWG4GammaConv.pkg rename to PWGGA/CMakelibPWGGAGammaConv.pkg index d0e602a8a05..51bb66daa5f 100644 --- a/PWG4/CMakelibPWG4GammaConv.pkg +++ b/PWGGA/CMakelibPWGGAGammaConv.pkg @@ -1,6 +1,6 @@ # -*- mode: CMake -*- #--------------------------------------------------------------------------------# -# Package File for PWG4GammaConv # +# Package File for PWGGAGammaConv # # Author : Johny Jose (johny.jose@cern.ch) # # Variables Defined : # # # @@ -50,8 +50,8 @@ set ( SRCS GammaConv/AliV0Reader.cxx ) string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) -set ( DHDR PWG4GammaConvLinkDef.h) +set ( DHDR PWGGAGammaConvLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set ( EINCLUDE PWG4/GammaConv CORRFW STEER/AOD STEER/ESD STEER/STEERBase) +set ( EINCLUDE PWGGA/GammaConv CORRFW STEER/AOD STEER/ESD STEER/STEERBase) diff --git a/PWG4/CMakelibPWG4PartCorrDep.pkg b/PWGGA/CMakelibPWGGAPHOSTasks.pkg similarity index 66% rename from PWG4/CMakelibPWG4PartCorrDep.pkg rename to PWGGA/CMakelibPWGGAPHOSTasks.pkg index 3f705388683..fed57d9beee 100644 --- a/PWG4/CMakelibPWG4PartCorrDep.pkg +++ b/PWGGA/CMakelibPWGGAPHOSTasks.pkg @@ -1,7 +1,7 @@ -# -*- mode: CMake -*- +# -*- mode: Makefile -*- #--------------------------------------------------------------------------------# -# Package File for PWG4PartCorrDep # -# Author : Johny Jose (johny.jose@cern.ch) # +# Package File for PWGGAUserTask # +# Author : Yuri Kharlov # # Variables Defined : # # # # SRCS - C++ source files # @@ -26,29 +26,22 @@ # SHLIBS - Shared Libraries and objects for linking (Executables only) # #--------------------------------------------------------------------------------# -set ( SRCS - PartCorrDep/AliAnaParticleIsolation.cxx - PartCorrDep/AliAnaParticlePartonCorrelation.cxx - PartCorrDep/AliAnaParticleHadronCorrelation.cxx - PartCorrDep/AliAnaParticleJetFinderCorrelation.cxx - PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx - PartCorrDep/AliAnaPhoton.cxx - PartCorrDep/AliAnaElectron.cxx - PartCorrDep/AliAnaPi0.cxx - PartCorrDep/AliAnaPi0EbE.cxx - PartCorrDep/AliAnaChargedParticles.cxx - PartCorrDep/AliAnaCalorimeterQA.cxx - PartCorrDep/AliAnaShowerParameter.cxx - PartCorrDep/AliAnalysisTaskTaggedPhotons.cxx - PartCorrDep/AliAnaOmegaToPi0Gamma.cxx - PartCorrDep/AliAnaPhotonConvInCalo.cxx - PartCorrDep/AliAnaInsideClusterInvariantMass.cxx - ) +set ( SRCS + PHOSTasks/PHOS_pp_pi0/AliCaloPhoton.cxx + PHOSTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.cxx + PHOSTasks/PHOS_embedding/AliPHOSEmbedding.cxx + PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.cxx + PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx + PHOSTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.cxx + PHOSTasks/CaloCellQA/AliCaloCellsQA.cxx + PHOSTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.cxx + PHOSTasks/omega3pi/AliAnalysisTaskOmegaPi0PiPi.cxx + ) string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) -set ( DHDR PWG4PartCorrDepLinkDef.h) +set ( DHDR PWGGAPHOSTasksLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set ( EINCLUDE ANALYSIS EMCAL PHOS PWG4/PartCorrBase PWG4/PartCorrDep STEER/AOD STEER/STEERBase) +set ( EINCLUDE PWGGA/PHOSTasks/PHOS_pp_pi0 PWGGA/PHOSTasks/CaloCellQA PWGGA/PHOSTasks/omega3pi PHOS STEER/ESD STEER/STEERBase) diff --git a/PWG4/CaloCalib/AliAnalysisTaskCaloFilter.cxx b/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx similarity index 100% rename from PWG4/CaloCalib/AliAnalysisTaskCaloFilter.cxx rename to PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx diff --git a/PWG4/CaloCalib/AliAnalysisTaskCaloFilter.h b/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.h similarity index 100% rename from PWG4/CaloCalib/AliAnalysisTaskCaloFilter.h rename to PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.h diff --git a/PWG4/PartCorrDep/AliAnaCalorimeterQA.cxx b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaCalorimeterQA.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx diff --git a/PWG4/PartCorrDep/AliAnaCalorimeterQA.h b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaCalorimeterQA.h rename to PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.h diff --git a/PWG4/PartCorrDep/AliAnaChargedParticles.cxx b/PWGGA/CaloTrackCorrelations/AliAnaChargedParticles.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaChargedParticles.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaChargedParticles.cxx diff --git a/PWG4/PartCorrDep/AliAnaChargedParticles.h b/PWGGA/CaloTrackCorrelations/AliAnaChargedParticles.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaChargedParticles.h rename to PWGGA/CaloTrackCorrelations/AliAnaChargedParticles.h diff --git a/PWG4/PartCorrDep/AliAnaElectron.cxx b/PWGGA/CaloTrackCorrelations/AliAnaElectron.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaElectron.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaElectron.cxx diff --git a/PWG4/PartCorrDep/AliAnaElectron.h b/PWGGA/CaloTrackCorrelations/AliAnaElectron.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaElectron.h rename to PWGGA/CaloTrackCorrelations/AliAnaElectron.h diff --git a/PWG4/PartCorrDep/AliAnaInsideClusterInvariantMass.cxx b/PWGGA/CaloTrackCorrelations/AliAnaInsideClusterInvariantMass.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaInsideClusterInvariantMass.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaInsideClusterInvariantMass.cxx diff --git a/PWG4/PartCorrDep/AliAnaInsideClusterInvariantMass.h b/PWGGA/CaloTrackCorrelations/AliAnaInsideClusterInvariantMass.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaInsideClusterInvariantMass.h rename to PWGGA/CaloTrackCorrelations/AliAnaInsideClusterInvariantMass.h diff --git a/PWG4/PartCorrDep/AliAnaOmegaToPi0Gamma.cxx b/PWGGA/CaloTrackCorrelations/AliAnaOmegaToPi0Gamma.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaOmegaToPi0Gamma.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaOmegaToPi0Gamma.cxx diff --git a/PWG4/PartCorrDep/AliAnaOmegaToPi0Gamma.h b/PWGGA/CaloTrackCorrelations/AliAnaOmegaToPi0Gamma.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaOmegaToPi0Gamma.h rename to PWGGA/CaloTrackCorrelations/AliAnaOmegaToPi0Gamma.h diff --git a/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx b/PWGGA/CaloTrackCorrelations/AliAnaParticleHadronCorrelation.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaParticleHadronCorrelation.cxx diff --git a/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.h b/PWGGA/CaloTrackCorrelations/AliAnaParticleHadronCorrelation.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.h rename to PWGGA/CaloTrackCorrelations/AliAnaParticleHadronCorrelation.h diff --git a/PWG4/PartCorrDep/AliAnaParticleIsolation.cxx b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticleIsolation.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx diff --git a/PWG4/PartCorrDep/AliAnaParticleIsolation.h b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticleIsolation.h rename to PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h diff --git a/PWG4/PartCorrDep/AliAnaParticleJetFinderCorrelation.cxx b/PWGGA/CaloTrackCorrelations/AliAnaParticleJetFinderCorrelation.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticleJetFinderCorrelation.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaParticleJetFinderCorrelation.cxx diff --git a/PWG4/PartCorrDep/AliAnaParticleJetFinderCorrelation.h b/PWGGA/CaloTrackCorrelations/AliAnaParticleJetFinderCorrelation.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticleJetFinderCorrelation.h rename to PWGGA/CaloTrackCorrelations/AliAnaParticleJetFinderCorrelation.h diff --git a/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx b/PWGGA/CaloTrackCorrelations/AliAnaParticleJetLeadingConeCorrelation.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaParticleJetLeadingConeCorrelation.cxx diff --git a/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.h b/PWGGA/CaloTrackCorrelations/AliAnaParticleJetLeadingConeCorrelation.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.h rename to PWGGA/CaloTrackCorrelations/AliAnaParticleJetLeadingConeCorrelation.h diff --git a/PWG4/PartCorrDep/AliAnaParticlePartonCorrelation.cxx b/PWGGA/CaloTrackCorrelations/AliAnaParticlePartonCorrelation.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticlePartonCorrelation.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaParticlePartonCorrelation.cxx diff --git a/PWG4/PartCorrDep/AliAnaParticlePartonCorrelation.h b/PWGGA/CaloTrackCorrelations/AliAnaParticlePartonCorrelation.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaParticlePartonCorrelation.h rename to PWGGA/CaloTrackCorrelations/AliAnaParticlePartonCorrelation.h diff --git a/PWG4/PartCorrDep/AliAnaPhoton.cxx b/PWGGA/CaloTrackCorrelations/AliAnaPhoton.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaPhoton.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaPhoton.cxx diff --git a/PWG4/PartCorrDep/AliAnaPhoton.h b/PWGGA/CaloTrackCorrelations/AliAnaPhoton.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaPhoton.h rename to PWGGA/CaloTrackCorrelations/AliAnaPhoton.h diff --git a/PWG4/PartCorrDep/AliAnaPhotonConvInCalo.cxx b/PWGGA/CaloTrackCorrelations/AliAnaPhotonConvInCalo.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaPhotonConvInCalo.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaPhotonConvInCalo.cxx diff --git a/PWG4/PartCorrDep/AliAnaPhotonConvInCalo.h b/PWGGA/CaloTrackCorrelations/AliAnaPhotonConvInCalo.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaPhotonConvInCalo.h rename to PWGGA/CaloTrackCorrelations/AliAnaPhotonConvInCalo.h diff --git a/PWG4/PartCorrDep/AliAnaPi0.cxx b/PWGGA/CaloTrackCorrelations/AliAnaPi0.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaPi0.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaPi0.cxx diff --git a/PWG4/PartCorrDep/AliAnaPi0.h b/PWGGA/CaloTrackCorrelations/AliAnaPi0.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaPi0.h rename to PWGGA/CaloTrackCorrelations/AliAnaPi0.h diff --git a/PWG4/PartCorrDep/AliAnaPi0EbE.cxx b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaPi0EbE.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx diff --git a/PWG4/PartCorrDep/AliAnaPi0EbE.h b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaPi0EbE.h rename to PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.h diff --git a/PWG4/PartCorrDep/AliAnaShowerParameter.cxx b/PWGGA/CaloTrackCorrelations/AliAnaShowerParameter.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnaShowerParameter.cxx rename to PWGGA/CaloTrackCorrelations/AliAnaShowerParameter.cxx diff --git a/PWG4/PartCorrDep/AliAnaShowerParameter.h b/PWGGA/CaloTrackCorrelations/AliAnaShowerParameter.h similarity index 100% rename from PWG4/PartCorrDep/AliAnaShowerParameter.h rename to PWGGA/CaloTrackCorrelations/AliAnaShowerParameter.h diff --git a/PWG4/PartCorrDep/AliAnalysisTaskTaggedPhotons.cxx b/PWGGA/CaloTrackCorrelations/AliAnalysisTaskTaggedPhotons.cxx similarity index 100% rename from PWG4/PartCorrDep/AliAnalysisTaskTaggedPhotons.cxx rename to PWGGA/CaloTrackCorrelations/AliAnalysisTaskTaggedPhotons.cxx diff --git a/PWG4/PartCorrDep/AliAnalysisTaskTaggedPhotons.h b/PWGGA/CaloTrackCorrelations/AliAnalysisTaskTaggedPhotons.h similarity index 100% rename from PWG4/PartCorrDep/AliAnalysisTaskTaggedPhotons.h rename to PWGGA/CaloTrackCorrelations/AliAnalysisTaskTaggedPhotons.h diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx similarity index 100% rename from PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.h similarity index 100% rename from PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.h diff --git a/PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALClusterizeFast.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALClusterizeFast.cxx rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALClusterizeFast.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALClusterizeFast.h rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterizeFast.h diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0CalibSelection.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPi0CalibSelection.cxx similarity index 100% rename from PWG4/CaloCalib/AliAnalysisTaskEMCALPi0CalibSelection.cxx rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALPi0CalibSelection.cxx diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0CalibSelection.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPi0CalibSelection.h similarity index 100% rename from PWG4/CaloCalib/AliAnalysisTaskEMCALPi0CalibSelection.h rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALPi0CalibSelection.h diff --git a/PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALPi0PbPb.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPi0PbPb.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALPi0PbPb.cxx rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALPi0PbPb.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALPi0PbPb.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALPi0PbPb.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALPi0PbPb.h rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALPi0PbPb.h diff --git a/PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALTriggerQA.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALTriggerQA.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALTriggerQA.cxx rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALTriggerQA.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALTriggerQA.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALTriggerQA.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliAnalysisTaskEMCALTriggerQA.h rename to PWGGA/EMCALTasks/AliAnalysisTaskEMCALTriggerQA.h diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalEsdTpcTrackTask.cxx b/PWGGA/EMCALTasks/AliEmcalEsdTpcTrackTask.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalEsdTpcTrackTask.cxx rename to PWGGA/EMCALTasks/AliEmcalEsdTpcTrackTask.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalEsdTpcTrackTask.h b/PWGGA/EMCALTasks/AliEmcalEsdTpcTrackTask.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalEsdTpcTrackTask.h rename to PWGGA/EMCALTasks/AliEmcalEsdTpcTrackTask.h diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalPhysicsSelection.cxx b/PWGGA/EMCALTasks/AliEmcalPhysicsSelection.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalPhysicsSelection.cxx rename to PWGGA/EMCALTasks/AliEmcalPhysicsSelection.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalPhysicsSelection.h b/PWGGA/EMCALTasks/AliEmcalPhysicsSelection.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalPhysicsSelection.h rename to PWGGA/EMCALTasks/AliEmcalPhysicsSelection.h diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalPhysicsSelectionTask.cxx b/PWGGA/EMCALTasks/AliEmcalPhysicsSelectionTask.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalPhysicsSelectionTask.cxx rename to PWGGA/EMCALTasks/AliEmcalPhysicsSelectionTask.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalPhysicsSelectionTask.h b/PWGGA/EMCALTasks/AliEmcalPhysicsSelectionTask.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalPhysicsSelectionTask.h rename to PWGGA/EMCALTasks/AliEmcalPhysicsSelectionTask.h diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalSetupTask.cxx b/PWGGA/EMCALTasks/AliEmcalSetupTask.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalSetupTask.cxx rename to PWGGA/EMCALTasks/AliEmcalSetupTask.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalSetupTask.h b/PWGGA/EMCALTasks/AliEmcalSetupTask.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalSetupTask.h rename to PWGGA/EMCALTasks/AliEmcalSetupTask.h diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalTrackPropagatorTask.cxx b/PWGGA/EMCALTasks/AliEmcalTrackPropagatorTask.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalTrackPropagatorTask.cxx rename to PWGGA/EMCALTasks/AliEmcalTrackPropagatorTask.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliEmcalTrackPropagatorTask.h b/PWGGA/EMCALTasks/AliEmcalTrackPropagatorTask.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEmcalTrackPropagatorTask.h rename to PWGGA/EMCALTasks/AliEmcalTrackPropagatorTask.h diff --git a/PWG4/UserTasks/EmcalTasks/AliEsdSkimTask.cxx b/PWGGA/EMCALTasks/AliEsdSkimTask.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEsdSkimTask.cxx rename to PWGGA/EMCALTasks/AliEsdSkimTask.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliEsdSkimTask.h b/PWGGA/EMCALTasks/AliEsdSkimTask.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEsdSkimTask.h rename to PWGGA/EMCALTasks/AliEsdSkimTask.h diff --git a/PWG4/UserTasks/EmcalTasks/AliEsdTrackExt.cxx b/PWGGA/EMCALTasks/AliEsdTrackExt.cxx similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEsdTrackExt.cxx rename to PWGGA/EMCALTasks/AliEsdTrackExt.cxx diff --git a/PWG4/UserTasks/EmcalTasks/AliEsdTrackExt.h b/PWGGA/EMCALTasks/AliEsdTrackExt.h similarity index 100% rename from PWG4/UserTasks/EmcalTasks/AliEsdTrackExt.h rename to PWGGA/EMCALTasks/AliEsdTrackExt.h diff --git a/PWG4/CaloCalib/macros/AddTaskCaloFilter.C b/PWGGA/EMCALTasks/macros/AddTaskCaloFilter.C similarity index 100% rename from PWG4/CaloCalib/macros/AddTaskCaloFilter.C rename to PWGGA/EMCALTasks/macros/AddTaskCaloFilter.C diff --git a/PWG4/UserTasks/EmcalTasks/macros/AddTaskClusterizerFW.C b/PWGGA/EMCALTasks/macros/AddTaskClusterizerFW.C similarity index 100% rename from PWG4/UserTasks/EmcalTasks/macros/AddTaskClusterizerFW.C rename to PWGGA/EMCALTasks/macros/AddTaskClusterizerFW.C diff --git a/PWG4/CaloCalib/macros/AddTaskEMCALClusterize.C b/PWGGA/EMCALTasks/macros/AddTaskEMCALClusterize.C similarity index 100% rename from PWG4/CaloCalib/macros/AddTaskEMCALClusterize.C rename to PWGGA/EMCALTasks/macros/AddTaskEMCALClusterize.C diff --git a/PWG4/UserTasks/EmcalTasks/macros/AddTaskEMCALTriggerQA.C b/PWGGA/EMCALTasks/macros/AddTaskEMCALTriggerQA.C similarity index 100% rename from PWG4/UserTasks/EmcalTasks/macros/AddTaskEMCALTriggerQA.C rename to PWGGA/EMCALTasks/macros/AddTaskEMCALTriggerQA.C diff --git a/PWG4/UserTasks/EmcalTasks/macros/AddTaskEmcalPhysicsSelection.C b/PWGGA/EMCALTasks/macros/AddTaskEmcalPhysicsSelection.C similarity index 100% rename from PWG4/UserTasks/EmcalTasks/macros/AddTaskEmcalPhysicsSelection.C rename to PWGGA/EMCALTasks/macros/AddTaskEmcalPhysicsSelection.C diff --git a/PWG4/CaloCalib/macros/ConfigCaloFilter.C b/PWGGA/EMCALTasks/macros/ConfigCaloFilter.C similarity index 100% rename from PWG4/CaloCalib/macros/ConfigCaloFilter.C rename to PWGGA/EMCALTasks/macros/ConfigCaloFilter.C diff --git a/PWG4/CaloCalib/macros/ConfigEMCALClusterize.C b/PWGGA/EMCALTasks/macros/ConfigEMCALClusterize.C similarity index 100% rename from PWG4/CaloCalib/macros/ConfigEMCALClusterize.C rename to PWGGA/EMCALTasks/macros/ConfigEMCALClusterize.C diff --git a/PWG4/CaloCalib/macros/ConfigureEMCALRecoUtils.C b/PWGGA/EMCALTasks/macros/ConfigureEMCALRecoUtils.C similarity index 100% rename from PWG4/CaloCalib/macros/ConfigureEMCALRecoUtils.C rename to PWGGA/EMCALTasks/macros/ConfigureEMCALRecoUtils.C diff --git a/PWG4/CaloCalib/macros/anaCaloFilter.C b/PWGGA/EMCALTasks/macros/anaCaloFilter.C similarity index 100% rename from PWG4/CaloCalib/macros/anaCaloFilter.C rename to PWGGA/EMCALTasks/macros/anaCaloFilter.C diff --git a/PWG4/CaloCalib/macros/anaEMCALCalib.C b/PWGGA/EMCALTasks/macros/anaEMCALCalib.C similarity index 100% rename from PWG4/CaloCalib/macros/anaEMCALCalib.C rename to PWGGA/EMCALTasks/macros/anaEMCALCalib.C diff --git a/PWG4/CaloCalib/macros/emcalReclusterize.C b/PWGGA/EMCALTasks/macros/emcalReclusterize.C similarity index 100% rename from PWG4/CaloCalib/macros/emcalReclusterize.C rename to PWGGA/EMCALTasks/macros/emcalReclusterize.C diff --git a/PWG4/GammaConv/AliAODConversionMother.cxx b/PWGGA/GammaConv/AliAODConversionMother.cxx similarity index 100% rename from PWG4/GammaConv/AliAODConversionMother.cxx rename to PWGGA/GammaConv/AliAODConversionMother.cxx diff --git a/PWG4/GammaConv/AliAODConversionMother.h b/PWGGA/GammaConv/AliAODConversionMother.h similarity index 100% rename from PWG4/GammaConv/AliAODConversionMother.h rename to PWGGA/GammaConv/AliAODConversionMother.h diff --git a/PWG4/GammaConv/AliAODConversionParticle.cxx b/PWGGA/GammaConv/AliAODConversionParticle.cxx similarity index 100% rename from PWG4/GammaConv/AliAODConversionParticle.cxx rename to PWGGA/GammaConv/AliAODConversionParticle.cxx diff --git a/PWG4/GammaConv/AliAODConversionParticle.h b/PWGGA/GammaConv/AliAODConversionParticle.h similarity index 100% rename from PWG4/GammaConv/AliAODConversionParticle.h rename to PWGGA/GammaConv/AliAODConversionParticle.h diff --git a/PWG4/GammaConv/AliAODConversionPhoton.cxx b/PWGGA/GammaConv/AliAODConversionPhoton.cxx similarity index 100% rename from PWG4/GammaConv/AliAODConversionPhoton.cxx rename to PWGGA/GammaConv/AliAODConversionPhoton.cxx diff --git a/PWG4/GammaConv/AliAODConversionPhoton.h b/PWGGA/GammaConv/AliAODConversionPhoton.h similarity index 100% rename from PWG4/GammaConv/AliAODConversionPhoton.h rename to PWGGA/GammaConv/AliAODConversionPhoton.h diff --git a/PWG4/GammaConv/AliAnalysisTaskCaloConv.cxx b/PWGGA/GammaConv/AliAnalysisTaskCaloConv.cxx similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskCaloConv.cxx rename to PWGGA/GammaConv/AliAnalysisTaskCaloConv.cxx diff --git a/PWG4/GammaConv/AliAnalysisTaskCaloConv.h b/PWGGA/GammaConv/AliAnalysisTaskCaloConv.h similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskCaloConv.h rename to PWGGA/GammaConv/AliAnalysisTaskCaloConv.h diff --git a/PWG4/GammaConv/AliAnalysisTaskGCPartToPWG4Part.cxx b/PWGGA/GammaConv/AliAnalysisTaskGCPartToPWG4Part.cxx similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskGCPartToPWG4Part.cxx rename to PWGGA/GammaConv/AliAnalysisTaskGCPartToPWG4Part.cxx diff --git a/PWG4/GammaConv/AliAnalysisTaskGCPartToPWG4Part.h b/PWGGA/GammaConv/AliAnalysisTaskGCPartToPWG4Part.h similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskGCPartToPWG4Part.h rename to PWGGA/GammaConv/AliAnalysisTaskGCPartToPWG4Part.h diff --git a/PWG4/GammaConv/AliAnalysisTaskGammaConvDalitz.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitz.cxx similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskGammaConvDalitz.cxx rename to PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitz.cxx diff --git a/PWG4/GammaConv/AliAnalysisTaskGammaConvDalitz.h b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitz.h similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskGammaConvDalitz.h rename to PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitz.h diff --git a/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConversion.cxx similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx rename to PWGGA/GammaConv/AliAnalysisTaskGammaConversion.cxx diff --git a/PWG4/GammaConv/AliAnalysisTaskGammaConversion.h b/PWGGA/GammaConv/AliAnalysisTaskGammaConversion.h similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskGammaConversion.h rename to PWGGA/GammaConv/AliAnalysisTaskGammaConversion.h diff --git a/PWG4/GammaConv/AliAnalysisTaskdPhi.cxx b/PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskdPhi.cxx rename to PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx diff --git a/PWG4/GammaConv/AliAnalysisTaskdPhi.h b/PWGGA/GammaConv/AliAnalysisTaskdPhi.h similarity index 100% rename from PWG4/GammaConv/AliAnalysisTaskdPhi.h rename to PWGGA/GammaConv/AliAnalysisTaskdPhi.h diff --git a/PWG4/GammaConv/AliConversionCuts.cxx b/PWGGA/GammaConv/AliConversionCuts.cxx similarity index 100% rename from PWG4/GammaConv/AliConversionCuts.cxx rename to PWGGA/GammaConv/AliConversionCuts.cxx diff --git a/PWG4/GammaConv/AliConversionCuts.h b/PWGGA/GammaConv/AliConversionCuts.h similarity index 100% rename from PWG4/GammaConv/AliConversionCuts.h rename to PWGGA/GammaConv/AliConversionCuts.h diff --git a/PWG4/GammaConv/AliConversionPhotonBase.cxx b/PWGGA/GammaConv/AliConversionPhotonBase.cxx similarity index 100% rename from PWG4/GammaConv/AliConversionPhotonBase.cxx rename to PWGGA/GammaConv/AliConversionPhotonBase.cxx diff --git a/PWG4/GammaConv/AliConversionPhotonBase.h b/PWGGA/GammaConv/AliConversionPhotonBase.h similarity index 100% rename from PWG4/GammaConv/AliConversionPhotonBase.h rename to PWGGA/GammaConv/AliConversionPhotonBase.h diff --git a/PWG4/GammaConv/AliGammaConversionBGHandler.cxx b/PWGGA/GammaConv/AliGammaConversionBGHandler.cxx similarity index 100% rename from PWG4/GammaConv/AliGammaConversionBGHandler.cxx rename to PWGGA/GammaConv/AliGammaConversionBGHandler.cxx diff --git a/PWG4/GammaConv/AliGammaConversionBGHandler.h b/PWGGA/GammaConv/AliGammaConversionBGHandler.h similarity index 100% rename from PWG4/GammaConv/AliGammaConversionBGHandler.h rename to PWGGA/GammaConv/AliGammaConversionBGHandler.h diff --git a/PWG4/GammaConv/AliGammaConversionHistograms.cxx b/PWGGA/GammaConv/AliGammaConversionHistograms.cxx similarity index 100% rename from PWG4/GammaConv/AliGammaConversionHistograms.cxx rename to PWGGA/GammaConv/AliGammaConversionHistograms.cxx diff --git a/PWG4/GammaConv/AliGammaConversionHistograms.h b/PWGGA/GammaConv/AliGammaConversionHistograms.h similarity index 100% rename from PWG4/GammaConv/AliGammaConversionHistograms.h rename to PWGGA/GammaConv/AliGammaConversionHistograms.h diff --git a/PWG4/GammaConv/AliKFConversionMother.cxx b/PWGGA/GammaConv/AliKFConversionMother.cxx similarity index 100% rename from PWG4/GammaConv/AliKFConversionMother.cxx rename to PWGGA/GammaConv/AliKFConversionMother.cxx diff --git a/PWG4/GammaConv/AliKFConversionMother.h b/PWGGA/GammaConv/AliKFConversionMother.h similarity index 100% rename from PWG4/GammaConv/AliKFConversionMother.h rename to PWGGA/GammaConv/AliKFConversionMother.h diff --git a/PWG4/GammaConv/AliKFConversionPhoton.cxx b/PWGGA/GammaConv/AliKFConversionPhoton.cxx similarity index 100% rename from PWG4/GammaConv/AliKFConversionPhoton.cxx rename to PWGGA/GammaConv/AliKFConversionPhoton.cxx diff --git a/PWG4/GammaConv/AliKFConversionPhoton.h b/PWGGA/GammaConv/AliKFConversionPhoton.h similarity index 100% rename from PWG4/GammaConv/AliKFConversionPhoton.h rename to PWGGA/GammaConv/AliKFConversionPhoton.h diff --git a/PWG4/GammaConv/AliV0Reader.cxx b/PWGGA/GammaConv/AliV0Reader.cxx similarity index 100% rename from PWG4/GammaConv/AliV0Reader.cxx rename to PWGGA/GammaConv/AliV0Reader.cxx diff --git a/PWG4/GammaConv/AliV0Reader.h b/PWGGA/GammaConv/AliV0Reader.h similarity index 100% rename from PWG4/GammaConv/AliV0Reader.h rename to PWGGA/GammaConv/AliV0Reader.h diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrBase.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrBase.cxx similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrBase.cxx rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrBase.cxx diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrBase.h b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrBase.h similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrBase.h rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrBase.h diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.cxx similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.cxx rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.cxx diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.h b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.h similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.h rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhoton.h diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPion.h b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPion.h similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPion.h rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPion.h diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.h b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.h similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.h rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.h diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvIsolation.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.cxx similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvIsolation.cxx rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.cxx diff --git a/PWG4/GammaConv/ConvCorrelations/AliAnaConvIsolation.h b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.h similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/AliAnaConvIsolation.h rename to PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.h diff --git a/PWG4/GammaConv/ConvCorrelations/macros/ConfigGammaJet.C b/PWGGA/GammaConv/ConvCorrelations/macros/ConfigGammaJet.C similarity index 100% rename from PWG4/GammaConv/ConvCorrelations/macros/ConfigGammaJet.C rename to PWGGA/GammaConv/ConvCorrelations/macros/ConfigGammaJet.C diff --git a/PWG4/GammaConv/macros/Cuts_Events_new.C b/PWGGA/GammaConv/macros/Cuts_Events_new.C similarity index 100% rename from PWG4/GammaConv/macros/Cuts_Events_new.C rename to PWGGA/GammaConv/macros/Cuts_Events_new.C diff --git a/PWG4/GammaConv/macros/ExtractSignal.C b/PWGGA/GammaConv/macros/ExtractSignal.C similarity index 100% rename from PWG4/GammaConv/macros/ExtractSignal.C rename to PWGGA/GammaConv/macros/ExtractSignal.C diff --git a/PWG4/GammaConv/macros/Extract_IntegratedPi0Yield.C b/PWGGA/GammaConv/macros/Extract_IntegratedPi0Yield.C similarity index 100% rename from PWG4/GammaConv/macros/Extract_IntegratedPi0Yield.C rename to PWGGA/GammaConv/macros/Extract_IntegratedPi0Yield.C diff --git a/PWG4/GammaConv/macros/Extract_Pi0_Characteristics.C b/PWGGA/GammaConv/macros/Extract_Pi0_Characteristics.C similarity index 100% rename from PWG4/GammaConv/macros/Extract_Pi0_Characteristics.C rename to PWGGA/GammaConv/macros/Extract_Pi0_Characteristics.C diff --git a/PWG4/GammaConv/macros/MakeCutLog.C b/PWGGA/GammaConv/macros/MakeCutLog.C similarity index 100% rename from PWG4/GammaConv/macros/MakeCutLog.C rename to PWGGA/GammaConv/macros/MakeCutLog.C diff --git a/PWG4/GammaConv/macros/Photon_Characteristics_Events.C b/PWGGA/GammaConv/macros/Photon_Characteristics_Events.C similarity index 100% rename from PWG4/GammaConv/macros/Photon_Characteristics_Events.C rename to PWGGA/GammaConv/macros/Photon_Characteristics_Events.C diff --git a/PWG4/GammaConv/macros/Photon_Resolution.C b/PWGGA/GammaConv/macros/Photon_Resolution.C similarity index 100% rename from PWG4/GammaConv/macros/Photon_Resolution.C rename to PWGGA/GammaConv/macros/Photon_Resolution.C diff --git a/PWG4/GammaConv/macros/Plot_IntegratedPi0Yield.C b/PWGGA/GammaConv/macros/Plot_IntegratedPi0Yield.C similarity index 100% rename from PWG4/GammaConv/macros/Plot_IntegratedPi0Yield.C rename to PWGGA/GammaConv/macros/Plot_IntegratedPi0Yield.C diff --git a/PWG4/GammaConv/macros/Plot_Mapping_Histos_Events.C b/PWGGA/GammaConv/macros/Plot_Mapping_Histos_Events.C similarity index 100% rename from PWG4/GammaConv/macros/Plot_Mapping_Histos_Events.C rename to PWGGA/GammaConv/macros/Plot_Mapping_Histos_Events.C diff --git a/PWG4/GammaConv/macros/Plot_Pi0_Characteristics.C b/PWGGA/GammaConv/macros/Plot_Pi0_Characteristics.C similarity index 100% rename from PWG4/GammaConv/macros/Plot_Pi0_Characteristics.C rename to PWGGA/GammaConv/macros/Plot_Pi0_Characteristics.C diff --git a/PWG4/GammaConv/macros/PlottingGammaConversionAdditional.h b/PWGGA/GammaConv/macros/PlottingGammaConversionAdditional.h similarity index 100% rename from PWG4/GammaConv/macros/PlottingGammaConversionAdditional.h rename to PWGGA/GammaConv/macros/PlottingGammaConversionAdditional.h diff --git a/PWG4/GammaConv/macros/PlottingGammaConversionHistos.h b/PWGGA/GammaConv/macros/PlottingGammaConversionHistos.h similarity index 100% rename from PWG4/GammaConv/macros/PlottingGammaConversionHistos.h rename to PWGGA/GammaConv/macros/PlottingGammaConversionHistos.h diff --git a/PWG4/GammaConv/macros/PlottingMeson.h b/PWGGA/GammaConv/macros/PlottingMeson.h similarity index 100% rename from PWG4/GammaConv/macros/PlottingMeson.h rename to PWGGA/GammaConv/macros/PlottingMeson.h diff --git a/PWG4/GammaConv/macros/printCuts.C b/PWGGA/GammaConv/macros/printCuts.C similarity index 100% rename from PWG4/GammaConv/macros/printCuts.C rename to PWGGA/GammaConv/macros/printCuts.C diff --git a/PWG4/GammaConv/macros/start_Analysis.sh b/PWGGA/GammaConv/macros/start_Analysis.sh similarity index 100% rename from PWG4/GammaConv/macros/start_Analysis.sh rename to PWGGA/GammaConv/macros/start_Analysis.sh diff --git a/PWG4/GammaConv/macros/start_GammaConversionAnalysis.sh b/PWGGA/GammaConv/macros/start_GammaConversionAnalysis.sh similarity index 100% rename from PWG4/GammaConv/macros/start_GammaConversionAnalysis.sh rename to PWGGA/GammaConv/macros/start_GammaConversionAnalysis.sh diff --git a/PWG4/GammaConv/macros/start_Resolution.sh b/PWGGA/GammaConv/macros/start_Resolution.sh similarity index 100% rename from PWG4/GammaConv/macros/start_Resolution.sh rename to PWGGA/GammaConv/macros/start_Resolution.sh diff --git a/PWG4/UserTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.cxx b/PWGGA/PHOSTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.cxx similarity index 100% rename from PWG4/UserTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.cxx rename to PWGGA/PHOSTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.cxx diff --git a/PWG4/UserTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.h b/PWGGA/PHOSTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.h similarity index 100% rename from PWG4/UserTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.h rename to PWGGA/PHOSTasks/CaloCellQA/AliAnalysisTaskCaloCellsQA.h diff --git a/PWG4/UserTasks/CaloCellQA/AliCaloCellsQA.cxx b/PWGGA/PHOSTasks/CaloCellQA/AliCaloCellsQA.cxx similarity index 100% rename from PWG4/UserTasks/CaloCellQA/AliCaloCellsQA.cxx rename to PWGGA/PHOSTasks/CaloCellQA/AliCaloCellsQA.cxx diff --git a/PWG4/UserTasks/CaloCellQA/AliCaloCellsQA.h b/PWGGA/PHOSTasks/CaloCellQA/AliCaloCellsQA.h similarity index 100% rename from PWG4/UserTasks/CaloCellQA/AliCaloCellsQA.h rename to PWGGA/PHOSTasks/CaloCellQA/AliCaloCellsQA.h diff --git a/PWG4/UserTasks/CaloCellQA/macros/AddTaskCaloCellsQA.C b/PWGGA/PHOSTasks/CaloCellQA/macros/AddTaskCaloCellsQA.C similarity index 100% rename from PWG4/UserTasks/CaloCellQA/macros/AddTaskCaloCellsQA.C rename to PWGGA/PHOSTasks/CaloCellQA/macros/AddTaskCaloCellsQA.C diff --git a/PWG4/UserTasks/CaloCellQA/macros/AddTaskPHOSQA.C b/PWGGA/PHOSTasks/CaloCellQA/macros/AddTaskPHOSQA.C similarity index 100% rename from PWG4/UserTasks/CaloCellQA/macros/AddTaskPHOSQA.C rename to PWGGA/PHOSTasks/CaloCellQA/macros/AddTaskPHOSQA.C diff --git a/PWG4/UserTasks/CaloCellQA/macros/ExtractPHOSCellQA.C b/PWGGA/PHOSTasks/CaloCellQA/macros/ExtractPHOSCellQA.C similarity index 100% rename from PWG4/UserTasks/CaloCellQA/macros/ExtractPHOSCellQA.C rename to PWGGA/PHOSTasks/CaloCellQA/macros/ExtractPHOSCellQA.C diff --git a/PWG4/UserTasks/CaloCellQA/macros/ana_example.C b/PWGGA/PHOSTasks/CaloCellQA/macros/ana_example.C similarity index 100% rename from PWG4/UserTasks/CaloCellQA/macros/ana_example.C rename to PWGGA/PHOSTasks/CaloCellQA/macros/ana_example.C diff --git a/PWG4/UserTasks/CaloCellQA/macros/getCellsRunsQA.C b/PWGGA/PHOSTasks/CaloCellQA/macros/getCellsRunsQA.C similarity index 100% rename from PWG4/UserTasks/CaloCellQA/macros/getCellsRunsQA.C rename to PWGGA/PHOSTasks/CaloCellQA/macros/getCellsRunsQA.C diff --git a/PWG4/UserTasks/CaloCellQA/macros/getCellsRunsQAPHOS.C b/PWGGA/PHOSTasks/CaloCellQA/macros/getCellsRunsQAPHOS.C similarity index 100% rename from PWG4/UserTasks/CaloCellQA/macros/getCellsRunsQAPHOS.C rename to PWGGA/PHOSTasks/CaloCellQA/macros/getCellsRunsQAPHOS.C diff --git a/PWG4/UserTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.cxx b/PWGGA/PHOSTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.cxx similarity index 100% rename from PWG4/UserTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.cxx rename to PWGGA/PHOSTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.cxx diff --git a/PWG4/UserTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.h b/PWGGA/PHOSTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.h similarity index 100% rename from PWG4/UserTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.h rename to PWGGA/PHOSTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.h diff --git a/PWG4/UserTasks/PHOS_PbPbQA/README.PbPbQA b/PWGGA/PHOSTasks/PHOS_PbPbQA/README.PbPbQA similarity index 100% rename from PWG4/UserTasks/PHOS_PbPbQA/README.PbPbQA rename to PWGGA/PHOSTasks/PHOS_PbPbQA/README.PbPbQA diff --git a/PWG4/UserTasks/PHOS_PbPbQA/macros/AddTaskPHOSPbPb.C b/PWGGA/PHOSTasks/PHOS_PbPbQA/macros/AddTaskPHOSPbPb.C similarity index 100% rename from PWG4/UserTasks/PHOS_PbPbQA/macros/AddTaskPHOSPbPb.C rename to PWGGA/PHOSTasks/PHOS_PbPbQA/macros/AddTaskPHOSPbPb.C diff --git a/PWG4/UserTasks/PHOS_PbPbQA/macros/ExtractPHOSPbPbQA.C b/PWGGA/PHOSTasks/PHOS_PbPbQA/macros/ExtractPHOSPbPbQA.C similarity index 100% rename from PWG4/UserTasks/PHOS_PbPbQA/macros/ExtractPHOSPbPbQA.C rename to PWGGA/PHOSTasks/PHOS_PbPbQA/macros/ExtractPHOSPbPbQA.C diff --git a/PWG4/UserTasks/PHOS_PbPbQA/macros/MakeMmixPi0.C b/PWGGA/PHOSTasks/PHOS_PbPbQA/macros/MakeMmixPi0.C similarity index 100% rename from PWG4/UserTasks/PHOS_PbPbQA/macros/MakeMmixPi0.C rename to PWGGA/PHOSTasks/PHOS_PbPbQA/macros/MakeMmixPi0.C diff --git a/PWG4/UserTasks/PHOS_PbPbQA/macros/PHOSPbPb.C b/PWGGA/PHOSTasks/PHOS_PbPbQA/macros/PHOSPbPb.C similarity index 100% rename from PWG4/UserTasks/PHOS_PbPbQA/macros/PHOSPbPb.C rename to PWGGA/PHOSTasks/PHOS_PbPbQA/macros/PHOSPbPb.C diff --git a/PWG4/UserTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx b/PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx rename to PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx diff --git a/PWG4/UserTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.h b/PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.h similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.h rename to PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.h diff --git a/PWG4/UserTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.cxx b/PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.cxx similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.cxx rename to PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.cxx diff --git a/PWG4/UserTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.h b/PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.h similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.h rename to PWGGA/PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.h diff --git a/PWG4/UserTasks/PHOS_embedding/AliPHOSEmbedding.cxx b/PWGGA/PHOSTasks/PHOS_embedding/AliPHOSEmbedding.cxx similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/AliPHOSEmbedding.cxx rename to PWGGA/PHOSTasks/PHOS_embedding/AliPHOSEmbedding.cxx diff --git a/PWG4/UserTasks/PHOS_embedding/AliPHOSEmbedding.h b/PWGGA/PHOSTasks/PHOS_embedding/AliPHOSEmbedding.h similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/AliPHOSEmbedding.h rename to PWGGA/PHOSTasks/PHOS_embedding/AliPHOSEmbedding.h diff --git a/PWG4/UserTasks/PHOS_embedding/Analyze.C b/PWGGA/PHOSTasks/PHOS_embedding/Analyze.C similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/Analyze.C rename to PWGGA/PHOSTasks/PHOS_embedding/Analyze.C diff --git a/PWG4/UserTasks/PHOS_embedding/AnalyzeDiff.C b/PWGGA/PHOSTasks/PHOS_embedding/AnalyzeDiff.C similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/AnalyzeDiff.C rename to PWGGA/PHOSTasks/PHOS_embedding/AnalyzeDiff.C diff --git a/PWG4/UserTasks/PHOS_embedding/Config.C b/PWGGA/PHOSTasks/PHOS_embedding/Config.C similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/Config.C rename to PWGGA/PHOSTasks/PHOS_embedding/Config.C diff --git a/PWG4/UserTasks/PHOS_embedding/CreateAOD.C b/PWGGA/PHOSTasks/PHOS_embedding/CreateAOD.C similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/CreateAOD.C rename to PWGGA/PHOSTasks/PHOS_embedding/CreateAOD.C diff --git a/PWG4/UserTasks/PHOS_embedding/Embedding.C b/PWGGA/PHOSTasks/PHOS_embedding/Embedding.C similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/Embedding.C rename to PWGGA/PHOSTasks/PHOS_embedding/Embedding.C diff --git a/PWG4/UserTasks/PHOS_embedding/Readme b/PWGGA/PHOSTasks/PHOS_embedding/Readme similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/Readme rename to PWGGA/PHOSTasks/PHOS_embedding/Readme diff --git a/PWG4/UserTasks/PHOS_embedding/rec.C b/PWGGA/PHOSTasks/PHOS_embedding/rec.C similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/rec.C rename to PWGGA/PHOSTasks/PHOS_embedding/rec.C diff --git a/PWG4/UserTasks/PHOS_embedding/sim.C b/PWGGA/PHOSTasks/PHOS_embedding/sim.C similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/sim.C rename to PWGGA/PHOSTasks/PHOS_embedding/sim.C diff --git a/PWG4/UserTasks/PHOS_embedding/simrun.C b/PWGGA/PHOSTasks/PHOS_embedding/simrun.C similarity index 100% rename from PWG4/UserTasks/PHOS_embedding/simrun.C rename to PWGGA/PHOSTasks/PHOS_embedding/simrun.C diff --git a/PWG4/UserTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.cxx b/PWGGA/PHOSTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.cxx similarity index 100% rename from PWG4/UserTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.cxx rename to PWGGA/PHOSTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.cxx diff --git a/PWG4/UserTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.h b/PWGGA/PHOSTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.h similarity index 100% rename from PWG4/UserTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.h rename to PWGGA/PHOSTasks/PHOS_pp_pi0/AliAnalysisTaskPi0.h diff --git a/PWG4/UserTasks/PHOS_pp_pi0/AliCaloPhoton.cxx b/PWGGA/PHOSTasks/PHOS_pp_pi0/AliCaloPhoton.cxx similarity index 100% rename from PWG4/UserTasks/PHOS_pp_pi0/AliCaloPhoton.cxx rename to PWGGA/PHOSTasks/PHOS_pp_pi0/AliCaloPhoton.cxx diff --git a/PWG4/UserTasks/PHOS_pp_pi0/AliCaloPhoton.h b/PWGGA/PHOSTasks/PHOS_pp_pi0/AliCaloPhoton.h similarity index 100% rename from PWG4/UserTasks/PHOS_pp_pi0/AliCaloPhoton.h rename to PWGGA/PHOSTasks/PHOS_pp_pi0/AliCaloPhoton.h diff --git a/PWG4/omega3pi/AliAnalysisTaskOmegaPi0PiPi.cxx b/PWGGA/PHOSTasks/omega3pi/AliAnalysisTaskOmegaPi0PiPi.cxx similarity index 100% rename from PWG4/omega3pi/AliAnalysisTaskOmegaPi0PiPi.cxx rename to PWGGA/PHOSTasks/omega3pi/AliAnalysisTaskOmegaPi0PiPi.cxx diff --git a/PWG4/omega3pi/AliAnalysisTaskOmegaPi0PiPi.h b/PWGGA/PHOSTasks/omega3pi/AliAnalysisTaskOmegaPi0PiPi.h similarity index 100% rename from PWG4/omega3pi/AliAnalysisTaskOmegaPi0PiPi.h rename to PWGGA/PHOSTasks/omega3pi/AliAnalysisTaskOmegaPi0PiPi.h diff --git a/PWG4/omega3pi/grid/AnaTaskOmega3pi.C b/PWGGA/PHOSTasks/omega3pi/grid/AnaTaskOmega3pi.C similarity index 100% rename from PWG4/omega3pi/grid/AnaTaskOmega3pi.C rename to PWGGA/PHOSTasks/omega3pi/grid/AnaTaskOmega3pi.C diff --git a/PWG4/omega3pi/grid/Omega.jdl b/PWGGA/PHOSTasks/omega3pi/grid/Omega.jdl similarity index 100% rename from PWG4/omega3pi/grid/Omega.jdl rename to PWGGA/PHOSTasks/omega3pi/grid/Omega.jdl diff --git a/PWG4/omega3pi/grid/README b/PWGGA/PHOSTasks/omega3pi/grid/README similarity index 100% rename from PWG4/omega3pi/grid/README rename to PWGGA/PHOSTasks/omega3pi/grid/README diff --git a/PWG4/omega3pi/grid/ana.sh b/PWGGA/PHOSTasks/omega3pi/grid/ana.sh similarity index 100% rename from PWG4/omega3pi/grid/ana.sh rename to PWGGA/PHOSTasks/omega3pi/grid/ana.sh diff --git a/PWG4/omega3pi/grid/list.txt b/PWGGA/PHOSTasks/omega3pi/grid/list.txt similarity index 100% rename from PWG4/omega3pi/grid/list.txt rename to PWGGA/PHOSTasks/omega3pi/grid/list.txt diff --git a/PWG4/omega3pi/grid/submit.sh b/PWGGA/PHOSTasks/omega3pi/grid/submit.sh similarity index 100% rename from PWG4/omega3pi/grid/submit.sh rename to PWGGA/PHOSTasks/omega3pi/grid/submit.sh diff --git a/PWG4/PROOF-INF.PWG4GammaConv/BUILD.sh b/PWGGA/PROOF-INF.PWGGACaloTasks/BUILD.sh similarity index 100% rename from PWG4/PROOF-INF.PWG4GammaConv/BUILD.sh rename to PWGGA/PROOF-INF.PWGGACaloTasks/BUILD.sh diff --git a/PWGGA/PROOF-INF.PWGGACaloTasks/SETUP.C b/PWGGA/PROOF-INF.PWGGACaloTasks/SETUP.C new file mode 100755 index 00000000000..b043d72b0a0 --- /dev/null +++ b/PWGGA/PROOF-INF.PWGGACaloTasks/SETUP.C @@ -0,0 +1,13 @@ +void SETUP() +{ + + // Load the ESD library + gSystem->Load("libPWGGACaloTasks"); + + // Set the Include paths + gSystem->SetIncludePath("-I$ROOTSYS/include -IPWGGACaloTasks"); + gROOT->ProcessLine(".include PWGGACaloTasks/CaloTasks"); + + // Set our location, so that other packages can find us + gSystem->Setenv("PWGGACaloTasks_INCLUDE", "PWGGACaloTasks/CaloTasks"); +} diff --git a/PWG4/PROOF-INF.PWG4PartCorrBase/BUILD.sh b/PWGGA/PROOF-INF.PWGGACaloTrackCorrelations/BUILD.sh similarity index 100% rename from PWG4/PROOF-INF.PWG4PartCorrBase/BUILD.sh rename to PWGGA/PROOF-INF.PWGGACaloTrackCorrelations/BUILD.sh diff --git a/PWGGA/PROOF-INF.PWGGACaloTrackCorrelations/SETUP.C b/PWGGA/PROOF-INF.PWGGACaloTrackCorrelations/SETUP.C new file mode 100755 index 00000000000..743ecfe5cbd --- /dev/null +++ b/PWGGA/PROOF-INF.PWGGACaloTrackCorrelations/SETUP.C @@ -0,0 +1,15 @@ +void SETUP() +{ + + // Load the ESD library + //gSystem->Load("libPWGGACaloTrackCorrelations"); + TString ocwd = gSystem->WorkingDirectory(); + gSystem->Load(ocwd+"/libPWGGACaloTrackCorrelations.so"); + + // Set the Include paths + gSystem->SetIncludePath("-I$ROOTSYS/include -IPWGGACaloTrackCorrelations"); + gROOT->ProcessLine(".include PWGGACaloTrackCorrelations/CaloTrackCorrelations"); + + // Set our location, so that other packages can find us + gSystem->Setenv("PWGGACaloTrackCorrelations_INCLUDE", "PWGGACaloTrackCorrelations/CaloTrackCorrelations"); +} diff --git a/PWG4/PROOF-INF.PWG4PartCorrDep/BUILD.sh b/PWGGA/PROOF-INF.PWGGAEMCALTasks/BUILD.sh similarity index 100% rename from PWG4/PROOF-INF.PWG4PartCorrDep/BUILD.sh rename to PWGGA/PROOF-INF.PWGGAEMCALTasks/BUILD.sh diff --git a/PWGGA/PROOF-INF.PWGGAEMCALTasks/SETUP.C b/PWGGA/PROOF-INF.PWGGAEMCALTasks/SETUP.C new file mode 100755 index 00000000000..2c4233636a1 --- /dev/null +++ b/PWGGA/PROOF-INF.PWGGAEMCALTasks/SETUP.C @@ -0,0 +1,15 @@ +void SETUP() +{ + + // Load the ESD library + //gSystem->Load("libPWGGAEMCALTasks"); + TString ocwd = gSystem->WorkingDirectory(); + gSystem->Load(ocwd+"/libPWGGAEMCALTasks.so"); + + // Set the Include paths + gSystem->SetIncludePath("-I$ROOTSYS/include -IPWGGAEMCALTasks"); + gROOT->ProcessLine(".include PWGGAEMCALTasks/EMCALTasks"); + + // Set our location, so that other packages can find us + gSystem->Setenv("PWGGAEMCALTasks_INCLUDE", "PWGGAEMCALTasks/EMCALTasks"); +} diff --git a/PWG4/PROOF-INF.PWG4omega3pi/BUILD.sh b/PWGGA/PROOF-INF.PWGGAGammaConv/BUILD.sh similarity index 100% rename from PWG4/PROOF-INF.PWG4omega3pi/BUILD.sh rename to PWGGA/PROOF-INF.PWGGAGammaConv/BUILD.sh diff --git a/PWGGA/PROOF-INF.PWGGAGammaConv/SETUP.C b/PWGGA/PROOF-INF.PWGGAGammaConv/SETUP.C new file mode 100644 index 00000000000..50e0f35c02c --- /dev/null +++ b/PWGGA/PROOF-INF.PWGGAGammaConv/SETUP.C @@ -0,0 +1,13 @@ +void SETUP() +{ + + // Load the ESD library + gSystem->Load("libPWGGAGammaConv"); + + // Set the Include paths + gSystem->SetIncludePath("-I$ROOTSYS/include -IPWGGAGammaConv"); + gROOT->ProcessLine(".include PWGGAGammaConv/GammaConv"); + + // Set our location, so that other packages can find us + gSystem->Setenv("PWGGAGammaConv_INCLUDE", "PWGGAGammaConv/GammaConv"); +} diff --git a/PWG4/PROOF-INF.PWG4UserTasks/BUILD.sh b/PWGGA/PROOF-INF.PWGGAPHOSTasks/BUILD.sh similarity index 100% rename from PWG4/PROOF-INF.PWG4UserTasks/BUILD.sh rename to PWGGA/PROOF-INF.PWGGAPHOSTasks/BUILD.sh diff --git a/PWGGA/PROOF-INF.PWGGAPHOSTasks/SETUP.C b/PWGGA/PROOF-INF.PWGGAPHOSTasks/SETUP.C new file mode 100644 index 00000000000..771479ed9be --- /dev/null +++ b/PWGGA/PROOF-INF.PWGGAPHOSTasks/SETUP.C @@ -0,0 +1,14 @@ +// $Id$ + +void SETUP() +{ + TString ocwd = gSystem->WorkingDirectory(); + gSystem->Load(ocwd+"/libPWGGAPHOSTasks.so"); + + // Set the Include paths + gSystem->SetIncludePath("-I$ROOTSYS/include -IPWGGAPHOSTasks"); + gROOT->ProcessLine(".include PWGGAPHOSTasks/PHOSTasks"); + + // Set our location, so that other packages can find us + gSystem->Setenv("PWGGAPHOSTasks_INCLUDE", "PWGGAPHOSTasks/PHOSTasks"); +} diff --git a/PWG4/PWG4omega3piLinkDef.h b/PWGGA/PWGGACaloTasksLinkDef.h similarity index 69% rename from PWG4/PWG4omega3piLinkDef.h rename to PWGGA/PWGGACaloTasksLinkDef.h index ca33c395323..972810705bd 100644 --- a/PWG4/PWG4omega3piLinkDef.h +++ b/PWGGA/PWGGACaloTasksLinkDef.h @@ -4,6 +4,6 @@ #pragma link off all classes; #pragma link off all functions; -#pragma link C++ class AliAnalysisTaskOmegaPi0PiPi+; +#pragma link C++ class AliAnalysisTaskCaloFilter+; #endif diff --git a/PWG4/PWG4PartCorrDepLinkDef.h b/PWGGA/PWGGACaloTrackCorrelationsLinkDef.h similarity index 100% rename from PWG4/PWG4PartCorrDepLinkDef.h rename to PWGGA/PWGGACaloTrackCorrelationsLinkDef.h diff --git a/PWG4/PWG4UserTasksLinkDef.h b/PWGGA/PWGGAEMCALTasksLinkDef.h similarity index 66% rename from PWG4/PWG4UserTasksLinkDef.h rename to PWGGA/PWGGAEMCALTasksLinkDef.h index 6170a2bb92e..b41e181f7ce 100644 --- a/PWG4/PWG4UserTasksLinkDef.h +++ b/PWGGA/PWGGAEMCALTasksLinkDef.h @@ -4,22 +4,6 @@ #pragma link off all classes; #pragma link off all functions; -// PHOS_pp_pi0 -#pragma link C++ class AliCaloPhoton+; -#pragma link C++ class AliAnalysisTaskPi0+; - -// PHOS_embedding -#pragma link C++ class AliPHOSEmbedding+; -#pragma link C++ class AliAnalysisTaskPi0Efficiency+; -#pragma link C++ class AliAnalysisTaskPi0DiffEfficiency+; - -// PHOS_PbPbQA -#pragma link C++ class AliAnalysisTaskPHOSPbPbQA+; - -// CaloCellQA -#pragma link C++ class AliCaloCellsQA+; -#pragma link C++ class AliAnalysisTaskCaloCellsQA+; - // EmcalTasks #pragma link C++ class AliAnalysisTaskEMCALClusterizeFast+; #pragma link C++ class AliAnalysisTaskEMCALPi0PbPb+; @@ -37,5 +21,7 @@ #pragma link C++ class AliStaVertex+; #pragma link C++ class AliStaTrigger+; #pragma link C++ class AliStaPart+; +#pragma link C++ class AliAnalysisTaskEMCALPi0CalibSelection+; +#pragma link C++ class AliAnalysisTaskEMCALClusterize+; #endif diff --git a/PWG4/PWG4GammaConvLinkDef.h b/PWGGA/PWGGAGammaConvLinkDef.h similarity index 100% rename from PWG4/PWG4GammaConvLinkDef.h rename to PWGGA/PWGGAGammaConvLinkDef.h diff --git a/PWGGA/PWGGAPHOSTasksLinkDef.h b/PWGGA/PWGGAPHOSTasksLinkDef.h new file mode 100644 index 00000000000..a9afd7be0ea --- /dev/null +++ b/PWGGA/PWGGAPHOSTasksLinkDef.h @@ -0,0 +1,26 @@ +#ifdef __CINT__ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +// PHOS_pp_pi0 +#pragma link C++ class AliCaloPhoton+; +#pragma link C++ class AliAnalysisTaskPi0+; + +// PHOS_embedding +#pragma link C++ class AliPHOSEmbedding+; +#pragma link C++ class AliAnalysisTaskPi0Efficiency+; +#pragma link C++ class AliAnalysisTaskPi0DiffEfficiency+; + +// PHOS_PbPbQA +#pragma link C++ class AliAnalysisTaskPHOSPbPbQA+; + +// CaloCellQA +#pragma link C++ class AliCaloCellsQA+; +#pragma link C++ class AliAnalysisTaskCaloCellsQA+; + +// Omega3pi +#pragma link C++ class AliAnalysisTaskOmegaPi0PiPi+; + +#endif -- 2.43.0