From f35407ff56cda898daed742aeda4cfc69ae044ba Mon Sep 17 00:00:00 2001 From: sjena Date: Wed, 18 Jun 2014 09:46:34 +0200 Subject: [PATCH] Update from Prabhat : Dpt-Dpt Corr --- .../AliAnalysisTaskDptDptCorrelations.cxx | 35 +++++----- .../DPhi/AliAnalysisTaskDptDptCorrelations.h | 3 +- .../AddTaskDptDptCorr_dca1.C | 64 ++++++++----------- 3 files changed, 42 insertions(+), 60 deletions(-) diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx index 34add68a2c2..a6f3c538778 100644 --- a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx +++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx @@ -22,6 +22,7 @@ #include "TH3D.h" #include "THnSparse.h" #include "TCanvas.h" +#include "TRandom.h" #include #include @@ -36,7 +37,6 @@ #include #include #include -#include #include "AliAnalysisManager.h" #include "AliAODHandler.h" @@ -123,7 +123,7 @@ _mult4 ( 0 ), _mult4a ( 0 ), _mult5 ( 0 ), _mult6 ( 0 ), -arraySize ( 2000), +arraySize ( 2500), _id_1(0), _charge_1(0), _iEtaPhi_1(0), @@ -408,7 +408,7 @@ _mult4 ( 0 ), _mult4a ( 0 ), _mult5 ( 0 ), _mult6 ( 0 ), -arraySize ( 2000), +arraySize ( 2500), _id_1(0), _charge_1(0), _iEtaPhi_1(0), @@ -1167,7 +1167,6 @@ void AliAnalysisTaskDptDptCorrelations::UserExec(Option_t */*option*/) //********************************************************* TExMap *trackMap = new TExMap();//Mapping matrix---- - //TRandom *ran = new TRandom(); //random eff. correction //1st loop track for Global tracks for(Int_t i = 0; i < _nTracks; i++) @@ -1191,21 +1190,10 @@ void AliAnalysisTaskDptDptCorrelations::UserExec(Option_t */*option*/) AliError(Form("Could not receive track %d", iTrack)); continue; } - + bitOK = t->TestFilterBit(_trackFilterBit); if (!bitOK) continue; //128bit or 272bit - /* //------- Eff. test---------- - Double_t yy = (1-0.7)/1.8; - Double_t zz = (pt-0.2); - //Double_t effValue = 0.7+yy*zz; //Slope - Double_t effValue = 0.7; //Flat - Double_t R = ran->Uniform(0,1); - - if(R > effValue) continue; - //--------------------------- - */ - Int_t gID = t->GetID(); newAodTrack = gID >= 0 ?t : fAODEvent->GetTrack(trackMap->GetValue(-1-gID)); @@ -1234,7 +1222,6 @@ void AliAnalysisTaskDptDptCorrelations::UserExec(Option_t */*option*/) && nsigmaproton > fNSigmaCut ) continue; if(charge == 0) continue; - // Kinematics cuts used if( pt < _min_pt_1 || pt > _max_pt_1) continue; if( eta < _min_eta_1 || eta > _max_eta_1) continue; @@ -1253,6 +1240,12 @@ void AliAnalysisTaskDptDptCorrelations::UserExec(Option_t */*option*/) DCAXY > _dcaXYMax ) continue; + //------- Eff. test---------- //just for checking + Double_t effValue = 0.7; + Double_t R = gRandom->Rndm(); + if(R > effValue) continue; + //--------------------------- + //==== QA =========================== //_dcaz->Fill(DCAZ); //_dcaxy->Fill(DCAXY); @@ -1262,7 +1255,9 @@ void AliAnalysisTaskDptDptCorrelations::UserExec(Option_t */*option*/) //************************************************* //Particle 1 - if (_requestedCharge_1 == charge) + if (_requestedCharge_1 == charge && + eta >= _min_eta_1 && + eta < _max_eta_1) { iPhi = int( phi/_width_phi_1); @@ -1333,7 +1328,9 @@ void AliAnalysisTaskDptDptCorrelations::UserExec(Option_t */*option*/) } } - if (!_sameFilter && _requestedCharge_2 == charge) + if (!_sameFilter && _requestedCharge_2 == charge && + eta >= _min_eta_2 && + eta < _max_eta_2) { iPhi = int( phi/_width_phi_2); diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.h b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.h index 4c5acd32048..b51717c8be6 100644 --- a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.h +++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.h @@ -26,7 +26,6 @@ class TH3D; class TProfile; - class AliAnalysisTaskDptDptCorrelations : public AliAnalysisTaskSE { public: @@ -318,7 +317,7 @@ protected: TH1F * _dcaz; TH1F * _dcaxy; - + // PARTICLE 1 (satisfies filter 1) // Primary filled quantities TH1F * _n1_1_vsPt; diff --git a/PWGCF/Correlations/macros/dptdptcorrelations/AddTaskDptDptCorr_dca1.C b/PWGCF/Correlations/macros/dptdptcorrelations/AddTaskDptDptCorr_dca1.C index affa4857c60..fce2b1ca228 100644 --- a/PWGCF/Correlations/macros/dptdptcorrelations/AddTaskDptDptCorr_dca1.C +++ b/PWGCF/Correlations/macros/dptdptcorrelations/AddTaskDptDptCorr_dca1.C @@ -1,8 +1,5 @@ -// // Macro designed for use with the AliAnalysisTaskDptDptCorrelations task. -// // Author: Prabhat Pujahari & Claude Pruneau, Wayne State -// // system: 0: PbPb 1: pPb // singlesOnly: 0: full correlations 1: singles only // useWeights: 0: no 1: yes @@ -10,23 +7,25 @@ // chargeSet: 0: ++ 1: +- 2: -+ 3: -- ///////////////////////////////////////////////////////////////////////////////// AliAnalysisTaskDptDptCorrelations *AddTaskDptDptCorr_dca1 -(int system = 0, - int singlesOnly = 0, - int useWeights = 1, - int centralityMethod = 4, - int chargeSet = 1, - int trackFilterBit = 128, - int nClusterMin = 80, - double etaMin = -0.9, - double etaMax = 0.9, - double dcaZMin = -2.0, - double dcaZMax = 2.0, - double dcaXYMin = -2.4, - double dcaXYMax = 2.4, - int nCentrality = 4, - Bool_t trigger = kFALSE, - const char* taskname = "dcaz2", - char *inputHistogramFileName = "alien:///alice/cern.ch/user/p/prabhat/CalibFiles/PbPbCalib_dca1.root") +(int system = 0, + int singlesOnly = 0, + int useWeights = 0, + int centralityMethod = 4, + int chargeSet = 1, + int trackFilterBit = 128, + int nClusterMin = 80, + double eta1Min = -0.8, + double eta1Max = 0.8, + double eta2Min = -0.8, + double eta2Max = 0.8, + double dcaZMin = -3.2, + double dcaZMax = 3.2, + double dcaXYMin = -2.4, + double dcaXYMax = 2.4, + int nCentrality = 1, + Bool_t trigger = kFALSE, + const char* taskname = "dcaz2", + char *inputHistogramFileName = "alien:///alice/cern.ch/user/p/prabhat/CalibFiles/PbPbCalib_dca1.root") { // Set Default Configuration of this analysis @@ -35,7 +34,6 @@ AliAnalysisTaskDptDptCorrelations *AddTaskDptDptCorr_dca1 int rejectPileup = 1; int rejectPairConversion = 1; int sameFilter = 1; - //int nCentrality; double minCentrality[10]; @@ -51,18 +49,6 @@ AliAnalysisTaskDptDptCorrelations *AddTaskDptDptCorr_dca1 minCentrality[2] = 30.; maxCentrality[2] = 40.; minCentrality[3] = 60.; maxCentrality[3] = 70.; - //nCentrality = 10; - /*minCentrality[0] = 0.0; maxCentrality[0] = 5.0; - minCentrality[1] = 5.0; maxCentrality[1] = 10.; - minCentrality[2] = 10.; maxCentrality[2] = 20.; - minCentrality[3] = 20.; maxCentrality[3] = 30.; - minCentrality[4] = 30.; maxCentrality[4] = 40.; - minCentrality[5] = 40.; maxCentrality[5] = 50.; - minCentrality[6] = 50.; maxCentrality[6] = 60.; - minCentrality[7] = 60.; maxCentrality[7] = 70.; - minCentrality[8] = 70.; maxCentrality[8] = 80.; - minCentrality[9] = 80.; maxCentrality[9] = 90.; - */ } else { @@ -147,7 +133,7 @@ AliAnalysisTaskDptDptCorrelations *AddTaskDptDptCorr_dca1 } part1Name += "eta"; - part1Name += int(1000*etaMax); + part1Name += int(1000*eta1Max); part1Name += "_"; part1Name += int(1000*ptMin); part1Name += "pt"; @@ -159,7 +145,7 @@ AliAnalysisTaskDptDptCorrelations *AddTaskDptDptCorr_dca1 part1Name += "_"; part2Name += "eta"; - part2Name += int(1000*etaMax); + part2Name += int(1000*eta2Max); part2Name += "_"; part2Name += int(1000*ptMin); part2Name += "pt"; @@ -260,12 +246,12 @@ AliAnalysisTaskDptDptCorrelations *AddTaskDptDptCorr_dca1 task->SetCentrality( minCentrality[iCentrality], maxCentrality[iCentrality]); task->SetPtMin1( ptMin ); task->SetPtMax1( ptMax ); - task->SetEtaMin1( etaMin ); - task->SetEtaMax1( etaMax ); + task->SetEtaMin1( eta1Min ); + task->SetEtaMax1( eta1Max ); task->SetPtMin2( ptMin ); task->SetPtMax2( ptMax ); - task->SetEtaMin2( etaMin ); - task->SetEtaMax2( etaMax ); + task->SetEtaMin2( eta2Min ); + task->SetEtaMax2( eta2Max ); task->SetDcaZMin( dcaZMin ); task->SetDcaZMax( dcaZMax ); task->SetDcaXYMin( dcaXYMin ); -- 2.43.0