Transition PWG3 --> PWGHF
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 23 Jan 2012 20:23:34 +0000 (20:23 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 23 Jan 2012 20:23:34 +0000 (20:23 +0000)
70 files changed:
ANALYSIS/macros/TaskBuzzer.C
ANALYSIS/macros/runCalibTrain.C
ANALYSIS/macros/runCentralitySelection.C
CMakeLists.txt
EVE/alice-macros/aod_HF.C
PWG/PROOF-INF.PWGmuon/BUILD.sh [new file with mode: 0755]
PWG/PROOF-INF.PWGmuon/SETUP.C [copied from PWG3/PROOF-INF.PWG3muon/SETUP.C with 79% similarity]
PWG/PROOF-INF.PWGmuondep/BUILD.sh [new file with mode: 0755]
PWG/PROOF-INF.PWGmuondep/SETUP.C [moved from PWG3/PROOF-INF.PWG3muondep/SETUP.C with 86% similarity]
PWG/muon/AnalysisTrainCreateMixedDimuons.C
PWG/muon/AnalysisTrainFromESDToAOD.C
PWG/muon/AnalysisTrainFromStandardToMuonAODLocal.C
PWG/muon/AnalysisTrainMuonComp.C
PWG/muon/AnalysisTrainMuonLocal.C
PWG/muon/AnalysisTrigChEff.C
PWG/muon/CreateAlienHandler_FromESDToAOD.C
PWG/muon/PlotMuonQA.C
PWG/muon/ReadSpecAOD.C
PWG/muon/RunLinkToMCAnalysisExample.C
PWG/muon/RunMuonAODfromGeneral.C
PWG/muon/RunMuonQA.C
PWG/muon/RunSingleMuonAnalysisFromAOD.C
PWG/muon/RunSingleMuonAnalysisFromESD.C
PWG/muon/TransferMuonQATrain.C
PWG/muon/mergeGridFiles.C
PWG/muon/runQA.sh
PWG/muon/terminateQA.C
PWG/muondep/AliAnalysisTaskPileup.cxx
PWG/muondep/RunMuonResolution.C
PWG/muondep/RunMuonTrackingEffAnalysis.C
PWG/muondep/RunRecoCheck.C
PWG3/PROOF-INF.PWG3hfe/SETUP.C [deleted file]
PWG3/PROOF-INF.PWG3muon/BUILD.sh [deleted file]
PWG3/PROOF-INF.PWG3muondep/BUILD.sh [deleted file]
PWG3/PROOF-INF.PWG3vertexingHF/BUILD.sh [deleted file]
PWG4/CaloCalib/macros/anaCaloFilter.C
PWG4/CaloCalib/macros/anaEMCALCalib.C
PWG4/CaloCalib/macros/emcalReclusterize.C
PWG4/UserTasks/PHOS_embedding/CreateAOD.C
PWG4/macros/AnalysisTrainCAF.C
PWG4/macros/jetspectrum/rootlogon.C
PWGHF/CMakelibPWGHFbase.pkg
PWGHF/PROOF-INF.PWGHFbase/BUILD.sh [new file with mode: 0755]
PWGHF/PROOF-INF.PWGHFbase/SETUP.C [moved from PWG3/PROOF-INF.PWG3muon/SETUP.C with 79% similarity]
PWGHF/PROOF-INF.PWGHFhfe/BUILD.sh [moved from PWG3/PROOF-INF.PWG3hfe/BUILD.sh with 100% similarity]
PWGHF/PROOF-INF.PWGHFhfe/SETUP.C [new file with mode: 0644]
PWGHF/PROOF-INF.PWGHFvertexingHF/BUILD.sh [new file with mode: 0755]
PWGHF/PROOF-INF.PWGHFvertexingHF/SETUP.C [moved from PWG3/PROOF-INF.PWG3vertexingHF/SETUP.C with 77% similarity]
PWGHF/PWGHFbaseLinkDef.h
PWGHF/base/runAnalysisTaskPtMothFromPtDaug.C
PWGHF/hfe/macros/DrawMCQAplots.C
PWGHF/hfe/macros/MakeD2eSpectra.C
PWGHF/hfe/macros/runAlien.C
PWGHF/hfe/macros/runPIDqa.C
PWGHF/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C
PWGHF/vertexingHF/RunAnalysisAODVertexingHF.C
PWGHF/vertexingHF/macros/DrawEfficiency.C
PWGHF/vertexingHF/macros/LoadLibraries.C
PWGHF/vertexingHF/macros/MakeCuts4Charm4Prong.C
PWGPP/CalibMacros/MergeCalibration/LoadLibraries.C
PWGPP/CalibMacros/PassX/LoadLibraries.C
PWGPP/PWGPPmacros/runPWGPPTrain.C
PWGPP/PilotTrain/PilotAnalysis.C
PWGPP/PilotTrain/PilotAnalysis_sim.C
PWGPP/PilotTrain/memoryCheck.C
PWGPP/PilotTrain/runPilot.C
PWGPP/PilotTrain/testOutputSize.C
PWGPP/macros/RunPerformanceTrain.C
STEER/CreateAODfromESD.C
macros/mkhtml.C

index 0d0b40c..153cf36 100644 (file)
@@ -252,9 +252,9 @@ void LoadLibraries()
   gSystem->Load("libEMCALUtils");
   gSystem->Load("libPWG4PartCorrBase");
   gSystem->Load("libPWG4PartCorrDep");
-  gSystem->Load("libPWG3base");
-  gSystem->Load("libPWG3muon");
-  gSystem->Load("libPWG3muondep");
+  gSystem->Load("libPWGHFbase");
+  gSystem->Load("libPWGmuon");
+  gSystem->Load("libPWGmuondep");
 // fast xrootd reading enabled
    printf("!!! You requested FastRead option. Using xrootd flags to reduce timeouts. Note that this may skip some files that could be accessed !!!");
    gEnv->SetValue("XNet.ConnectTimeout",10);
index 2c024f9..aed4bf1 100644 (file)
@@ -31,7 +31,7 @@ void runCalibTrain(TString runNumberString, const char *inFileName = "AliESDs.ro
     gSystem->Load("libANALYSISalice");
     gSystem->Load("libANALYSIScalib");
     gSystem->Load("libCORRFW");
-    gSystem->Load("libPWG3muon");
+    gSystem->Load("libPWGmuon");
     gROOT->LoadMacro("ConfigCalibTrain.C");
     gROOT->LoadMacro("AddTaskCopyESD.C");
     gROOT->LoadMacro("AddTaskFilterFriend.C");
index db740c4..265778b 100644 (file)
@@ -12,8 +12,8 @@ void runCentralitySelection(const char *mode="local")
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");   
   gSystem->Load("libCORRFW");   
-  gSystem->Load("libPWG3base");   
-  gSystem->Load("libPWG3muon");   
+  gSystem->Load("libPWGHFbase");   
+  gSystem->Load("libPWGmuon");   
   // Use AliRoot includes to compile our task
   gROOT->ProcessLine(".include $ALICE_ROOT/include");
 
index 77165e5..d904543 100644 (file)
@@ -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 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 PWGHF TRIGGER PYTHIA8 TAmpt OADB MFT)
 
 if(THydjet)
   list(APPEND ALIROOTMODULES THydjet)
index 3724fa1..d2acc35 100644 (file)
@@ -69,8 +69,8 @@ AliEveHFList* aod_HF()
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
     gSystem->Load("libCORRFW");
-    gSystem->Load("libPWG3base");
-    gSystem->Load("libPWG3vertexingHF");
+    gSystem->Load("libPWGHFbase");
+    gSystem->Load("libPWGHFvertexingHF");
   */
 
   // load MC particles
diff --git a/PWG/PROOF-INF.PWGmuon/BUILD.sh b/PWG/PROOF-INF.PWGmuon/BUILD.sh
new file mode 100755 (executable)
index 0000000..dbc3ebc
--- /dev/null
@@ -0,0 +1,2 @@
+#! /bin/sh
+make libPWGmuon.so
similarity index 79%
copy from PWG3/PROOF-INF.PWG3muon/SETUP.C
copy to PWG/PROOF-INF.PWGmuon/SETUP.C
index 65bdf21..77151bb 100644 (file)
@@ -11,15 +11,14 @@ void SETUP()
     CheckLoadLibrary("libESD");
     CheckLoadLibrary("libAOD");
     CheckLoadLibrary("libANALYSISalice");
-    CheckLoadLibrary("libPWG3base");
-    CheckLoadLibrary("libPWG3muon");
+    CheckLoadLibrary("libPWGmuon");
 
 
    // Set the include paths
-   gROOT->ProcessLine(".include PWG3muon/muon");
+   gROOT->ProcessLine(".include PWGmuon/muon");
 
    // Set our location, so that other packages can find us
-   gSystem->Setenv("PWG3muon_INCLUDE", "PWG3muon/muon");
+   gSystem->Setenv("PWGmuon_INCLUDE", "PWGmuon/muon");
 }
 
 Int_t CheckLoadLibrary(const char* library)
