Code Migration PWG2/EBYE to PWGCF/EBYE + Creation of Balance Function Folder
authormiweber <miweber@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 24 Jan 2012 20:37:25 +0000 (20:37 +0000)
committermiweber <miweber@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 24 Jan 2012 20:37:25 +0000 (20:37 +0000)
69 files changed:
PWGCF/CMakelibPWGCFebye.pkg [moved from PWG2/CMakelibPWG2ebye.pkg with 90% similarity]
PWGCF/EBYE/AliAnalysisTaskBF.cxx [moved from PWG2/EBYE/AliAnalysisTaskBF.cxx with 100% similarity]
PWGCF/EBYE/AliAnalysisTaskBF.h [moved from PWG2/EBYE/AliAnalysisTaskBF.h with 100% similarity]
PWGCF/EBYE/AliAnalysisTaskChargeFluctuations.cxx [moved from PWG2/EBYE/AliAnalysisTaskChargeFluctuations.cxx with 100% similarity]
PWGCF/EBYE/AliAnalysisTaskChargeFluctuations.h [moved from PWG2/EBYE/AliAnalysisTaskChargeFluctuations.h with 100% similarity]
PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx [moved from PWG2/EBYE/AliAnalysisTaskToyModel.cxx with 100% similarity]
PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.h [moved from PWG2/EBYE/AliAnalysisTaskToyModel.h with 100% similarity]
PWGCF/EBYE/BalanceFunctions/AliBalance.cxx [moved from PWG2/EBYE/AliBalance.cxx with 100% similarity]
PWGCF/EBYE/BalanceFunctions/AliBalance.h [moved from PWG2/EBYE/AliBalance.h with 100% similarity]
PWGCF/EBYE/Fluctuations/AliEbyEFluctuationAnalysisTask.cxx [moved from PWG2/EBYE/Fluctuations/AliEbyEFluctuationAnalysisTask.cxx with 100% similarity]
PWGCF/EBYE/Fluctuations/AliEbyEFluctuationAnalysisTask.h [moved from PWG2/EBYE/Fluctuations/AliEbyEFluctuationAnalysisTask.h with 100% similarity]
PWGCF/EBYE/Fluctuations/AliEbyEFluctuationAnalysisTaskTrain.cxx [moved from PWG2/EBYE/Fluctuations/AliEbyEFluctuationAnalysisTaskTrain.cxx with 100% similarity]
PWGCF/EBYE/Fluctuations/AliEbyEFluctuationAnalysisTaskTrain.h [moved from PWG2/EBYE/Fluctuations/AliEbyEFluctuationAnalysisTaskTrain.h with 100% similarity]
PWGCF/EBYE/Fluctuations/macro/calculateNuDyn.C [moved from PWG2/EBYE/Fluctuations/macro/calculateNuDyn.C with 100% similarity]
PWGCF/EBYE/Fluctuations/macro/compareCentralitySets.C [moved from PWG2/EBYE/Fluctuations/macro/compareCentralitySets.C with 100% similarity]
PWGCF/EBYE/Fluctuations/macro/compareRHIC.C [moved from PWG2/EBYE/Fluctuations/macro/compareRHIC.C with 100% similarity]
PWGCF/EBYE/Fluctuations/macro/drawCentralityDependence.C [moved from PWG2/EBYE/Fluctuations/macro/drawCentralityDependence.C with 100% similarity]
PWGCF/EBYE/Fluctuations/macro/drawEnergyDependence.C [moved from PWG2/EBYE/Fluctuations/macro/drawEnergyDependence.C with 100% similarity]
PWGCF/EBYE/Fluctuations/macro/drawMultiplicity.C [moved from PWG2/EBYE/Fluctuations/macro/drawMultiplicity.C with 100% similarity]
PWGCF/EBYE/Fluctuations/macro/drawNpartDependence.C [moved from PWG2/EBYE/Fluctuations/macro/drawNpartDependence.C with 100% similarity]
PWGCF/EBYE/Fluctuations/macro/drawScaledNpartDependence.C [moved from PWG2/EBYE/Fluctuations/macro/drawScaledNpartDependence.C with 100% similarity]
PWGCF/EBYE/Fluctuations/macro/drawSystematics.C [moved from PWG2/EBYE/Fluctuations/macro/drawSystematics.C with 100% similarity]
PWGCF/EBYE/LRC/AliAnalysisTaskLRC.cxx [moved from PWG2/EBYE/LRC/AliAnalysisTaskLRC.cxx with 100% similarity]
PWGCF/EBYE/LRC/AliAnalysisTaskLRC.h [moved from PWG2/EBYE/LRC/AliAnalysisTaskLRC.h with 100% similarity]
PWGCF/EBYE/LRC/AliLRCAnalysis.cxx [moved from PWG2/EBYE/LRC/AliLRCAnalysis.cxx with 100% similarity]
PWGCF/EBYE/LRC/AliLRCAnalysis.h [moved from PWG2/EBYE/LRC/AliLRCAnalysis.h with 100% similarity]
PWGCF/EBYE/LRC/AliLRCBase.cxx [moved from PWG2/EBYE/LRC/AliLRCBase.cxx with 100% similarity]
PWGCF/EBYE/LRC/AliLRCBase.h [moved from PWG2/EBYE/LRC/AliLRCBase.h with 100% similarity]
PWGCF/EBYE/LRC/AliLRCFit.cxx [moved from PWG2/EBYE/LRC/AliLRCFit.cxx with 100% similarity]
PWGCF/EBYE/LRC/AliLRCFit.h [moved from PWG2/EBYE/LRC/AliLRCFit.h with 100% similarity]
PWGCF/EBYE/LRC/AliLRCNN.cxx [moved from PWG2/EBYE/LRC/AliLRCNN.cxx with 100% similarity]
PWGCF/EBYE/LRC/AliLRCNN.h [moved from PWG2/EBYE/LRC/AliLRCNN.h with 100% similarity]
PWGCF/EBYE/LRC/AliLRCProcess.cxx [moved from PWG2/EBYE/LRC/AliLRCProcess.cxx with 100% similarity]
PWGCF/EBYE/LRC/AliLRCProcess.h [moved from PWG2/EBYE/LRC/AliLRCProcess.h with 100% similarity]
PWGCF/EBYE/LRC/AliLRCPtN.cxx [moved from PWG2/EBYE/LRC/AliLRCPtN.cxx with 100% similarity]
PWGCF/EBYE/LRC/AliLRCPtN.h [moved from PWG2/EBYE/LRC/AliLRCPtN.h with 100% similarity]
PWGCF/EBYE/LRC/AliLRCPtPt.cxx [moved from PWG2/EBYE/LRC/AliLRCPtPt.cxx with 100% similarity]
PWGCF/EBYE/LRC/AliLRCPtPt.h [moved from PWG2/EBYE/LRC/AliLRCPtPt.h with 100% similarity]
PWGCF/EBYE/LRC/Test/AliLRCFit.i [moved from PWG2/EBYE/LRC/Test/AliLRCFit.i with 100% similarity]
PWGCF/EBYE/LRC/Test/TestNN.C [moved from PWG2/EBYE/LRC/Test/TestNN.C with 100% similarity]
PWGCF/EBYE/LRC/Test/TestPtN.C [moved from PWG2/EBYE/LRC/Test/TestPtN.C with 100% similarity]
PWGCF/EBYE/LRC/Test/TestPtPt.C [moved from PWG2/EBYE/LRC/Test/TestPtPt.C with 100% similarity]
PWGCF/EBYE/MeanPtFluctuations/AliAnalysisTaskPtFluc.cxx [moved from PWG2/EBYE/MeanPtFluctuations/AliAnalysisTaskPtFluc.cxx with 100% similarity]
PWGCF/EBYE/MeanPtFluctuations/AliAnalysisTaskPtFluc.h [moved from PWG2/EBYE/MeanPtFluctuations/AliAnalysisTaskPtFluc.h with 100% similarity]
PWGCF/EBYE/MeanPtFluctuations/AliAnalysisTaskPtFlucPbPb.cxx [moved from PWG2/EBYE/MeanPtFluctuations/AliAnalysisTaskPtFlucPbPb.cxx with 100% similarity]
PWGCF/EBYE/MeanPtFluctuations/AliAnalysisTaskPtFlucPbPb.h [moved from PWG2/EBYE/MeanPtFluctuations/AliAnalysisTaskPtFlucPbPb.h with 100% similarity]
PWGCF/EBYE/macros/AddTaskBalanceCentralityTrain.C [moved from PWG2/EBYE/macros/AddTaskBalanceCentralityTrain.C with 95% similarity]
PWGCF/EBYE/macros/AddTaskBalanceFunction.C [moved from PWG2/EBYE/macros/AddTaskBalanceFunction.C with 93% similarity]
PWGCF/EBYE/macros/AddTaskBalanceFunctionInpp.C [moved from PWG2/EBYE/macros/AddTaskBalanceFunctionInpp.C with 100% similarity]
PWGCF/EBYE/macros/AddTaskBalanceFunctionInppMultiplicityTrain.C [moved from PWG2/EBYE/macros/AddTaskBalanceFunctionInppMultiplicityTrain.C with 96% similarity]
PWGCF/EBYE/macros/AddTaskBalanceMCCentralityTrain.C [moved from PWG2/EBYE/macros/AddTaskBalanceMCCentralityTrain.C with 95% similarity]
PWGCF/EBYE/macros/AddTaskFluctuations.C [moved from PWG2/EBYE/macros/AddTaskFluctuations.C with 100% similarity]
PWGCF/EBYE/macros/AddTaskFluctuationsCentralityTrain.C [moved from PWG2/EBYE/macros/AddTaskFluctuationsCentralityTrain.C with 100% similarity]
PWGCF/EBYE/macros/AddTaskLRC.C [moved from PWG2/EBYE/macros/AddTaskLRC.C with 95% similarity]
PWGCF/EBYE/macros/AddTaskPtFluc.C [moved from PWG2/EBYE/macros/AddTaskPtFluc.C with 100% similarity]
PWGCF/EBYE/macros/AddTaskPtFlucPbPb.C [moved from PWG2/EBYE/macros/AddTaskPtFlucPbPb.C with 100% similarity]
PWGCF/EBYE/macros/CreateAlienHandler.C [moved from PWG2/EBYE/macros/CreateAlienHandler.C with 100% similarity]
PWGCF/EBYE/macros/configBalanceFunctionAnalysis.C [moved from PWG2/EBYE/macros/configBalanceFunctionAnalysis.C with 100% similarity]
PWGCF/EBYE/macros/configFluctuationsAnalysis.C [moved from PWG2/EBYE/macros/configFluctuationsAnalysis.C with 100% similarity]
PWGCF/EBYE/macros/configLRCAnalysis.C [moved from PWG2/EBYE/macros/configLRCAnalysis.C with 99% similarity]
PWGCF/EBYE/macros/readBalanceFunction.C [moved from PWG2/EBYE/macros/readBalanceFunction.C with 94% similarity]
PWGCF/EBYE/macros/runBalanceFunction.C [moved from PWG2/EBYE/macros/runBalanceFunction.C with 97% similarity]
PWGCF/EBYE/macros/runBalanceFunctionInpp.C [moved from PWG2/EBYE/macros/runBalanceFunctionInpp.C with 96% similarity]
PWGCF/EBYE/macros/runBalanceFunctionMC.C [moved from PWG2/EBYE/macros/runBalanceFunctionMC.C with 96% similarity]
PWGCF/EBYE/macros/runBalanceFunctionToyModel.C [moved from PWG2/EBYE/macros/runBalanceFunctionToyModel.C with 96% similarity]
PWGCF/EBYE/macros/runLRCAnalysis.C [moved from PWG2/EBYE/macros/runLRCAnalysis.C with 99% similarity]
PWGCF/EBYE/macros/runTaskFluctuations.C [moved from PWG2/EBYE/macros/runTaskFluctuations.C with 98% similarity]
PWGCF/EBYE/macros/runTaskFluctuationsCentralityTrain.C [moved from PWG2/EBYE/macros/runTaskFluctuationsCentralityTrain.C with 98% similarity]
PWGCF/PWGCFebyeLinkDef.h [moved from PWG2/PWG2ebyeLinkDef.h with 100% similarity]

