From b5687c21bfe8b201a9a87c3106bfdd1a8ce05d6b Mon Sep 17 00:00:00 2001 From: Maria Teresa Date: Thu, 6 Aug 2015 18:18:03 +0200 Subject: [PATCH] Changed style of plot before Final Reading --- Analysis/config/sources.cfg | 24 ++++----- Analysis/include/BaseFlatTreeAnalyzer.h | 2 +- Analysis/include/FlatAnalyzerData.h | 43 +++++++++------ PrintTools/include/StackedPlotDescriptor.h | 63 +++++++++++++++------- PrintTools/include/TdrStyle.h | 2 +- PrintTools/source/Print_Stack.C | 2 +- 6 files changed, 85 insertions(+), 51 deletions(-) diff --git a/Analysis/config/sources.cfg b/Analysis/config/sources.cfg index dcb6f65b..fb57451f 100644 --- a/Analysis/config/sources.cfg +++ b/Analysis/config/sources.cfg @@ -118,7 +118,7 @@ draw_sf: 50 [ggHhh260] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=260 tan#beta=2) +title: H#rightarrowhh(m_{H}=260,tan#beta=2) datacard: ggHTohhTo2Tau2B260 color: blue file: ggH_hh_bbtautau_260.root 0.0358936 @@ -128,7 +128,7 @@ draw_sf: 10 [ggHhh270] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=270 tan#beta=2) +title: H#rightarrowhh(m_{H}=270,tan#beta=2) datacard: ggHTohhTo2Tau2B270 color: blue file: ggH_hh_bbtautau_270.root 0.03057 @@ -138,7 +138,7 @@ draw_sf: 10 [ggHhh280] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=280 tan#beta=2) +title: H#rightarrowhh(m_{H}=280,tan#beta=2) datacard: ggHTohhTo2Tau2B280 color: blue file: ggH_hh_bbtautau_280.root 0.0284073 @@ -148,7 +148,7 @@ draw_sf: 10 [ggHhh290] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=290 tan#beta=2) +title: H#rightarrowhh(m_{H}=290,tan#beta=2) datacard: ggHTohhTo2Tau2B290 color: blue file: ggH_hh_bbtautau_290.root 0.0201117 @@ -158,7 +158,7 @@ draw_sf: 10 [ggHhh300] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=300 tan#beta=2) +title: H#rightarrowhh(m_{H}=300,tan#beta=2) datacard: ggHTohhTo2Tau2B300 color: blue file: ggH_hh_bbtautau_300.root 0.0053075 @@ -168,7 +168,7 @@ draw_sf: 10 [ggHhh310] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=310 tan#beta=2) +title: H#rightarrowhh(m_{H}=310,tan#beta=2) datacard: ggHTohhTo2Tau2B310 color: blue file: ggH_hh_bbtautau_310.root 0.0221424 @@ -178,7 +178,7 @@ draw_sf: 10 [ggHhh320] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=320 tan#beta=2) +title: H#rightarrowhh(m_{H}=320,tan#beta=2) datacard: ggHTohhTo2Tau2B320 color: blue file: ggH_hh_bbtautau_320.root 0.0215317 @@ -188,7 +188,7 @@ draw_sf: 10 [ggHhh330] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=330 tan#beta=2) +title: H#rightarrowhh(m_{H}=330,tan#beta=2) datacard: ggHTohhTo2Tau2B330 color: blue file: ggH_hh_bbtautau_330.root 0.0199818 @@ -198,7 +198,7 @@ draw_sf: 10 [ggHhh340] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=340 tan#beta=2) +title: H#rightarrowhh(m_{H}=340,tan#beta=2) datacard: ggHTohhTo2Tau2B340 color: blue file: ggH_hh_bbtautau_340.root 0.0207792 @@ -208,7 +208,7 @@ draw_sf: 10 [ggHhh350] type: SIGNAL type: LIMITS -title: hh#rightarrow#tau#taubb(m_{H}=350 tan#beta=2) +title: H#rightarrowhh(m_{H}=350,tan#beta=2) datacard: ggHTohhTo2Tau2B350 color: blue file: ggH_hh_bbtautau_350.root 0.0179311 @@ -600,7 +600,7 @@ uncertainty: zttNorm type: BACKGROUND type: ZTT type: LIMITS -title: Z #rightarrow tautau +title: Z#rightarrow#tau#tau datacard: ZTT draw: true color: yellow_custom @@ -611,7 +611,7 @@ type: BACKGROUND type: COMPOSIT type: LIMITS datacard: ZLL -title: Z #rightarrow ll +title: Z#rightarrowll draw: true color: azure_custom subcategory: ZL diff --git a/Analysis/include/BaseFlatTreeAnalyzer.h b/Analysis/include/BaseFlatTreeAnalyzer.h index 7d349de5..62cf219d 100644 --- a/Analysis/include/BaseFlatTreeAnalyzer.h +++ b/Analysis/include/BaseFlatTreeAnalyzer.h @@ -849,7 +849,7 @@ class BaseFlatTreeAnalyzer { static const std::map histogramsToBlind = { { FlatAnalyzerData_semileptonic::m_sv_Name(), 1 }, { FlatAnalyzerData::m_vis_Name(), 1 }, - { FlatAnalyzerData::m_bb_Name(), 1 }, { FlatAnalyzerData::m_ttbb_Name(), 2 }, + { FlatAnalyzerData_semileptonic::m_bb_Name(), 1 }, { FlatAnalyzerData::m_ttbb_Name(), 2 }, { FlatAnalyzerData::m_ttbb_kinfit_Name(), 2 }, { FlatAnalyzerData::m_bb_slice_Name(), 3 } }; diff --git a/Analysis/include/FlatAnalyzerData.h b/Analysis/include/FlatAnalyzerData.h index c06a86a3..3b737a11 100644 --- a/Analysis/include/FlatAnalyzerData.h +++ b/Analysis/include/FlatAnalyzerData.h @@ -37,20 +37,20 @@ class FlatAnalyzerData : public root_ext::AnalyzerData { public: TH1D_ENTRY_CUSTOM_EX(m_vis, M_tt_Bins(), "M_{vis}(GeV)", "Events", false, 1.1, false, SaveAll) TH1D_ENTRY_CUSTOM_EX(m_bb_slice, M_tt_bbSlice_Bins(), "2DM_{sv}(GeV)", "Events", false, 1.1, false, SaveAll) - TH1D_ENTRY_CUSTOM_EX(m_ttbb, M_ttbb_Bins(), "M_{#tau#tau+jj} (GeV)", "dN/dM_{#tau#tau+jj} (1/GeV)", false, 1.3, true, SaveAll) - TH1D_ENTRY_CUSTOM_EX(m_ttbb_kinfit, M_ttbb_Bins(), "M_{H}^{kinfit} (GeV)", "dN/dM_{H}^{kinfit} (1/GeV)", false, 1.3, true, true) + TH1D_ENTRY_CUSTOM_EX(m_ttbb, M_ttbb_Bins(), "M_{#tau#tau+jj} (GeV)", "dN/dm_{#tau#tau+jj} (1/GeV)", false, 1.5, true, SaveAll) + TH1D_ENTRY_CUSTOM_EX(m_ttbb_kinfit, M_ttbb_Bins(), "M_{H}^{kinfit} (GeV)", "dN/dm_{H}^{kinfit} (1/GeV)", false, 1.4, true, true) - TH1D_ENTRY_EX(pt_b1, 20, 0, 200, "Leading selected jet p_{T} (GeV)", "Events", false, 1.3, false, SaveAll) + TH1D_ENTRY_EX(pt_b1, 20, 0, 200, "Leading selected jet p_{T} (GeV)", "Events", false, 1.4, false, SaveAll) TH1D_ENTRY_EX(eta_b1, 25, -2.5, 2.5, "Leading selected jet #eta", "Events", false, 1.8, false, SaveAll) - TH1D_ENTRY_EX(csv_b1, 25, 0, 1, "Leading selected jet CSV", "Events", false, 1.3, false, SaveAll) - TH1D_ENTRY_EX(pt_b2, 20, 0, 200, "Subleading selected jet p_{T} (GeV)", "Events", false, 1.3, false, SaveAll) + TH1D_ENTRY_EX(csv_b1, 25, 0, 1, "Leading selected jet CSV", "Events", false, 1.4, false, SaveAll) + TH1D_ENTRY_EX(pt_b2, 20, 0, 200, "Subleading selected jet p_{T} (GeV)", "Events", false, 1.4, false, SaveAll) TH1D_ENTRY_EX(eta_b2, 25, -2.5, 2.5, "Subleading selected jet #eta", "Events", false, 1.8, false, SaveAll) - TH1D_ENTRY_EX(csv_b2, 25, 0, 1, "Subleading selected jet CSV", "Events", false, 1.3, false, SaveAll) + TH1D_ENTRY_EX(csv_b2, 25, 0, 1, "Subleading selected jet CSV", "Events", false, 1.4, false, SaveAll) TH1D_ENTRY_EX(pt_H_tt, 20, 0, 300, "P_{T}(GeV)", "Events", false, 1.1, false, SaveAll) TH1D_ENTRY_EX(pt_H_bb, 20, 0, 300, "P_{T}(GeV)", "Events", false, 1.1, false, SaveAll) TH1D_ENTRY_EX(pt_H_hh, 20, 0, 300, "P_{T}(GeV)", "Events", false, 1.1, false, SaveAll) - TH1D_ENTRY_EX(m_bb, 30, 0, 600, "M_{jj} (GeV)", "dN/dM_{jj} (1/GeV)", false, 1.25, true, SaveAll) + //TH1D_ENTRY_EX(m_bb, 20, 0, 400, "M_{jj} (GeV)", "dN/dm_{jj} (1/GeV)", false, 1.4, true, SaveAll) TH1D_ENTRY_EX(DeltaPhi_tt, 22, 0., 3.3, "#Delta#Phi_{#tau#tau}[rad]", "Events", false, 1.3, false, SaveAll) TH1D_ENTRY_EX(DeltaPhi_bb, 22, 0., 3.3, "#Delta#Phi_{bb}[rad]", "Events", false, 1.8, false, SaveAll) TH1D_ENTRY_EX(DeltaPhi_bb_MET, 22, 0., 3.3, "#Delta#Phi_{bb,MET}[rad]", "Events", false, 1.5, false, SaveAll) @@ -67,7 +67,7 @@ class FlatAnalyzerData : public root_ext::AnalyzerData { TH1D_ENTRY_EX(pull_balance, 20, -10, 10, "pull_balance", "Events", false, 2, false, SaveAll) TH1D_ENTRY_EX(pull_balance_1, 100, -10, 10, "pull_balance_1", "Events", false, 1.1, false, SaveAll) TH1D_ENTRY_EX(pull_balance_2, 100, -10, 10, "pull_balance_1", "Events", false, 1.1, false, SaveAll) - TH1D_ENTRY_EX(MET, 20, 0, 100, "E_{T}^{miss} (GeV)", "Events", false, 1.3, false, SaveAll) + TH1D_ENTRY_EX(MET, 20, 0, 100, "E_{T}^{miss} (GeV)", "Events", false, 1.4, false, SaveAll) TH1D_ENTRY_EX(nJets_Pt30, 20, -0.5, 19.5, "nJets", "Events", false, 1.1, false, SaveAll) TH2D_ENTRY_EX(csv_b1_vs_ptb1, 20, 0, 200, 25, 0, 1, "P_{T}(GeV)(leading_jet)", "CSV(leading_jet)", false, 1, SaveAll) TH2D_ENTRY_EX(chi2_vs_ptb1, 20, 0, 200, 20, 0, 100, "P_{T}(GeV)(leading_jet)", "#chi^{2}", false, 1, SaveAll) @@ -139,7 +139,7 @@ class FlatAnalyzerData : public root_ext::AnalyzerData { DeltaR_bb().Fill(eventInfo.bjet_momentums.at(eventInfo.selected_bjets.first).DeltaR( eventInfo.bjet_momentums.at(eventInfo.selected_bjets.second)), weight); pt_H_bb().Fill(eventInfo.Hbb.Pt(),weight); - m_bb().Fill(eventInfo.Hbb.M(), weight); +// m_bb().Fill(eventInfo.Hbb.M(), weight); DeltaPhi_bb_MET().Fill(std::abs(eventInfo.Hbb.DeltaPhi(eventInfo.MET)), weight); DeltaPhi_hh().Fill(std::abs(eventInfo.Htt.DeltaPhi(eventInfo.Hbb)), weight); DeltaR_hh().Fill(eventInfo.Htt.DeltaR(eventInfo.Hbb), weight); @@ -165,7 +165,7 @@ class FlatAnalyzerData : public root_ext::AnalyzerData { virtual void CreateAll() { m_vis(); m_bb_slice(); m_ttbb(); m_ttbb_kinfit(); pt_b1(); eta_b1(); csv_b1(); pt_b2(); eta_b2(); - csv_b2(); pt_H_tt(); pt_H_bb(); pt_H_hh(); m_bb(); DeltaPhi_tt(); DeltaPhi_bb(); DeltaPhi_bb_MET(); + csv_b2(); pt_H_tt(); pt_H_bb(); pt_H_hh(); /*m_bb();*/ DeltaPhi_tt(); DeltaPhi_bb(); DeltaPhi_bb_MET(); DeltaPhi_tt_MET(); DeltaPhi_hh(); DeltaR_tt(); DeltaR_bb(); DeltaR_hh(); mt_2(); pt_H_tt_MET(); convergence(); chi2(); fit_probability(); pull_balance(); pull_balance_1(); pull_balance_2(); MET(); nJets_Pt30(); csv_b1_vs_ptb1(); chi2_vs_ptb1(); mH_vs_chi2(); @@ -210,13 +210,14 @@ class FlatAnalyzerData : public root_ext::AnalyzerData { class FlatAnalyzerData_semileptonic : public FlatAnalyzerData { public: - TH1D_ENTRY_CUSTOM_EX(m_sv, M_tt_Bins(), "M_{#tau#tau} (GeV)", "dN/dM_{#tau#tau} (1/GeV)", false, 1.5, true, true) + TH1D_ENTRY_CUSTOM_EX(m_sv, M_tt_Bins(), "M_{#tau#tau} (GeV)", "dN/dm_{#tau#tau} (1/GeV)", false, 1.5, true, true) TH1D_ENTRY_EX(pt_1, 20, 0, 200, "P_{T}(leading#tau_{h})(GeV)", "Events", false, 1.1, false, SaveAll) TH1D_ENTRY_EX(eta_1, 25, -2.5, 2.5, "#eta(leading#tau_{h})", "Events", false, 2, false, SaveAll) TH1D_ENTRY_EX(pt_2, 20, 0, 200, "P_{T}(subleading#tau_{h})(GeV)", "Events", false, 1, false, SaveAll) TH1D_ENTRY_EX(eta_2, 25, -2.5, 2.5, "#eta(subleading#tau_{h})", "Events", false, 2, false, SaveAll) TH1D_ENTRY_EX(mt_1, 50, 0, 50, "M_{T}(GeV)", "Events", false, 1.1, false, SaveAll) + TH1D_ENTRY_EX(m_bb, 20, 0, 400, "M_{jj} (GeV)", "Events/ 20 GeV", false, 1.4, true, SaveAll) explicit FlatAnalyzerData_semileptonic(bool _fill_all) : FlatAnalyzerData(_fill_all) {} @@ -234,6 +235,8 @@ class FlatAnalyzerData_semileptonic : public FlatAnalyzerData { pt_2().Fill(event.pt_2, weight); eta_2().Fill(event.eta_2, weight); mt_1().Fill(event.mt_1, weight); + if(!eventInfo.has_bjet_pair) return; + m_bb().Fill(eventInfo.Hbb.M(), weight); } virtual root_ext::SmartHistogram& m_sv_base() override { return m_sv(); } @@ -248,7 +251,7 @@ class FlatAnalyzerData_semileptonic : public FlatAnalyzerData { virtual void CreateAll() override { FlatAnalyzerData::CreateAll(); - m_sv(); pt_1(); eta_1(); pt_2(); eta_2(); mt_1(); + m_sv(); pt_1(); eta_1(); pt_2(); eta_2(); mt_1();m_bb(); } }; @@ -269,9 +272,9 @@ class FlatAnalyzerData_semileptonic_2tag : public FlatAnalyzerData_semileptonic class FlatAnalyzerData_tautau : public FlatAnalyzerData { public: - TH1D_ENTRY_EX(pt_1, 20, 0, 200, "Leading tau p_{T} (GeV)", "Events", false, 1.3, false, SaveAll) + TH1D_ENTRY_EX(pt_1, 20, 0, 200, "Leading tau p_{T} (GeV)", "Events", false, 1.4, false, SaveAll) TH1D_ENTRY_EX(eta_1, 25, -2.5, 2.5, "Leading tau #eta", "Events", false, 1.8, false, SaveAll) - TH1D_ENTRY_EX(pt_2, 20, 0, 200, "Subleading tau p_{T} (GeV)", "Events", false, 1.3, false, SaveAll) + TH1D_ENTRY_EX(pt_2, 20, 0, 200, "Subleading tau p_{T} (GeV)", "Events", false, 1.4, false, SaveAll) TH1D_ENTRY_EX(eta_2, 25, -2.5, 2.5, "Subleading tau #eta", "Events", false, 1.8, false, SaveAll) TH1D_ENTRY_EX(mt_1, 20, 0, 200, "M_{T}(GeV)", "Events", false, 1.1, false, SaveAll) @@ -312,7 +315,8 @@ class FlatAnalyzerData_tautau : public FlatAnalyzerData { class FlatAnalyzerData_tautau_other_tag : public FlatAnalyzerData_tautau { public: - TH1D_ENTRY_CUSTOM_EX(m_sv, M_tt_Bins(), "M_{#tau#tau} (GeV)", "dN/dM_{#tau#tau} (1/GeV)", false, 1.3, true, true) + TH1D_ENTRY_CUSTOM_EX(m_sv, M_tt_Bins(), "M_{#tau#tau} (GeV)", "dN/dm_{#tau#tau} (1/GeV)", false, 1.5, true, true) + TH1D_ENTRY_EX(m_bb, 20, 0, 400, "M_{jj} (GeV)", "Events/ 20 GeV", false, 1.4, true, SaveAll) explicit FlatAnalyzerData_tautau_other_tag(bool _fill_all) : FlatAnalyzerData_tautau(_fill_all) {} @@ -323,6 +327,8 @@ class FlatAnalyzerData_tautau_other_tag : public FlatAnalyzerData_tautau { { FlatAnalyzerData_tautau::Fill(eventInfo, weight); m_sv().Fill(eventInfo.event->m_sv_MC, weight); + if(!eventInfo.has_bjet_pair) return; + m_bb().Fill(eventInfo.Hbb.M(), weight); } virtual root_ext::SmartHistogram& m_sv_base() override { return m_sv(); } @@ -331,13 +337,15 @@ class FlatAnalyzerData_tautau_other_tag : public FlatAnalyzerData_tautau { { FlatAnalyzerData_tautau::CreateAll(); m_sv(); + m_bb(); } }; class FlatAnalyzerData_tautau_2tag : public FlatAnalyzerData_tautau { public: - TH1D_ENTRY_CUSTOM_EX(m_sv, M_tt_Bins(), "M_{#tau#tau} (GeV)", "dN/dM_{#tau#tau} (1/GeV)", false, 1.7, true, true) + TH1D_ENTRY_CUSTOM_EX(m_sv, M_tt_Bins(), "M_{#tau#tau} (GeV)", "dN/dm_{#tau#tau} (1/GeV)", false, 1.7, true, true) + TH1D_ENTRY_EX(m_bb, 10, 0, 400, "M_{jj} (GeV)", "Events/ 40 GeV", false, 1.4, true, SaveAll) explicit FlatAnalyzerData_tautau_2tag(bool _fill_all) : FlatAnalyzerData_tautau(_fill_all) {} @@ -348,6 +356,8 @@ class FlatAnalyzerData_tautau_2tag : public FlatAnalyzerData_tautau { { FlatAnalyzerData_tautau::Fill(eventInfo, weight); m_sv().Fill(eventInfo.event->m_sv_MC, weight); + if(!eventInfo.has_bjet_pair) return; + m_bb().Fill(eventInfo.Hbb.M(), weight); } virtual root_ext::SmartHistogram& m_sv_base() override { return m_sv(); } @@ -362,6 +372,7 @@ class FlatAnalyzerData_tautau_2tag : public FlatAnalyzerData_tautau { { FlatAnalyzerData_tautau::CreateAll(); m_sv(); + m_bb(); } }; diff --git a/PrintTools/include/StackedPlotDescriptor.h b/PrintTools/include/StackedPlotDescriptor.h index dd5f1ae8..eacc8067 100644 --- a/PrintTools/include/StackedPlotDescriptor.h +++ b/PrintTools/include/StackedPlotDescriptor.h @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include "RootPrintSource.h" #include "../include/TdrStyle.h" @@ -52,10 +54,12 @@ class StackedPlotDescriptor { StackedPlotDescriptor(const std::string& page_title, bool draw_title, const std::string& channelNameLatex, const std::string& _categoryName, bool _draw_ratio, bool _drawBKGerrors) - : text(new TPaveText(0.15, 0.95, 0.95, 0.99, "NDC")), categoryText(new TPaveText(0.45, 0.93, 0.95, 0.97, "NDC")), + : text(new TPaveText(0.18, 0.95, 0.65, 0.99, "NDC")), categoryText(new TPaveText(0.21, 0.71, 0.35, 0.75, "NDC")), channelText(new TPaveText(0.2, 0.85, 0.25, 0.89, "NDC")), channelName(channelNameLatex), categoryName(_categoryName), draw_ratio(_draw_ratio), drawBKGerrors(_drawBKGerrors) { + + page.side.fit_range_x = false; page.title = page_title; page.layout.has_title = draw_title; @@ -90,24 +94,27 @@ class StackedPlotDescriptor { legend->SetFillColor (0); legend->SetBorderSize(0); - text->SetTextSize(0.05); + text->SetTextSize(0.035); text->SetTextFont(62); text->SetFillColor(0); text->SetBorderSize(0); text->SetMargin(0.01); text->SetTextAlign(12); // align left std::ostringstream ss_text; - ss_text << channelName << ", " << categoryName; + ss_text << "H#rightarrowhh#rightarrowbb#tau#tau " ; text->AddText(0.01,0.05, ss_text.str().c_str()); + //category -// categoryText->SetTextSize(0.04); -// categoryText->SetTextFont(62); -// categoryText->SetFillColor(0); -// categoryText->SetBorderSize(0); -// categoryText->SetMargin(0.01); -// categoryText->SetTextAlign(32); // align left -// categoryText->AddText(categoryName.c_str()); + categoryText->SetTextSize(0.035); + categoryText->SetTextFont(62); + categoryText->SetFillColor(0); + categoryText->SetBorderSize(0); + categoryText->SetMargin(0.01); + categoryText->SetTextAlign(12); // align left + std::ostringstream ss_text_2; + ss_text_2 << channelName << ", " << categoryName; + categoryText->AddText(ss_text_2.str().c_str()); // channelText->SetTextSize(0.08); //0.05 // channelText->SetTextFont(62); @@ -143,10 +150,18 @@ class StackedPlotDescriptor { unsigned scale_factor) { hist_ptr histogram = PrepareHistogram(original_signal); + //Reb + htt_style::SetStyle(); + histogram->SetFillStyle(1001); + histogram->SetLineStyle(2); + histogram->SetFillColor(0); + histogram->SetLineColor(kBlue+3); + histogram->SetLineWidth(3); + //ours //histogram->SetLineColor(color); - histogram->SetLineColor(4); - histogram->SetLineStyle(11); //2 - histogram->SetLineWidth(2); //3 + //histogram->SetLineColor(4); + //histogram->SetLineStyle(11); //2 + //histogram->SetLineWidth(2); //3 histogram->Scale(scale_factor); signal_histograms.push_back(histogram); std::ostringstream ss; @@ -210,14 +225,14 @@ class StackedPlotDescriptor { main_pad->SetRightMargin( R/W ); main_pad->SetTopMargin( T/H ); main_pad->SetBottomMargin( B/H ); - main_pad->SetTickx(0); - main_pad->SetTicky(0); + main_pad->SetTickx(1); + main_pad->SetTicky(1); main_pad->Draw(); main_pad->cd(); if (data_histogram) - legend->AddEntry(data_histogram.get(), data_histogram->GetLegendTitle().c_str(), "PE"); + legend->AddEntry(data_histogram.get(), data_histogram->GetLegendTitle().c_str(), "PLE"); if (drawBKGerrors && sum_backgound_histogram) legend->AddEntry(sum_backgound_histogram.get(),sum_backgound_histogram->GetLegendTitle().c_str(), "f"); for(const hist_ptr& signal : signal_histograms) @@ -278,7 +293,7 @@ class StackedPlotDescriptor { int new_idx = root_ext::CreateTransparentColor(12,0.5); sum_backgound_histogram->SetFillColor(new_idx); sum_backgound_histogram->SetFillStyle(3001); - sum_backgound_histogram->SetLineWidth(1); + sum_backgound_histogram->SetLineWidth(0); sum_backgound_histogram->Draw("e2same"); // end new @@ -294,14 +309,22 @@ class StackedPlotDescriptor { signal->Draw("SAME HIST"); if(data_histogram) { + data_histogram->SetMarkerColor(1); + data_histogram->SetLineColor(1); + data_histogram->SetFillColor(1); + data_histogram->SetFillStyle(0); + data_histogram->SetLineWidth(2); + + data_histogram->SetMarkerStyle(20); - data_histogram->SetMarkerSize(1); - data_histogram->Draw("samepPE0X0"); + data_histogram->SetMarkerSize(1.1); +// data_histogram->Draw("samepPE0X0"); + data_histogram->Draw("pesame"); } text->Draw("same"); // channelText->Draw("same"); -// categoryText->Draw("same"); + categoryText->Draw("same"); cms_tdr::writeExtraText = true; cms_tdr::extraText = TString("Unpublished"); diff --git a/PrintTools/include/TdrStyle.h b/PrintTools/include/TdrStyle.h index d20d1144..077f3a34 100755 --- a/PrintTools/include/TdrStyle.h +++ b/PrintTools/include/TdrStyle.h @@ -147,7 +147,7 @@ void setTDRStyle() { // Postscript options: tdrStyle->SetPaperSize(20.,20.); // tdrStyle->SetLineScalePS(Float_t scale = 3); - // tdrStyle->SetLineStyleString(Int_t i, const char* text); +// tdrStyle->SetLineStyleString(Int_t i, const char* text); // tdrStyle->SetHeaderPS(const char* header); // tdrStyle->SetTitlePS(const char* pstitle); diff --git a/PrintTools/source/Print_Stack.C b/PrintTools/source/Print_Stack.C index 88ef4a7b..69232259 100644 --- a/PrintTools/source/Print_Stack.C +++ b/PrintTools/source/Print_Stack.C @@ -200,7 +200,7 @@ private: static const std::map histogramsToBlind = { { FlatAnalyzerData_semileptonic::m_sv_Name(), 1 }, { FlatAnalyzerData::m_vis_Name(), 1 }, - { FlatAnalyzerData::m_bb_Name(), 1 }, { FlatAnalyzerData::m_ttbb_Name(), 2 }, + { FlatAnalyzerData_semileptonic::m_bb_Name(), 1 }, { FlatAnalyzerData::m_ttbb_Name(), 2 }, { FlatAnalyzerData::m_ttbb_kinfit_Name(), 2 }, { FlatAnalyzerData::m_bb_slice_Name(), 3 } };