diff --git a/PWG/PROOF-INF.PWGmuondep/BUILD.sh b/PWG/PROOF-INF.PWGmuondep/BUILD.sh
new file mode 100755 (executable)
index 0000000..7b1b205
--- /dev/null
@@ -0,0 +1,2 @@
+#! /bin/sh
+make libPWGmuondep.so
similarity index 86%
rename from PWG3/PROOF-INF.PWG3muondep/SETUP.C
rename to PWG/PROOF-INF.PWGmuondep/SETUP.C
index 0c58d0c..19ffdff 100644 (file)
@@ -31,14 +31,13 @@ void SETUP()
     CheckLoadLibrary("libMUONbase");
     CheckLoadLibrary("libMUONrec");
 
-    CheckLoadLibrary("libPWG3base");
-    CheckLoadLibrary("libPWG3muondep");
+    CheckLoadLibrary("libPWGmuondep");
 
    // Set the include paths
-   gROOT->ProcessLine(".include PWG3muondep/muondep");
+   gROOT->ProcessLine(".include PWGmuondep/muondep");
 
    // Set our location, so that other packages can find us
-   gSystem->Setenv("PWG3muondep_INCLUDE", "PWG3muondep/muondep");
+   gSystem->Setenv("PWGmuondep_INCLUDE", "PWGmuondep/muondep");
 }
 
 Int_t CheckLoadLibrary(const char* library)
