From 724d7ba9767d7864c7f086ccc95ff07ddd32dfb1 Mon Sep 17 00:00:00 2001 From: pchrist Date: Tue, 14 Apr 2009 11:31:36 +0000 Subject: [PATCH] Minor modifications --- PWG2/SPECTRA/AliProtonQAAnalysis.cxx | 16 ++++++++-------- PWG2/SPECTRA/macros/drawProtonQAResults.C | 16 +++++++++++----- PWG2/SPECTRA/macros/runProtonAnalysisQA.C | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/PWG2/SPECTRA/AliProtonQAAnalysis.cxx b/PWG2/SPECTRA/AliProtonQAAnalysis.cxx index 37ec42ffc3a..7478fdd4edd 100644 --- a/PWG2/SPECTRA/AliProtonQAAnalysis.cxx +++ b/PWG2/SPECTRA/AliProtonQAAnalysis.cxx @@ -1462,7 +1462,7 @@ void AliProtonQAAnalysis::InitCutLists() { fAcceptedCutList->Add(gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsPass);//eta-phi of secondary accepted ESD antiprotons //eta-phi-number of TPC points for the dE/dx TH3D *gHistEtaPhiTPCdEdxNPointsPrimaryProtonsPass = new TH3D("gHistEtaPhiTPCdEdxNPointsPrimaryProtonsPass", - "Accepted primary protons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)", + "Accepted primary protons;#eta;#phi;N_{points}(TPC)", fNBinsY,fMinY,fMaxY, 100,0,360, 100,0,200); @@ -1470,7 +1470,7 @@ void AliProtonQAAnalysis::InitCutLists() { gHistEtaPhiTPCdEdxNPointsPrimaryProtonsPass->GetXaxis()->SetTitleColor(1); fAcceptedCutList->Add(gHistEtaPhiTPCdEdxNPointsPrimaryProtonsPass);//eta-phi of primary accepted ESD protons TH3D *gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsPass = new TH3D("gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsPass", - "Accepted primary antiprotons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)", + "Accepted primary antiprotons;#eta;#phi;N_{points}(TPC)", fNBinsY,fMinY,fMaxY, 100,0,360, 100,0,200); @@ -1478,7 +1478,7 @@ void AliProtonQAAnalysis::InitCutLists() { gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsPass->GetXaxis()->SetTitleColor(1); fAcceptedCutList->Add(gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsPass);//eta-phi of primary accepted ESD antiprotons TH3D *gHistEtaPhiTPCdEdxNPointsSecondaryProtonsPass = new TH3D("gHistEtaPhiTPCdEdxNPointsSecondaryProtonsPass", - "Accepted secondary protons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)", + "Accepted secondary protons;#eta;#phi;N_{points}(TPC)", fNBinsY,fMinY,fMaxY, 100,0,360, 100,0,200); @@ -1486,7 +1486,7 @@ void AliProtonQAAnalysis::InitCutLists() { gHistEtaPhiTPCdEdxNPointsSecondaryProtonsPass->GetXaxis()->SetTitleColor(1); fAcceptedCutList->Add(gHistEtaPhiTPCdEdxNPointsSecondaryProtonsPass);//eta-phi of secondary accepted ESD protons TH3D *gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsPass = new TH3D("gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsPass", - "Accepted secondary antiprotons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)", + "Accepted secondary antiprotons;#eta;#phi;N_{points}(TPC)", fNBinsY,fMinY,fMaxY, 100,0,360, 100,0,200); @@ -1581,7 +1581,7 @@ void AliProtonQAAnalysis::InitCutLists() { fRejectedCutList->Add(gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsReject);//eta-phi of secondary rejected ESD antiprotons //eta-phi-number of TPC points for the dE/dx TH3D *gHistEtaPhiTPCdEdxNPointsPrimaryProtonsReject = new TH3D("gHistEtaPhiTPCdEdxNPointsPrimaryProtonsReject", - "Rejected primary protons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)", + "Rejected primary protons;#eta;#phi;N_{points}(TPC)", fNBinsY,fMinY,fMaxY, 100,0,360, 100,0,200); @@ -1589,7 +1589,7 @@ void AliProtonQAAnalysis::InitCutLists() { gHistEtaPhiTPCdEdxNPointsPrimaryProtonsReject->GetXaxis()->SetTitleColor(1); fRejectedCutList->Add(gHistEtaPhiTPCdEdxNPointsPrimaryProtonsReject);//eta-phi of primary rejected ESD protons TH3D *gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsReject = new TH3D("gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsReject", - "Rejected primary antiprotons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)", + "Rejected primary antiprotons;#eta;#phi;N_{points}(TPC)", fNBinsY,fMinY,fMaxY, 100,0,360, 100,0,200); @@ -1597,7 +1597,7 @@ void AliProtonQAAnalysis::InitCutLists() { gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsReject->GetXaxis()->SetTitleColor(1); fRejectedCutList->Add(gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsReject);//eta-phi of primary rejected ESD antiprotons TH3D *gHistEtaPhiTPCdEdxNPointsSecondaryProtonsReject = new TH3D("gHistEtaPhiTPCdEdxNPointsSecondaryProtonsReject", - "Rejected secondary protons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)", + "Rejected secondary protons;#eta;#phi;N_{points}(TPC)", fNBinsY,fMinY,fMaxY, 100,0,360, 100,0,200); @@ -1605,7 +1605,7 @@ void AliProtonQAAnalysis::InitCutLists() { gHistEtaPhiTPCdEdxNPointsSecondaryProtonsReject->GetXaxis()->SetTitleColor(1); fRejectedCutList->Add(gHistEtaPhiTPCdEdxNPointsSecondaryProtonsReject);//eta-phi of secondary rejected ESD protons TH3D *gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsReject = new TH3D("gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsReject", - "Rejected secondary antiprotons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)", + "Rejected secondary antiprotons;#eta;#phi;N_{points}(TPC)", fNBinsY,fMinY,fMaxY, 100,0,360, 100,0,200); diff --git a/PWG2/SPECTRA/macros/drawProtonQAResults.C b/PWG2/SPECTRA/macros/drawProtonQAResults.C index 28d8287310b..79caa1e1d17 100644 --- a/PWG2/SPECTRA/macros/drawProtonQAResults.C +++ b/PWG2/SPECTRA/macros/drawProtonQAResults.C @@ -1,6 +1,6 @@ -void drawProtonQAResults(const char *analysisType = "TPC") { +void drawProtonQAResults(const char *analysisType = "TPC", + const char *pidMode = "Bayesian") { //Macro to visualize the results of the proton QA task - //TCanvas objects: 20 gStyle->SetPalette(1,0); gStyle->SetCanvasColor(41); gStyle->SetFrameFillColor(10); @@ -8,11 +8,17 @@ void drawProtonQAResults(const char *analysisType = "TPC") { PrintHelpMenu(); TString filename1 = "Protons.QA."; - filename1 += analysisType; filename1 += ".root"; + filename1 += analysisType; + filename1 += "."; filename1 += pidMode; + filename1 += ".root"; TString filename2 = "Protons.MC.QA."; - filename2 += analysisType; filename2 += ".root"; + filename2 += analysisType; + filename2 += "."; filename2 += pidMode; + filename2 += ".root"; TString filename3 = "Protons.Efficiency."; - filename3 += analysisType; filename3 += ".root"; + filename3 += analysisType; + filename3 += "."; filename3 += pidMode; + filename3 += ".root"; TFile *fQA = TFile::Open(filename1.Data()); TList *listGlobalQA = (TList *)fQA->Get("globalQAList"); diff --git a/PWG2/SPECTRA/macros/runProtonAnalysisQA.C b/PWG2/SPECTRA/macros/runProtonAnalysisQA.C index c01f6687a28..9bab9d1cf2b 100644 --- a/PWG2/SPECTRA/macros/runProtonAnalysisQA.C +++ b/PWG2/SPECTRA/macros/runProtonAnalysisQA.C @@ -37,14 +37,18 @@ void runLocal(const char* mode = "ESD", const char* pidMode = 0x0, const char* path = 0x0) { TString outputFilename1 = "Protons.QA."; outputFilename1 += analysisType; + outputFilename1 += "."; outputFilename1 += pidMode; outputFilename1 += ".root"; //main QA file TString outputFilename2 = "Protons.MC.QA."; outputFilename2 += analysisType; + outputFilename2 += "."; outputFilename2 += pidMode; outputFilename2 += ".root"; //MC process QA TString outputFilename3 = "Protons.QA.Histograms."; outputFilename3 += analysisType; + outputFilename3 += "."; outputFilename2 += pidMode; outputFilename3 += ".root"; //Accepted cut distributions TString outputFilename4 = "Protons.Efficiency."; outputFilename4 += analysisType; + outputFilename4 += "."; outputFilename2 += pidMode; outputFilename4 += ".root"; //Reco and PID efficiency TString outputFilename5 = "Vertex.QA.root"; //vertex QA @@ -156,14 +160,18 @@ void runInteractive(const char* mode = "ESD", const char* pidMode = 0x0, const char* collectionName = "tag.xml") { TString outputFilename1 = "Protons.QA."; outputFilename1 += analysisType; + outputFilename1 += "."; outputFilename1 += pidMode; outputFilename1 += ".root"; //main QA file TString outputFilename2 = "Protons.MC.QA."; outputFilename2 += analysisType; + outputFilename2 += "."; outputFilename2 += pidMode; outputFilename2 += ".root"; //MC process QA TString outputFilename3 = "Protons.QA.Histograms."; outputFilename3 += analysisType; + outputFilename3 += "."; outputFilename3 += pidMode; outputFilename3 += ".root"; //Accepted cut distributions TString outputFilename4 = "Protons.Efficiency."; outputFilename4 += analysisType; + outputFilename4 += "."; outputFilename4 += pidMode; outputFilename4 += ".root"; //Reco and PID efficiency TString outputFilename5 = "Vertex.QA.root"; //vertex QA @@ -278,14 +286,18 @@ void runBatch(const char* mode = "ESD", const char* pidMode = 0x0, const char *collectionfile = "wn.xml") { TString outputFilename1 = "Protons.QA."; outputFilename1 += analysisType; + outputFilename1 += "."; outputFilename1 += pidMode; outputFilename1 += ".root"; //main QA file TString outputFilename2 = "Protons.MC.QA."; outputFilename2 += analysisType; + outputFilename2 += "."; outputFilename2 += pidMode; outputFilename2 += ".root"; //MC process QA TString outputFilename3 = "Protons.QA.Histograms."; outputFilename3 += analysisType; + outputFilename3 += "."; outputFilename3 += pidMode; outputFilename3 += ".root"; //Accepted cut distributions TString outputFilename4 = "Protons.Efficiency."; outputFilename4 += analysisType; + outputFilename4 += "."; outputFilename4 += pidMode; outputFilename4 += ".root"; //Reco and PID efficiency TString outputFilename5 = "Vertex.QA.root"; //vertex QA @@ -393,14 +405,18 @@ void runProof(const char* mode = "ESD", Int_t stats = 0, const char* dataset = 0x0) { TString outputFilename1 = "Protons.QA."; outputFilename1 += analysisType; + outputFilename1 += "."; outputFilename1 += pidMode; outputFilename1 += ".root"; //main QA file TString outputFilename2 = "Protons.MC.QA."; outputFilename2 += analysisType; + outputFilename2 += "."; outputFilename2 += pidMode; outputFilename2 += ".root"; //MC process QA TString outputFilename3 = "Protons.QA.Histograms."; outputFilename3 += analysisType; + outputFilename3 += "."; outputFilename3 += pidMode; outputFilename3 += ".root"; //Accepted cut distributions TString outputFilename4 = "Protons.Efficiency."; outputFilename4 += analysisType; + outputFilename4 += "."; outputFilename4 += pidMode; outputFilename4 += ".root"; //Reco and PID efficiency TString outputFilename5 = "Vertex.QA.root"; //vertex QA -- 2.43.5