From: fbock Date: Thu, 6 Mar 2014 16:32:42 +0000 (+0100) Subject: changes by Pedro Gonzales X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=f47b2bb50420922f21a0385979467503d9dbae55;p=u%2Fmrichter%2FAliRoot.git changes by Pedro Gonzales --- diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx index 475342e6f77..c2b8811babb 100644 --- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx +++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx @@ -104,6 +104,8 @@ fV0Reader(NULL), hESDDalitzPositronAfterNFindClsTPC(NULL), hESDDalitzElectronAfterNClsTPC(NULL), hESDDalitzPositronAfterNClsTPC(NULL), + hESDDalitzElectronAfterNCrossedRowsTPC(NULL), + hESDDalitzPositronAfterNCrossedRowsTPC(NULL), hESDDalitzPosEleAfterDCAxy(NULL), hESDDalitzPosEleAfterDCAz(NULL), hESDDalitzElectronAfterTPCdEdxVsP(NULL), @@ -246,6 +248,8 @@ AliAnalysisTaskGammaConvDalitzV1::AliAnalysisTaskGammaConvDalitzV1( const char* hESDDalitzPositronAfterNFindClsTPC(NULL), hESDDalitzElectronAfterNClsTPC(NULL), hESDDalitzPositronAfterNClsTPC(NULL), + hESDDalitzElectronAfterNCrossedRowsTPC(NULL), + hESDDalitzPositronAfterNCrossedRowsTPC(NULL), hESDDalitzPosEleAfterDCAxy(NULL), hESDDalitzPosEleAfterDCAz(NULL), hESDDalitzElectronAfterTPCdEdxVsP(NULL), @@ -505,6 +509,8 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects() hESDDalitzPositronAfterNFindClsTPC = new TH2F*[fnCuts]; hESDDalitzElectronAfterNClsTPC = new TH2F*[fnCuts]; hESDDalitzPositronAfterNClsTPC = new TH2F*[fnCuts]; + hESDDalitzElectronAfterNCrossedRowsTPC = new TH2F*[fnCuts]; + hESDDalitzPositronAfterNCrossedRowsTPC = new TH2F*[fnCuts]; hESDDalitzPosEleAfterDCAxy = new TH2F*[fnCuts]; hESDDalitzPosEleAfterDCAz = new TH2F*[fnCuts]; hESDDalitzElectronAfterTPCdEdxVsP = new TH2F*[fnCuts]; @@ -655,17 +661,17 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects() hESDDalitzPositronAfterPhi[iCut] = new TH1F("ESD_DalitzPositron_After_Phi","ESD_DalitzPositron_After_Phi",360,0,2*TMath::Pi()); fQAFolder[iCut]->Add(hESDDalitzPositronAfterPhi[iCut]); - hESDDalitzElectronAfterNClsITS[iCut] = new TH1F("ESD_DalitzElectron_After_NClsITS","ESD_DalitzElectron_After_NClsITS",6,0.,6.); + hESDDalitzElectronAfterNClsITS[iCut] = new TH1F("ESD_DalitzElectron_After_NClsITS","ESD_DalitzElectron_After_NClsITS",7,0.,7.); fQAFolder[iCut]->Add(hESDDalitzElectronAfterNClsITS[iCut]); - hESDDalitzPositronAfterNClsITS[iCut] = new TH1F("ESD_DalitzPositron_After_NClsITS","ESD_DalitzPositron_After_NClsITS",6,0.,6.); + hESDDalitzPositronAfterNClsITS[iCut] = new TH1F("ESD_DalitzPositron_After_NClsITS","ESD_DalitzPositron_After_NClsITS",7,0.,7.); fQAFolder[iCut]->Add(hESDDalitzPositronAfterNClsITS[iCut]); - hESDDalitzElectronAfterNFindClsTPC[iCut] = new TH2F("ESD_DalitzElectron_After_NFindClsTPC","ESD_DalitzElectron_After_NFindClsTPC",50,0,1,kPtBins,binsPtDummy); + hESDDalitzElectronAfterNFindClsTPC[iCut] = new TH2F("ESD_DalitzElectron_After_NFindClsTPC","ESD_DalitzElectron_After_NFindClsTPC",60,0,1.5,kPtBins,binsPtDummy); fQAFolder[iCut]->Add(hESDDalitzElectronAfterNFindClsTPC[iCut]); - hESDDalitzPositronAfterNFindClsTPC[iCut] = new TH2F("ESD_DalitzPositron_After_NFindClsTPC","ESD_DalitzPositron_After_NFindClsTPC",50,0,1,kPtBins,binsPtDummy); + hESDDalitzPositronAfterNFindClsTPC[iCut] = new TH2F("ESD_DalitzPositron_After_NFindClsTPC","ESD_DalitzPositron_After_NFindClsTPC",60,0,1.5,kPtBins,binsPtDummy); fQAFolder[iCut]->Add(hESDDalitzPositronAfterNFindClsTPC[iCut]); @@ -674,9 +680,13 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects() hESDDalitzPositronAfterNClsTPC[iCut] = new TH2F("ESD_DalitzPositron_After_NClsTPC","ESD_DalitzPositron_After_NClsTPC",200,0,200,kPtBins,binsPtDummy); fQAFolder[iCut]->Add(hESDDalitzPositronAfterNClsTPC[iCut]); + + hESDDalitzPositronAfterNCrossedRowsTPC[iCut] = new TH2F("ESD_DalitzPositron_After_NCrossedRowsTPC","ESD_DalitzPositron_After_NCrossedRowsTPC",165,-0.5,164.5,kPtBins,binsPtDummy); + fQAFolder[iCut]->Add(hESDDalitzPositronAfterNCrossedRowsTPC[iCut]); - - + hESDDalitzElectronAfterNCrossedRowsTPC[iCut] = new TH2F("ESD_DalitzElectron_After_NCrossedRowsTPC","ESD_DalitzElectron_After_NCrossedRowsTPC",165,-0.5,164.5,kPtBins,binsPtDummy); + fQAFolder[iCut]->Add(hESDDalitzElectronAfterNCrossedRowsTPC[iCut]); + hESDDalitzPosEleAfterDCAxy[iCut] = new TH2F("ESD_DalitzPosEle_After_DCAxy","ESD_DalitzPosEle_After_DCAxy",kDCABins,binsDCADummy,kPtBins,binsPtDummy); fQAFolder[iCut]->Add(hESDDalitzPosEleAfterDCAxy[iCut]); @@ -2572,11 +2582,16 @@ void AliAnalysisTaskGammaConvDalitzV1::FillElectronQAHistos(AliAODConversionPhot Double_t clsToFPos = -1.0; Double_t clsToFNeg = -1.0; + Double_t NumClsITSPos = -1.0; Double_t NumClsITSNeg = -1.0; Double_t NumClsTPCPos = -1.0; Double_t NumClsTPCNeg = -1.0; + Double_t nCrossedRowsTPCPos = -1.0; + Double_t nCrossedRowsTPCNeg = -1.0; + + Float_t dcaToVertexXYPos = -1.0; Float_t dcaToVertexZPos = -1.0; @@ -2601,6 +2616,10 @@ void AliAnalysisTaskGammaConvDalitzV1::FillElectronQAHistos(AliAODConversionPhot NumClsTPCPos = positronVgamma->GetNcls(1); //Get number of TPC clusters NumClsTPCNeg = electronVgamma->GetNcls(1); + nCrossedRowsTPCPos = positronVgamma->GetTPCCrossedRows(); + nCrossedRowsTPCNeg = electronVgamma->GetTPCCrossedRows(); + + Float_t bPos[2]; Float_t bCovPos[3]; @@ -2637,8 +2656,11 @@ void AliAnalysisTaskGammaConvDalitzV1::FillElectronQAHistos(AliAODConversionPhot hESDDalitzElectronAfterNFindClsTPC[fiCut]->Fill(clsToFNeg,electronVgamma->Pt()); hESDDalitzPositronAfterNFindClsTPC[fiCut]->Fill(clsToFPos,positronVgamma->Pt()); - hESDDalitzElectronAfterNClsTPC[fiCut]->Fill( NumClsTPCNeg,electronVgamma->Pt()); - hESDDalitzPositronAfterNClsTPC[fiCut]->Fill( NumClsTPCPos,positronVgamma->Pt()); + hESDDalitzElectronAfterNClsTPC[fiCut]->Fill( NumClsTPCNeg,electronVgamma->Pt()); + hESDDalitzPositronAfterNClsTPC[fiCut]->Fill( NumClsTPCPos,positronVgamma->Pt()); + + hESDDalitzElectronAfterNCrossedRowsTPC[fiCut]->Fill( nCrossedRowsTPCNeg, electronVgamma->Pt() ); + hESDDalitzPositronAfterNCrossedRowsTPC[fiCut]->Fill( nCrossedRowsTPCPos, positronVgamma->Pt() ); hESDDalitzElectronAfterNClsITS[fiCut]->Fill( NumClsITSNeg); hESDDalitzPositronAfterNClsITS[fiCut]->Fill( NumClsITSPos); diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h index af4395700aa..44997fe475e 100644 --- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h +++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h @@ -130,6 +130,8 @@ class AliAnalysisTaskGammaConvDalitzV1: public AliAnalysisTaskSE TH2F **hESDDalitzPositronAfterNFindClsTPC; TH2F **hESDDalitzElectronAfterNClsTPC; TH2F **hESDDalitzPositronAfterNClsTPC; + TH2F **hESDDalitzElectronAfterNCrossedRowsTPC; + TH2F **hESDDalitzPositronAfterNCrossedRowsTPC; TH2F **hESDDalitzPosEleAfterDCAxy; TH2F **hESDDalitzPosEleAfterDCAz; TH2F **hESDDalitzElectronAfterTPCdEdxVsP; diff --git a/PWGGA/GammaConv/AliDalitzElectronCuts.cxx b/PWGGA/GammaConv/AliDalitzElectronCuts.cxx index d25364e3690..1b9ce7c539a 100644 --- a/PWGGA/GammaConv/AliDalitzElectronCuts.cxx +++ b/PWGGA/GammaConv/AliDalitzElectronCuts.cxx @@ -281,7 +281,7 @@ void AliDalitzElectronCuts::InitCutHistograms(TString name, Bool_t preCut,TStrin hTrackDCAzPtbefore = new TH2F(Form("hTrack_DCAz_Pt_before %s",cutName.Data()), "DCAz Vs Pt of tracks before",kDCABins,binsDCADummy,kPtBins,binsPtDummy); fHistograms->Add(hTrackDCAzPtbefore); - hTrackNFindClsPtTPCbefore = new TH2F(Form("hTrack_NFindCls_Pt_TPC_before %s",cutName.Data()),"Track: N Findable Cls TPC Vs Pt before",50,0,1,kPtBins,binsPtDummy); + hTrackNFindClsPtTPCbefore = new TH2F(Form("hTrack_NFindCls_Pt_TPC_before %s",cutName.Data()),"Track: N Findable Cls TPC Vs Pt before",60,0,1.5,kPtBins,binsPtDummy); fHistograms->Add(hTrackNFindClsPtTPCbefore); @@ -307,7 +307,7 @@ void AliDalitzElectronCuts::InitCutHistograms(TString name, Bool_t preCut,TStrin hTrackDCAzPtafter = new TH2F(Form("hTrack_DCAz_Pt_after %s",cutName.Data()), "DCAz Vs Pt of tracks after",kDCABins,binsDCADummy,kPtBins,binsPtDummy); fHistograms->Add(hTrackDCAzPtafter); - hTrackNFindClsPtTPCafter = new TH2F(Form("hTrack_NFindCls_Pt_TPC_after %s",cutName.Data()),"Track: N Findable Cls TPC Vs Pt after",50,0,1,kPtBins,binsPtDummy); + hTrackNFindClsPtTPCafter = new TH2F(Form("hTrack_NFindCls_Pt_TPC_after %s",cutName.Data()),"Track: N Findable Cls TPC Vs Pt after",60,0,1.5,kPtBins,binsPtDummy); fHistograms->Add(hTrackNFindClsPtTPCafter); diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C index 7b4ea872e9a..ff0e2a73f93 100644 --- a/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C +++ b/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C @@ -59,7 +59,15 @@ void AddTask_GammaConvDalitzQAV1_pPb( Int_t trainConfig = 1, } //========= Set Cutnumber for V0Reader ================================ - TString ConvCutnumber = "8000000060084001001500000000"; //Online V0 finder + TString ConvCutnumber=""; + + if(trainConfig == 9 || trainConfig == 10 ){ + ConvCutnumber = "8000000160084001001500000000"; //Offline V0 finder + } + else { + ConvCutnumber = "8000000160084001001500000000"; //Online V0 finder + } + TString ElecCuts = "9000540000000200000"; //Electron Cuts Bool_t doEtaShift = kFALSE; @@ -214,7 +222,15 @@ if( trainConfig == 1 ) { // No eta shift |Y| < 0.8 ConvCutarray[0] = "8000012002093603007200000000"; ElecCutarray[0] = "9047540023310264371"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100 //Tracks 2011 -} +} else if ( trainConfig == 9 ) { + + ConvCutarray[0] = "8000011102093603007200000000"; ElecCutarray[0] = "9047540023310262371"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100 //Tracks 2011 + +} else if ( trainConfig == 10 ) { + + ConvCutarray[0] = "8000012102093603007200000000"; ElecCutarray[0] = "9047540023310262371"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100 //Tracks 2011 + +} @@ -246,7 +262,7 @@ if( trainConfig == 1 ) { // No eta shift |Y| < 0.8 return 0; } else { - if ( ( trainConfig >= 1 && trainConfig <= 6 ) ){ + if ( ( trainConfig >= 1 && trainConfig <= 6 ) || trainConfig == 9 ){ if (doWeighting){ if (generatorName.CompareTo("DPMJET")==0){ @@ -255,7 +271,7 @@ if( trainConfig == 1 ) { // No eta shift |Y| < 0.8 analysisCuts[i]->SetUseReweightingWithHistogramFromFile(kTRUE, kTRUE, kFALSE, fileNameInputForWeighting, "Pi0_Hijing_LHC13e7_pPb_5023GeV_MBV0A", "Eta_Hijing_LHC13e7_pPb_5023GeV_MBV0A", "","Pi0_Fit_Data_pPb_5023GeV_MBV0A","Eta_Fit_Data_pPb_5023GeV_MBV0A"); } } - } else if ( trainConfig >= 7 && trainConfig <= 8 ){ + } else if ( trainConfig == 7 || trainConfig == 8 || trainConfig == 10 ){ if (doWeighting){ analysisCuts[i]->SetUseReweightingWithHistogramFromFile(kTRUE, kTRUE, kFALSE, fileNameInputForWeighting, "Pi0_Hijing_LHC13e7_addSig_pPb_5023GeV_MBV0A", "Eta_Hijing_LHC13e7_addSig_pPb_5023GeV_MBV0A", "","Pi0_Fit_Data_pPb_5023GeV_MBV0A","Eta_Fit_Data_pPb_5023GeV_MBV0A");