From 01d3a3734a8da76e86d00d1e2dc3c9f39419ff25 Mon Sep 17 00:00:00 2001 From: pgonzale Date: Fri, 31 Oct 2014 14:40:01 +0100 Subject: [PATCH] New cut and histograms for photon calculation efficiency --- .../AliAnalysisTaskGammaConvDalitzV1.cxx | 12 +++++++++++- .../AliAnalysisTaskGammaConvDalitzV1.h | 1 + .../macros/AddTask_GammaConvDalitzQAV1_pPb.C | 17 +++++++++++++---- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx index 3712bef5165..c398ff97fd6 100644 --- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx +++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx @@ -184,6 +184,7 @@ AliAnalysisTaskGammaConvDalitzV1::AliAnalysisTaskGammaConvDalitzV1(): hESDTrueMotherGGInvMassPt(NULL), hESDTrueConvGammaPt(NULL), hESDTrueConvGammaR(NULL), + hESDTrueConvGammaRMC(NULL), hESDTruePositronPt(NULL), hESDTrueElectronPt(NULL), hESDTrueSecConvGammaPt(NULL), @@ -355,6 +356,7 @@ AliAnalysisTaskGammaConvDalitzV1::AliAnalysisTaskGammaConvDalitzV1( const char* hESDTrueMotherGGInvMassPt(NULL), hESDTrueConvGammaPt(NULL), hESDTrueConvGammaR(NULL), + hESDTrueConvGammaRMC(NULL), hESDTruePositronPt(NULL), hESDTrueElectronPt(NULL), hESDTrueSecConvGammaPt(NULL), @@ -897,6 +899,7 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects() hESDEposEnegTruePhotonPsiPairDPhiPtCut = new TH2F*[fnCuts]; hESDEposEnegTrueJPsiInvMassPt = new TH2F*[fnCuts]; hESDTrueConvGammaR = new TH1F*[fnCuts]; + hESDTrueConvGammaRMC = new TH1F*[fnCuts]; } @@ -1049,6 +1052,10 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects() hESDTrueConvGammaR[iCut] = new TH1F("ESD_TrueConvGamma_R","ESD_TrueConvGamma_R",800,0,200); fTrueList[iCut]->Add(hESDTrueConvGammaR[iCut]); + + hESDTrueConvGammaRMC[iCut] = new TH1F("ESD_TrueConvGamma_R_MC","ESD_TrueConvGamma_R_MC",800,0,200); + fTrueList[iCut]->Add(hESDTrueConvGammaRMC[iCut]); + } hESDTruePositronPt[iCut] = new TH1F("ESD_TruePositron_Pt","ESD_TruePositron_Pt",1000,0,25); @@ -1516,7 +1523,10 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessTruePhotonCandidates(AliAODConvers if( labelGamma < MCStack->GetNprimary() ){ if( fIsFromMBHeader ){ hESDTrueConvGammaPt[fiCut]->Fill(TruePhotonCandidate->Pt()); - if(fDoMesonQA) hESDTrueConvGammaR[fiCut]->Fill(TruePhotonCandidate->GetConversionRadius()); + if(fDoMesonQA){ + hESDTrueConvGammaR[fiCut]->Fill(TruePhotonCandidate->GetConversionRadius()); + hESDTrueConvGammaRMC[fiCut]->Fill( posDaughter->R() ); + } } } else { if( fIsFromMBHeader){ diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h index f023158cb2a..2f2a9cd606f 100644 --- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h +++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h @@ -207,6 +207,7 @@ class AliAnalysisTaskGammaConvDalitzV1: public AliAnalysisTaskSE TH2F **hESDTrueMotherGGInvMassPt; TH1F **hESDTrueConvGammaPt; TH1F **hESDTrueConvGammaR; + TH1F **hESDTrueConvGammaRMC; TH1F **hESDTruePositronPt; TH1F **hESDTrueElectronPt; TH1F **hESDTrueSecConvGammaPt; diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C index 94494a4bc1e..336f6d956f1 100644 --- a/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C +++ b/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C @@ -72,9 +72,10 @@ void AddTask_GammaConvDalitzQAV1_pPb( Int_t trainConfig = 1, if(trainConfig == 9 || trainConfig == 10 ){ cutnumberPhoton = "160084001001500000000"; //Offline V0 finder - } - else { - cutnumberPhoton = "060084001001500000000"; //Online V0 finder + } else if ( trainConfig == 54 ){ // Warning!!! Those trains must run in stand-alone mode + cutnumberPhoton = "000700040000500000000"; + } else { + cutnumberPhoton = "060084001000500000000"; //Online V0 finder //change } TString ElecCuts = "90005400000002000000"; //Electron Cuts @@ -425,6 +426,14 @@ if( trainConfig == 1 ) { // No eta shift |Y| < 0.8 eventCutArray[0]="8000011"; photonCutArray[0] = "002093603007200000000"; ElecCutarray[0] = "90475400233202623700"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100 //Tracks 2011 + kAny + New psi pair cut + New psi pair cut fPsiPairCut = 0.60 fDeltaPhiCutMin = 0.0 fDeltaPhiCutMax = 0.12 +} else if( trainConfig == 53 ) { + + eventCutArray[0]="8000011"; photonCutArray[0] = "002093603007200000000"; ElecCutarray[0] = "90475400233202623700"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100 //Tracks 2011 + kAny + New psi pair cut + New psi pair cut fPsiPairCut = 0.60 fDeltaPhiCutMin = 0.0 fDeltaPhiCutMax = 0.12 + +} else if( trainConfig == 54 ) { + + eventCutArray[0]="8000011"; photonCutArray[0] = "000700040000500000000"; ElecCutarray[0] = "90475400233202623710"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100 //Tracks 2011 + kAny + new psiPair Cut 0.60, 0.0 0.12 + 0 cm < Rconv < 180 cm //open cuts + } @@ -470,7 +479,7 @@ if( trainConfig == 1 ) { // No eta shift |Y| < 0.8 if ( ( trainConfig >= 1 && trainConfig <= 6 ) || trainConfig == 9 || trainConfig == 11 || trainConfig == 13 || trainConfig == 14 || trainConfig == 16 || trainConfig == 17 || trainConfig == 18 || trainConfig == 19 || trainConfig == 20 || trainConfig == 21 || trainConfig == 22 || trainConfig == 23 || trainConfig == 28 || trainConfig == 29 || trainConfig == 30 || trainConfig == 31 || trainConfig == 32 || trainConfig == 33 || trainConfig == 37 || trainConfig == 38 || trainConfig == 39 || trainConfig == 40 || trainConfig == 41 || trainConfig == 41 || trainConfig == 43 || trainConfig == 44 || - trainConfig == 45 || trainConfig == 46 || trainConfig == 47 || trainConfig == 48 || trainConfig == 49 || trainConfig == 50 || trainConfig == 51 || trainConfig == 52 ) { + trainConfig == 45 || trainConfig == 46 || trainConfig == 47 || trainConfig == 48 || trainConfig == 49 || trainConfig == 50 || trainConfig == 51 || trainConfig == 52 || trainConfig == 54 ) { if (doWeighting){ if (generatorName.CompareTo("DPMJET")==0){ -- 2.43.0