From 29f145690499837d5ecfe666c751dbe181553930 Mon Sep 17 00:00:00 2001 From: belikov Date: Mon, 17 Sep 2012 17:04:15 +0000 Subject: [PATCH] adding parameters to AddTask (Xitzel) --- .../AliAnalysisTaskLambdaOverK0sJets.cxx | 22 ++++++++----------- .../macros/AddTaskLambdaOverK0sJets.C | 4 +++- .../macros/runGridLambdaOverK0sJets.C | 13 ++++++----- .../macros/runProofLambdaOverK0sJets.C | 7 +++--- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.cxx b/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.cxx index 8bec4808283..dd77cff6b56 100644 --- a/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.cxx +++ b/PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.cxx @@ -13,7 +13,6 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ - #include #include #include @@ -49,6 +48,7 @@ extern TROOT *gROOT; + ClassImp(AliAnalysisTaskLambdaOverK0sJets) // Global variables: @@ -1583,9 +1583,7 @@ TArrayD* AliAnalysisTaskLambdaOverK0sJets::V0Loop(AliAODTrack *trkTrig, V0LoopSt noas: - Double_t pNeg = -100.; Double_t pPos = -100.; - Double_t dedxNeg = -1000.; Double_t dedxPos = -1000.; Double_t nsigPosPion = 0.; @@ -1598,9 +1596,7 @@ TArrayD* AliAnalysisTaskLambdaOverK0sJets::V0Loop(AliAODTrack *trkTrig, V0LoopSt const AliAODPid *pidPos = ptrack->GetDetPid(); if (pidNeg && pidPos) { - pNeg = pidNeg->GetTPCmomentum(); pPos = pidPos->GetTPCmomentum(); - dedxNeg = pidNeg->GetTPCsignal()/47.; dedxPos = pidPos->GetTPCsignal()/47.; } @@ -2129,8 +2125,12 @@ TArrayD* AliAnalysisTaskLambdaOverK0sJets::TriggerParticle() isTriggerFromV0Daug = TMath::FloorNint( v0Audit->At(1) ); ptV0LP = v0Audit->At(2); - if(isV0LP) - fTriggerIsV0->Fill(ptV0LP); + fCheckTriggerFromV0Daug->Fill(isTriggerFromV0Daug); + + if(isV0LP) fTriggerIsV0->Fill(ptV0LP); + + if(isTriggerFromV0Daug && isV0LP) + fCheckTriggerFromV0Daug->Fill(2); if(isTriggerFromV0Daug) fTriggerComingFromDaug->Fill(ptTrigger); @@ -2326,15 +2326,11 @@ void AliAnalysisTaskLambdaOverK0sJets::UserExec(Option_t *) // ------------------- - fCheckTriggerFromV0Daug->Fill(isTriggerFromV0daug); - if(!isTriggerFromV0daug && is2ndLoop) fCheckTriggerFromV0Daug->Fill(-1); - else if(isTriggerFromV0daug && isV0LP) - fCheckTriggerFromV0Daug->Fill(isTriggerFromV0daug+isV0LP); else if(isTriggerFromV0daug && isV0LP && is2ndLoop) - fCheckTriggerFromV0Daug->Fill(isTriggerFromV0daug+isV0LP+is2ndLoop); - + fCheckTriggerFromV0Daug->Fill(3); + // The highest-pt particle is a V0-candidate if(isV0LP) fEvents->Fill(8); diff --git a/PWGLF/STRANGENESS/Correlations/macros/AddTaskLambdaOverK0sJets.C b/PWGLF/STRANGENESS/Correlations/macros/AddTaskLambdaOverK0sJets.C index d289df9a63c..76c9613fc1a 100644 --- a/PWGLF/STRANGENESS/Correlations/macros/AddTaskLambdaOverK0sJets.C +++ b/PWGLF/STRANGENESS/Correlations/macros/AddTaskLambdaOverK0sJets.C @@ -4,6 +4,7 @@ AliAnalysisTaskLambdaOverK0sJets *AddTaskLambdaOverK0sJets( TString name = Double_t ptMinTrig = 8., Double_t ptMaxTrig = 20., Double_t etaMaxTrig = 0.75, + Double_t rapMaxV0 = 0.75, Bool_t sepInjec = kTRUE, Bool_t isMC = kFALSE, Bool_t usePID = kTRUE){ @@ -21,6 +22,7 @@ AliAnalysisTaskLambdaOverK0sJets *AddTaskLambdaOverK0sJets( TString name = task->SetCentrality(minCen,maxCen); task->SetTriggerPt(ptMinTrig,ptMaxTrig); task->SetTriggerEta(etaMaxTrig); + task->SetMaxY(rapMaxV0); task->SetSeparateInjectedPart(sepInjec); task->SetMC(isMC); task->SetPID(usePID); @@ -38,7 +40,7 @@ AliAnalysisTaskLambdaOverK0sJets *AddTaskLambdaOverK0sJets( TString name = if (isMC) name+="_mc"; AliAnalysisDataContainer *coutput1 = - mgr->CreateContainer("LambdaOverK0sRatio", TList::Class(), + mgr->CreateContainer(name, TList::Class(), AliAnalysisManager::kOutputContainer, name+".root"); diff --git a/PWGLF/STRANGENESS/Correlations/macros/runGridLambdaOverK0sJets.C b/PWGLF/STRANGENESS/Correlations/macros/runGridLambdaOverK0sJets.C index 9f266e65e1f..2b551dde71f 100644 --- a/PWGLF/STRANGENESS/Correlations/macros/runGridLambdaOverK0sJets.C +++ b/PWGLF/STRANGENESS/Correlations/macros/runGridLambdaOverK0sJets.C @@ -1,8 +1,8 @@ class AliAnalysisAlien; void runGridLambdaOverK0sJets(TString runMode = "full", - TString alirootVer = "v5-03-39-AN", - TString rootVer = "v5-33-02b", + TString alirootVer = "v5-03-46-AN", + TString rootVer = "v5-34-01-1", TString dataPath = "ESDs/pass2/AOD049/*/AliAOD.root", TString dataDir = "/alice/data/2010/LHC10h", TString workDir = "work", @@ -12,6 +12,7 @@ void runGridLambdaOverK0sJets(TString runMode = "full", Double_t ptMinTrig = 8., Double_t ptMaxTrig = 20., Double_t etaMaxTrig = 0.75, + Double_t rapMaxV0 = 0.75, Bool_t sepInjec = kTRUE, Bool_t isMC = kFALSE, Bool_t usePID = kTRUE, @@ -41,11 +42,11 @@ void runGridLambdaOverK0sJets(TString runMode = "full", AliAnalysisTask *pidTask = AddTaskPIDResponse(isMC); //AliAnalysisTask *pidTask = AddTaskPIDResponse(isMC,kTRUE); if(!pidTask) { printf("no PIDtask\n"); return; } - + // My task gROOT->LoadMacro("AliAnalysisTaskLambdaOverK0sJets.cxx+g"); gROOT->LoadMacro("AddTaskLambdaOverK0sJets.C"); - AliAnalysisTaskLambdaOverK0sJets *task = AddTaskLambdaOverK0sJets(name,minCen,maxCen,ptMinTrig,ptMaxTrig,etaMaxTrig,sepInjec,isMC,usePID); + AliAnalysisTaskLambdaOverK0sJets *task = AddTaskLambdaOverK0sJets(name,minCen,maxCen,ptMinTrig,ptMaxTrig,etaMaxTrig,rapMaxV0,sepInjec,isMC,usePID); // _____________________________________________________ // if (!mgr->InitAnalysis()) return; @@ -81,7 +82,9 @@ void InitAndLoadLibs() { gSystem->Load("libRAWDatabase.so"); gSystem->Load("libSTEER.so"); gSystem->Load("libCORRFW.so"); - + + + gSystem->AddIncludePath("-I$ALICE_ROOT/include"); } // ___________________________________________________________________ // diff --git a/PWGLF/STRANGENESS/Correlations/macros/runProofLambdaOverK0sJets.C b/PWGLF/STRANGENESS/Correlations/macros/runProofLambdaOverK0sJets.C index 8ca4acedf92..f91e7bf8da6 100644 --- a/PWGLF/STRANGENESS/Correlations/macros/runProofLambdaOverK0sJets.C +++ b/PWGLF/STRANGENESS/Correlations/macros/runProofLambdaOverK0sJets.C @@ -1,7 +1,7 @@ //Based on the file $ALICE_ROOT/PWGLF/STRANGENESS/Cascades/macros/runProofCascadePbPb() void runProofLambdaOverK0sJets(TString proofCluster = "xsanchez@skaf.saske.sk", - TString alirootVer = "VO_ALICE@AliRoot::v5-03-33-AN", - TString rootVer = "VO_ALICE@ROOT::v5-33-02b", + TString alirootVer = "VO_ALICE@AliRoot::v5-03-46-AN", + TString rootVer = "VO_ALICE@ROOT::v5-34-01-1", TString path = "/alice/data/LHC10h_000138624_p2_AOD049", TString name = "LambdaOverK0sRatio", Double_t minCen = 0., @@ -9,6 +9,7 @@ void runProofLambdaOverK0sJets(TString proofCluster = "xsanchez@skaf.saske.sk" Double_t ptMinTrig = 8., Double_t ptMaxTrig = 20., Double_t etaMaxTrig = 0.75, + Double_t rapMaxV0 = 0.75, Bool_t sepInjec = kTRUE, Bool_t isMC = kFALSE, Bool_t usePID = kTRUE){ @@ -56,7 +57,7 @@ void runProofLambdaOverK0sJets(TString proofCluster = "xsanchez@skaf.saske.sk" // My task gProof->Load("AliAnalysisTaskLambdaOverK0sJets.cxx+g"); gROOT->LoadMacro("AddTaskLambdaOverK0sJets.C"); - AliAnalysisTaskLambdaOverK0sJets *task = AddTaskLambdaOverK0sJets(name,minCen,maxCen,ptMinTrig,ptMaxTrig,etaMaxTrig,sepInjec,isMC,usePID); + AliAnalysisTaskLambdaOverK0sJets *task = AddTaskLambdaOverK0sJets(name,minCen,maxCen,ptMinTrig,ptMaxTrig,etaMaxTrig,rapMaxV0,sepInjec,isMC,usePID); // _____________________________________________________ // -- 2.43.0