From ea6d858b33c5f4de21da8f00f5bee063f4f1ca61 Mon Sep 17 00:00:00 2001 From: lmilano Date: Wed, 10 Sep 2014 14:05:27 +0200 Subject: [PATCH] update from markus --- PWGCF/Correlations/Base/AliTwoPlusOneContainer.cxx | 4 ++-- PWGCF/Correlations/Base/AliUEHist.cxx | 6 ++++-- PWGCF/Correlations/Base/AliUEHist.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/PWGCF/Correlations/Base/AliTwoPlusOneContainer.cxx b/PWGCF/Correlations/Base/AliTwoPlusOneContainer.cxx index 6bf3fd0270c..3ec39afd07a 100644 --- a/PWGCF/Correlations/Base/AliTwoPlusOneContainer.cxx +++ b/PWGCF/Correlations/Base/AliTwoPlusOneContainer.cxx @@ -188,9 +188,9 @@ void AliTwoPlusOneContainer::FillCorrelations(Double_t centrality, Float_t zVtx, if(dphi_triggers>TMath::Pi()) dphi_triggers -= TMath::TwoPi(); //look at delta phi = +/- pi/2 - if(TMath::Abs(dphi_triggers)<0) + if(dphi_triggers<0) dphi_triggers += 0.5*TMath::Pi(); - else if(TMath::Abs(dphi_triggers)>0) + else if(dphi_triggers>0) dphi_triggers -= 0.5*TMath::Pi(); } if(!is1plus1 && TMath::Abs(dphi_triggers)>fAlpha) diff --git a/PWGCF/Correlations/Base/AliUEHist.cxx b/PWGCF/Correlations/Base/AliUEHist.cxx index 18e39658947..37c2572b93b 100644 --- a/PWGCF/Correlations/Base/AliUEHist.cxx +++ b/PWGCF/Correlations/Base/AliUEHist.cxx @@ -946,7 +946,7 @@ void AliUEHist::GetHistsZVtxMult(AliUEHist::CFStep step, AliUEHist::Region regio } //____________________________________________________________________ -TH2* AliUEHist::GetSumOfRatios2(AliUEHist* mixed, AliUEHist::CFStep step, AliUEHist::Region region, Float_t ptLeadMin, Float_t ptLeadMax, Int_t multBinBegin, Int_t multBinEnd, Bool_t normalizePerTrigger, Int_t stepForMixed) +TH2* AliUEHist::GetSumOfRatios2(AliUEHist* mixed, AliUEHist::CFStep step, AliUEHist::Region region, Float_t ptLeadMin, Float_t ptLeadMax, Int_t multBinBegin, Int_t multBinEnd, Bool_t normalizePerTrigger, Int_t stepForMixed, Int_t* trigger) { // Calls GetUEHist(...) for *each* vertex bin and multiplicity bin and performs a sum of ratios: // 1_N [ (same/mixed)_1 + (same/mixed)_2 + (same/mixed)_3 + ... ] @@ -1030,7 +1030,7 @@ TH2* AliUEHist::GetSumOfRatios2(AliUEHist* mixed, AliUEHist::CFStep step, AliUEH // Printf("%f", tracksMixed->Integral()); Float_t binWidthEta = tracksMixed->GetYaxis()->GetBinWidth(1); - if (step == kCFStepBiasStudy && !trackMixedAllStep6) + if (stepForMixed == -1 && step == kCFStepBiasStudy && !trackMixedAllStep6) { // get mixed event normalization by assuming full acceptance at deta at 0 (integrate over dphi), excluding (0, 0) Float_t phiExclude = 0.41; @@ -1226,6 +1226,8 @@ TH2* AliUEHist::GetSumOfRatios2(AliUEHist* mixed, AliUEHist::CFStep step, AliUEH if (totalEvents > 0) totalTracks->Scale(1.0 / totalEvents); } + if(trigger!=NULL) + *trigger = (Int_t)totalEvents; // normalizate to dphi width Float_t normalization = totalTracks->GetXaxis()->GetBinWidth(1); diff --git a/PWGCF/Correlations/Base/AliUEHist.h b/PWGCF/Correlations/Base/AliUEHist.h index 2aeb69ec821..cd3ff66a9da 100644 --- a/PWGCF/Correlations/Base/AliUEHist.h +++ b/PWGCF/Correlations/Base/AliUEHist.h @@ -58,7 +58,7 @@ class AliUEHist : public TObject void GetHistsZVtx(AliUEHist::CFStep step, AliUEHist::Region region, Float_t ptLeadMin, Float_t ptLeadMax, Int_t multBinBegin, Int_t multBinEnd, TH3** trackHist, TH1** eventHist); void GetHistsZVtxMult(AliUEHist::CFStep step, AliUEHist::Region region, Float_t ptLeadMin, Float_t ptLeadMax, THnBase** trackHist, TH2** eventHist); - TH2* GetSumOfRatios2(AliUEHist* mixed, AliUEHist::CFStep step, AliUEHist::Region region, Float_t ptLeadMin, Float_t ptLeadMax, Int_t multBinBegin, Int_t multBinEnd, Bool_t normalizePerTrigger = kTRUE, Int_t stepForMixed = -1); + TH2* GetSumOfRatios2(AliUEHist* mixed, AliUEHist::CFStep step, AliUEHist::Region region, Float_t ptLeadMin, Float_t ptLeadMax, Int_t multBinBegin, Int_t multBinEnd, Bool_t normalizePerTrigger = kTRUE, Int_t stepForMixed = -1, Int_t *trigger = NULL); TH1* GetTriggersAsFunctionOfMultiplicity(AliUEHist::CFStep step, Float_t ptLeadMin, Float_t ptLeadMax); -- 2.43.0