From fb128ded73a5abd4f5cf71ccfe972445d100f50b Mon Sep 17 00:00:00 2001 From: pchrist Date: Wed, 4 Apr 2012 14:09:52 +0000 Subject: [PATCH] Fixing the angles for the phi-dphi analysis --- PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx | 7 +-- .../macros/AddTaskBalancePsiCentralityTrain.C | 38 +++++++------- PWGCF/EBYE/macros/runBalanceFunctionPsi.C | 51 +++++++++++++++---- 3 files changed, 63 insertions(+), 33 deletions(-) diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx index 5fd693e9cae..3fc8aa17584 100644 --- a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx +++ b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx @@ -344,7 +344,7 @@ void AliBalancePsi::CalculateBalance(Float_t fCentrality, pt1 = chargeVector[7]->at(i); energy1 = chargeVector[8]->at(i); gPsiMinusPhi = phi1 - gReactionPlane; - if(phi1 > 180.) phi1 -= 360.; + //if(phi1 > 180.) phi1 -= 360.; if(gPsiMinusPhi < -fPsiInterval/2) gPsiMinusPhi = 360. + gPsiMinusPhi; gPsiBin = (Int_t)((gPsiMinusPhi + 360./fPsiNumberOfBins/2.)/(360./fPsiNumberOfBins)); @@ -358,7 +358,7 @@ void AliBalancePsi::CalculateBalance(Float_t fCentrality, pz2 = chargeVector[6]->at(j); pt2 = chargeVector[7]->at(i); energy2 = chargeVector[8]->at(j); - if(phi2 > 180.) phi2 -= 360.; + //if(phi2 > 180.) phi2 -= 360.; // filling the arrays // RAPIDITY @@ -401,7 +401,8 @@ void AliBalancePsi::CalculateBalance(Float_t fCentrality, //phi dphi = phi1 - phi2; - if(dphi < -180) dphi = 360 - dphi; //dphi should be between -180 and 180! + if(dphi < -180.) dphi = 360. + dphi; //dphi should be between -180 and 180! + else if(dphi > 180.) dphi = -360. + dphi; //dphi should be between -180 and 180! //0:y - 1:eta - 2:Qlong - 3:Qout - 4:Qside - 5:Qinv - 6:phi if((rap1 >= fP1Start[kRapidity]) && (rap1 <= fP1Stop[kRapidity]) && (rap2 >= fP1Start[kRapidity]) && (rap2 <= fP1Stop[kRapidity])) { diff --git a/PWGCF/EBYE/macros/AddTaskBalancePsiCentralityTrain.C b/PWGCF/EBYE/macros/AddTaskBalancePsiCentralityTrain.C index 8efa3cff2cb..1d1bc29c974 100644 --- a/PWGCF/EBYE/macros/AddTaskBalancePsiCentralityTrain.C +++ b/PWGCF/EBYE/macros/AddTaskBalancePsiCentralityTrain.C @@ -15,23 +15,23 @@ Bool_t kUseBayesianPID = kTRUE; Double_t gMinAcceptedProbability = 0.7; //_________________________________________________________// -AliAnalysisTaskBF *AddTaskBalancePsiCentralityTrain(Double_t centrMin=0., - Double_t centrMax=100., - Bool_t gRunShuffling=kFALSE, - TString centralityEstimator="V0M", - Double_t vertexZ=10., - Double_t DCAxy=-1, - Double_t DCAz=-1, - Double_t ptMin=0.3, - Double_t ptMax=1.5, - Double_t etaMin=-0.8, - Double_t etaMax=0.8, - Double_t maxTPCchi2 = -1, - Int_t minNClustersTPC = -1, - Bool_t kUsePID = kFALSE, - Int_t AODfilterBit = 128, - Bool_t bCentralTrigger = kFALSE, - TString fileNameBase="AnalysisResults") { +AliAnalysisTaskBFPsi *AddTaskBalancePsiCentralityTrain(Double_t centrMin=0., + Double_t centrMax=100., + Bool_t gRunShuffling=kFALSE, + TString centralityEstimator="V0M", + Double_t vertexZ=10., + Double_t DCAxy=-1, + Double_t DCAz=-1, + Double_t ptMin=0.3, + Double_t ptMax=1.5, + Double_t etaMin=-0.8, + Double_t etaMax=0.8, + Double_t maxTPCchi2 = -1, + Int_t minNClustersTPC = -1, + Bool_t kUsePID = kFALSE, + Int_t AODfilterBit = 128, + Bool_t bCentralTrigger = kFALSE, + TString fileNameBase="AnalysisResults") { // Creates a balance function analysis task and adds it to the analysis manager. // Get the pointer to the existing analysis manager via the static access method. TString centralityName(""); @@ -86,8 +86,8 @@ AliAnalysisTaskBF *AddTaskBalancePsiCentralityTrain(Double_t centrMin=0., if(dynamic_cast (AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler())) analysisType = "MC"; // for local changed BF configuration - //gROOT->LoadMacro("./configBalanceFunctionAnalysis.C"); - gROOT->LoadMacro("$ALICE_ROOT/PWGCF/EBYE/macros/configBalanceFunctionAnalysis.C"); + gROOT->LoadMacro("./configBalanceFunctionPsiAnalysis.C"); + //gROOT->LoadMacro("$ALICE_ROOT/PWGCF/EBYE/macros/configBalanceFunctionPsiAnalysis.C"); AliBalancePsi *bf = 0; // Balance Function object AliBalancePsi *bfs = 0; // shuffled Balance function object diff --git a/PWGCF/EBYE/macros/runBalanceFunctionPsi.C b/PWGCF/EBYE/macros/runBalanceFunctionPsi.C index 4d927ff2e91..fe41c09e17c 100755 --- a/PWGCF/EBYE/macros/runBalanceFunctionPsi.C +++ b/PWGCF/EBYE/macros/runBalanceFunctionPsi.C @@ -21,7 +21,7 @@ Float_t vZ[numberOfSyst] = {10.,12.,6.,8.,10.,10.,10.,10.,10.,10.,10.,10.,10 Float_t DCAxy[numberOfSyst] = {-1.,2.4,2.4,2.4,2.2,2.0,1.8,2.4,2.4,2.4,2.4,2.4,2.4}; // DCA xy cut (afterburner, -1 = w/o additional cut) Float_t DCAz[numberOfSyst] = {-1.,3.2,3.2,3.2,3.0,2.8,2.6,3.2,3.2,3.2,3.2,3.2,3.2}; // DCA z cut (afterburner, -1 = w/o additional cut) Float_t ptMin[numberOfSyst] = {0.3,0.3,0.3,0.3,0.3,0.3,0.3,1.5,5.0,0.3,0.3,0.3,0.3}; // pt cuts -Float_t ptMax[numberOfSyst] = {1.5,1.5,1.5,1.5,1.5,1.5,1.5,5.0,10.0,10.0,1.5,1.5,1.5}; // pt cuts +Float_t ptMax[numberOfSyst] = {5.,1.5,1.5,1.5,1.5,1.5,1.5,5.0,10.0,10.0,1.5,1.5,1.5}; // pt cuts Float_t etaMin[numberOfSyst] = {-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-1.0,-0.6,-0.4}; // eta cuts Float_t etaMax[numberOfSyst] = {0.8,0.8,0.8,0.8,0.8,0.8,0.8,0.8,0.8,0.8,1.0,0.6,0.4}; // eta cuts @@ -43,7 +43,7 @@ void runBalanceFunctionPsi( ) { // check run type - if(runtype != "local" && runtype != "proof" && runtype != "grid"){ + if(runtype != "local" && runtype != "proof" && runtype != "grid") { Printf("\n\tIncorrect run option, check first argument of run macro"); Printf("\tint runtype = local, proof or grid\n"); return; @@ -79,9 +79,35 @@ void runBalanceFunctionPsi( AliAnalysisManager* mgr = new AliAnalysisManager(Form("%s%i",taskname,bunchN)); // create the alien handler and attach it to the manager - AliAnalysisGrid *plugin = CreateAlienHandler(bAOD,bunchN,Form("%s%i",taskname,bunchN), gridmode, proofcluster, Form("%s_%d.txt",proofdataset.Data(),bunchN)); - mgr->SetGridHandler(plugin); - + if(runtype == "grid") { + AliAnalysisGrid *plugin = CreateAlienHandler(bAOD,bunchN,Form("%s%i",taskname,bunchN), gridmode, proofcluster, Form("%s_%d.txt",proofdataset.Data(),bunchN)); + mgr->SetGridHandler(plugin); + } + else if(runtype == "local") { + TString filename; + TChain* chain = 0x0; + if((!bAOD)&&(!bMCtruth)) { + chain = new TChain("esdTree"); + for(Int_t i = 0; i < 8; i++) { + filename = "/data/alice2/pchrist/HeavyIons/Data/2011/Set"; + filename += i; filename += "/AliESDs.root"; + chain->Add(filename.Data()); + } + } + else if((bAOD)&&(!bMCtruth)) { + chain = new TChain("aodTree"); + for(Int_t i = 0; i < 8; i++) { + filename = "/data/alice2/pchrist/HeavyIons/Data/2011/Set"; + filename += i; filename += "/AliAOD.root"; + chain->Add(filename.Data()); + } + } + else if(bMCtruth) { + chain = new TChain("TE"); + filename = "galice.root"; + chain->Add(filename.Data()); + } + }//local mode // input handler (ESD or AOD) AliVEventHandler* inputH = NULL; @@ -95,12 +121,12 @@ void runBalanceFunctionPsi( // mc event handler if(bMCtruth) { - AliMCEventHandler* mchandler = new AliMCEventHandler(); - // Not reading track references - mchandler->SetReadTR(kFALSE); - mgr->SetMCtruthEventHandler(mchandler); + AliMCEventHandler* mchandler = new AliMCEventHandler(); + // Not reading track references + mchandler->SetReadTR(kFALSE); + mgr->SetMCtruthEventHandler(mchandler); } - + // AOD output handler //AliAODHandler* aodoutHandler = new AliAODHandler(); //aodoutHandler->SetOutputFileName("aod.root"); @@ -177,7 +203,10 @@ void runBalanceFunctionPsi( // start analysis Printf("Starting Analysis...."); - mgr->StartAnalysis(runtype,nentries,firstentry); + if(runtype == "local") + mgr->StartAnalysis("local",chain); + else + mgr->StartAnalysis(runtype,nentries,firstentry); } //______________________________________________________________________________ -- 2.43.0