for all Balance Function tasks in UserCreateOutputObjects: global switch disabling...

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx
index 350fe0625110e99abef194d9cba40a7abc1fbf10..5b4d5a3d55c4a71852e27b4558e9540828dd4e47 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx
@@ -161,6 +161,12 @@ AliAnalysisTaskBF::~AliAnalysisTaskBF() {
 void AliAnalysisTaskBF::UserCreateOutputObjects() {
   // Create histograms
   // Called once
+
+  // global switch disabling the reference 
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
+
   if(!fBalance) {
     fBalance = new AliBalance();
     fBalance->SetAnalysisLevel("ESD");
@@ -374,6 +380,9 @@ void AliAnalysisTaskBF::UserCreateOutputObjects() {
   PostData(2, fListBF);
   if(fRunShuffling) PostData(3, fListBFS);
   if(fUsePID) PostData(4, fHistListPIDQA);       //PID
+
+  TH1::AddDirectory(oldStatus);
+
 }
 
 //________________________________________________________________________

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
index 25f5120bc060bbb9a8a62cad0601edcf0a5ebb48..be85cbd4dd695577573d0dd8380b729b5dee78ce 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
@@ -178,6 +178,12 @@ AliAnalysisTaskBFPsi::~AliAnalysisTaskBFPsi() {
 void AliAnalysisTaskBFPsi::UserCreateOutputObjects() {\r
   // Create histograms\r
   // Called once\r
+\r
+  // global switch disabling the reference \r
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)\r
+  Bool_t oldStatus = TH1::AddDirectoryStatus();\r
+  TH1::AddDirectory(kFALSE);\r
+\r
   if(!fBalance) {\r
     fBalance = new AliBalancePsi();\r
     fBalance->SetAnalysisLevel("ESD");\r
@@ -435,6 +441,9 @@ void AliAnalysisTaskBFPsi::UserCreateOutputObjects() {
   if(fRunShuffling) PostData(3, fListBFS);\r
   if(fRunMixing) PostData(4, fListBFM);\r
   if(fUsePID) PostData(5, fHistListPIDQA);       //PID\r
+\r
+  TH1::AddDirectory(oldStatus);\r
+\r
 }\r
 \r
 //________________________________________________________________________\r

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEfficiencyBF.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEfficiencyBF.cxx
index 5623f5181c5c63e1bf8017280f7a14925416b2fb..b03a0b035adcd44517e8cc62531ae41cfcd6514c 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEfficiencyBF.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEfficiencyBF.cxx
@@ -73,6 +73,11 @@ void AliAnalysisTaskEfficiencyBF::UserCreateOutputObjects() {
   // Create histograms
   // Called once
 
+  // global switch disabling the reference 
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
+
   fQAList = new TList();
   fQAList->SetName("QAList");
   fQAList->SetOwner();
@@ -291,6 +296,9 @@ void AliAnalysisTaskEfficiencyBF::UserCreateOutputObjects() {
 
   PostData(1, fQAList);
   PostData(2, fOutputList);
+
+  TH1::AddDirectory(oldStatus);
+
 }
 
 //________________________________________________________________________

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEfficiencyBFPsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEfficiencyBFPsi.cxx
index 2864a4d127af383805bd1e53f01ed8e4f194c981..b1c0e7cc64576d53e1ad3dee9bd623f1bc99583b 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEfficiencyBFPsi.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEfficiencyBFPsi.cxx
@@ -64,6 +64,11 @@ void AliAnalysisTaskEfficiencyBFPsi::UserCreateOutputObjects() {
   // Create histograms
   // Called once
 
+  // global switch disabling the reference 
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
+
   fQAList = new TList();
   fQAList->SetName("QAList");
   fQAList->SetOwner();
@@ -272,6 +277,9 @@ void AliAnalysisTaskEfficiencyBFPsi::UserCreateOutputObjects() {
 
   PostData(1, fQAList);
   PostData(2, fOutputList);
+
+  TH1::AddDirectory(oldStatus);
+
 }
 
 //________________________________________________________________________

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx
index 1cd6ac8e702e4528a8931839b495b287b7d98aeb..3ce0f1225ea2292204c564ffa7ea57d27aebcad1 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx
@@ -177,6 +177,12 @@ void AliAnalysisTaskToyModel::Init() {
 void AliAnalysisTaskToyModel::CreateOutputObjects() {\r
   // Create histograms\r
   // Called once\r
+\r
+  // global switch disabling the reference \r
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)\r
+  Bool_t oldStatus = TH1::AddDirectoryStatus();\r
+  TH1::AddDirectory(kFALSE);\r
+\r
   if(!fBalance) {\r
     fBalance = new AliBalance();\r
     fBalance->SetInterval(-1,-0.8,0.8,16,0.,1.6);\r
@@ -299,6 +305,9 @@ void AliAnalysisTaskToyModel::CreateOutputObjects() {
   //PostData(1, fList);\r
   //PostData(2, fListBF);\r
   //if(fRunShuffling) PostData(3, fListBFS);\r
+\r
+  TH1::AddDirectory(oldStatus);\r
+\r
 }\r
 \r
 //________________________________________________________________________\r

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.cxx
index 351d8e474e2a42ffe984ca0175af2b4bcc83fa3a..146bbd09bc046389b3b1f676926d1abfcc33c9b0 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.cxx
@@ -154,6 +154,12 @@ AliAnalysisTaskTriggeredBF::~AliAnalysisTaskTriggeredBF() {
 void AliAnalysisTaskTriggeredBF::UserCreateOutputObjects() {\r
   // Create histograms\r
   // Called once\r
+\r
+  // global switch disabling the reference \r
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)\r
+  Bool_t oldStatus = TH1::AddDirectoryStatus();\r
+  TH1::AddDirectory(kFALSE);\r
+\r
   if(!fBalance) {\r
     fBalance = new AliBalanceTriggered();\r
     fBalance->SetAnalysisLevel("AOD");\r
@@ -464,6 +470,9 @@ void AliAnalysisTaskTriggeredBF::UserCreateOutputObjects() {
   if(fRunShuffling) PostData(3, fListTriggeredBFS);\r
   if(fRunMixing) PostData(4, fListTriggeredBFM);\r
   if(fRunV0) PostData(5,fHistListV0);\r
+\r
+  TH1::AddDirectory(oldStatus);\r
+\r
 }\r
 \r
 //________________________________________________________________________\r

diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalance.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalance.cxx
index 1523df64324d8c8d4a07d972304dfc1bf6906b1e..ec7d21ca58bf314bcdfc999006b6bf8ddd5844bb 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliBalance.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliBalance.cxx
@@ -203,6 +203,12 @@ void AliBalance::SetInterval(Int_t iAnalysisType,
 //____________________________________________________________________//
 void AliBalance::InitHistograms() {
   //Initialize the histograms
+
+  // global switch disabling the reference 
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
+
   TString histName;
   for(Int_t iAnalysisType = 0; iAnalysisType < ANALYSIS_TYPES; iAnalysisType++) {
     histName = "fHistP"; histName += kBFAnalysisType[iAnalysisType]; 
@@ -242,6 +248,8 @@ void AliBalance::InitHistograms() {
   fHistConversionbefore = new TH2D("fHistConversionbefore","before Conversion cut",200,0,2,200,0,200);
   fHistConversionafter  = new TH2D("fHistConversionafter","after Conversion cut",200,0,2,200,0,200);
 
+  TH1::AddDirectory(oldStatus);
+
 }
 
 //____________________________________________________________________//

diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalanceEventMixing.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalanceEventMixing.cxx
index 0ca01e0570f70de53e1a4f55d3ef51fcd4f06c73..da51f8628215be9b6cbe4bd26b96d6fca1a86261 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliBalanceEventMixing.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliBalanceEventMixing.cxx
@@ -193,6 +193,12 @@ void AliBalanceEventMixing::SetInterval(Int_t iAnalysisType,
 //____________________________________________________________________//
 void AliBalanceEventMixing::InitHistograms() {
   //Initialize the histograms
+
+  // global switch disabling the reference 
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
+
   TString histName;
   for(Int_t iAnalysisType = 0; iAnalysisType < ANALYSIS_TYPES; iAnalysisType++) {
     histName = "fHistP"; histName += kBFAnalysisType[iAnalysisType]; 
@@ -225,6 +231,9 @@ void AliBalanceEventMixing::InitHistograms() {
     if(fCentralityId) histName += fCentralityId.Data();
     fHistNN[iAnalysisType] = new TH2D(histName.Data(),"",fCentStop-fCentStart,fCentStart,fCentStop,fNumberOfBins[iAnalysisType],fP2Start[iAnalysisType],fP2Stop[iAnalysisType]);
   }
+
+  TH1::AddDirectory(oldStatus);
+
 }
 
 //____________________________________________________________________//

diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
index 91af1b6362b6f37a96c2a5f32f9c28075d3fccda..4ca2c16429ea3d5384c4572569086cb33db0b3f7 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
@@ -113,6 +113,12 @@ AliBalancePsi::~AliBalancePsi() {
 //____________________________________________________________________//
 void AliBalancePsi::InitHistograms() {
   // single particle histograms
+
+  // global switch disabling the reference 
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
+
   Int_t anaSteps   = 1;       // analysis steps
   Int_t iBinSingle[kTrackVariablesSingle];        // binning for track variables
   Double_t* dBinsSingle[kTrackVariablesSingle];   // bins for track variables  
@@ -249,6 +255,9 @@ void AliBalancePsi::InitHistograms() {
   fHistConversionbefore = new TH2D("fHistConversionbefore","before Conversion cut",200,0,2,200,0,2.*TMath::Pi());
   fHistConversionafter  = new TH2D("fHistConversionafter","after Conversion cut",200,0,2,200,0,2.*TMath::Pi());
   fHistPsiMinusPhi     = new TH2D("fHistPsiMinusPhi","",4,-0.5,3.5,100,0,2.*TMath::Pi());
+
+  TH1::AddDirectory(oldStatus);
+
 }
 
 //____________________________________________________________________//

diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.cxx
index f2e2b700db196923a22a44ef54a055a0ff3f787e..4bb80af06f2efa97bdabb4545d3be1a1305ca4c4 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.cxx
@@ -89,9 +89,13 @@ AliBalanceTriggered::~AliBalanceTriggered() {
 
 //____________________________________________________________________//
 void AliBalanceTriggered::InitHistograms() {
-
   //Initialize the histograms
 
+  // global switch disabling the reference 
+  // (to avoid "Replacing existing TH1" if several wagons are created in train)
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
+
   TString title    = "";      // histogram title
   Int_t anaSteps   = 1;       // analysis steps
 
@@ -241,6 +245,7 @@ void AliBalanceTriggered::InitHistograms() {
   //-----------------------------------------------------------
   //-----------------------------------------------------------
 
+  TH1::AddDirectory(oldStatus);
 
 }
 

diff --git a/PWGCF/EBYE/macros/drawBalanceFunctionPsi.C b/PWGCF/EBYE/macros/drawBalanceFunctionPsi.C
index 961ac147888069858629fab95b71d2a8f93184a7..2769c8223b0b94d13817307858dbf5c31cc5829e 100644 (file)
--- a/PWGCF/EBYE/macros/drawBalanceFunctionPsi.C
+++ b/PWGCF/EBYE/macros/drawBalanceFunctionPsi.C
@@ -1,5 +1,5 @@
-const Int_t numberOfCentralityBins = 10;
-TString centralityArray[numberOfCentralityBins] = {"0-10","10-20","20-30","30-40","40-50","50-60","60-70","70-80","0-1","1-2"};
+const Int_t numberOfCentralityBins = 11;
+TString centralityArray[numberOfCentralityBins] = {"0-10","10-20","20-30","30-40","40-50","50-60","60-70","70-80","0-1","1-2","0-100"};
 
 void drawBalanceFunctionPsi(const char* filename = "AnalysisResultsPsi.root", 
                            Int_t gCentrality = 1,
@@ -87,7 +87,8 @@ TList *GetListOfObjects(const char* filename,
     listBFName += "_"; listBFName += gCentralityEstimator;}
   listBF = dynamic_cast<TList *>(dir->Get(listBFName.Data()));
   cout<<"======================================================="<<endl;
-  cout<<"List name: "<<listBF->GetName()<<endl;
+  cout<<"List name: "<<listBFName<<endl;
+  cout<<"List name (check): "<<listBF->GetName()<<endl;
   listBF->ls();
 
   //Get the histograms