index 9b01911..51fb389 100644 (file)
@@ -15,7 +15,7 @@ void AnalysisTrainCreateMixedDimuons(Char_t *nameTagDir = ".",
   gSystem->Load("libANALYSIS.so");
   gSystem->Load("libANALYSISalice.so"); 
   gSystem->Load("libCORRFW.so"); 
-  gSystem->Load("libPWG3muon.so"); 
+  gSystem->Load("libPWGmuon.so"); 
 
   AliMultiEventInputHandler *inputHandler  = new AliMultiEventInputHandler(bufferSize);
 
index 0d3b1e8..ae6743b 100644 (file)
@@ -56,8 +56,8 @@ void AnalysisTrainFromESDToAOD(const char *analysisMode = "GRID", Bool_t usePLUG
     //=====================================================================
     if (iESDfilter) {
        if(!strcmp(analysisMode, "LOCAL")){
-         gSystem->Load("libPWG3base.so");
-         gSystem->Load("libPWG3muon.so");
+         gSystem->Load("libPWGHFbase.so");
+         gSystem->Load("libPWGmuon.so");
        } 
        else if(!strcmp(analysisMode, "GRID"))LoadAnalysisLibraries(analysisMode);
      }
index f3dd2f9..1d5c1fb 100644 (file)
@@ -23,7 +23,7 @@ void AnalysisTrainFromStandardToMuonAODLocal(char* filein= "AliAODs.root",
     gSystem->Load("libVMC.so");
     gSystem->Load("libPhysics.so");
     gSystem->Load("libSTEER.so");              // for aliroot based analysis
-    gSystem->Load("libPWG3muon.so");  // for aliroot based analysis
+    gSystem->Load("libPWGmuon.so");  // for aliroot based analysis
 
     // Load par files, if the analysis is par based
     // SetupPar("STEERBase");
index d58a67f..4cda515 100644 (file)
@@ -24,7 +24,7 @@ void AnalysisTrainMuonComp(){
   gSystem->Load("libANALYSISalice.so");
   // Analysis-specific packages
   SetupPar("PWG3muon");      
-  gSystem->Load("libPWG3muon.so");
+  gSystem->Load("libPWGmuon.so");
   
   gROOT->LoadMacro("AliAnalysisTaskAODvsESD.cxx+");  
 
index 2391354..bf6bd86 100644 (file)
@@ -19,7 +19,7 @@ void AnalysisTrainMuonLocal(char* filein = "AliESDs.root",
     gSystem->Load("libGeom.so");
     gSystem->Load("libVMC.so");
     gSystem->Load("libPhysics.so");
-    gSystem->Load("${ALICE_ROOT}/lib/tgt_${ALICE_TARGET}/libPWG3muon.so");  // for aliroot based analysis
+    gSystem->Load("${ALICE_ROOT}/lib/tgt_${ALICE_TARGET}/libPWGmuon.so");  // for aliroot based analysis
 
     // Par files for a par based analysis 
     // SetupPar("STEERBase");
index 7e6c09e..4e112aa 100644 (file)
@@ -56,7 +56,7 @@ void AnalysisTrigChEff(Int_t mode=kMlocal)
   gSystem->Load("libANALYSIS.so");
   gSystem->Load("libANALYSISalice.so");
   gSystem->Load("libANALYSISalice.so");
-  gSystem->Load("libPWG3muon.so");
+  gSystem->Load("libPWGmuon.so");
 
   //
   // Connect to alien
index fb82c1f..da21a8b 100644 (file)
@@ -58,7 +58,7 @@ AliAnalysisGrid* CreateAlienHandler_FromESDToAOD()
 // Add all extra files (task .cxx/.h/.C) here.
 // (AddTaskTagCreation.C can be removed from SetAdditionalLibs, if available in the grid aliroot version)
 //=====================================================================
-   plugin->SetAdditionalLibs("libPWG3base.so libPWG3muon.so AddTaskTagCreation.C");
+   plugin->SetAdditionalLibs("libPWGHFbase.so libPWGmuon.so AddTaskTagCreation.C");
 
 // Declare the output file names separated by blancs.
 //=====================================================================
index 513dd80..cab25fe 100644 (file)
@@ -8,7 +8,7 @@
 //  - libANALYSIS.so
 //  - libANALYSISalice.so
 //  - libCORRFW.so
-//  - libPWG3muon.so
+//  - libPWGmuon.so
 //
 // TString includePath = "-I${ALICE_ROOT}/PWG3/base/ ";  gSystem->SetIncludePath(includePath.Data());
 //
@@ -88,8 +88,8 @@ void PlotMuonQA(const char* baseDir, const char* runList = 0x0, const char * tri
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");
   gSystem->Load("libCORRFW");
-  gSystem->Load("libPWG3base");
-  gSystem->Load("libPWG3muon");
+  gSystem->Load("libPWGHFbase");
+  gSystem->Load("libPWGmuon");
 #endif
   
   // Cosmetics and configuration
index 5bc2c8b..33635ef 100644 (file)
@@ -28,7 +28,7 @@ void ReadSpecAOD(const char *fileName = "AliMuonAOD.root") {
     gSystem->Load("libSTEERBase");
     gSystem->Load("libAOD");
     gSystem->Load("libANALYSIS");                      
-    gSystem->Load("libPWG3base.so");
+    gSystem->Load("libPWGHFbase.so");
 
 
 
index 2df32f4..adcc2e5 100644 (file)
@@ -48,8 +48,8 @@ void RunLinkToMCAnalysisExample(const char* esdFile = "./AliESDs.root")
        gSystem->Load("libAOD.so");
        gSystem->Load("libANALYSIS.so");
        gSystem->Load("libANALYSISalice.so");
-       gSystem->Load("libPWG3base.so");
-       gSystem->Load("libPWG3muon.so");
+       gSystem->Load("libPWGHFbase.so");
+       gSystem->Load("libPWGmuon.so");
        
        // Create the TChain for esdTrees in the AliESDs.root file.
        TChain* chain = new TChain("esdTree");
index d5dd804..1e8b617 100644 (file)
@@ -9,7 +9,7 @@ void RunMuonAODfromGeneral(char* filein = "../FromESDToGenAOD/AliAOD.root", char
     gSystem->Load("libSTEERBase");
     gSystem->Load("libAOD");
     gSystem->Load("libANALYSIS");                      
-    gSystem->Load("libPWG3base.so");
+    gSystem->Load("libPWGHFbase.so");
              
     // Input AOD file
     TChain* chain = new TChain("aodTree");
index 5e9592a..e4d2e5f 100644 (file)
@@ -8,7 +8,7 @@
 //  - libANALYSIS.so
 //  - libANALYSISalice.so
 //  - libCORRFW.so
-//  - libPWG3muon.so
+//  - libPWGmuon.so
 //
 // The macro reads ESDs and store outputs in standard output file (AnalysisResults.root)
 //
@@ -41,7 +41,7 @@ void RunMuonQA(TString inputFileName = "AliESDs.root", Bool_t selectPhysics = kT
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");
   gSystem->Load("libCORRFW");
-  gSystem->Load("libPWG3muon");
+  gSystem->Load("libPWGmuon");
   
   // Create input chain
   TChain* chain = CreateChain(inputFileName);
index 918d80f..a33d4bf 100644 (file)
@@ -45,7 +45,7 @@ void RunSingleMuonAnalysisFromAOD(Int_t mode=kMlocal, Char_t *inputPath=".", Cha
     gSystem->Load("libSTEERBase");
     gSystem->Load("libAOD");
     gSystem->Load("libESD");  
-    gSystem->Load("${ALICE_ROOT}/lib/tgt_${ALICE_TARGET}/libPWG3muon.so");
+    gSystem->Load("${ALICE_ROOT}/lib/tgt_${ALICE_TARGET}/libPWGmuon.so");
   }
   else {
     const Int_t nNeededPar = 6;
index 27adcdc..f96d743 100644 (file)
@@ -25,7 +25,7 @@ void RunSingleMuonAnalysisFromESD(Bool_t local = kFALSE) {
   gSystem->Load("libSTEERBase");
   gSystem->Load("libAOD");
   gSystem->Load("libESD");
-  gSystem->Load("libPWG3muon.so");
+  gSystem->Load("libPWGmuon.so");
 
   TChain* chain = new TChain("esdTree");
 
index 5af1524..90e7248 100644 (file)
@@ -8,7 +8,7 @@
 //  - libANALYSIS.so
 //  - libANALYSISalice.so
 //  - libCORRFW.so
-//  - libPWG3muon.so
+//  - libPWGmuon.so
 //
 //  TString includePath = "-I${ALICE_ROOT}/PWG3/base/ ";  gSystem->SetIncludePath(includePath.Data());
 
@@ -61,8 +61,8 @@ Bool_t TransferMuonQATrain_v4(const char* baseDir, const char * trainName, const
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");
   gSystem->Load("libCORRFW");
-  gSystem->Load("libPWG3base");
-  gSystem->Load("libPWG3muon");
+  gSystem->Load("libPWGHFbase");
+  gSystem->Load("libPWGmuon");
 #endif
   
   TString sbaseDir = baseDir;
index 61d9508..84d063f 100644 (file)
@@ -192,9 +192,9 @@ void completeProd(TString runListName="runList.txt", TString prodDir = "", TStri
 
   // if ( outTaskFilename.Contains("QAresults.root") ) {
   const Int_t kNlibs = 5; // 1
-  //TString loadLibs[kNlibs] = {"libPWG3base.so"};
-  //TString loadLibs[kNlibs] = {"libANALYSIS.so", "libANALYSISalice.so", "libTENDER.so", "libPWGPP.so", "libPWG3base.so"};
-  TString loadLibs[kNlibs] = {"libANALYSIS.so", "libOADB.so", "libANALYSISalice.so", "libCORRFW.so", "libPWG3base.so"};
+  //TString loadLibs[kNlibs] = {"libPWGHFbase.so"};
+  //TString loadLibs[kNlibs] = {"libANALYSIS.so", "libANALYSISalice.so", "libTENDER.so", "libPWGPP.so", "libPWGHFbase.so"};
+  TString loadLibs[kNlibs] = {"libANALYSIS.so", "libOADB.so", "libANALYSISalice.so", "libCORRFW.so", "libPWGHFbase.so"};
   for ( Int_t ilib=0; ilib<kNlibs; ilib++ ) {
     Int_t exitVal = gSystem->Load(loadLibs[ilib].Data());
     if ( exitVal < 0 ) {
index d28c686..36801e5 100755 (executable)
@@ -54,7 +54,7 @@ if [[ $# -ne 3 || "$EXIT" -eq 1 ]]; then
     exit 4
 fi
 
-loadLibs="gSystem->Load(\"libANALYSIS.so\");gSystem->Load(\"libOADB.so\");gSystem->Load(\"libANALYSISalice.so\");gSystem->Load(\"libCORRFW.so\");gSystem->Load(\"libPWG3base.so\");"
+loadLibs="gSystem->Load(\"libANALYSIS.so\");gSystem->Load(\"libOADB.so\");gSystem->Load(\"libANALYSISalice.so\");gSystem->Load(\"libCORRFW.so\");gSystem->Load(\"libPWGHFbase.so\");"
 
 function mergePerRun()
 {
@@ -78,7 +78,7 @@ function mergeRuns()
     outFilename=$2
     aliroot -b <<EOF &> logMergeAll.txt
 ${loadLibs}
-gSystem->Load("libANALYSIS.so");gSystem->Load("libOADB.so");gSystem->Load("libANALYSISalice.so");gSystem->Load("libCORRFW.so");gSystem->Load("libPWG3base.so");
+gSystem->Load("libANALYSIS.so");gSystem->Load("libOADB.so");gSystem->Load("libANALYSISalice.so");gSystem->Load("libCORRFW.so");gSystem->Load("libPWGHFbase.so");
 .x $qaMacroDir/mergeGridFiles.C+("${outFilename}","${fileListName}","");
 .q
 EOF
index 02cb153..2ae5eef 100644 (file)
@@ -86,7 +86,7 @@ AliAnalysisAlien* CreateAlienHandler()
   plugin->SetRunMode("terminate");
 
   // Declare all libraries
-  plugin->SetAdditionalLibs("libCORRFW.so libPWG3base.so libPWG3muon.so");
+  plugin->SetAdditionalLibs("libCORRFW.so libPWGHFbase.so libPWGmuon.so");
 
   plugin->SetAdditionalRootLibs("libXMLParser.so libGui.so libProofPlayer.so");
 
@@ -110,7 +110,7 @@ void terminateQA(TString outfilename = "QAresults.root", Bool_t force = kFALSE)
   gSystem->Load("libPhysics");
   gSystem->Load("libProof");
 
-  TString libsList = "libANALYSIS.so libOADB.so libANALYSISalice.so libCORRFW.so libPWG3base.so libPWG3muon.so";
+  TString libsList = "libANALYSIS.so libOADB.so libANALYSISalice.so libCORRFW.so libPWGHFbase.so libPWGmuon.so";
 
   TObjArray* libsArray = libsList.Tokenize(" ");
   libsArray->SetOwner();
index 2e0e04d..518cb84 100644 (file)
@@ -44,7 +44,7 @@
 //   (hopefully it will be changed in the future)
 //   Hence the following libraries need to be included (in addition to
 //   the standard analysis ones):
-//   libRAWDatabase.so libCDB.so libSTEER.so libPWG3base.so
+//   libRAWDatabase.so libCDB.so libSTEER.so libPWGHFbase.so
 //-------------------------------------------------------------------------
 
 #include <Riostream.h>
index eecac00..027b785 100644 (file)
@@ -23,8 +23,8 @@
 //  - libMUONbase.so
 //  - libMUONrec.so
 //  - libCORRFW.so
-//  - libPWG3base.so
-//  - libPWG3muondep.so
+//  - libPWGHFbase.so
+//  - libPWGmuondep.so
 //
 // It also needs to load magnetic field, mapping, geometry (+alignment), and reconstruction parameters from the OCDB
 //
index d1cfdc8..9957799 100644 (file)
@@ -37,7 +37,7 @@ void RunMuonTrackingEffAnalysis (Bool_t alien = false,
     gSystem->Load("libANALYSISalice.so");
  
 //  setupPar(pwg3ParFile);
-    gSystem->Load("libPWG3muon.so");
+    gSystem->Load("libPWGmuon.so");
 
     char macro[1024];
     sprintf(macro,"%s++",macroFileName);
index 362ed65..8df1320 100644 (file)
@@ -13,7 +13,7 @@ void RunRecoCheck(Bool_t local = kFALSE) {
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");
 
-  gSystem->Load("libPWG3muondep.so");
+  gSystem->Load("libPWGmuondep.so");
 
   TChain* chain = new TChain("esdTree");
 
diff --git a/PWG3/PROOF-INF.PWG3hfe/SETUP.C b/PWG3/PROOF-INF.PWG3hfe/SETUP.C
deleted file mode 100644 (file)
index c39dfd4..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  gSystem->Load("libPWG3hfe.so");
-  // Set the include paths
-  gROOT->ProcessLine(".include PWG3hfe/hfe");
-}
diff --git a/PWG3/PROOF-INF.PWG3muon/BUILD.sh b/PWG3/PROOF-INF.PWG3muon/BUILD.sh
deleted file mode 100755 (executable)
index 7335ddf..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-make libPWG3muon.so
diff --git a/PWG3/PROOF-INF.PWG3muondep/BUILD.sh b/PWG3/PROOF-INF.PWG3muondep/BUILD.sh
deleted file mode 100755 (executable)
index 63f8c74..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-make libPWG3muondep.so
diff --git a/PWG3/PROOF-INF.PWG3vertexingHF/BUILD.sh b/PWG3/PROOF-INF.PWG3vertexingHF/BUILD.sh
deleted file mode 100755 (executable)
index 7193d7e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-make libPWG3vertexingHF.so
index 944c9a0..d76d550 100644 (file)
@@ -175,8 +175,8 @@ void  LoadLibraries(const anaModes mode) {
     /*
       //     gSystem->Load("libPWG4omega3pi.so");
       //     gSystem->Load("libCORRFW.so");
-      //     gSystem->Load("libPWG3base.so");
-      //     gSystem->Load("libPWG3muon.so");
+      //     gSystem->Load("libPWGCFbase.so");
+      //     gSystem->Load("libPWGmuon.so");
  */
     //--------------------------------------------------------
     //If you want to use root and par files from aliroot
index 35d592f..0796e53 100644 (file)
@@ -270,8 +270,8 @@ void  LoadLibraries(const anaModes mode) {
     /*
       //     gSystem->Load("libPWG4omega3pi.so");
       //     gSystem->Load("libCORRFW.so");
-      //     gSystem->Load("libPWG3base.so");
-      //     gSystem->Load("libPWG3muon.so");
+      //     gSystem->Load("libPWGHFbase.so");
+      //     gSystem->Load("libPWGmuon.so");
  */
     //--------------------------------------------------------
     //If you want to use root and par files from aliroot
index 73bebcd..c6dea75 100644 (file)
@@ -188,8 +188,8 @@ void  LoadLibraries(const anaModes mode) {
     /*
       //     gSystem->Load("libPWG4omega3pi.so");
       //     gSystem->Load("libCORRFW.so");
-      //     gSystem->Load("libPWG3base.so");
-      //     gSystem->Load("libPWG3muon.so");
+      //     gSystem->Load("libPWGHFbase.so");
+      //     gSystem->Load("libPWGmuon.so");
  */
     //--------------------------------------------------------
     //If you want to use root and par files from aliroot
index e292050..502c502 100644 (file)
@@ -15,8 +15,8 @@ void CreateAOD()
   gSystem->Load("libANALYSIS.so");
   gSystem->Load("libANALYSISalice.so");
   gSystem->Load("libCORRFW.so");
-  gSystem->Load("libPWG3base.so");
-  gSystem->Load("libPWG3muon.so");
+  gSystem->Load("libPWGHFbase.so");
+  gSystem->Load("libPWGmuon.so");
   gSystem->Load("libTENDER.so");
 //gSystem->Load("libTENDERSupplies.so"); 
 
index 493cff4..7730853 100644 (file)
@@ -236,7 +236,7 @@ void AnalysisTrainCAF(Int_t nEvents = 10000, Int_t nOffset = 0, char *ds = "/PWG
 \r
     if (iESDfilter && !iAODanalysis) {\r
       gSystem->Load("libCORRFW.so");\r
-      gSystem->Load("libPWG3muon.so");\r
+      gSystem->Load("libPWGmuon.so");\r
 \r
       gROOT->LoadMacro(Form("%s/ANALYSIS/macros/AddTaskESDFilter.C",gSystem->ExpandPathName("${ALICE_ROOT}")));\r
       //      gROOT->LoadMacro("AddTaskESDfilter.C");\r
index 50f89e4..ca5a256 100644 (file)
@@ -62,8 +62,8 @@ Printf("%s \n>>> Setting style",(char*)__FILE__);
  gSystem->Load("libANALYSIS");
  gSystem->Load("libANALYSISalice");
  gSystem->Load("libCORRFW");
- gSystem->Load("libPWG3base");
- gSystem->Load("libPWG3muon");
+ gSystem->Load("libPWGHFbase");
+ gSystem->Load("libPWGmuon");
  gSystem->Load("libJETAN");
  gSystem->Load("libFASTJETAN");
  gSystem->Load("libPWG4JetTasks");
index 6412e80..b9588ae 100644 (file)
@@ -29,7 +29,6 @@
 set ( SRCS   
     base/AliAnalysisTaskPtMothFromPtDaugh.cxx 
     base/AliPtMothFromPtDaugh.cxx 
-    base/AliCounterCollection.cxx 
     )
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
diff --git a/PWGHF/PROOF-INF.PWGHFbase/BUILD.sh b/PWGHF/PROOF-INF.PWGHFbase/BUILD.sh
new file mode 100755 (executable)
index 0000000..112e19e
--- /dev/null
@@ -0,0 +1,2 @@
+#! /bin/sh
+make libPWGHFbase.so
similarity index 79%
rename from PWG3/PROOF-INF.PWG3muon/SETUP.C
rename to PWGHF/PROOF-INF.PWGHFbase/SETUP.C
index 65bdf21..02851f3 100644 (file)
@@ -11,15 +11,14 @@ void SETUP()
     CheckLoadLibrary("libESD");
     CheckLoadLibrary("libAOD");
     CheckLoadLibrary("libANALYSISalice");
-    CheckLoadLibrary("libPWG3base");
-    CheckLoadLibrary("libPWG3muon");
+    CheckLoadLibrary("libPWGHFbase");
 
 
    // Set the include paths
-   gROOT->ProcessLine(".include PWG3muon/muon");
+   gROOT->ProcessLine(".include PWGHFbase/base");
 
    // Set our location, so that other packages can find us
-   gSystem->Setenv("PWG3muon_INCLUDE", "PWG3muon/muon");
+   gSystem->Setenv("PWGHFbase_INCLUDE", "PWGHFbase/base");
 }
 
 Int_t CheckLoadLibrary(const char* library)
diff --git a/PWGHF/PROOF-INF.PWGHFhfe/SETUP.C b/PWGHF/PROOF-INF.PWGHFhfe/SETUP.C
new file mode 100644 (file)
index 0000000..5028f6b
--- /dev/null
@@ -0,0 +1,5 @@
+{
+  gSystem->Load("libPWGHFhfe.so");
+  // Set the include paths
+  gROOT->ProcessLine(".include PWGHFhfe/hfe");
+}
diff --git a/PWGHF/PROOF-INF.PWGHFvertexingHF/BUILD.sh b/PWGHF/PROOF-INF.PWGHFvertexingHF/BUILD.sh
new file mode 100755 (executable)
index 0000000..9896385
--- /dev/null
@@ -0,0 +1,2 @@
+#! /bin/sh
+make libPWGHFvertexingHF.so
similarity index 77%
rename from PWG3/PROOF-INF.PWG3vertexingHF/SETUP.C
rename to PWGHF/PROOF-INF.PWGHFvertexingHF/SETUP.C
index 9649ccc..7c1c054 100644 (file)
@@ -13,14 +13,14 @@ void SETUP()
     CheckLoadLibrary("libAOD");
     CheckLoadLibrary("libCORRFW");
     CheckLoadLibrary("libANALYSISalice");
-    CheckLoadLibrary("libPWG3base");
-    CheckLoadLibrary("libPWG3vertexingHF");
+    CheckLoadLibrary("libPWGHFbase");
+    CheckLoadLibrary("libPWGHFvertexingHF");
 
    // Set the include paths
-   gROOT->ProcessLine(".include PWG3vertexingHF/vertexingHF");
+   gROOT->ProcessLine(".include PWGHFvertexingHF/vertexingHF");
 
    // Set our location, so that other packages can find us
-   gSystem->Setenv("PWG3vertexingHF_INCLUDE", "PWG3vertexingHF/vertexingHF");
+   gSystem->Setenv("PWGHFvertexingHF_INCLUDE", "PWGHFvertexingHF/vertexingHF");
 }
 
 Int_t CheckLoadLibrary(const char* library)
index 0e98a5b..a19ea4e 100644 (file)
@@ -6,7 +6,6 @@
 
 #pragma link C++ class AliAnalysisTaskPtMothFromPtDaugh+;
 #pragma link C++ class AliPtMothFromPtDaugh+;
-#pragma link C++ class AliCounterCollection+;
 #endif
 
 
index a76aed0..336ec33 100644 (file)
@@ -31,7 +31,7 @@ void runAnalysisTaskPtMothFromPtDaug(TH1F* histPtDaug=0x0,
   else{
   gSystem->Load("libANALYSIS.so"); 
   gSystem->Load("libANALYSISalice.so");                  
-  gSystem->Load("libPWG3base.so");
+  gSystem->Load("libPWGHFbase.so");
   }
   // Set AliPtMothFromPtDaugh object 
   AliPtMothFromPtDaugh *ptExtr = new AliPtMothFromPtDaugh();
@@ -124,4 +124,4 @@ gProof->UploadPackage("ANALYSISalice.par");
 gProof->EnablePackage("ANALYSISalice.par");
 gProof->UploadPackage("PWG3base.par");
 gProof->EnablePackage("PWG3base.par");
-}
\ No newline at end of file
+}
index 9212026..db5dc20 100644 (file)
@@ -11,7 +11,7 @@ void DrawMCQAplots(Int_t imode){
   gSystem->Load("libANALYSISalice.so");
   gSystem->Load("libCORRFW.so");
   gSystem->Load("libPWG0base.so");
-  gSystem->Load("../libPWG3hfeDevel.so");
+  gSystem->Load("libPWGHFhfe.so");
 
   // put input file name
   //char filename[]="./HFEtask.root";
index 1a0b689..4789890 100644 (file)
@@ -7,7 +7,7 @@ void MakeD2eSpectra(){
   gSystem->Load("libANALYSISalice.so");
   gSystem->Load("libCORRFW.so");
   gSystem->Load("libPWG0base.so");
-  gSystem->Load("/alidata10/alice_u/minjung/032.heavy/hfe/bg4conv/util/hfe/libPWG3hfeDevel.so");
+  gSystem->Load("libPWGHFhfe.so");
 
   setGeneralStyle();
 
index b3d2755..20638cc 100644 (file)
@@ -50,7 +50,7 @@ AliAnalysisAlien *CreateAlienHandler(Bool_t isProof){
   alienplugin->SetAliROOTVersion(aliroot_version);
   alienplugin->SetROOTVersion(root_version);
   alienplugin->SetAPIVersion(api_version);
-  alienplugin->SetAdditionalLibs("libPWG3hfe.so");
+  alienplugin->SetAdditionalLibs("libPWGHFhfe.so");
   alienplugin->SetDefaultOutputs(kTRUE);
   if(isProof){
     // proof mode
@@ -165,7 +165,7 @@ void runAlien(TString data, TString mode = "test", Bool_t MC = kFALSE){
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");
   gSystem->Load("libCORRFW");
-  gSystem->Load("libPWG3hfe");
+  gSystem->Load("libPWGhfe");
   
   // Create Analysis Manager
   AliAnalysisManager *runAnalysis = new AliAnalysisManager("Heavy Flavour Electron Analysis");
index 11fa91d..e0b5031 100644 (file)
@@ -23,7 +23,7 @@ void runPIDqa(const char *treelist = 0x0, Bool_t hasMC = kTRUE, Int_t nFiles = 5
     SetupPar("Util");
   }
   //SetupPar("HFE");
-  gSystem->Load("libPWG3hfeDevel.so");
+  gSystem->Load("libPWGHFhfe.so");
   AliLog::SetClassDebugLevel("AliHFEV0pid", 0);
   AliLog::SetClassDebugLevel("AliHFEpidQA", 0);
   //  gROOT->LoadMacro("AliAnalysisTaskHFE.cxx++");
index a0baeab..0e4b44a 100644 (file)
@@ -15,7 +15,7 @@ void AliAnalysisTaskSEVertexingHFTest()
 \r
   gROOT->LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/macros/LoadLibraries.C");\r
   LoadLibraries(useParFiles);\r
-  gSystem->Load("libPWG3muon");\r
+  gSystem->Load("libPWGmuon");\r
   TChain *chain = 0;\r
 \r
   if(mode=="local") {\r
index f6bb863..9c1f3f3 100644 (file)
@@ -329,7 +329,7 @@ AliAnalysisGrid* CreateAlienHandler(TString pluginmode="test",Bool_t useParFiles
    //plugin->SetAnalysisSource("AliDStarJets.cxx");
    // Declare all libraries (other than the default ones for the framework. These will be
    // loaded by the generated analysis macro. Add all extra files (task .cxx/.h) here.
-   plugin->SetAdditionalLibs("libPWG3base.so libPWG3vertexingHF.so");
+   plugin->SetAdditionalLibs("libPWGHFbase.so libPWGvertexingHF.so");
    // use par files
    if(useParFiles) {
      plugin->EnablePackage("STEERBase.par");
index 12b8483..bb9e64a 100644 (file)
@@ -39,8 +39,8 @@ void DrawEfficiency(const char* channel, Int_t selection = 0, Int_t ieff = 7){
        gSystem->Load("libANALYSIS.so");
        gSystem->Load("libANALYSISalice.so");
        gSystem->Load("$ALICE_ROOT/CORRFW/libCORRFW.so") ;
-       gSystem->Load("libPWG3base.so");
-       gSystem->Load("libPWG3vertexingHF.so");
+       gSystem->Load("libPWGHFbase.so");
+       gSystem->Load("libPWGHFvertexingHF.so");
                
        Int_t mcAcc_over_mcLimAcc = 0x001;
        Int_t recPPR_over_mcAcc = 0x002;
index 63dc86b..efeab13 100644 (file)
@@ -12,9 +12,9 @@ void LoadLibraries(Bool_t useParFiles=kFALSE) {
   gSystem->Load("libOADB.so");
   gSystem->Load("libANALYSISalice.so");
   gSystem->Load("libCORRFW.so");
-  gSystem->Load("libPWG3base.so");
-  gSystem->Load("libPWG3vertexingHF.so");
-  //gSystem->Load("libPWG3muon.so");
+  gSystem->Load("libPWGHFbase.so");
+  gSystem->Load("libPWGHFvertexingHF.so");
+  //gSystem->Load("libPWGmuon.so");
  
 
   if(useParFiles) {
index 396cb75..a00f50f 100644 (file)
@@ -23,9 +23,9 @@ gSystem->Load("libAOD.so");
 gSystem->Load("libANALYSIS.so");
 gSystem->Load("libANALYSISalice.so");
 gSystem->Load("libCORRFW.so");
-gSystem->Load("libPWG3base.so");
-gSystem->Load("libPWG3vertexingHF.so");
-gSystem->Load("libPWG3muon.so");
+gSystem->Load("libPWGHFbase.so");
+gSystem->Load("libPWGHFvertexingHF.so");
+gSystem->Load("libPWGmuon.so");
 
   AliRDHFCutsD0toKpipipi* RDHFCharm4Prong=new AliRDHFCutsD0toKpipipi();
   RDHFCharm4Prong->SetName("Charm4ProngCuts");
@@ -156,9 +156,9 @@ gSystem->Load("libAOD.so");
 gSystem->Load("libANALYSIS.so");
 gSystem->Load("libANALYSISalice.so");
 gSystem->Load("libCORRFW.so");
-gSystem->Load("libPWG3base.so");
-gSystem->Load("libPWG3vertexingHF.so");
-gSystem->Load("libPWG3muon.so");
+gSystem->Load("libPWGHFbase.so");
+gSystem->Load("libPWGHFvertexingHF.so");
+gSystem->Load("libPWGmuon.so");
 
   AliRDHFCutsD0toKpipipi* RDHFCharm4Prong=new AliRDHFCutsD0toKpipipi();
   RDHFCharm4Prong->SetName("loosercuts");
index 86eab50..17ec533 100644 (file)
@@ -11,7 +11,7 @@ void LoadLibraries(){
     gSystem->Load("libANALYSISalice");
     gSystem->Load("libANALYSIScalib");
     gSystem->Load("libCORRFW");
-    gSystem->Load("libPWG3muon");
+    gSystem->Load("libPWGmuon");
     //
     // detector libraries
     //    
index 86eab50..17ec533 100644 (file)
@@ -11,7 +11,7 @@ void LoadLibraries(){
     gSystem->Load("libANALYSISalice");
     gSystem->Load("libANALYSIScalib");
     gSystem->Load("libCORRFW");
-    gSystem->Load("libPWG3muon");
+    gSystem->Load("libPWGmuon");
     //
     // detector libraries
     //    
index 74c9b1d..f9f38e5 100644 (file)
@@ -27,8 +27,8 @@ void LoadTrainLibs(){
   gSystem->Load("libPWG0selectors.so");
   gSystem->Load("libPWGPP.so");
   gSystem->Load("libPWG2.so");
-  gSystem->Load("libPWG3muon.so");
-  gSystem->Load("libPWG3muondep.so");
+  gSystem->Load("libPWGmuon.so");
+  gSystem->Load("libPWGmuondep.so");
   gSystem->Load("libPWG2forward.so");
   gSystem->Load("libPWG4PartCorrBase.so");
   gSystem->Load("libPWG4PartCorrDep.so");
index a3b100f..81638ec 100644 (file)
@@ -179,9 +179,9 @@ void LoadLibraries()
      gSystem->Load("libPWG4PartCorrDep");
   }  
   if(doMUON || doMUONTrig) {
-     gSystem->Load("libPWG3base");
-     gSystem->Load("libPWG3muon");
-     gSystem->Load("libPWG3muondep");
+     gSystem->Load("libPWGHFbase");
+     gSystem->Load("libPWGmuon");
+     gSystem->Load("libPWGmuondep");
   }
   if (doFMD) {
      gSystem->Load("libPWG2forward2");
@@ -527,7 +527,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    
    plugin->SetAdditionalLibs("libCORRFW.so libTENDER.so libPWG0base.so libPWG0dep.so libPWG0selectors.so libPWGPP.so \
                               libEMCALUtils.so libPHOSUtils.so libPWG4PartCorrBase.so libPWG4PartCorrDep.so \
-                              libPWG3base.so libPWG3muon.so libPWG3muondep.so libPWG2forward2.so");
+                              libPWGHFbase.so libPWGmuon.so libPWGmuondep.so libPWG2forward2.so");
      
 // Declare the output file names separated by blancs.
    plugin->SetDefaultOutputs();
index 67f1987..db9d5fe 100644 (file)
@@ -142,9 +142,9 @@ void LoadLibraries()
      gSystem->Load("libPWG4PartCorrDep");
   }  
   if(doMUONTrig || doAOD) {
-     gSystem->Load("libPWG3base");
-     gSystem->Load("libPWG3muon");
-     gSystem->Load("libPWG3muondep");
+     gSystem->Load("libPWGHFbase");
+     gSystem->Load("libPWGmuon");
+     gSystem->Load("libPWGmuondep");
   }   
 }
 
@@ -353,7 +353,7 @@ AliAnalysisAlien* CreateAlienHandler(const char *plugin_mode)
    
    plugin->SetAdditionalLibs("libTENDER.so libPWG0base.so libPWG0dep.so libPWG0selectors.so libPWGPP.so libPWG2.so \
                               libPWG2forward.so libEMCALUtils.so libPWG4PartCorrBase.so libPWG4PartCorrDep.so \
-                              libPWG3base.so libPWG3muon.so libPWG3muondep.so");
+                              libPWGHFbase.so libPWGmuon.so libPWGmuondep.so");
      
 // Declare the output file names separated by blancs.
 // (can be like: file.root or file.root@ALICE::Niham::File)
index 37a4c8c..51b9d56 100644 (file)
@@ -20,9 +20,9 @@ void memoryCheck()
    gSystem->Load("libEMCALUtils.so");
    gSystem->Load("libPWG4PartCorrBase.so");
    gSystem->Load("libPWG4PartCorrDep.so");
-   gSystem->Load("libPWG3base.so");
-   gSystem->Load("libPWG3muon.so");
-   gSystem->Load("libPWG3muondep.so");
+   gSystem->Load("libPWGHFbase.so");
+   gSystem->Load("libPWGmuon.so");
+   gSystem->Load("libPWGmuondep.so");
    TFile *f = new TFile("QA/syswatch.root");
    if (!f) return;
    TTree *t = (TTree*)f->Get("syswatch");
index d5c04ce..d5779ed 100644 (file)
@@ -11,8 +11,8 @@ void runPilot() {
   gSystem->Load("libPWG0selectors.so");
   gSystem->Load("libPWGPP.so");
   gSystem->Load("libPWG2.so");
-  gSystem->Load("libPWG3muon.so");
-  gSystem->Load("libPWG3muondep.so");
+  gSystem->Load("libPWGmuon.so");
+  gSystem->Load("libPWGmuondep.so");
   gSystem->Load("libPWG2forward.so");
   gSystem->Load("libPWG4PartCorrBase.so");
   gSystem->Load("libPWG4PartCorrDep.so");
index 061428b..b31f9ee 100644 (file)
@@ -61,9 +61,9 @@ void testOutputSize(const char *filename="QA/QAresults.root")
    gSystem->Load("libEMCALUtils.so");
    gSystem->Load("libPWG4PartCorrBase.so");
    gSystem->Load("libPWG4PartCorrDep.so");
-   gSystem->Load("libPWG3base.so");
-   gSystem->Load("libPWG3muon.so");
-   gSystem->Load("libPWG3muondep.so");
+   gSystem->Load("libPWGHFbase.so");
+   gSystem->Load("libPWGmuon.so");
+   gSystem->Load("libPWGmuondep.so");
    gSystem->Unlink("syswatch.log");
    AliSysInfo::AddStamp("Start", 0, 0);
  
index e152eb3..f57fff8 100644 (file)
@@ -62,7 +62,7 @@ void RunPerformanceTrain(Char_t *file="esd.root", Int_t runNumber = 2, const cha
   gSystem->Load("libPWG4PartCorrBase");
   gSystem->Load("libPWG4PartCorrDep");
 
-  gSystem->Load("libPWG3muon.so"); // The class is here
+  gSystem->Load("libPWGmuon.so"); // The class is here
 
   //
   // OCDB Configuration 
index 480a2a8..85b81c3 100644 (file)
@@ -24,8 +24,8 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
     gSystem->Load("libCORRFW");
-    gSystem->Load("libPWG3base");
-    gSystem->Load("libPWG3muon");
+    gSystem->Load("libPWGHFbase");
+    gSystem->Load("libPWGmuon");
 
     TChain *chain = new TChain("esdTree");
     // Steering input chain
index 73402f5..f2940bd 100644 (file)
@@ -48,11 +48,11 @@ void mkhtml (char *macro=0, Int_t force=0) {
     gSystem->Load("libPWG2spectra.so");
     gSystem->Load("libPWG2unicor.so");
 
-    gSystem->Load("libPWG3base.so");
-    gSystem->Load("libPWG3hfe.so");
-    gSystem->Load("libPWG3muondep.so");
-    gSystem->Load("libPWG3muon.so");
-    gSystem->Load("libPWG3vertexingHF.so");
+    gSystem->Load("libPWGHFbase.so");
+    gSystem->Load("libPWGHFhfe.so");
+    gSystem->Load("libPWGmuondep.so");
+    gSystem->Load("libPWGmuon.so");
+    gSystem->Load("libPWGHFvertexingHF.so");
 
     gSystem->Load("libJETAN.so");
     gSystem->Load("libPWG4CaloCalib.so");