From 67d3cb61912a3f44d3728fb1a6892bd73d366c56 Mon Sep 17 00:00:00 2001 From: snelling Date: Thu, 23 Sep 2010 12:50:31 +0000 Subject: [PATCH] fix merging problem on the grid --- .../AliFlowAnalysisWithScalarProduct.cxx | 76 ++++++++++++------- 1 file changed, 48 insertions(+), 28 deletions(-) diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx index 2b3686ce2f7..06d9c1c24e6 100644 --- a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx +++ b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx @@ -873,7 +873,7 @@ void AliFlowAnalysisWithScalarProduct::GetOutputHistograms(TList *outputListHist for(Int_t rp=0;rp<2;rp++) { for(Int_t pe=0;pe<2;pe++) { for(Int_t sc=0;sc<2;sc++) { - pHistProNonIsotropicTermsU[rp][pe][sc] = dynamic_cast(outputListHistos->FindObject(Form("Flow_NonIsotropicTerms_%s_%s_%s_SP",rpPoi[rp].Data(),ptEta[pe].Data(),sinCos[sc].Data()))); + pHistProNonIsotropicTermsU[rp][pe][sc] = dynamic_cast(outputListHistos->FindObject(Form("FlowPro_NonIsotropicTerms_%s_%s_%s_SP",rpPoi[rp].Data(),ptEta[pe].Data(),sinCos[sc].Data()))); } } } @@ -891,22 +891,43 @@ void AliFlowAnalysisWithScalarProduct::GetOutputHistograms(TList *outputListHist TH2D* pHistMavsMb = dynamic_cast(outputListHistos->FindObject("Flow_MavsMb_SP")); //pass the pointers to the task - if (pCommonHistSP && pCommonHistResultsSP && pCommonHistmuQ && - pHistProQNorm && pHistProQaQb && - pHistProQaQbNorm && pHistProQaQbReImNorm && + if (pCommonHistSP && + pCommonHistResultsSP && + pCommonHistmuQ && + pHistProQNorm && + pHistProQaQb && + pHistProQaQbNorm && + pHistProQaQbReImNorm && pHistProNonIsotropicTermsQ && pHistSumOfLinearWeights && pHistSumOfQuadraticWeights && - pHistQNorm && pHistQaQb && - pHistQaQbNorm && pHistQNormvsQaQbNorm && - pHistQaQbCos && pHistResolution && - pHistQaNorm && pHistQaNormvsMa && - pHistQbNorm && pHistQbNormvsMb && - pHistMavsMb && pHistProFlags && - pHistProUQetaRP && pHistProUQetaPOI && - pHistProUQPtRP && pHistProUQPtPOI && - pHistProUQQaQbPtRP && pHistProUQQaQbEtaRP && - pHistProUQQaQbPtPOI && pHistProUQQaQbEtaPOI) { + pHistProFlags && + pHistProUQetaRP && + pHistProUQetaPOI && + pHistProUQPtRP && + pHistProUQPtPOI && + pHistProUQQaQbPtRP && + pHistProUQQaQbEtaRP && + pHistProUQQaQbPtPOI && + pHistProUQQaQbEtaPOI && + pHistSumOfWeightsPtRP[0] && pHistSumOfWeightsPtRP[1] && pHistSumOfWeightsPtRP[2] && + pHistSumOfWeightsEtaRP[0] && pHistSumOfWeightsEtaRP[1] && pHistSumOfWeightsEtaRP[2] && + pHistSumOfWeightsPtPOI[0] && pHistSumOfWeightsPtPOI[1] && pHistSumOfWeightsPtPOI[2] && + pHistSumOfWeightsEtaPOI[0] && pHistSumOfWeightsEtaPOI[1] && pHistSumOfWeightsEtaPOI[2] && + pHistProNonIsotropicTermsU[0][0][0] && pHistProNonIsotropicTermsU[1][0][0] && pHistProNonIsotropicTermsU[0][1][0] && pHistProNonIsotropicTermsU[0][0][1] && + pHistProNonIsotropicTermsU[1][1][0] && pHistProNonIsotropicTermsU[1][0][1] && pHistProNonIsotropicTermsU[0][1][1] && pHistProNonIsotropicTermsU[1][1][1] && + pHistQNorm && + pHistQaQb && + pHistQaQbNorm && + pHistQNormvsQaQbNorm && + pHistQaQbCos && + pHistResolution && + pHistQaNorm && + pHistQaNormvsMa && + pHistQbNorm && + pHistQbNormvsMb && + pHistMavsMb + ) { this -> SetCommonHistsSP(pCommonHistSP); this -> SetCommonHistsResSP(pCommonHistResultsSP); @@ -918,17 +939,6 @@ void AliFlowAnalysisWithScalarProduct::GetOutputHistograms(TList *outputListHist this -> SetHistProNonIsotropicTermsQ(pHistProNonIsotropicTermsQ); this -> SetHistSumOfLinearWeights(pHistSumOfLinearWeights); this -> SetHistSumOfQuadraticWeights(pHistSumOfQuadraticWeights); - this -> SetHistQNorm(pHistQNorm); - this -> SetHistQaQb(pHistQaQb); - this -> SetHistQaQbNorm(pHistQaQbNorm); - this -> SetHistQNormvsQaQbNorm(pHistQNormvsQaQbNorm); - this -> SetHistQaQbCos(pHistQaQbCos); - this -> SetHistResolution(pHistResolution); - this -> SetHistQaNorm(pHistQaNorm); - this -> SetHistQaNormvsMa(pHistQaNormvsMa); - this -> SetHistQbNorm(pHistQbNorm); - this -> SetHistQbNormvsMb(pHistQbNormvsMb); - this -> SetHistMavsMb(pHistMavsMb); this -> SetHistProFlags(pHistProFlags); this -> SetHistProUQetaRP(pHistProUQetaRP); this -> SetHistProUQetaPOI(pHistProUQetaPOI); @@ -937,14 +947,13 @@ void AliFlowAnalysisWithScalarProduct::GetOutputHistograms(TList *outputListHist this -> SetHistProUQQaQbPtRP(pHistProUQQaQbPtRP); this -> SetHistProUQQaQbEtaRP(pHistProUQQaQbEtaRP); this -> SetHistProUQQaQbPtPOI(pHistProUQQaQbPtPOI); - this -> SetHistProUQQaQbEtaPOI(pHistProUQQaQbEtaPOI); - + this -> SetHistProUQQaQbEtaPOI(pHistProUQQaQbEtaPOI); for(Int_t i=0;i<3;i++) { if(pHistSumOfWeightsPtRP[i]) this -> SetHistSumOfWeightsPtRP(pHistSumOfWeightsPtRP[i],i); if(pHistSumOfWeightsEtaRP[i]) this -> SetHistSumOfWeightsEtaRP(pHistSumOfWeightsEtaRP[i],i); if(pHistSumOfWeightsPtPOI[i]) this -> SetHistSumOfWeightsPtPOI(pHistSumOfWeightsPtPOI[i],i); if(pHistSumOfWeightsEtaPOI[i]) this -> SetHistSumOfWeightsEtaPOI(pHistSumOfWeightsEtaPOI[i],i); - } + } for(Int_t rp=0;rp<2;rp++) { for(Int_t pe=0;pe<2;pe++) { for(Int_t sc=0;sc<2;sc++) { @@ -954,6 +963,17 @@ void AliFlowAnalysisWithScalarProduct::GetOutputHistograms(TList *outputListHist } } } + this -> SetHistQNorm(pHistQNorm); + this -> SetHistQaQb(pHistQaQb); + this -> SetHistQaQbNorm(pHistQaQbNorm); + this -> SetHistQNormvsQaQbNorm(pHistQNormvsQaQbNorm); + this -> SetHistQaQbCos(pHistQaQbCos); + this -> SetHistResolution(pHistResolution); + this -> SetHistQaNorm(pHistQaNorm); + this -> SetHistQaNormvsMa(pHistQaNormvsMa); + this -> SetHistQbNorm(pHistQbNorm); + this -> SetHistQbNormvsMb(pHistQbNormvsMb); + this -> SetHistMavsMb(pHistMavsMb); } else { cout<<"WARNING: Histograms needed to run Finish() in SP are not accessable!"<