From 972a21adaa04af60c14b68248e973f3a7bfbfa6a Mon Sep 17 00:00:00 2001 From: lmilano Date: Thu, 7 Jun 2012 11:20:43 +0000 Subject: [PATCH] - Patch for centrality selection applied - signal for reconstructedID added --- .../TestAOD/AliAnalysisTaskSpectraAOD.cxx | 2 +- .../PiKaPr/TestAOD/AliSpectraAODEventCuts.cxx | 82 ++++++++++++++++++- .../PiKaPr/TestAOD/AliSpectraAODEventCuts.h | 10 ++- .../PiKaPr/TestAOD/AliSpectraAODPID.cxx | 18 ++-- .../SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.h | 2 +- PWGLF/SPECTRA/PiKaPr/TestAOD/Histograms.h | 5 +- PWGLF/SPECTRA/PiKaPr/TestAOD/MainAnalysis.C | 33 ++++---- PWGLF/SPECTRA/PiKaPr/TestAOD/QAPlots.C | 40 ++++----- PWGLF/SPECTRA/PiKaPr/TestAOD/runAODProof.C | 19 +++-- PWGLF/SPECTRA/PiKaPr/TestAOD/runGrid.C | 9 +- 10 files changed, 156 insertions(+), 64 deletions(-) diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraAOD.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraAOD.cxx index 3d3505da5f0..74ce108b7fb 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraAOD.cxx +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraAOD.cxx @@ -152,7 +152,7 @@ void AliAnalysisTaskSpectraAOD::UserExec(Option_t *) fHistMan->GetPtHistogram(kHistPtRec)->Fill(track->Pt(),dca); // PT histo // get identity and charge - Int_t idRec = fPID->GetParticleSpecie(track, fTrackCuts); + Int_t idRec = fPID->GetParticleSpecie(fHistMan,track, fTrackCuts); Int_t charge = track->Charge() > 0 ? kChPos : kChNeg; diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.cxx index 3b4dea6631e..69221f640d4 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.cxx +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.cxx @@ -41,7 +41,7 @@ using namespace std; ClassImp(AliSpectraAODEventCuts) -AliSpectraAODEventCuts::AliSpectraAODEventCuts(const char *name) : TNamed(name, "AOD Event Cuts"), fAOD(0), fIsSelected(0), fCentralityCutMin(0), fCentralityCutMax(0), fHistoCuts(0),fHistoVtxBefSel(0),fHistoVtxAftSel(0),fHistoEtaBefSel(0),fHistoEtaAftSel(0),fHistoNChAftSel(0) +AliSpectraAODEventCuts::AliSpectraAODEventCuts(const char *name) : TNamed(name, "AOD Event Cuts"), fAOD(0),fIsMC(0), fIsSelected(0), fCentralityCutMin(0), fCentralityCutMax(0), fHistoCuts(0),fHistoVtxBefSel(0),fHistoVtxAftSel(0),fHistoEtaBefSel(0),fHistoEtaAftSel(0),fHistoNChAftSel(0) { // Constructor fHistoCuts = new TH1I("fEventCuts", "Event Cuts", kNVtxCuts, -0.5, kNVtxCuts - 0.5); @@ -106,7 +106,11 @@ Bool_t AliSpectraAODEventCuts::CheckVtxRange() Bool_t AliSpectraAODEventCuts::CheckCentralityCut() { // Check centrality cut - if ( (fAOD->GetCentrality()->GetCentralityPercentile("V0M") <= fCentralityCutMax) && (fAOD->GetCentrality()->GetCentralityPercentile("V0M") >= fCentralityCutMin) ) return kTRUE; + Double_t cent=0; + if(fIsMC)cent=fAOD->GetCentrality()->GetCentralityPercentile("V0M"); + else cent=ApplyCentralityPatchAOD049(); + + if ( (cent <= fCentralityCutMax) && (cent >= fCentralityCutMin) ) return kTRUE; fHistoCuts->Fill(kVtxCentral); return kFALSE; } @@ -124,6 +128,80 @@ void AliSpectraAODEventCuts::PrintCuts() } //______________________________________________________ +Double_t AliSpectraAODEventCuts::ApplyCentralityPatchAOD049() +{ + // + //Apply centrality patch for AOD049 outliers + // + // if (fCentralityType!="V0M") { + // AliWarning("Requested patch forAOD049 for wrong value (not centrality from V0)."); + // return -999.0; + // } + AliCentrality *centrality = fAOD->GetCentrality(); + if (!centrality) { + AliWarning("Cannot get centrality from AOD event."); + return -999.0; + } + + Float_t cent = (Float_t)(centrality->GetCentralityPercentile("V0M")); + /* + Bool_t isSelRun = kFALSE; + Int_t selRun[5] = {138364, 138826, 138828, 138836, 138871}; + if(cent<0){ + Int_t quality = centrality->GetQuality(); + if(quality<=1){ + cent=(Float_t)centrality->GetCentralityPercentileUnchecked("V0M"); + } else { + Int_t runnum=aodEvent->GetRunNumber(); + for(Int_t ir=0;ir<5;ir++){ + if(runnum==selRun[ir]){ + isSelRun=kTRUE; + break; + } + } + if((quality==8||quality==9)&&isSelRun) cent=(Float_t)centrality->GetCentralityPercentileUnchecked("V0M"); + } + } + */ + if(cent>=0.0) { + Float_t v0 = 0.0; + AliAODEvent *aodEvent = (AliAODEvent *)fAOD; + AliAODVZERO *aodV0 = (AliAODVZERO *) aodEvent->GetVZEROData(); + v0+=aodV0->GetMTotV0A(); + v0+=aodV0->GetMTotV0C(); + if ( (cent==0) && (v0<19500) ) { + AliDebug(3, Form("Filtering issue in centrality -> cent = %5.2f",cent)); + return -999.0; + } + Float_t tkl = (Float_t)(aodEvent->GetTracklets()->GetNumberOfTracklets()); + Float_t val = 1.30552 + 0.147931 * v0; + + Float_t tklSigma[101] = {176.644, 156.401, 153.789, 153.015, 142.476, 137.951, 136.127, 129.852, 127.436, 124.86, + 120.788, 115.611, 113.172, 110.496, 109.127, 104.421, 102.479, 99.9766, 97.5152, 94.0654, + 92.4602, 89.3364, 87.1342, 83.3497, 82.6216, 81.1084, 78.0793, 76.1234, 72.9434, 72.1334, + 68.0056, 68.2755, 66.0376, 62.9666, 62.4274, 59.65, 58.3776, 56.6361, 54.5184, 53.4224, + 51.932, 50.8922, 48.2848, 47.912, 46.5717, 43.4114, 43.2083, 41.3065, 40.1863, 38.5255, + 37.2851, 37.5396, 34.4949, 33.8366, 31.8043, 31.7412, 30.8392, 30.0274, 28.8793, 27.6398, + 26.6488, 25.0183, 25.1489, 24.4185, 22.9107, 21.2002, 21.6977, 20.1242, 20.4963, 19.0235, + 19.298, 17.4103, 16.868, 15.2939, 15.2939, 16.0295, 14.186, 14.186, 15.2173, 12.9504, 12.9504, + 12.9504, 15.264, 12.3674, 12.3674, 12.3674, 12.3674, 12.3674, 18.3811, 13.7544, 13.7544, + 13.7544, 13.7544, 13.7544, 13.7544, 13.7544, 13.7544, 13.7544, 13.7544, 13.7544, 13.7544 + }; + + if ( TMath::Abs(tkl-val) > 6.*tklSigma[(Int_t)cent] ) { + AliDebug(3, Form("Outlier event in centrality -> cent = %5.2f",cent)); + return -999.0; + } + } else { + //force it to be -999. whatever the negative value was + cent = -999.; + } + return cent; +} + +//______________________________________________________ + + Long64_t AliSpectraAODEventCuts::Merge(TCollection* list) { // Merge a list of AliSpectraAODEventCuts objects with this. diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.h b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.h index 292d8f44047..22e0c7e61dd 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.h +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.h @@ -24,10 +24,13 @@ class AliSpectraAODEventCuts : public TNamed enum { kProcessedEvents = 0,kAcceptedEvents, kVtxRange, kVtxCentral, kVtxNoEvent, kNVtxCuts}; // Constructors - AliSpectraAODEventCuts() : TNamed(), fAOD(0), fIsSelected(0), fCentralityCutMin(0), fCentralityCutMax(0), fHistoCuts(0),fHistoVtxBefSel(0),fHistoVtxAftSel(0),fHistoEtaBefSel(0),fHistoEtaAftSel(0),fHistoNChAftSel(0) {} + AliSpectraAODEventCuts() : TNamed(), fAOD(0), fIsMC(0), fIsSelected(0), fCentralityCutMin(0), fCentralityCutMax(0), fHistoCuts(0),fHistoVtxBefSel(0),fHistoVtxAftSel(0),fHistoEtaBefSel(0),fHistoEtaAftSel(0),fHistoNChAftSel(0) {} AliSpectraAODEventCuts(const char *name); virtual ~AliSpectraAODEventCuts() {} - + + void SetIsMC(Bool_t isMC = kFALSE) {fIsMC = isMC; }; + Bool_t GetIsMC() const { return fIsMC;}; + // Methods Bool_t IsSelected(AliAODEvent * aod,AliSpectraAODTrackCuts *trackcuts); Bool_t CheckVtxRange(); @@ -45,6 +48,8 @@ class AliSpectraAODEventCuts : public TNamed Float_t GetCentralityMin() const { return fCentralityCutMin; } Float_t GetCentralityMax() const { return fCentralityCutMax; } void PrintCuts(); + Double_t ApplyCentralityPatchAOD049(); + Float_t NumberOfEvents() { return fHistoCuts->GetBinContent(kAcceptedEvents+1); } Float_t NumberOfProcessedEvents() { return fHistoCuts->GetBinContent(kProcessedEvents+1); } @@ -54,6 +59,7 @@ class AliSpectraAODEventCuts : public TNamed private: AliAODEvent *fAOD; //! AOD event + Bool_t fIsMC;// true if processing MC AliSpectraAODTrackCuts *fTrackCuts; //! track cuts Bool_t fIsSelected; // True if cuts are selected Float_t fCentralityCutMin; // minimum centrality percentile diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.cxx index a546eccc0e3..cc046e735a8 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.cxx +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.cxx @@ -104,7 +104,7 @@ Int_t AliSpectraAODPID::GetParticleSpecie(AliAODMCParticle * part) { } -Int_t AliSpectraAODPID::GetParticleSpecie(AliAODTrack * trk, AliSpectraAODTrackCuts * trackCuts) { +Int_t AliSpectraAODPID::GetParticleSpecie(AliSpectraAODHistoManager * hman,AliAODTrack * trk, AliSpectraAODTrackCuts * trackCuts) { // return PID according to detectors // Get PID response object, if needed @@ -164,10 +164,18 @@ Int_t AliSpectraAODPID::GetParticleSpecie(AliAODTrack * trk, AliSpectraAODT // guess the particle based on the smaller nsigma if( ( nsigmaKaon==nsigmaPion ) && ( nsigmaKaon==nsigmaProton )) return kSpUndefined;//if is the default value for the three - if( ( nsigmaKaon < nsigmaPion ) && ( nsigmaKaon < nsigmaProton ) && (nsigmaKaon < fNSigmaPID)) return kSpKaon; - if( ( nsigmaPion < nsigmaKaon ) && ( nsigmaPion < nsigmaProton ) && (nsigmaPion < fNSigmaPID)) return kSpPion; - if( ( nsigmaProton < nsigmaKaon ) && ( nsigmaProton < nsigmaPion ) && (nsigmaProton < fNSigmaPID)) return kSpProton; - + if( ( nsigmaKaon < nsigmaPion ) && ( nsigmaKaon < nsigmaProton ) && (nsigmaKaon < fNSigmaPID)){ + hman->GetPIDHistogram(kHistPIDTPCKaonRec)->Fill(trk->GetTPCmomentum(), trk->GetTPCsignal()*trk->Charge()); // Reconstructed PIDKaon histo + return kSpKaon; + } + if( ( nsigmaPion < nsigmaKaon ) && ( nsigmaPion < nsigmaProton ) && (nsigmaPion < fNSigmaPID)){ + hman->GetPIDHistogram(kHistPIDTPCPionRec)->Fill(trk->GetTPCmomentum(), trk->GetTPCsignal()*trk->Charge()); // Reconstructed PIDPion histo + return kSpPion; + } + if( ( nsigmaProton < nsigmaKaon ) && ( nsigmaProton < nsigmaPion ) && (nsigmaProton < fNSigmaPID)){ + hman->GetPIDHistogram(kHistPIDTPCProtonRec)->Fill(trk->GetTPCmomentum(), trk->GetTPCsignal()*trk->Charge()); // Reconstructed PIDProton histo + return kSpProton; + } // else, return undefined return kSpUndefined; diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.h b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.h index 729cf7d4786..0001d71cf77 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.h +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODPID.h @@ -50,7 +50,7 @@ public: void FillQAHistos(AliSpectraAODHistoManager * hman, AliAODTrack * track, AliSpectraAODTrackCuts * trackCuts) ; void SetNSigmaCut(Float_t nsigma) { fNSigmaPID = nsigma; } - Int_t GetParticleSpecie(AliAODTrack * trk, AliSpectraAODTrackCuts * trackCuts); + Int_t GetParticleSpecie(AliSpectraAODHistoManager * hman,AliAODTrack * trk, AliSpectraAODTrackCuts * trackCuts); Int_t GetParticleSpecie(AliAODMCParticle * trk); Long64_t Merge(TCollection* list); diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/Histograms.h b/PWGLF/SPECTRA/PiKaPr/TestAOD/Histograms.h index c40be592552..089dd3f8699 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/Histograms.h +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/Histograms.h @@ -95,7 +95,10 @@ namespace AliSpectraNameSpace kHistPIDTPCPion, kHistPIDTPCKaon, kHistPIDTPCProton, - kNHistPID =kHistPIDTPCProton, + kHistPIDTPCPionRec, + kHistPIDTPCKaonRec, + kHistPIDTPCProtonRec, + kNHistPID =kHistPIDTPCProtonRec, kHistNSigPionTPC, kHistNSigKaonTPC, diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/MainAnalysis.C b/PWGLF/SPECTRA/PiKaPr/TestAOD/MainAnalysis.C index 8d6333baa18..4c4dbc6f601 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/MainAnalysis.C +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/MainAnalysis.C @@ -45,14 +45,13 @@ void MainAnalysis() { mass[1] = TDatabasePDG::Instance()->GetParticle("K+")->Mass(); mass[2] = TDatabasePDG::Instance()->GetParticle("proton")->Mass(); - //TString fold="3SigmaPID_AOD048-049_FilterBit6"; - //TString fold="3SigmaPID_AOD048-049_FilterBit5"; TString fold="3SigmaPID_AOD048-049_FilterBit5"; - //TString fold="3SigmaPID_AOD048-049_FilterBit5_test"; //TString fold="3SigmaPID_AOD086-090_FilterBit10"; + //TString fold="3SigmaPID_AOD086-090_FilterBit7"; Int_t ibinToCompare=-1; TString sname="Cent0to5_QVec0.0to100.0";ibinToCompare=0; + //TString sname="Cent0to100_QVec0.0to100.0";ibinToCompare=0; TString dataFile = Form("output/%s/Pt.AOD.1._data_ptcut_%s.root",fold.Data(),sname.Data()); TString mcFile =Form("output/%s/Pt.AOD.1._MC_%s.root",fold.Data(),sname.Data()); @@ -80,7 +79,7 @@ void MainAnalysis() { tcuts_data->PrintCuts(); QAPlots(hman_data,hman_mc,ecuts_data,ecuts_mc,tcuts_data,tcuts_mc); - return; + //efficiencies Printf("\n\n-> Calculating MC Correction Factors"); TH1F *CorrFact[6]; @@ -114,7 +113,7 @@ void MainAnalysis() { TFile *fESD=new TFile("EffAlex/pionEffPbPb.root"); TH1F *hEffESD=(TH1F*)fESD->Get("effMapPionTpcOnlyNeg0"); hEffESD->DrawClone("same"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); //Normalization printf("\n\n-> Spectra Normalization"); @@ -214,7 +213,7 @@ void MainAnalysis() { hMatcEffNeg_data->DrawClone("lhistsame"); hMatcEffPos_mc->DrawClone("lhistsame"); hMatcEffNeg_mc->DrawClone("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); hMatcEffPos_data->Divide(hMatcEffPos_mc); hMatcEffNeg_data->Divide(hMatcEffNeg_mc); cMatchingEff->cd(2); @@ -257,7 +256,7 @@ void MainAnalysis() { else Spectra[index]->DrawClone("same"); } } - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); //saving spectra Printf("\n\n-> Saving spectra in Out%s_%s.root",sname.Data(),fold.Data()); @@ -288,11 +287,11 @@ void MainAnalysis() { CratioComb->cd(ipart+1); gPad->SetGridy(); gPad->SetGridx(); - for(Int_t ibin=1;ibinGetNbinsX();ibin++)hcomb->SetBinError(ibin,0); + //for(Int_t ibin=1;ibinGetNbinsX();ibin++)hcomb->SetBinError(ibin,0); if(icharge==0)htmp->DrawClone(); else htmp->DrawClone("same"); - MCTruth[index]->DrawClone("same"); + //MCTruth[index]->DrawClone("same"); hcomb->DrawClone("same"); htmp->Divide(hcomb); htmp->SetMaximum(1.3); @@ -339,13 +338,13 @@ void MainAnalysis() { gPad->SetGridx(); hPrimRec_mc->SetTitle("Prim/All, charged hadron pure MC"); hPrimRec_mc->DrawClone("lhist"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); cAllChFactors->cd(2); gPad->SetGridy(); gPad->SetGridx(); hEff_mc->SetTitle("Efficiency for Primaries, charged hadron pure MC"); hEff_mc->DrawClone("lhist"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); //Printf("--------%f ",((TH1F*)hman_mc->GetPtHistogram1D("hHistPtGen",1,1))->GetEntries()/1.6/ecuts_mc->NumberOfEvents()); hChHad_data->Scale(1./events_data,"width");//NORMALIZATION hChHad_data->Divide(hEff_mc);//Efficiency @@ -368,7 +367,7 @@ void MainAnalysis() { hCh->SetBinError(ibin,hCh->GetBinError(ibin)*(2*TMath::Pi()*hCh->GetBinCenter(ibin))); } hCh->DrawClone("same"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); TH1F *gRatio=AliPWGHistoTools::MyDivideHistosDifferentBins(hChHad_data,hCh); gRatio->SetMaximum(1.3); gRatio->SetMinimum(.7); @@ -410,7 +409,7 @@ void MainAnalysis() { func->SetLineColor(2); hCh->DrawClone("same"); func->DrawClone("same"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); Printf("TOTAL YIELD (JACEK): %f +- %f",yieldTools,yieldETools); //sumID vs AllCh //Convert spectra to dNdeta and sum @@ -459,7 +458,7 @@ void MainAnalysis() { hChHad_data->SetMarkerColor(2); hChHad_data->SetLineColor(2); hChHad_data->DrawClone("same"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); cChargHadComp->cd(2); gPad->SetGridy(); gPad->SetGridx(); @@ -617,9 +616,9 @@ void DCACorrection(TH1F **Spectra, AliSpectraAODHistoManager* hman_data, AliSpec } } ccorrection->cd(1); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); ccorrection->cd(2); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); } @@ -806,7 +805,7 @@ void GFCorrection(TH1F **Spectra,AliSpectraAODTrackCuts* tcuts_data){ fGFpNegTracking->DrawClone("lsame"); fGFpPosMatching->DrawClone("lsame"); fGFpNegMatching->DrawClone("lsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); } diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/QAPlots.C b/PWGLF/SPECTRA/PiKaPr/TestAOD/QAPlots.C index 0dee9bba87a..915abcf8dd5 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/QAPlots.C +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/QAPlots.C @@ -1,9 +1,3 @@ -gROOT->LoadMacro("~/works/AOD/AliSpectraAODTrackCuts.cxx+g"); -gROOT->LoadMacro("~/works/AOD/AliSpectraAODEventCuts.cxx+g"); -gROOT->LoadMacro("~/works/AOD/AliSpectraAODHistoManager.cxx+g"); -gROOT->LoadMacro("~/works/AOD/AliSpectraAODPID.cxx+g"); -gROOT->LoadMacro("~/works/AOD/AliAnalysisTaskSpectraAOD.cxx+g"); - void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* hman_mc, AliSpectraAODEventCuts* ecuts_data, AliSpectraAODEventCuts* ecuts_mc, AliSpectraAODTrackCuts* tcuts_data, AliSpectraAODTrackCuts* tcuts_mc){ @@ -23,7 +17,7 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h gPad->SetGridx(); hVtxBef_data->DrawClone("lhist"); hVtxBef_mc->DrawClone("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); TH1F *hVtxAft_data=ecuts_data->GetHistoVtxAftSel(); hVtxAft_data->Scale(1./ecuts_data->NumberOfEvents()); hVtxAft_data->SetTitle(Form("%s - data",hVtxAft_data->GetTitle())); @@ -36,7 +30,7 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h gPad->SetGridx(); hVtxAft_data->DrawClone("lhist"); hVtxAft_mc->DrawClone("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); //eta distr in data and MC before and after event selection TCanvas *cEta=new TCanvas("Etadistr","Etadistr",700,500); @@ -53,7 +47,7 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h gPad->SetGridx(); hEtaBef_data->DrawClone("lhist"); hEtaBef_mc->DrawClone("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); TH1F *hEtaAft_data=ecuts_data->GetHistoEtaAftSel(); hEtaAft_data->Scale(1./ecuts_data->NumberOfEvents()); hEtaAft_data->SetTitle(Form("%s - data",hEtaAft_data->GetTitle())); @@ -66,7 +60,7 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h gPad->SetGridx(); hEtaAft_data->DrawClone("lhist"); hEtaAft_mc->DrawClone("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); //Nch distr in data and MC before and after event selection TCanvas *cNCh=new TCanvas("NChdistr","NChdistr",700,500); @@ -81,7 +75,7 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h hNChAft_mc->SetLineColor(2); hNChAft_data->DrawClone("lhist"); hNChAft_mc->DrawClone("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); //Eta Phi at high Pt in data and Monte Carlo TCanvas *cEtaPhi=new TCanvas("EtaPhi","EtaPhi",700,500); @@ -128,14 +122,14 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h hTrCuts_data->SetMinimum(0); hTrCuts_data->DrawClone(); hTrCuts_mc->DrawClone("same"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); cTrackCuts->cd(2); gPad->SetGridy(); gPad->SetGridx(); hTrCuts_data->Divide(hTrCuts_mc); hTrCuts_data->SetTitle("DATA/MC"); hTrCuts_data->DrawClone(); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); @@ -184,7 +178,7 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h PIDSig_mc->DrawClone("colz"); //dedx projection in data and MC - Double_t Proj1[2]={0.4,0.5}; + Double_t Proj1[2]={0.6,0.7}; Double_t Proj2[2]={1.1,1.2}; TCanvas *cPIDSigProjection=new TCanvas("cPIDSigProjection","cPIDSigProjection",700,500); cPIDSigProjection->Divide(2,2); @@ -211,14 +205,14 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h gPad->SetGridx(); PIDSig_data_Proj1->DrawNormalized("lhist"); PIDSig_mc_Proj1->DrawNormalized("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); cPIDSigProjection->cd(2); gPad->SetLogy(); gPad->SetGridy(); gPad->SetGridx(); PIDSig_data_Proj2->DrawNormalized("lhist"); PIDSig_mc_Proj2->DrawNormalized("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); //TOF TH2F *PIDSig_data = (TH2F*)((TH2F*)hman_data->GetPIDHistogram("hHistPIDTOF"))->Clone(); TH1F *PIDSig_data_Proj1=(TH1F*)PIDSig_data->ProjectionY(Form("TOF, data [%.1f,%.1f]",Proj1[0],Proj1[1]), @@ -242,14 +236,14 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h gPad->SetGridx(); PIDSig_data_Proj1->DrawNormalized("lhist"); PIDSig_mc_Proj1->DrawNormalized("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); cPIDSigProjection->cd(4); gPad->SetLogy(); gPad->SetGridy(); gPad->SetGridx(); PIDSig_data_Proj2->DrawNormalized("lhist"); PIDSig_mc_Proj2->DrawNormalized("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); //nsig in data and MC for(Int_t ipart=0;ipart<3;ipart++){ @@ -340,14 +334,14 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h gPad->SetGridx(); nsig_data_Proj1->DrawNormalized("lhist"); nsig_mc_Proj1->DrawNormalized("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); cnsigProjection->cd(2*ipart+2); gPad->SetLogy(); gPad->SetGridy(); gPad->SetGridx(); nsig_data_Proj2->DrawNormalized("lhist"); nsig_mc_Proj2->DrawNormalized("lhistsame"); - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); } //Muon over Pion Ratio @@ -394,7 +388,7 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h //Spectra[index]->Multiply(Cont[index]); } } - gPad->BuildLegend(); + gPad->BuildLegend()->SetFillColor(0); //Raw yield @@ -485,7 +479,7 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h // //Spectra[index]->Multiply(PIDEff[index]); // } // } - // gPad->BuildLegend(); + // gPad->BuildLegend()->SetFillColor(0); //qvec in data and MC // for (Int_t icharge=0;icharge<2;icharge++){ @@ -521,7 +515,7 @@ void QAPlots( AliSpectraAODHistoManager* hman_data, AliSpectraAODHistoManager* h // gPad->SetGridx(); // proj_data->DrawClone(); // proj_mc->DrawClone("same"); - // gPad->BuildLegend(); + // gPad->BuildLegend()->SetFillColor(0); // proj_data->Divide(proj_mc); // cProjqvec->cd(iproj+4); // proj_data->DrawClone(); diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/runAODProof.C b/PWGLF/SPECTRA/PiKaPr/TestAOD/runAODProof.C index de6b3338c67..8edbd66a6f5 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/runAODProof.C +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/runAODProof.C @@ -1,4 +1,4 @@ -void runAODProof(Int_t c=1, const char * proofMode = "full") +void runAODProof(Int_t c=2, const char * proofMode = "full") { //1 data AOD049 //2 MC AOD048 //3 data AOD086 @@ -26,7 +26,7 @@ void runAODProof(Int_t c=1, const char * proofMode = "full") //handler->SetAliROOTVersion("v5-03-11-AN"); handler->SetAliROOTVersion("v5-04-25-AN"); - handler->SetNproofWorkers(54); + //handler->SetNproofWorkers(1); //handler->SetNproofWorkersPerSlave(4); handler->SetProofCluster(Form("%s@alice-caf.cern.ch", gSystem->Getenv("CAFUSER"))); //handler->SetProofCluster(Form("%s@skaf.saske.sk",gSystem->Getenv("CAFUSER"))); @@ -42,11 +42,11 @@ void runAODProof(Int_t c=1, const char * proofMode = "full") } if (c == 3){ handler->SetProofDataSet("/default/lmilano/LHC10h_000138653_AOD086_p2#aodTree|/default/lmilano/LHC10h_000138662_AOD086_p2#aodTree|/default/lmilano/LHC10h_000138666_AOD086_p2#aodTree|/default/lmilano/LHC10h_000139107_AOD086_p2#aodTree|/default/lmilano/LHC10h_000138275_AOD086_p2#aodTree"); - // handler->SetProofDataSet("/default/lmilano/LHC10h_000138275_AOD086_p2#aodTree"); + //handler->SetProofDataSet("/default/lmilano/LHC10h_000138275_AOD086_p2#aodTree"); } if (c == 4){ handler->SetProofDataSet("/default/lmilano/LHC11a10a_bis_138653_AOD090#aodTree|/default/lmilano/LHC11a10a_bis_138662_AOD090#aodTree|/default/lmilano/LHC11a10a_bis_138666_AOD090#aodTree|/default/lmilano/LHC11a10a_bis_139107_AOD090#aodTree|/default/lmilano/LHC11a10a_bis_138653_AOD090#aodTree"); - // handler->SetProofDataSet("/default/lmilano/LHC11a10a_bis_138653_AOD090#aodTree"); + //handler->SetProofDataSet("/default/lmilano/LHC11a10a_bis_138653_AOD090#aodTree"); } gROOT->LoadMacro("AliSpectraAODTrackCuts.cxx+g"); @@ -71,8 +71,10 @@ void runAODProof(Int_t c=1, const char * proofMode = "full") gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDResponse.C"); Bool_t isMC = kFALSE; if (c == 2 || c == 4) isMC = kTRUE; + Printf("-------------------------------adding in runAOD AddTaskPIDResponse"); AliAnalysisTask * taskPID = AddTaskPIDResponse(isMC); - mgr->AddTask(taskPID); + //gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDqa.C"); + //AddTaskPIDqa(); //LOOP OVER SELECTION Double_t CentCutMin[4]={0,0,20,20}; @@ -99,9 +101,9 @@ void runAODProof(Int_t c=1, const char * proofMode = "full") AliSpectraAODTrackCuts * tcuts = new AliSpectraAODTrackCuts("Track Cuts"); if(c==1 || c==2)tcuts->SetTrackType(5); //AOD 046 & 047. Standard Cut with loose DCA //if(c==1 || c==2)tcuts->SetTrackType(6); //AOD 046 & 047. Standard Cut with tight DCA - if(c==3 || c==4)tcuts->SetTrackType(10); //AOD 086 & 090. Standard Raa cut - //if(c==3 || c==4)tcuts->SetTrackType(8); //AOD 086 & 090. TPC only - //if(c==3 || c==4)tcuts->SetTrackType(2); //AOD 086 & 090. ITS strong + //if(c==3 || c==4)tcuts->SetTrackType(10); //AOD 086 & 090. Standard Raa cut + //if(c==3 || c==4)tcuts->SetTrackType(4); //AOD 086 & 090. Jet analysis + if(c==3 || c==4)tcuts->SetTrackType(7); //AOD 086 & 090. TPC Only tcuts->SetEta(.8); //tcuts->SetDCA(.1); tcuts->SetPt(5); @@ -120,6 +122,7 @@ void runAODProof(Int_t c=1, const char * proofMode = "full") if (c == 2 || c == 4) { task->SetIsMC(kTRUE); + vcuts->SetIsMC(kTRUE); AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutputpt1 = mgr->CreateContainer(Form("chistpt%d",iCut), AliSpectraAODHistoManager::Class(), AliAnalysisManager::kOutputContainer, Form("Pt.AOD.1._MC_Cent%.0fto%.0f_QVec%.1fto%.1f.root",CentCutMin[iCut],CentCutMax[iCut],QvecCutMin[iCut],QvecCutMax[iCut])); diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/runGrid.C b/PWGLF/SPECTRA/PiKaPr/TestAOD/runGrid.C index 1b9f2268c7e..94d2a36e747 100644 --- a/PWGLF/SPECTRA/PiKaPr/TestAOD/runGrid.C +++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/runGrid.C @@ -1,7 +1,7 @@ class AliAnalysisManager; class AliAnalysisAlien; -void runGrid(TString mode="full",Int_t mc=1,Int_t sub=0,Int_t hi=1,TString fname="AODAnalysis_5June2012") +void runGrid(TString mode="terminate",Int_t mc=1,Int_t sub=1,Int_t hi=1,TString fname="AODAnalysis_6June2012") { //0 is AOD048-049 in this case you can choos FilterBit5 (loose DCA) or 6 (tight DCA)!!!!!!!!! //1 is AOD086-090 @@ -46,12 +46,12 @@ void runGrid(TString mode="full",Int_t mc=1,Int_t sub=0,Int_t hi=1,TString fname // Add PID task gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDResponse.C"); AliAnalysisTask * taskPID = AddTaskPIDResponse(mc); - mgr->AddTask(taskPID); + //mgr->AddTask(taskPID); //setting the analysis Int_t iCut=0; //Double_t CentCut[2]={0,100}; - Double_t CentCut[2]={0,100}; + Double_t CentCut[2]={0,5}; Double_t qVecCut[2]={0,100}; //PID object @@ -91,6 +91,7 @@ void runGrid(TString mode="full",Int_t mc=1,Int_t sub=0,Int_t hi=1,TString fname if (mc) { task->SetIsMC(kTRUE); + vcuts->SetIsMC(kTRUE); AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer(); AliAnalysisDataContainer *coutputpt1 = mgr->CreateContainer(Form("chistpt%d",iCut), AliSpectraAODHistoManager::Class(), AliAnalysisManager::kOutputContainer, Form("Pt.AOD.1._MC_Cent%.0fto%.0f_QVec%.1fto%.1f.root",CentCut[0],CentCut[1],qVecCut[0],qVecCut[1])); @@ -127,7 +128,7 @@ void runGrid(TString mode="full",Int_t mc=1,Int_t sub=0,Int_t hi=1,TString fname } -AliAnalysisGrid* CreateAlienHandler(TString mode="test",Int_t mc=0,Int_t sub=0,TString fname){ +AliAnalysisGrid* CreateAlienHandler(TString mode="test",Int_t mc=1,Int_t sub=0,TString fname){ -- 2.43.0