similarity index 90%
rename from PWG2/CMakelibPWG2ebye.pkg
rename to PWGCF/CMakelibPWGCFebye.pkg
index 2411a70..9a60b1a 100644 (file)
@@ -27,9 +27,9 @@
 #--------------------------------------------------------------------------------#
 
 set ( SRCS   
-    EBYE/AliAnalysisTaskToyModel.cxx 
-    EBYE/AliAnalysisTaskBF.cxx 
-    EBYE/AliBalance.cxx 
+    EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx 
+    EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx 
+    EBYE/BalanceFunctions/AliBalance.cxx 
     EBYE/LRC/AliLRCBase.cxx
     EBYE/LRC/AliAnalysisTaskLRC.cxx 
     EBYE/LRC/AliLRCAnalysis.cxx 
@@ -45,8 +45,8 @@ set ( SRCS
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
-set ( DHDR PWG2ebyeLinkDef.h)
+set ( DHDR PWGCFebyeLinkDef.h)
 
 set ( EXPORT )
 
-set ( EINCLUDE  PWG2/EBYE PWG2/EBYE/LRC PWG2/EBYE/Fluctuations STEER/STEERBase)
+set ( EINCLUDE  PWGCF/EBYE PWGCF/EBYE/BalanceFunctions PWGCF/EBYE/LRC PWGCF/EBYE/Fluctuations STEER/STEERBase)
@@ -77,7 +77,7 @@ AliAnalysisTaskBF *AddTaskBalanceCentralityTrain(Double_t centrMin=0.,
 \r
   // for local changed BF configuration\r
   //gROOT->LoadMacro("./configBalanceFunctionAnalysis.C");\r
-  gROOT->LoadMacro("$ALICE_ROOT/PWG2/EBYE/macros/configBalanceFunctionAnalysis.C");\r
+  gROOT->LoadMacro("$ALICE_ROOT/PWGCF/EBYE/macros/configBalanceFunctionAnalysis.C");\r
   AliBalance *bf  = 0;  // Balance Function object\r
   AliBalance *bfs = 0;  // shuffled Balance function object\r
 \r
@@ -147,7 +147,7 @@ AliAnalysisTaskBF *AddTaskBalanceCentralityTrain(Double_t centrMin=0.,
   // Get and connect other common input/output containers via the manager as below\r
   //==============================================================================\r
   TString outputFileName = AliAnalysisManager::GetCommonFileName();\r
-  outputFileName += ":PWG2EbyE.outputBalanceFunctionAnalysis";\r
+  outputFileName += ":PWGCFEbyE.outputBalanceFunctionAnalysis";\r
   AliAnalysisDataContainer *coutQA = mgr->CreateContainer(Form("listQA_%s",centralityName.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName.Data());\r
   AliAnalysisDataContainer *coutBF = mgr->CreateContainer(Form("listBF_%s",centralityName.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName.Data());\r
   if(gRunShuffling) AliAnalysisDataContainer *coutBFS= mgr->CreateContainer(Form("listBFShuffled_%s",centralityName.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName.Data());\r
similarity index 93%
rename from PWG2/EBYE/macros/AddTaskBalanceFunction.C
rename to PWGCF/EBYE/macros/AddTaskBalanceFunction.C
index 4267e9d..e39b682 100644 (file)
@@ -15,7 +15,7 @@ AliAnalysisTaskBF *AddTaskBalanceFunction() {
     return NULL;
   }
   TString type = mgr->GetInputEventHandler()->GetDataType(); // can be "ESD" or "AOD"
-  gROOT->LoadMacro("$ALICE_ROOT/PWG2/EBYE/macros/configBalanceFunctionAnalysis.C");
+  gROOT->LoadMacro("$ALICE_ROOT/PWGCF/EBYE/macros/configBalanceFunctionAnalysis.C");
   AliBalance *bf = 0;
   if (type=="ESD") bf = GetBalanceFunctionObject("ESD");
   else if (type=="AOD") bf = GetBalanceFunctionObject("AOD");
@@ -37,7 +37,7 @@ AliAnalysisTaskBF *AddTaskBalanceFunction() {
   // Get and connect other common input/output containers via the manager as below
   //==============================================================================
   TString outputFileName = AliAnalysisManager::GetCommonFileName();
-  outputFileName += ":PWG2EbyE.outputBalanceFunctionAnalysis.root";
+  outputFileName += ":PWGCFEbyE.outputBalanceFunctionAnalysis.root";
   AliAnalysisDataContainer *coutBF = mgr->CreateContainer("bfOutput", AliBalance::Class(),AliAnalysisManager::kOutputContainer,outputFileName.Data());
   AliAnalysisDataContainer *coutQA = mgr->CreateContainer("listQA", TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName.Data());
   mgr->ConnectInput(taskBF, 0, mgr->GetCommonInputContainer());
@@ -29,7 +29,7 @@ AliAnalysisTaskBF *AddTaskBalanceFunctionInppMultiplicityTrain(Int_t nMultMin =
     return NULL;\r
   }\r
   TString analysisType = mgr->GetInputEventHandler()->GetDataType(); // can be "ESD" or "AOD"\r
-  gROOT->LoadMacro("$ALICE_ROOT/PWG2/EBYE/macros/configBalanceFunctionAnalysis.C");\r
+  gROOT->LoadMacro("$ALICE_ROOT/PWGCF/EBYE/macros/configBalanceFunctionAnalysis.C");\r
   AliBalance *bf  = 0;  // Balance Function object\r
   AliBalance *bfs = 0;  // shuffled Balance function object\r
 \r
@@ -49,7 +49,7 @@ AliAnalysisTaskBF *AddTaskBalanceMCCentralityTrain(Double_t centrMin=0.,
 \r
   // for local changed BF configuration\r
   gROOT->LoadMacro("./configBalanceFunctionAnalysis.C");\r
-  //gROOT->LoadMacro("$ALICE_ROOT/PWG2/EBYE/macros/configBalanceFunctionAnalysis.C");\r
+  //gROOT->LoadMacro("$ALICE_ROOT/PWGCF/EBYE/macros/configBalanceFunctionAnalysis.C");\r
   AliBalance *bf  = 0;  // Balance Function object\r
   AliBalance *bfs = 0;  // shuffled Balance function object\r
 \r
@@ -128,7 +128,7 @@ AliAnalysisTaskBF *AddTaskBalanceMCCentralityTrain(Double_t centrMin=0.,
   // Get and connect other common input/output containers via the manager as below\r
   //==============================================================================\r
   TString outputFileName = AliAnalysisManager::GetCommonFileName();\r
-  outputFileName += ":PWG2EbyE.outputBalanceFunctionAnalysis";\r
+  outputFileName += ":PWGCFEbyE.outputBalanceFunctionAnalysis";\r
   AliAnalysisDataContainer *coutQA = mgr->CreateContainer(Form("listQA_%s",centralityName.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName.Data());\r
   AliAnalysisDataContainer *coutBF = mgr->CreateContainer(Form("listBF_%s",centralityName.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName.Data());\r
   if(gRunShuffling) AliAnalysisDataContainer *coutBFS= mgr->CreateContainer(Form("listBFShuffled_%s",centralityName.Data()), TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName.Data());\r
similarity index 95%
rename from PWG2/EBYE/macros/AddTaskLRC.C
rename to PWGCF/EBYE/macros/AddTaskLRC.C
index ab1c4ba..1fc2a65 100644 (file)
@@ -1,5 +1,5 @@
 
-AliAnalysisTaskLRC *AddTaskLRC(Bool_t RunKine=kFALSE, TString OutputRootFolder=":PWG2LRC")
+AliAnalysisTaskLRC *AddTaskLRC(Bool_t RunKine=kFALSE, TString OutputRootFolder=":PWGCFLRC")
 {
 // This macro adds AliAnalysisTaskLRC to existing AnalysisManager
 // RunKine paramiter switch task to kinematics analysis 
@@ -42,7 +42,7 @@ AliAnalysisTaskLRC *AddTaskLRC(Bool_t RunKine=kFALSE, TString OutputRootFolder="
        taskLRC->SetMaxPtLimit(1.5);
        taskLRC->SetMinPtLimit(0.3);
        mgr->AddTask(taskLRC);
-       configureLRCtaskOutput(taskLRC,":PWG2LRC");
+       configureLRCtaskOutput(taskLRC,":PWGCFLRC");
 
 return taskLRC;
 }
similarity index 99%
rename from PWG2/EBYE/macros/configLRCAnalysis.C
rename to PWGCF/EBYE/macros/configLRCAnalysis.C
index 5c40c8b..f28068f 100644 (file)
@@ -142,7 +142,7 @@ if(AddPhiWindows)
 }
 
 //===========================================================================
-void configureLRCtaskOutput(AliAnalysisTaskLRC* taskLRC,TString OutputRootFolder=":PWG2LRC")
+void configureLRCtaskOutput(AliAnalysisTaskLRC* taskLRC,TString OutputRootFolder=":PWGCFLRC")
 {
 if(!taskLRC){return ;}
 AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
similarity index 94%
rename from PWG2/EBYE/macros/readBalanceFunction.C
rename to PWGCF/EBYE/macros/readBalanceFunction.C
index 05070f3..6e661eb 100644 (file)
@@ -16,7 +16,7 @@ void readBalanceFunction(Bool_t bHistos = kTRUE, TString inFile = "AnalysisResul
   gSystem->Load("libProofPlayer.so");\r
   gSystem->Load("libANALYSIS.so");\r
   gSystem->Load("libANALYSISalice.so");\r
-  gSystem->Load("libPWG2ebye.so");\r
+  gSystem->Load("libPWGCFebye.so");\r
 \r
   //Draw BF              \r
   drawBF(bHistos,inFile, fStartBinBFWidth, fRebin,centEst,extraString);\r
@@ -47,7 +47,7 @@ void drawBF(Bool_t bHistos = kTRUE, TString inFile = "AnalysisResults.root", Int
   }\r
 \r
   // get the BF output directory\r
-  TDirectoryFile *dir = dynamic_cast<TDirectoryFile *>(f->Get("PWG2EbyE.outputBalanceFunctionAnalysis"));\r
+  TDirectoryFile *dir = dynamic_cast<TDirectoryFile *>(f->Get("PWGCFEbyE.outputBalanceFunctionAnalysis"));\r
   if(!dir) {\r
     Printf("Output directory not found!!!");\r
     break;\r
@@ -291,12 +291,12 @@ void drawBF(Bool_t bHistos = kTRUE, TString inFile = "AnalysisResults.root", Int
        // create the BF object\r
        bfs[a]  = new AliBalance();\r
 \r
-       fHistPS[a] = (TH2D*)list->FindObject(Form("fHistP%s%s_shuffle",gBFAnalysisType[a].Data(),centEst.Data()));\r
-       fHistNS[a] = (TH2D*)list->FindObject(Form("fHistN%s%s_shuffle",gBFAnalysisType[a].Data(),centEst.Data()));\r
-       fHistPPS[a] = (TH2D*)list->FindObject(Form("fHistPP%s%s_shuffle",gBFAnalysisType[a].Data(),centEst.Data()));\r
-       fHistPNS[a] = (TH2D*)list->FindObject(Form("fHistPN%s%s_shuffle",gBFAnalysisType[a].Data(),centEst.Data()));\r
-       fHistNPS[a] = (TH2D*)list->FindObject(Form("fHistNP%s%s_shuffle",gBFAnalysisType[a].Data(),centEst.Data()));\r
-       fHistNNS[a] = (TH2D*)list->FindObject(Form("fHistNN%s%s_shuffle",gBFAnalysisType[a].Data(),centEst.Data()));\r
+       fHistPS[a] = (TH2D*)list->FindObject(Form("fHistP%s_shuffle%s",gBFAnalysisType[a].Data(),centEst.Data()));\r
+       fHistNS[a] = (TH2D*)list->FindObject(Form("fHistN%s_shuffle%s",gBFAnalysisType[a].Data(),centEst.Data()));\r
+       fHistPPS[a] = (TH2D*)list->FindObject(Form("fHistPP%s_shuffle%s",gBFAnalysisType[a].Data(),centEst.Data()));\r
+       fHistPNS[a] = (TH2D*)list->FindObject(Form("fHistPN%s_shuffle%s",gBFAnalysisType[a].Data(),centEst.Data()));\r
+       fHistNPS[a] = (TH2D*)list->FindObject(Form("fHistNP%s_shuffle%s",gBFAnalysisType[a].Data(),centEst.Data()));\r
+       fHistNNS[a] = (TH2D*)list->FindObject(Form("fHistNN%s_shuffle%s",gBFAnalysisType[a].Data(),centEst.Data()));\r
 \r
        // rebin histograms (be careful with divider!)\r
        fHistPS[a]->RebinY(fRebin);\r
@@ -487,7 +487,7 @@ void mergeOutput(const char* outputDir) {
     alienUrl += "#AnalysisResults.root";\r
     Printf("Opening file: %s",alienUrl.Data());\r
     TFile *file = TFile::Open(alienUrl.Data());\r
-    dirSubJob = dynamic_cast<TDirectoryFile *>(file->Get("PWG2EbyE.outputBalanceFunctionAnalysis.root"));\r
+    dirSubJob = dynamic_cast<TDirectoryFile *>(file->Get("PWGCFEbyE.outputBalanceFunctionAnalysis.root"));\r
 \r
     //merge BF\r
     AliBalance *bfSubJob = dynamic_cast<AliBalance *>(dirSubJob->Get("AliBalance"));\r
@@ -507,7 +507,7 @@ void mergeOutput(const char* outputDir) {
   TString outputFile = "AnalysisResults.Merged.root";\r
   TFile *foutput = TFile::Open(outputFile.Data(),"recreate");\r
   TDirectoryFile *dirOutput = new TDirectoryFile();\r
-  dirOutput->SetName("PWG2EbyE.outputBalanceFunctionAnalysis.root");\r
+  dirOutput->SetName("PWGCFEbyE.outputBalanceFunctionAnalysis.root");\r
   //dirOutput->cd();\r
   dirOutput->Add(bf);\r
   TList *list = new TList();\r
similarity index 97%
rename from PWG2/EBYE/macros/runBalanceFunction.C
rename to PWGCF/EBYE/macros/runBalanceFunction.C
index b932fe0..b943398 100755 (executable)
@@ -59,7 +59,7 @@ void runBalanceFunction(
     gSystem->Load("libAOD.so");\r
     gSystem->Load("libANALYSIS.so");\r
     gSystem->Load("libANALYSISalice.so");\r
-    gSystem->Load("libPWG2ebye.so");\r
+    gSystem->Load("libPWGCFebye.so");\r
 \r
     // additional\r
 \r
@@ -372,7 +372,7 @@ AliAnalysisGrid* CreateAlienHandler(Bool_t bAOD, Int_t bunchN, const char *taskn
     // Declare all libraries (other than the default ones for the framework. These will be\r
     // loaded by the generated analysis macro. Add all extra files (task .cxx/.h) here.\r
     //plugin->AddIncludePath("-I.");\r
-    //plugin->SetAdditionalLibs("libPWG2ebye.so");\r
+    //plugin->SetAdditionalLibs("libPWGCFebye.so");\r
     plugin->SetAdditionalLibs("AliBalance.cxx AliBalance.h AliAnalysisTaskBF.cxx AliAnalysisTaskBF.h");\r
 \r
      // Declare the output file names separated by blancs.\r
similarity index 96%
rename from PWG2/EBYE/macros/runBalanceFunctionInpp.C
rename to PWGCF/EBYE/macros/runBalanceFunctionInpp.C
index 343bae6..e8ccee5 100755 (executable)
@@ -139,7 +139,7 @@ void LoadLibraries(const analysisModes mode) {
     gSystem->Load("libAOD.so");\r
     gSystem->Load("libANALYSIS.so");\r
     gSystem->Load("libANALYSISalice.so");\r
-    gSystem->Load("libPWG2ebye.so");\r
+    gSystem->Load("libPWGCFebye.so");\r
     // Use AliRoot includes to compile our task\r
     gROOT->ProcessLine(".include $ALICE_ROOT/include");\r
   }\r
@@ -153,7 +153,7 @@ void LoadLibraries(const analysisModes mode) {
     SetupPar("AOD");\r
     SetupPar("ANALYSIS");\r
     SetupPar("ANALYSISalice");\r
-    SetupPar("PWG2ebye");\r
+    SetupPar("PWGCFebye");\r
 }\r
   \r
   //---------------------------------------------------------\r
similarity index 96%
rename from PWG2/EBYE/macros/runBalanceFunctionMC.C
rename to PWGCF/EBYE/macros/runBalanceFunctionMC.C
index 994152c..e582d5d 100755 (executable)
@@ -176,7 +176,7 @@ void LoadLibraries(const analysisModes mode) {
     gSystem->Load("libAOD.so");\r
     gSystem->Load("libANALYSIS.so");\r
     gSystem->Load("libANALYSISalice.so");\r
-    gSystem->Load("libPWG2ebye.so");\r
+    gSystem->Load("libPWGCFebye.so");\r
     // Use AliRoot includes to compile our task\r
     gROOT->ProcessLine(".include $ALICE_ROOT/include");\r
   }\r
@@ -190,7 +190,7 @@ void LoadLibraries(const analysisModes mode) {
     SetupPar("AOD");\r
     SetupPar("ANALYSIS");\r
     SetupPar("ANALYSISalice");\r
-    SetupPar("PWG2ebye");\r
+    SetupPar("PWGCFebye");\r
 }\r
   \r
   //---------------------------------------------------------\r
similarity index 96%
rename from PWG2/EBYE/macros/runBalanceFunctionToyModel.C
rename to PWGCF/EBYE/macros/runBalanceFunctionToyModel.C
index 39a13cb..8b99c1f 100755 (executable)
@@ -63,7 +63,7 @@ void runBalanceFunctionToyModel(Int_t nEvents = 10,
   gSystem->Load("libAOD.so");\r
   gSystem->Load("libANALYSIS.so");\r
   gSystem->Load("libANALYSISalice.so");\r
-  gSystem->Load("libPWG2ebye.so");\r
+  gSystem->Load("libPWGCFebye.so");\r
   \r
   //configure the bf objects\r
   gROOT->LoadMacro("configBalanceFunctionAnalysis.C");\r
similarity index 99%
rename from PWG2/EBYE/macros/runLRCAnalysis.C
rename to PWGCF/EBYE/macros/runLRCAnalysis.C
index 81ef315..9fe70ad 100644 (file)
@@ -9,7 +9,7 @@ runLRCAnalysis(const char* mode = "GRID", const char* inputName= "wn.xml",Bool_t
 // This macro needs AliRoot-v4-17 or later 
 // and macro AddTaskLRC.C in workdir
 
-// For PROOF run PARS(ANALYSISalice.par  ANALYSIS.par  AOD.par  ESD.par  PWG2ebye.par  
+// For PROOF run PARS(ANALYSISalice.par  ANALYSIS.par  AOD.par  ESD.par  PWGCFebye.par  
 // STEERBase.par ) are to be in workdir.
 
 
@@ -45,7 +45,7 @@ void LoadAnalysisLibs(Bool_t LoadTaskLocal=kFALSE)
   gSystem->Load("libAOD.so");
   gSystem->Load("libANALYSIS.so");
   gSystem->Load("libANALYSISalice.so");
-  if(!LoadTaskLocal)gSystem->Load("libPWG2ebye.so");
+  if(!LoadTaskLocal)gSystem->Load("libPWGCFebye.so");
 
   
   //___________Compile analysis task using AClic____________//
similarity index 98%
rename from PWG2/EBYE/macros/runTaskFluctuations.C
rename to PWGCF/EBYE/macros/runTaskFluctuations.C
index 8c7512e..7340338 100644 (file)
@@ -142,9 +142,9 @@ void LoadLibraries(const anaModes mode) {
     // Use AliRoot includes to compile our task                                   
     gROOT->ProcessLine(".include $ALICE_ROOT/include");
     if(mode==mLocal || mode==mGrid)
-      gSystem->Load("libPWG2ebye");
+      gSystem->Load("libPWGCFebye");
     if(mode==mGridPAR)
-      SetupPar("PWG2ebye");
+      SetupPar("PWGCFebye");
   }
   
   else if (mode == mLocalPAR) {
@@ -156,7 +156,7 @@ void LoadLibraries(const anaModes mode) {
     SetupPar("AOD");
     SetupPar("ANALYSIS");
     SetupPar("ANALYSISalice");
-    SetupPar("PWG2ebye");
+    SetupPar("PWGCFebye");
 }
   
   //---------------------------------------------------------
@@ -179,7 +179,7 @@ void LoadLibraries(const anaModes mode) {
     //gProof->ClearPackage("AOD.par");
     //gProof->ClearPackage("ANALYSIS.par");
     //gProof->ClearPackage("ANALYSISalice.par");    
-    //gProof->ClearPackage("PWG2ebye");
+    //gProof->ClearPackage("PWGCFebye");
     
     // Upload the Packages
     //gProof->UploadPackage("STEERBase.par");
@@ -188,7 +188,7 @@ void LoadLibraries(const anaModes mode) {
     //gProof->UploadPackage("ANALYSIS.par"); 
     //gProof->UploadPackage("ANALYSISalice.par");
     //gProof->UploadPackage("CORRFW.par");
-    //gProof->UploadPackage("PWG2ebye");
+    //gProof->UploadPackage("PWGCFebye");
 
     // Enable the Packages 
     //gProof->EnablePackage("STEERBase");
@@ -196,7 +196,7 @@ void LoadLibraries(const anaModes mode) {
     //gProof->EnablePackage("AOD");
     //gProof->EnablePackage("ANALYSIS");
     //gProof->EnablePackage("ANALYSISalice");
-    //gProof->EnablePackage("PWG2ebye");
+    //gProof->EnablePackage("PWGCFebye");
 
     // Show enables Packages
     //gProof->ShowEnabledPackages();
@@ -167,9 +167,9 @@ void LoadLibraries(const anaModes mode) {
     // Use AliRoot includes to compile our task                                   
     gROOT->ProcessLine(".include $ALICE_ROOT/include");
     if(mode==mLocal || mode==mGrid)
-      gSystem->Load("libPWG2ebye");
+      gSystem->Load("libPWGCFebye");
     if(mode==mGridPAR)
-      SetupPar("PWG2ebye");
+      SetupPar("PWGCFebye");
   }
   
   else if (mode == mLocalPAR) {
@@ -181,7 +181,7 @@ void LoadLibraries(const anaModes mode) {
     SetupPar("AOD");
     SetupPar("ANALYSIS");
     SetupPar("ANALYSISalice");
-    SetupPar("PWG2ebye");
+    SetupPar("PWGCFebye");
 }
   
   //---------------------------------------------------------
@@ -204,7 +204,7 @@ void LoadLibraries(const anaModes mode) {
     //gProof->ClearPackage("AOD.par");
     //gProof->ClearPackage("ANALYSIS.par");
     //gProof->ClearPackage("ANALYSISalice.par");    
-    //gProof->ClearPackage("PWG2ebye");
+    //gProof->ClearPackage("PWGCFebye");
     
     // Upload the Packages
     //gProof->UploadPackage("STEERBase.par");
@@ -213,7 +213,7 @@ void LoadLibraries(const anaModes mode) {
     //gProof->UploadPackage("ANALYSIS.par"); 
     //gProof->UploadPackage("ANALYSISalice.par");
     //gProof->UploadPackage("CORRFW.par");
-    //gProof->UploadPackage("PWG2ebye");
+    //gProof->UploadPackage("PWGCFebye");
 
     // Enable the Packages 
     //gProof->EnablePackage("STEERBase");
@@ -221,7 +221,7 @@ void LoadLibraries(const anaModes mode) {
     //gProof->EnablePackage("AOD");
     //gProof->EnablePackage("ANALYSIS");
     //gProof->EnablePackage("ANALYSISalice");
-    //gProof->EnablePackage("PWG2ebye");
+    //gProof->EnablePackage("PWGCFebye");
 
     // Show enables Packages
     //gProof->ShowEnabledPackages();