From 7a5902788d02bb92e1731f79a72727d660fa4450 Mon Sep 17 00:00:00 2001 From: Konstantin Androsov Date: Fri, 1 May 2015 19:20:17 +0200 Subject: [PATCH] Updated stacked plots cosmetics. - fixed "University of Siena" name in file headers; - added divide_by_bin_width to the SmartHistogram; - added FlatAnalyzerData_tautau_other_tag class; - in FlatAnalyzerDataCollectionReader taking information required to plot histograms from FlatAnalyzerDataCollection; - added CMS_lumi.h and updated TdrStyle.h according the last CMS Publications Committee reccommendations; - fixed Print_Stack, RootPrintToPdf and StackedPlotDescriptor to follow new plot decoration format; - added script print_control_plots.sh to print all control plots that should be put into the AN; - added dependency on ROOT library ASImage make.sh and make_withFactory.sh. --- Analysis/include/AnalysisCategories.h | 4 +- Analysis/include/BaseAnalyzer.h | 4 +- Analysis/include/BaseFlatTreeAnalyzer.h | 4 +- Analysis/include/BaseFlatTreeProducer.h | 4 +- Analysis/include/Config.h | 4 +- Analysis/include/EventWeights.h | 4 +- Analysis/include/FlatAnalyzerData.h | 159 +++++++++---- Analysis/include/FlatAnalyzerDataCollection.h | 34 ++- Analysis/include/Htautau_Summer13.h | 4 +- Analysis/include/JetEnergyUncertainty.h | 4 +- Analysis/include/KinFit.h | 4 +- Analysis/include/KinFit_CMSSW.h | 4 +- Analysis/include/LightBaseBigTreeAnalyzer.h | 4 +- Analysis/include/LightBaseFlatTreeAnalyzer.h | 4 +- Analysis/include/MvaMet.h | 4 +- Analysis/include/RecoilCorrection.h | 4 +- Analysis/include/SVfit.h | 4 +- Analysis/include/SelectionResults.h | 4 +- .../include/SemileptonicFlatTreeAnalyzer.h | 4 +- .../include/UncertaintyCalculatorCollection.h | 4 +- Analysis/include/UncertaintyConfiguration.h | 4 +- Analysis/include/custom_cuts.h | 4 +- Analysis/source/FlatTreeAnalyzer_etau.C | 4 +- Analysis/source/FlatTreeAnalyzer_mutau.C | 4 +- Analysis/source/FlatTreeAnalyzer_tautau.C | 4 +- Analysis/source/FlatTreeProducer.C | 4 +- Analysis/source/FlatTreeProducer_etau.C | 4 +- Analysis/source/FlatTreeProducer_mutau.C | 4 +- Analysis/source/FlatTreeProducer_tautau.C | 4 +- Analysis/source/KinFitTreeProducer.C | 6 +- Analysis/source/LimitConfigurationProducer.C | 4 +- Analysis/source/MergeRootFiles.C | 4 +- Analysis/source/PileUp.C | 4 +- Analysis/source/SyncTreeProducer.C | 6 +- Analysis/studies/BjetSelectionStudy.C | 4 +- Analysis/studies/EventSelectionStudy.C | 4 +- Analysis/studies/KinFitStudy.C | 6 +- Analysis/studies/McTruthStudy.C | 4 +- Analysis/studies/McTruthStudy_flat.C | 4 +- AnalysisBase/include/AnalysisMath.h | 4 +- AnalysisBase/include/AnalysisTools.h | 4 +- AnalysisBase/include/AnalysisTypes.h | 4 +- AnalysisBase/include/AnalyzerData.h | 16 +- AnalysisBase/include/BaseConfig.h | 2 +- AnalysisBase/include/Candidate.h | 4 +- AnalysisBase/include/ConfigReader.h | 2 +- AnalysisBase/include/CutTools.h | 4 +- AnalysisBase/include/DebugTools.h | 4 +- AnalysisBase/include/EventDescriptor.h | 4 +- AnalysisBase/include/EventId.h | 4 +- AnalysisBase/include/FlatEventInfo.h | 4 +- AnalysisBase/include/FlatTree.h | 4 +- AnalysisBase/include/GenParticle.h | 4 +- AnalysisBase/include/KinFitTree.h | 4 +- AnalysisBase/include/MCfinalState.h | 4 +- AnalysisBase/include/Particles.h | 4 +- AnalysisBase/include/PhysicalValue.h | 4 +- AnalysisBase/include/ProgressReporter.h | 2 +- AnalysisBase/include/RootExt.h | 2 +- AnalysisBase/include/RunReport.h | 4 +- AnalysisBase/include/SmartHistogram.h | 25 +- AnalysisBase/include/SyncTree.h | 4 +- AnalysisBase/include/Tools.h | 2 +- AnalysisBase/include/TreeExtractor.h | 4 +- AnalysisBase/include/exception.h | 2 +- HHKinFit/src/HHDiJetKinFitMaster.cpp | 52 ++--- HHKinFit/src/HHKinFitMaster.cpp | 52 ++--- HHKinFit/src/HHTauInputKinFitMaster.cpp | 52 ++--- HHKinFit/src/PSMath.cpp | 2 +- HHbbTauTau.files | 3 + PatProduction/interface/PatVertex.h | 4 +- .../plugins/ElectronsUserEmbedder.cc | 4 +- PatProduction/plugins/JetUserEmbedder.cc | 4 +- PatProduction/plugins/MuonsUserEmbedded.cc | 4 +- PatProduction/plugins/PatVertexProducer.cc | 4 +- PatProduction/plugins/SkimFilter.cc | 4 +- PatProduction/python/patElectrons.py | 4 +- PatProduction/python/patJets.py | 4 +- PatProduction/python/patMET.py | 4 +- PatProduction/python/patMuons.py | 4 +- PatProduction/python/patOptions.py | 4 +- PatProduction/python/patTaus.py | 4 +- PatProduction/python/patTrigger.py | 4 +- PatProduction/python/patTuple.py | 4 +- PatProduction/python/patVertices.py | 4 +- PatProduction/python/skimFilter.py | 4 +- PatProduction/python/treeProduction.py | 4 +- PatProduction/src/classes.h | 4 +- PrintTools/include/CMS_lumi.h | 201 ++++++++++++++++ PrintTools/include/HttStyles.h | 219 +++++++++++++++++- PrintTools/include/RootPrintSource.h | 2 +- PrintTools/include/RootPrintToPdf.h | 38 ++- PrintTools/include/RootPrintTools.h | 2 +- PrintTools/include/StackedPlotDescriptor.h | 125 ++++++---- PrintTools/include/TdrStyle.h | 30 ++- PrintTools/source/HttStyles.cc | 214 ----------------- PrintTools/source/Print_Histogram.C | 4 +- PrintTools/source/Print_Selection.C | 4 +- PrintTools/source/Print_SmartHistogram.C | 4 +- PrintTools/source/Print_Stack.C | 82 +++++-- PrintTools/source/Print_SyncPlots.C | 4 +- PrintTools/source/Print_TreeBranch.C | 4 +- RunTools/batch.sh | 4 +- RunTools/check_crab_duplicates.sh | 4 +- RunTools/check_finished_tree.sh | 4 +- RunTools/collect_partial_jobs.sh | 4 +- RunTools/generate_file_list.sh | 4 +- RunTools/hadd_analysis.sh | 4 +- RunTools/make.sh | 6 +- RunTools/make_withFactory.sh | 6 +- RunTools/print_control_plots.sh | 126 ++++++++++ RunTools/python/readFileList.py | 4 +- RunTools/python/skimRiccardo.py | 4 +- RunTools/replica.sh | 4 +- RunTools/replica_xrd.sh | 4 +- RunTools/resubmitAna_jobs.sh | 4 +- RunTools/resubmit_jobs.sh | 4 +- RunTools/runAnalysis.sh | 4 +- RunTools/runPatProducer.sh | 4 +- RunTools/runTreeProducer.sh | 4 +- RunTools/scan_trees.sh | 2 +- RunTools/source/Scan.C | 2 +- RunTools/submitAllAnalysis.sh | 4 +- RunTools/submitAnalysis_Batch.sh | 4 +- RunTools/submitMultiAnalysis_Batch.sh | 4 +- RunTools/submitPatProducer_Batch.sh | 4 +- RunTools/submitTreeProducer_Batch.sh | 4 +- TreeProduction/interface/Electron.h | 4 +- TreeProduction/interface/Event.h | 4 +- TreeProduction/interface/GenEvent.h | 4 +- TreeProduction/interface/GenJet.h | 4 +- TreeProduction/interface/GenMET.h | 4 +- TreeProduction/interface/GenParticle.h | 4 +- TreeProduction/interface/Jet.h | 4 +- TreeProduction/interface/MET.h | 4 +- TreeProduction/interface/Muon.h | 4 +- TreeProduction/interface/PFCand.h | 4 +- TreeProduction/interface/SmartTree.h | 2 +- TreeProduction/interface/Tau.h | 4 +- TreeProduction/interface/Track.h | 4 +- TreeProduction/interface/Trigger.h | 4 +- TreeProduction/interface/TriggerObject.h | 4 +- TreeProduction/interface/TriggerTools.h | 4 +- TreeProduction/interface/Vertex.h | 4 +- TreeProduction/plugins/ElectronBlock.cc | 4 +- TreeProduction/plugins/EventBlock.cc | 4 +- TreeProduction/plugins/GenEventBlock.cc | 4 +- TreeProduction/plugins/GenJetBlock.cc | 4 +- TreeProduction/plugins/GenMETBlock.cc | 4 +- TreeProduction/plugins/GenParticleBlock.cc | 4 +- TreeProduction/plugins/JetBlock.cc | 4 +- TreeProduction/plugins/METBlock.cc | 4 +- TreeProduction/plugins/MuonBlock.cc | 4 +- TreeProduction/plugins/PFCandBlock.cc | 4 +- TreeProduction/plugins/TauBlock.cc | 4 +- TreeProduction/plugins/TrackBlock.cc | 4 +- TreeProduction/plugins/TriggerBlock.cc | 4 +- TreeProduction/plugins/TriggerObjectBlock.cc | 4 +- TreeProduction/plugins/VertexBlock.cc | 4 +- TreeProduction/python/ElectronBlock_cfi.py | 4 +- TreeProduction/python/EventBlock_cfi.py | 4 +- TreeProduction/python/GenEventBlock_cfi.py | 4 +- TreeProduction/python/GenJetBlock_cfi.py | 4 +- TreeProduction/python/GenMETBlock_cfi.py | 4 +- TreeProduction/python/GenParticleBlock_cfi.py | 4 +- TreeProduction/python/JetBlock_cfi.py | 4 +- TreeProduction/python/METBlock_cfi.py | 4 +- TreeProduction/python/MuonBlock_cfi.py | 4 +- TreeProduction/python/PFCandBlock_cfi.py | 4 +- TreeProduction/python/TauBlock_cfi.py | 4 +- TreeProduction/python/TrackBlock_cfi.py | 4 +- .../python/TreeContentConfig_cff.py | 4 +- TreeProduction/python/TriggerBlock_cfi.py | 4 +- .../python/TriggerObjectBlock_cfi.py | 4 +- TreeProduction/python/VertexBlock_cfi.py | 4 +- TreeProduction/python/treeProducer.py | 4 +- debug.sh | 4 +- env.sh | 4 +- runx.sh | 4 +- 179 files changed, 1296 insertions(+), 770 deletions(-) create mode 100644 PrintTools/include/CMS_lumi.h delete mode 100644 PrintTools/source/HttStyles.cc create mode 100755 RunTools/print_control_plots.sh diff --git a/Analysis/include/AnalysisCategories.h b/Analysis/include/AnalysisCategories.h index f5d685bd..44cfbeec 100644 --- a/Analysis/include/AnalysisCategories.h +++ b/Analysis/include/AnalysisCategories.h @@ -1,8 +1,8 @@ /*! * \file AnalysisCategories.h * \brief Definition of data and event categories used in HH->bbTauTau analysis. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-09-16 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/BaseAnalyzer.h b/Analysis/include/BaseAnalyzer.h index a81bd101..6b1c24ee 100644 --- a/Analysis/include/BaseAnalyzer.h +++ b/Analysis/include/BaseAnalyzer.h @@ -1,8 +1,8 @@ /*! * \file BaseAnalyzer.h * \brief Definition of BaseAnalyzer class which is the base class for all X->HH->bbTauTau and H->tautau analyzers. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-20 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/BaseFlatTreeAnalyzer.h b/Analysis/include/BaseFlatTreeAnalyzer.h index dff5b636..60e01355 100644 --- a/Analysis/include/BaseFlatTreeAnalyzer.h +++ b/Analysis/include/BaseFlatTreeAnalyzer.h @@ -1,8 +1,8 @@ /*! * \file BaseFlatTreeAnalyzer.h * \brief Definition of BaseFlatTreeAnalyzer class, the base class for flat tree analyzers. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-09-03 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/BaseFlatTreeProducer.h b/Analysis/include/BaseFlatTreeProducer.h index e0ff417d..3c79a099 100644 --- a/Analysis/include/BaseFlatTreeProducer.h +++ b/Analysis/include/BaseFlatTreeProducer.h @@ -1,8 +1,8 @@ /*! * \file BaseFlatTreeProducer.h * \brief Definition of BaseFlatTreeProducer class, the base class for flat tree producers. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-07-11 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/Config.h b/Analysis/include/Config.h index ce68c583..496867b7 100644 --- a/Analysis/include/Config.h +++ b/Analysis/include/Config.h @@ -1,8 +1,8 @@ /*! * \file Config.h * \brief Definition of Config class. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2014 Konstantin Androsov , * Maria Teresa Grippo diff --git a/Analysis/include/EventWeights.h b/Analysis/include/EventWeights.h index eecd90e5..fbf605cc 100644 --- a/Analysis/include/EventWeights.h +++ b/Analysis/include/EventWeights.h @@ -1,8 +1,8 @@ /*! * \file EventWeights.h * \brief Definition of the class to calculate and store different event weights. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-11-17 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/FlatAnalyzerData.h b/Analysis/include/FlatAnalyzerData.h index 6c7ed47e..592512be 100644 --- a/Analysis/include/FlatAnalyzerData.h +++ b/Analysis/include/FlatAnalyzerData.h @@ -1,8 +1,8 @@ /*! * \file FlatAnalyzerData.h * \brief Definition of histogram containers for flat tree analyzers. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-12-02 created * * Copyright 2014 Konstantin Androsov , @@ -35,41 +35,40 @@ namespace analysis { class FlatAnalyzerData : public root_ext::AnalyzerData { public: - TH1D_ENTRY_CUSTOM_EX(m_sv, M_tt_Bins(), "M_{#tau#tau} [GeV]", "dN/dm_{#tau#tau} [1/GeV]", false, 1.5, true) - TH1D_ENTRY_CUSTOM_EX(m_vis, M_tt_Bins(), "M_{vis}[GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_CUSTOM_EX(m_bb_slice, M_tt_bbSlice_Bins(), "2DM_{sv}[GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_CUSTOM_EX(m_ttbb, M_ttbb_Bins(), "M_{#tau#tau+jj} [GeV]", "dN/dm_{#tau#tau+jj} [1/GeV]", false, 1.1, SaveAll) - TH1D_ENTRY_CUSTOM_EX(m_ttbb_kinfit, M_ttbb_Bins(), "M_{H}^{kinfit} [GeV]", "dN/dm_{H}^{kinfit} [1/GeV]", false, 1.1, true) - - - TH1D_ENTRY_EX(pt_b1, 20, 0, 200, "Leading selected jet p_{T} [GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(eta_b1, 25, -2.5, 2.5, "Leading selected jet #eta", "Events", false, 2, SaveAll) - TH1D_ENTRY_EX(csv_b1, 25, 0, 1, "Leading selected jet CSV", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(pt_b2, 20, 0, 200, "Subleading selected jet p_{T} [GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(eta_b2, 25, -2.5, 2.5, "Subleading selected jet #eta", "Events", false, 2, SaveAll) - TH1D_ENTRY_EX(csv_b2, 25, 0, 1, "Subleading selected jet CSV", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(pt_H_tt, 20, 0, 300, "P_{T}[GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(pt_H_bb, 20, 0, 300, "P_{T}[GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(pt_H_hh, 20, 0, 300, "P_{T}[GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(m_bb, 30, 0, 600, "M_{jj} [GeV]", "dN/dm_{jj} [1/GeV]", false, 1.1, SaveAll) - TH1D_ENTRY_EX(DeltaPhi_tt, 22, 0., 3.3, "#Delta#Phi_{#tau#tau}[rad]", "Events", false, 1.3, SaveAll) - TH1D_ENTRY_EX(DeltaPhi_bb, 22, 0., 3.3, "#Delta#Phi_{bb}[rad]", "Events", false, 1.8, SaveAll) - TH1D_ENTRY_EX(DeltaPhi_bb_MET, 22, 0., 3.3, "#Delta#Phi_{bb,MET}[rad]", "Events", false, 1.5, SaveAll) - TH1D_ENTRY_EX(DeltaPhi_tt_MET, 22, 0., 3.3, "#Delta#Phi_{#tau#tau,MET}[rad]", "Events", false, 1.5, SaveAll) - TH1D_ENTRY_EX(DeltaPhi_hh, 22, 0., 3.3, "#Delta#Phi_{#tau#taubb}[rad]", "Events", false, 1.5, SaveAll) - TH1D_ENTRY_EX(DeltaR_tt, 40, 0, 6, "#DeltaR_{#tau#tau}", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(DeltaR_bb, 40, 0, 6, "#DeltaR_{bb}[rad]", "Events", false, 1.7, SaveAll) - TH1D_ENTRY_EX(DeltaR_hh, 40, 0, 6, "#DeltaR_{#tau#taubb}[rad]", "Events", false, 1.5, SaveAll) - TH1D_ENTRY_EX(mt_2, 20, 0, 200, "M_{T}[GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(pt_H_tt_MET, 20, 0, 300, "P_{T}[GeV]", "Evnets", false, 1.1, SaveAll) - TH1D_ENTRY_EX(convergence, 10, -3.5, 6.5, "Fit_convergence", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(chi2, 20, 0, 100, "#chi^{2}", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(fit_probability, 20, 0, 1, "Fit_probability", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(pull_balance, 20, -10, 10, "pull_balance", "Events", false, 2, SaveAll) - TH1D_ENTRY_EX(pull_balance_1, 100, -10, 10, "pull_balance_1", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(pull_balance_2, 100, -10, 10, "pull_balance_1", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(MET, 20, 0, 100, "E_{T}^{miss} [GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(nJets_Pt30, 20, -0.5, 19.5, "nJets", "Events", false, 1.1, SaveAll) + 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_EX(pt_b1, 20, 0, 200, "Leading selected jet p_{T} [GeV]", "Events", false, 1.3, 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(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(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(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) + TH1D_ENTRY_EX(DeltaPhi_tt_MET, 22, 0., 3.3, "#Delta#Phi_{#tau#tau,MET}[rad]", "Events", false, 1.5, false, SaveAll) + TH1D_ENTRY_EX(DeltaPhi_hh, 22, 0., 3.3, "#Delta#Phi_{#tau#taubb}[rad]", "Events", false, 1.5, false, SaveAll) + TH1D_ENTRY_EX(DeltaR_tt, 40, 0, 6, "#DeltaR_{#tau#tau}", "Events", false, 1.1, false, SaveAll) + TH1D_ENTRY_EX(DeltaR_bb, 40, 0, 6, "#DeltaR_{bb}[rad]", "Events", false, 1.7, false, SaveAll) + TH1D_ENTRY_EX(DeltaR_hh, 40, 0, 6, "#DeltaR_{#tau#taubb}[rad]", "Events", false, 1.5, false, SaveAll) + TH1D_ENTRY_EX(mt_2, 20, 0, 200, "M_{T}[GeV]", "Events", false, 1.1, false, SaveAll) + TH1D_ENTRY_EX(pt_H_tt_MET, 20, 0, 300, "P_{T}[GeV]", "Evnets", false, 1.1, false, SaveAll) + TH1D_ENTRY_EX(convergence, 10, -3.5, 6.5, "Fit_convergence", "Events", false, 1.1, false, SaveAll) + TH1D_ENTRY_EX(chi2, 20, 0, 100, "#chi^{2}", "Events", false, 1.1, false, SaveAll) + TH1D_ENTRY_EX(fit_probability, 20, 0, 1, "Fit_probability", "Events", false, 1.1, false, SaveAll) + 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(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) TH2D_ENTRY_EX(mH_vs_chi2, 20, 0, 100, 50, 200, 700, "#chi^{2}", "M_{#tau#taubb}[GeV]", false, 1, SaveAll) @@ -108,8 +107,6 @@ class FlatAnalyzerData : public root_ext::AnalyzerData { { const ntuple::Flat& event = *eventInfo.event; - const double mass_tautau = event.m_sv_MC; - m_sv().Fill(mass_tautau, weight); if (eventInfo.fitResults.has_valid_mass) m_ttbb_kinfit().Fill(eventInfo.fitResults.mass, weight); // FillSlice(m_bb_slice(), mass_tautau, eventInfo.Hbb.M(), weight); @@ -163,6 +160,15 @@ 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(); + 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(); + } + protected: static void FillSlice(TH1D& hist, double m_sv, double m_Hbb, double weight) { @@ -202,12 +208,13 @@ class FlatAnalyzerData : public root_ext::AnalyzerData { class FlatAnalyzerData_semileptonic : public FlatAnalyzerData { public: - TH1D_ENTRY_EX(pt_1, 20, 0, 200, "P_{T}(leading#tau_{h})[GeV]", "Events", false, 1.1, SaveAll) - TH1D_ENTRY_EX(eta_1, 25, -2.5, 2.5, "#eta(leading#tau_{h})", "Events", false, 2, SaveAll) - TH1D_ENTRY_EX(pt_2, 20, 0, 200, "P_{T}(subleading#tau_{h})[GeV]", "Events", false, 1, SaveAll) - TH1D_ENTRY_EX(eta_2, 25, -2.5, 2.5, "#eta(subleading#tau_{h})", "Events", false, 2, SaveAll) + 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, SaveAll) + TH1D_ENTRY_EX(mt_1, 50, 0, 50, "M_{T}[GeV]", "Events", false, 1.1, false, SaveAll) explicit FlatAnalyzerData_semileptonic(bool _fill_all) : FlatAnalyzerData(_fill_all) {} @@ -217,6 +224,7 @@ class FlatAnalyzerData_semileptonic : public FlatAnalyzerData { virtual void Fill(const FlatEventInfo& eventInfo, double weight) override { FlatAnalyzerData::Fill(eventInfo, weight); + m_sv().Fill(eventInfo.event->m_sv_MC, weight); if(!fill_all) return; const ntuple::Flat& event = *eventInfo.event; pt_1().Fill(event.pt_1, weight); @@ -232,6 +240,12 @@ class FlatAnalyzerData_semileptonic : public FlatAnalyzerData { 600, 650, 700 }; return bins; } + + virtual void CreateAll() override + { + FlatAnalyzerData::CreateAll(); + m_sv(); pt_1(); eta_1(); pt_2(); eta_2(); mt_1(); + } }; class FlatAnalyzerData_semileptonic_2tag : public FlatAnalyzerData_semileptonic { @@ -251,14 +265,14 @@ 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.1, SaveAll) - TH1D_ENTRY_EX(eta_1, 25, -2.5, 2.5, "Leading tau #eta", "Events", false, 2, SaveAll) - TH1D_ENTRY_EX(pt_2, 20, 0, 200, "Subleading tau p_{T} [GeV]", "Events", false, 1, SaveAll) - TH1D_ENTRY_EX(eta_2, 25, -2.5, 2.5, "Subleading tau #eta", "Events", false, 2, SaveAll) + TH1D_ENTRY_EX(pt_1, 20, 0, 200, "Leading tau p_{T} [GeV]", "Events", false, 1.3, 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(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, SaveAll) - TH1D_ENTRY_EX(iso_tau1, 100, 0, 10, "Iso#tau_{1}", "Events", false, 1, SaveAll) - TH1D_ENTRY_EX(iso_tau2, 100, 0, 10, "Iso#tau_{2}", "Events", false, 1, SaveAll) + TH1D_ENTRY_EX(mt_1, 20, 0, 200, "M_{T}[GeV]", "Events", false, 1.1, false, SaveAll) + TH1D_ENTRY_EX(iso_tau1, 100, 0, 10, "Iso#tau_{1}", "Events", false, 1, false, SaveAll) + TH1D_ENTRY_EX(iso_tau2, 100, 0, 10, "Iso#tau_{2}", "Events", false, 1, false, SaveAll) explicit FlatAnalyzerData_tautau(bool _fill_all) : FlatAnalyzerData(_fill_all) {} @@ -284,20 +298,63 @@ class FlatAnalyzerData_tautau : public FlatAnalyzerData { static const std::vector bins = { 200, 250, 280, 310, 340, 370, 400, 500, 600, 700 }; return bins; } + + virtual void CreateAll() override + { + FlatAnalyzerData::CreateAll(); + pt_1(); eta_1(); pt_2(); eta_2(); mt_1(); iso_tau1(); iso_tau2(); + } }; +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) + + explicit FlatAnalyzerData_tautau_other_tag(bool _fill_all) : FlatAnalyzerData_tautau(_fill_all) {} + + FlatAnalyzerData_tautau_other_tag(std::shared_ptr outputFile, const std::string& directoryName, bool fill_all) + : FlatAnalyzerData_tautau(outputFile, directoryName, fill_all) {} + + virtual void Fill(const FlatEventInfo& eventInfo, double weight) override + { + FlatAnalyzerData_tautau::Fill(eventInfo, weight); + m_sv().Fill(eventInfo.event->m_sv_MC, weight); + } + + virtual void CreateAll() override + { + FlatAnalyzerData_tautau::CreateAll(); + m_sv(); + } +}; + + 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) + explicit FlatAnalyzerData_tautau_2tag(bool _fill_all) : FlatAnalyzerData_tautau(_fill_all) {} FlatAnalyzerData_tautau_2tag(std::shared_ptr outputFile, const std::string& directoryName, bool fill_all) : FlatAnalyzerData_tautau(outputFile, directoryName, fill_all) {} + virtual void Fill(const FlatEventInfo& eventInfo, double weight) override + { + FlatAnalyzerData_tautau::Fill(eventInfo, weight); + m_sv().Fill(eventInfo.event->m_sv_MC, weight); + } + virtual const std::vector& M_tt_Bins() const override { static const std::vector bins = { 0, 20, 40, 60, 80, 100, 120, 140, 160, 180, 200, 250, 300, 350 }; return bins; } + + virtual void CreateAll() override + { + FlatAnalyzerData_tautau::CreateAll(); + m_sv(); + } }; } // namespace analysis diff --git a/Analysis/include/FlatAnalyzerDataCollection.h b/Analysis/include/FlatAnalyzerDataCollection.h index 35dc7127..94131455 100644 --- a/Analysis/include/FlatAnalyzerDataCollection.h +++ b/Analysis/include/FlatAnalyzerDataCollection.h @@ -1,8 +1,8 @@ /*! * \file FlatAnalyzerDataCollection.h * \brief Collection of histogram containers for flat tree analyzers. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2015-02-07 created * * Copyright 2015 Konstantin Androsov , @@ -281,6 +281,10 @@ class FlatAnalyzerDataCollection { { if(store) outputFile = root_ext::CreateRootFile(outputFileName); + + TH1::SetDefaultSumw2(); + TH1::AddDirectory(kFALSE); + TH2::AddDirectory(kFALSE); } FlatAnalyzerData& Get(const FlatAnalyzerDataId& id, Channel channel) @@ -355,7 +359,7 @@ class FlatAnalyzerDataCollection { if(id.eventCategory == analysis::EventCategory::TwoJets_TwoBtag || id.eventCategory == analysis::EventCategory::TwoJets_TwoLooseBtag) return Make(id); - return Make(id); + return Make(id); } throw exception("Can't make analyzer data for ") << channel << " channel."; @@ -379,18 +383,36 @@ class FlatAnalyzerDataCollection { class FlatAnalyzerDataCollectionReader { public: + + typedef std::map HistogramMap; + FlatAnalyzerDataCollectionReader(const std::string& file_name) - : file(root_ext::OpenRootFile(file_name)) {} + : file(root_ext::OpenRootFile(file_name)), anaDataCollection("", false) {} template - Histogram* GetHistogram(const FlatAnalyzerDataId& id, const std::string& name) const + const root_ext::SmartHistogram* GetHistogram(const FlatAnalyzerDataId& id, Channel channel, + const std::string& name) { const std::string full_name = id.GetName() + "/" + name; - return root_ext::TryReadObject(*file, full_name); + if(!histograms.count(full_name)) { + Histogram* original_histogram = root_ext::TryReadObject(*file, full_name); + if(!original_histogram) + histograms[full_name] = nullptr; + FlatAnalyzerData& anaData = anaDataCollection.Get(id, channel); + anaData.CreateAll(); + root_ext::SmartHistogram* smart_hist = anaData.GetPtr(name); + if(!smart_hist) + throw exception("Histogram '") << name << "' not found."; + smart_hist->CopyContent(*original_histogram); + histograms[full_name] = smart_hist; + } + return dynamic_cast< const root_ext::SmartHistogram* >(histograms.at(full_name)); } private: std::shared_ptr file; + FlatAnalyzerDataCollection anaDataCollection; + HistogramMap histograms; }; } // namespace analysis diff --git a/Analysis/include/Htautau_Summer13.h b/Analysis/include/Htautau_Summer13.h index 66b193e7..b9142d83 100644 --- a/Analysis/include/Htautau_Summer13.h +++ b/Analysis/include/Htautau_Summer13.h @@ -2,8 +2,8 @@ * \file Htautau_Summer13.h * \brief Higgs in tautau recommended baseline selection cuts for Summer13 * see https://twiki.cern.ch/twiki/bin/viewauth/CMS/HiggsToTauTauWorkingSummer2013 - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-02-13 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/JetEnergyUncertainty.h b/Analysis/include/JetEnergyUncertainty.h index 1f7acdfb..d36a9fb0 100644 --- a/Analysis/include/JetEnergyUncertainty.h +++ b/Analysis/include/JetEnergyUncertainty.h @@ -1,8 +1,8 @@ /*! * \file JetEnergyUncertainty.h * \brief Definition of wrapper to estimate jet energy uncertainties. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-11-16 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/KinFit.h b/Analysis/include/KinFit.h index f3776759..d6c60f91 100644 --- a/Analysis/include/KinFit.h +++ b/Analysis/include/KinFit.h @@ -1,8 +1,8 @@ /*! * \file KinFit.h * \brief Definition of wrappers for HHKinFit code. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \author Francesco Brivio (Milano Bicocca University, INFN Milano) * \date 2014-09-17 created * diff --git a/Analysis/include/KinFit_CMSSW.h b/Analysis/include/KinFit_CMSSW.h index 05c33b06..ff5a9122 100644 --- a/Analysis/include/KinFit_CMSSW.h +++ b/Analysis/include/KinFit_CMSSW.h @@ -1,8 +1,8 @@ /*! * \file KinFit_CMSSW.h * \brief Definition of wrappers for CMSSW KinFitter code. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-10-15 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/LightBaseBigTreeAnalyzer.h b/Analysis/include/LightBaseBigTreeAnalyzer.h index aeb52784..76ddade7 100644 --- a/Analysis/include/LightBaseBigTreeAnalyzer.h +++ b/Analysis/include/LightBaseBigTreeAnalyzer.h @@ -1,8 +1,8 @@ /*! * \file LightBaseBigTreeAnalyzer.h * \brief Definition of LightBaseBigTreeAnalyzer class, the base class for separate studies on big trees. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-10-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/LightBaseFlatTreeAnalyzer.h b/Analysis/include/LightBaseFlatTreeAnalyzer.h index 31f605c6..4513f63e 100644 --- a/Analysis/include/LightBaseFlatTreeAnalyzer.h +++ b/Analysis/include/LightBaseFlatTreeAnalyzer.h @@ -1,8 +1,8 @@ /*! * \file LightBaseFlatTreeAnalyzer.h * \brief Definition of LightBaseFlatTreeAnalyzer class, the base class for separate studies on flat trees. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-10-08 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/MvaMet.h b/Analysis/include/MvaMet.h index b129be39..7ee16fb0 100644 --- a/Analysis/include/MvaMet.h +++ b/Analysis/include/MvaMet.h @@ -1,8 +1,8 @@ /*! * \file MvaMet.h * \brief Definition of wrapper for MVA MET code to apply MVA corrections for pfMet. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-05-29 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/RecoilCorrection.h b/Analysis/include/RecoilCorrection.h index de478acf..1cb68396 100644 --- a/Analysis/include/RecoilCorrection.h +++ b/Analysis/include/RecoilCorrection.h @@ -1,8 +1,8 @@ /*! * \file RecoilCorrection.h * \brief Definition of wrapper for RecoilCorrector code to apply recoil correction. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-05-02 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/SVfit.h b/Analysis/include/SVfit.h index 5c47b0bd..81212bab 100644 --- a/Analysis/include/SVfit.h +++ b/Analysis/include/SVfit.h @@ -1,8 +1,8 @@ /*! * \file SVfit.h * \brief Definition of wrappers for SVfit code. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-05-02 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/SelectionResults.h b/Analysis/include/SelectionResults.h index d2987531..32da923d 100644 --- a/Analysis/include/SelectionResults.h +++ b/Analysis/include/SelectionResults.h @@ -1,8 +1,8 @@ /*! * \file SelectionResults.h * \brief Definition of selection results container used in HH->bbTauTau analysis. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-11-17 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/SemileptonicFlatTreeAnalyzer.h b/Analysis/include/SemileptonicFlatTreeAnalyzer.h index d774c0b6..07850145 100644 --- a/Analysis/include/SemileptonicFlatTreeAnalyzer.h +++ b/Analysis/include/SemileptonicFlatTreeAnalyzer.h @@ -1,8 +1,8 @@ /*! * \file SemileptonicFlatTreeAnalyzer.h * \brief Definition of the base class for semi-leptonic flat tree analyzers. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-11-20 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/include/UncertaintyCalculatorCollection.h b/Analysis/include/UncertaintyCalculatorCollection.h index e02888ef..09b48ef2 100644 --- a/Analysis/include/UncertaintyCalculatorCollection.h +++ b/Analysis/include/UncertaintyCalculatorCollection.h @@ -1,8 +1,8 @@ /*! * \file UncertaintyCalculatorCollection.h * \brief Collection of methods to calculate uncertainties. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2015-02-04 created * * Copyright 2015 Konstantin Androsov , diff --git a/Analysis/include/UncertaintyConfiguration.h b/Analysis/include/UncertaintyConfiguration.h index ee5a4fee..0f8d24b1 100644 --- a/Analysis/include/UncertaintyConfiguration.h +++ b/Analysis/include/UncertaintyConfiguration.h @@ -1,8 +1,8 @@ /*! * \file UncertaintyConfiguration.h * \brief Classes to define uncertainties and read these definitions from a configuration file. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2015-02-02 created * * Copyright 2015 Konstantin Androsov , diff --git a/Analysis/include/custom_cuts.h b/Analysis/include/custom_cuts.h index afc11b16..a4d709eb 100644 --- a/Analysis/include/custom_cuts.h +++ b/Analysis/include/custom_cuts.h @@ -1,8 +1,8 @@ /*! * \file custom_cuts.h * \brief Cuts which are customized for HHbbtautau analysis - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-01 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/source/FlatTreeAnalyzer_etau.C b/Analysis/source/FlatTreeAnalyzer_etau.C index 06473091..c17c0677 100644 --- a/Analysis/source/FlatTreeAnalyzer_etau.C +++ b/Analysis/source/FlatTreeAnalyzer_etau.C @@ -1,8 +1,8 @@ /*! * \file FlatTreeAnalyzer_etau.C * \brief Analyze flat-tree for etau channel for Htautau analysis. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \author Rosamaria Venditti (INFN Bari, Bari University) * \author Claudio Caputo (INFN Bari, Bari University) * \date 2014-09-03 created diff --git a/Analysis/source/FlatTreeAnalyzer_mutau.C b/Analysis/source/FlatTreeAnalyzer_mutau.C index 14776ed8..7f0c6370 100644 --- a/Analysis/source/FlatTreeAnalyzer_mutau.C +++ b/Analysis/source/FlatTreeAnalyzer_mutau.C @@ -1,8 +1,8 @@ /*! * \file FlatTreeAnalyzer_mutau.C * \brief Analyze flat-tree for mu-tau channel for HHbbtautau analysis. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \author Rosamaria Venditti (INFN Bari, Bari University) * \author Claudio Caputo (INFN Bari, Bari University) * \date 2014-09-03 created diff --git a/Analysis/source/FlatTreeAnalyzer_tautau.C b/Analysis/source/FlatTreeAnalyzer_tautau.C index 76ab8acb..ec537455 100644 --- a/Analysis/source/FlatTreeAnalyzer_tautau.C +++ b/Analysis/source/FlatTreeAnalyzer_tautau.C @@ -1,8 +1,8 @@ /*! * \file FlatTreeAnalyzer_tautau.C * \brief Analyze flat-tree for tau-tau channel for HHbbtautau analysis. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-09-03 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/source/FlatTreeProducer.C b/Analysis/source/FlatTreeProducer.C index 03e7ade6..9bc2b460 100644 --- a/Analysis/source/FlatTreeProducer.C +++ b/Analysis/source/FlatTreeProducer.C @@ -1,8 +1,8 @@ /*! * \file FlatTreeProducer.C * \brief Analyzer which recalls three ananlysis to produce flatTree for Htautau using looser selection. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-07-11 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/source/FlatTreeProducer_etau.C b/Analysis/source/FlatTreeProducer_etau.C index 2112df0b..89db4f94 100644 --- a/Analysis/source/FlatTreeProducer_etau.C +++ b/Analysis/source/FlatTreeProducer_etau.C @@ -1,8 +1,8 @@ /*! * \file FlatTreeProducer_etau.C * \brief Generate flat-tree for H->tautau->e_taujet analysis using looser selection. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-07-11 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/source/FlatTreeProducer_mutau.C b/Analysis/source/FlatTreeProducer_mutau.C index 098a4cdb..3ef0bd1a 100644 --- a/Analysis/source/FlatTreeProducer_mutau.C +++ b/Analysis/source/FlatTreeProducer_mutau.C @@ -1,8 +1,8 @@ /*! * \file FlatTreeProducer_mutau.C * \brief Generate flat-tree for Htautau analysis using looser selection. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-07-11 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/source/FlatTreeProducer_tautau.C b/Analysis/source/FlatTreeProducer_tautau.C index f7ed1b7f..36127a5a 100644 --- a/Analysis/source/FlatTreeProducer_tautau.C +++ b/Analysis/source/FlatTreeProducer_tautau.C @@ -1,8 +1,8 @@ /*! * \file FlatTreeProducer_tautau.C * \brief Generate flat-tree for Htautau analysis using looser selection. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-07-11 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/source/KinFitTreeProducer.C b/Analysis/source/KinFitTreeProducer.C index 74ad8dd1..c647a6e9 100644 --- a/Analysis/source/KinFitTreeProducer.C +++ b/Analysis/source/KinFitTreeProducer.C @@ -1,9 +1,9 @@ /*! * \file KinFitStudy.C * \brief Study of kinematic fit performance. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) - * \author Maria Agnese Ciocci (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) + * \author Maria Agnese Ciocci (University of Siena, INFN Pisa) * \date 2014-10-15 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/source/LimitConfigurationProducer.C b/Analysis/source/LimitConfigurationProducer.C index eb1024df..96db5d6c 100644 --- a/Analysis/source/LimitConfigurationProducer.C +++ b/Analysis/source/LimitConfigurationProducer.C @@ -1,8 +1,8 @@ /*! * \file LimitConfigurationProducer.C * \brief Sync Tree Producer from FlatTree. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2015-02-02 created * * Copyright 2015 Konstantin Androsov , diff --git a/Analysis/source/MergeRootFiles.C b/Analysis/source/MergeRootFiles.C index 061e4a07..8365605d 100644 --- a/Analysis/source/MergeRootFiles.C +++ b/Analysis/source/MergeRootFiles.C @@ -4,8 +4,8 @@ * * Some parts of the code are taken from copyFile.C written by Rene Brun. * - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2013-09-10 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/source/PileUp.C b/Analysis/source/PileUp.C index 774e6384..c0413332 100644 --- a/Analysis/source/PileUp.C +++ b/Analysis/source/PileUp.C @@ -3,8 +3,8 @@ * \brief Class to calculate and apply PU reweighting. * * Based on PhysicsTools/Utilities/src/LumiReWeighting.cc - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2013-04-08 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/source/SyncTreeProducer.C b/Analysis/source/SyncTreeProducer.C index 57849211..ea3515d9 100644 --- a/Analysis/source/SyncTreeProducer.C +++ b/Analysis/source/SyncTreeProducer.C @@ -1,9 +1,9 @@ /*! * \file HH_SyncTreeProducer.C * \brief Sync Tree Producer from FlatTree. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) - * \author Maria Agnese Ciocci (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) + * \author Maria Agnese Ciocci (University of Siena, INFN Pisa) * \date 2014-11-13 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/studies/BjetSelectionStudy.C b/Analysis/studies/BjetSelectionStudy.C index 90707527..70dd1194 100644 --- a/Analysis/studies/BjetSelectionStudy.C +++ b/Analysis/studies/BjetSelectionStudy.C @@ -1,8 +1,8 @@ /*! * \file BjetSelectionStudy.C * \brief Study of different posibilities to select signal b-jets. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-10-08 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/studies/EventSelectionStudy.C b/Analysis/studies/EventSelectionStudy.C index 2094a72a..b5e8a86f 100644 --- a/Analysis/studies/EventSelectionStudy.C +++ b/Analysis/studies/EventSelectionStudy.C @@ -1,8 +1,8 @@ /*! * \file EventSelectionStudy.C * \brief Study of possible issues in event selection. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-11-05 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/studies/KinFitStudy.C b/Analysis/studies/KinFitStudy.C index 6e5a2900..a1ce1cc2 100644 --- a/Analysis/studies/KinFitStudy.C +++ b/Analysis/studies/KinFitStudy.C @@ -1,9 +1,9 @@ /*! * \file KinFitStudy.C * \brief Study of kinematic fit performance. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) - * \author Maria Agnese Ciocci (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) + * \author Maria Agnese Ciocci (University of Siena, INFN Pisa) * \date 2014-10-15 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/studies/McTruthStudy.C b/Analysis/studies/McTruthStudy.C index ad3d3021..e2ae3fc9 100644 --- a/Analysis/studies/McTruthStudy.C +++ b/Analysis/studies/McTruthStudy.C @@ -1,8 +1,8 @@ /*! * \file McTruthStudy.C * \brief Study of base analysis object at level of MC truth. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-10-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/Analysis/studies/McTruthStudy_flat.C b/Analysis/studies/McTruthStudy_flat.C index 1928013e..34014144 100644 --- a/Analysis/studies/McTruthStudy_flat.C +++ b/Analysis/studies/McTruthStudy_flat.C @@ -1,8 +1,8 @@ /*! * \file McTruthStudy_flat.C * \brief Study of base analysis object at level of MC truth. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-10-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/AnalysisMath.h b/AnalysisBase/include/AnalysisMath.h index 8a31229b..6b4899bf 100644 --- a/AnalysisBase/include/AnalysisMath.h +++ b/AnalysisBase/include/AnalysisMath.h @@ -1,8 +1,8 @@ /*! * \file AnalysisMath.h * \brief Common math functions and definitions suitable for analysis purposes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-09-08 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/AnalysisTools.h b/AnalysisBase/include/AnalysisTools.h index 580753ec..0a9e9a0c 100644 --- a/AnalysisBase/include/AnalysisTools.h +++ b/AnalysisBase/include/AnalysisTools.h @@ -1,8 +1,8 @@ /*! * \file AnalysisTools.h * \brief Common tools and definitions suitable for analysis purposes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-05-07 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/AnalysisTypes.h b/AnalysisBase/include/AnalysisTypes.h index 27901279..71b8b4da 100644 --- a/AnalysisBase/include/AnalysisTypes.h +++ b/AnalysisBase/include/AnalysisTypes.h @@ -1,8 +1,8 @@ /*! * \file AnalysisTypes.h * \brief Common simple types for analysis purposes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-10-09 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/AnalyzerData.h b/AnalysisBase/include/AnalyzerData.h index 17fba5bc..58f64214 100644 --- a/AnalysisBase/include/AnalyzerData.h +++ b/AnalysisBase/include/AnalyzerData.h @@ -1,8 +1,8 @@ /*! * \class AnalyzerData AnalyzerData.h * \brief Base class for Analyzer data containers. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2013-03-29 created * * Copyright 2013-2015 Konstantin Androsov , @@ -56,12 +56,12 @@ #define TH1D_ENTRY_FIX(name, binsizex, nbinsx, xlow) TH1D_ENTRY(name, nbinsx, xlow, (xlow+binsizex*nbinsx)) #define TH1D_ENTRY_CUSTOM(name, bins) ANA_DATA_ENTRY(TH1D, name, bins) -#define TH1D_ENTRY_EX(name, nbinsx, xlow, xup, x_axis_title, y_axis_title, use_log_y, max_y_sf, store) \ - ANA_DATA_ENTRY(TH1D, name, nbinsx, xlow, xup, x_axis_title, y_axis_title, use_log_y, max_y_sf, store) -#define TH1D_ENTRY_FIX_EX(name, binsizex, nbinsx, xlow, x_axis_title, y_axis_title, use_log_y, max_y_sf, store) \ - TH1D_ENTRY_EX(name, nbinsx, xlow, (xlow+binsizex*nbinsx), x_axis_title, y_axis_title, use_log_y, max_y_sf, store) -#define TH1D_ENTRY_CUSTOM_EX(name, bins, x_axis_title, y_axis_title, use_log_y, max_y_sf, store) \ - ANA_DATA_ENTRY(TH1D, name, bins, x_axis_title, y_axis_title, use_log_y, max_y_sf, store) +#define TH1D_ENTRY_EX(name, nbinsx, xlow, xup, x_axis_title, y_axis_title, use_log_y, max_y_sf, divide, store) \ + ANA_DATA_ENTRY(TH1D, name, nbinsx, xlow, xup, x_axis_title, y_axis_title, use_log_y, max_y_sf, divide, store) +#define TH1D_ENTRY_FIX_EX(name, binsizex, nbinsx, xlow, x_axis_title, y_axis_title, use_log_y, max_y_sf, divide, store) \ + TH1D_ENTRY_EX(name, nbinsx, xlow, (xlow+binsizex*nbinsx), x_axis_title, y_axis_title, use_log_y, max_y_sf, divide, store) +#define TH1D_ENTRY_CUSTOM_EX(name, bins, x_axis_title, y_axis_title, use_log_y, max_y_sf, divide, store) \ + ANA_DATA_ENTRY(TH1D, name, bins, x_axis_title, y_axis_title, use_log_y, max_y_sf, divide, store) #define TH2D_ENTRY(name, nbinsx, xlow, xup, nbinsy, ylow, yup) \ ANA_DATA_ENTRY(TH2D, name, nbinsx, xlow, xup, nbinsy, ylow, yup) diff --git a/AnalysisBase/include/BaseConfig.h b/AnalysisBase/include/BaseConfig.h index 439a93bb..6af9980a 100644 --- a/AnalysisBase/include/BaseConfig.h +++ b/AnalysisBase/include/BaseConfig.h @@ -1,7 +1,7 @@ /*! * \file BaseConfig.h * \brief Definition of BaseConfig class. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * * Copyright 2013, 2014 Konstantin Androsov * diff --git a/AnalysisBase/include/Candidate.h b/AnalysisBase/include/Candidate.h index 4c4139a9..f6b4e186 100644 --- a/AnalysisBase/include/Candidate.h +++ b/AnalysisBase/include/Candidate.h @@ -1,8 +1,8 @@ /*! * \file Candidate.h * \brief Definition of Candidate class to store reconstructed object candidate. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-19 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/ConfigReader.h b/AnalysisBase/include/ConfigReader.h index 41c76335..5dfed35c 100644 --- a/AnalysisBase/include/ConfigReader.h +++ b/AnalysisBase/include/ConfigReader.h @@ -1,7 +1,7 @@ /*! * \file ConfigReader.h * \brief Base class to parse configuration file. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * \date 2015-02-03 created * * Copyright 2015 Konstantin Androsov diff --git a/AnalysisBase/include/CutTools.h b/AnalysisBase/include/CutTools.h index b510493c..749a23e8 100644 --- a/AnalysisBase/include/CutTools.h +++ b/AnalysisBase/include/CutTools.h @@ -1,8 +1,8 @@ /*! * \file CutTools.h * \brief Common tools and definitions to apply cuts. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-02-14 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/DebugTools.h b/AnalysisBase/include/DebugTools.h index 99464f96..a4880997 100644 --- a/AnalysisBase/include/DebugTools.h +++ b/AnalysisBase/include/DebugTools.h @@ -1,8 +1,8 @@ /*! * \file DebugTools.h * \brief Common tools and definitions suitable for debug purposes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-29 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/EventDescriptor.h b/AnalysisBase/include/EventDescriptor.h index a4f42fbf..57e781f8 100644 --- a/AnalysisBase/include/EventDescriptor.h +++ b/AnalysisBase/include/EventDescriptor.h @@ -1,8 +1,8 @@ /*! * \file EventDescriptor.h * \brief Definition of EventDescriptor class that contains all ntuple data for one event-> - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-28 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/EventId.h b/AnalysisBase/include/EventId.h index 9eb5598e..7c49b8ad 100644 --- a/AnalysisBase/include/EventId.h +++ b/AnalysisBase/include/EventId.h @@ -1,8 +1,8 @@ /*! * \file EventId.h * \brief Definition of EventId class which represent unique CMS event identifier. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-16 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/FlatEventInfo.h b/AnalysisBase/include/FlatEventInfo.h index 6717f515..1b32c641 100644 --- a/AnalysisBase/include/FlatEventInfo.h +++ b/AnalysisBase/include/FlatEventInfo.h @@ -1,8 +1,8 @@ /*! * \file FlatEventInfo.h * \brief Definiton of analysis::FlatEventInfo class. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-10-07 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/FlatTree.h b/AnalysisBase/include/FlatTree.h index 9d6bbaed..82a38aa6 100644 --- a/AnalysisBase/include/FlatTree.h +++ b/AnalysisBase/include/FlatTree.h @@ -1,8 +1,8 @@ /*! * \file FlatTree.h * \brief Definiton of ntuple::FlatTree and ntuple::Flat classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-07-11 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/GenParticle.h b/AnalysisBase/include/GenParticle.h index 109be5ab..7538653a 100644 --- a/AnalysisBase/include/GenParticle.h +++ b/AnalysisBase/include/GenParticle.h @@ -1,8 +1,8 @@ /*! * \file GenParticle.h * \brief Definition of GenParticle class for analysis. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-02-17 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/KinFitTree.h b/AnalysisBase/include/KinFitTree.h index 2d83c8f5..6d0f70c5 100644 --- a/AnalysisBase/include/KinFitTree.h +++ b/AnalysisBase/include/KinFitTree.h @@ -1,8 +1,8 @@ /*! * \file KinFitTree.h * \brief Definiton of ntuple::KinFitTree and ntuple::KinFit classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-10-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/MCfinalState.h b/AnalysisBase/include/MCfinalState.h index 0ce828e9..1a20b4ab 100644 --- a/AnalysisBase/include/MCfinalState.h +++ b/AnalysisBase/include/MCfinalState.h @@ -1,8 +1,8 @@ /*! * \file MCfinalState.h * \brief Definition of MCfinalState class for analysis. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-19 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/Particles.h b/AnalysisBase/include/Particles.h index b689c915..bc9e53ab 100644 --- a/AnalysisBase/include/Particles.h +++ b/AnalysisBase/include/Particles.h @@ -1,8 +1,8 @@ /*! * \file Particles.h * \brief Enumaration of the PDG MC particle codes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2013-04-05 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/PhysicalValue.h b/AnalysisBase/include/PhysicalValue.h index 781fd48b..b9969e53 100644 --- a/AnalysisBase/include/PhysicalValue.h +++ b/AnalysisBase/include/PhysicalValue.h @@ -1,8 +1,8 @@ /*! * \file AnalysisTypes.h * \brief Definition of the class that represent measured physical value. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-05-07 created * \date 2015-02-14 separated from AnalysisTypes.h * diff --git a/AnalysisBase/include/ProgressReporter.h b/AnalysisBase/include/ProgressReporter.h index f539e80a..c1068df5 100644 --- a/AnalysisBase/include/ProgressReporter.h +++ b/AnalysisBase/include/ProgressReporter.h @@ -1,7 +1,7 @@ /*! * \file ProgressReporter.h * \brief Definition of the class to report current execution progress. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * \date 2014-05-05 created * \date 2015-02-14 separated from Tools.h * diff --git a/AnalysisBase/include/RootExt.h b/AnalysisBase/include/RootExt.h index 5ff6d3ec..083f094f 100644 --- a/AnalysisBase/include/RootExt.h +++ b/AnalysisBase/include/RootExt.h @@ -1,7 +1,7 @@ /*! * \file RootExt.h * \brief Common CERN ROOT extensions. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * \date 2015-02-15 combined from different files * * Copyright 2013-2015 Konstantin Androsov diff --git a/AnalysisBase/include/RunReport.h b/AnalysisBase/include/RunReport.h index 202fe0f2..7c7b412d 100644 --- a/AnalysisBase/include/RunReport.h +++ b/AnalysisBase/include/RunReport.h @@ -1,8 +1,8 @@ /*! * \file RunReport.h * \brief Definition of RunReport class that produces report about processed runs in JSON format. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-16 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/SmartHistogram.h b/AnalysisBase/include/SmartHistogram.h index ff39758e..fbe41a76 100644 --- a/AnalysisBase/include/SmartHistogram.h +++ b/AnalysisBase/include/SmartHistogram.h @@ -1,8 +1,8 @@ /*! * \file SmartHistogram.h * \brief Definition of class SmartHistogram that allows to create ROOT-compatible histograms. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-02-20 created * * Copyright 2014 Konstantin Androsov , @@ -204,32 +204,35 @@ class SmartHistogram : public TH1D, public AbstractHistogram { public: SmartHistogram(const std::string& name, size_t nbins, double low, double high) : TH1D(name.c_str(), name.c_str(), nbins, low, high), AbstractHistogram(name), store(true), use_log_y(false), - max_y_sf(1) {} + max_y_sf(1), divide_by_bin_width(false) {} SmartHistogram(const std::string& name, const std::vector& bins) : TH1D(name.c_str(), name.c_str(), static_cast(bins.size()) - 1, bins.data()), AbstractHistogram(name), - store(true), use_log_y(false), max_y_sf(1) {} + store(true), use_log_y(false), max_y_sf(1), divide_by_bin_width(false) {} SmartHistogram(const std::string& name, size_t nbins, double low, double high, const std::string& x_axis_title, - const std::string& y_axis_title, bool _use_log_y, double _max_y_sf, bool _store) + const std::string& y_axis_title, bool _use_log_y, double _max_y_sf, bool _divide_by_bin_width, + bool _store) : TH1D(name.c_str(), name.c_str(), nbins, low, high), AbstractHistogram(name), store(_store), - use_log_y(_use_log_y), max_y_sf(_max_y_sf) + use_log_y(_use_log_y), max_y_sf(_max_y_sf), divide_by_bin_width(_divide_by_bin_width) { SetXTitle(x_axis_title.c_str()); SetYTitle(y_axis_title.c_str()); } SmartHistogram(const std::string& name, const std::vector& bins, const std::string& x_axis_title, - const std::string& y_axis_title, bool _use_log_y, double _max_y_sf, bool _store) + const std::string& y_axis_title, bool _use_log_y, double _max_y_sf, bool _divide_by_bin_width, + bool _store) : TH1D(name.c_str(), name.c_str(), static_cast(bins.size()) - 1, bins.data()), AbstractHistogram(name), - store(_store), use_log_y(_use_log_y), max_y_sf(_max_y_sf) + store(_store), use_log_y(_use_log_y), max_y_sf(_max_y_sf), divide_by_bin_width(_divide_by_bin_width) { SetXTitle(x_axis_title.c_str()); SetYTitle(y_axis_title.c_str()); } - SmartHistogram(const TH1D& other, bool _use_log_y, double _max_y_sf) - : TH1D(other), AbstractHistogram(other.GetName()), store(false), use_log_y(_use_log_y), max_y_sf(_max_y_sf) {} + SmartHistogram(const TH1D& other, bool _use_log_y, double _max_y_sf, bool _divide_by_bin_width) + : TH1D(other), AbstractHistogram(other.GetName()), store(false), use_log_y(_use_log_y), max_y_sf(_max_y_sf), + divide_by_bin_width(_divide_by_bin_width) {} virtual void WriteRootObject() override { @@ -248,6 +251,7 @@ class SmartHistogram : public TH1D, public AbstractHistogram { double MaxYDrawScaleFactor() const { return max_y_sf; } std::string GetXTitle() const { return GetXaxis()->GetTitle(); } std::string GetYTitle() const { return GetYaxis()->GetTitle(); } + bool NeedToDivideByBinWidth() const { return divide_by_bin_width; } void SetLegendTitle(const std::string _legend_title) { legend_title = _legend_title; } const std::string& GetLegendTitle() const { return legend_title; } @@ -269,6 +273,7 @@ class SmartHistogram : public TH1D, public AbstractHistogram { bool store; bool use_log_y; double max_y_sf; + bool divide_by_bin_width; std::string legend_title; }; diff --git a/AnalysisBase/include/SyncTree.h b/AnalysisBase/include/SyncTree.h index 56760155..6cb112b6 100644 --- a/AnalysisBase/include/SyncTree.h +++ b/AnalysisBase/include/SyncTree.h @@ -1,8 +1,8 @@ /*! * \file SyncTree.h * \brief Definiton of ntuple::SyncTree and ntuple::Sync classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-05-05 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/Tools.h b/AnalysisBase/include/Tools.h index aa048a4b..62e40bad 100644 --- a/AnalysisBase/include/Tools.h +++ b/AnalysisBase/include/Tools.h @@ -1,7 +1,7 @@ /*! * \file Tools.h * \brief Common tools and definitions suitable for general purposes. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * \date 2014-05-05 created * * Copyright 2014, 2015 Konstantin Androsov diff --git a/AnalysisBase/include/TreeExtractor.h b/AnalysisBase/include/TreeExtractor.h index 2f3d6838..757aa3b9 100644 --- a/AnalysisBase/include/TreeExtractor.h +++ b/AnalysisBase/include/TreeExtractor.h @@ -1,8 +1,8 @@ /*! * \file TreeExtractor.h * \brief Definition of TreeExtractor class that extracts ntuple information. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-28 created * * Copyright 2014 Konstantin Androsov , diff --git a/AnalysisBase/include/exception.h b/AnalysisBase/include/exception.h index 08f9858d..fe4da834 100644 --- a/AnalysisBase/include/exception.h +++ b/AnalysisBase/include/exception.h @@ -1,7 +1,7 @@ /*! * \file exception.h * \brief Definition of the base exception class for the analysis namespace. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * * Copyright 2014 Konstantin Androsov * diff --git a/HHKinFit/src/HHDiJetKinFitMaster.cpp b/HHKinFit/src/HHDiJetKinFitMaster.cpp index 08c2f4ad..f0ee0cef 100644 --- a/HHKinFit/src/HHDiJetKinFitMaster.cpp +++ b/HHKinFit/src/HHDiJetKinFitMaster.cpp @@ -181,132 +181,132 @@ HHDiJetKinFitMaster::GetBjetResolution(double eta, double et){ double de=10; - if(0.000<=abs(eta) && abs(eta)<0.087){ + if(0.000<= std::abs(eta) && std::abs(eta)<0.087){ det = et * (sqrt(0.0686*0.0686 + (1.03/sqrt(et))*(1.03/sqrt(et)) + (1.68/et)*(1.68/et))); de = 1.0/sin(2 * atan(exp(-(0.000+0.087)/2))) * det; } - if(0.087<=abs(eta) && abs(eta)<0.174){ + if(0.087<= std::abs(eta) && std::abs(eta)<0.174){ det = et * (sqrt(0.0737*0.0737 + (1.01/sqrt(et))*(1.01/sqrt(et)) + (1.74/et)*(1.74/et))); de = 1.0/sin(2 * atan(exp(-(0.087+0.174)/2))) * det; } - if(0.174<=abs(eta) && abs(eta)<0.261){ + if(0.174<= std::abs(eta) && std::abs(eta)<0.261){ det = et * (sqrt(0.0657*0.0657 + (1.07/sqrt(et))*(1.07/sqrt(et)) + (5.16e-06/et)*(5.16e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.174+0.261)/2))) * det; } - if(0.261<=abs(eta) && abs(eta)<0.348){ + if(0.261<= std::abs(eta) && std::abs(eta)<0.348){ det = et * (sqrt(0.062*0.062 + (1.07/sqrt(et))*(1.07/sqrt(et)) + (0.000134/et)*(0.000134/et))); de = 1.0/sin(2 * atan(exp(-(0.261+0.348)/2))) * det; } - if(0.348<=abs(eta) && abs(eta)<0.435){ + if(0.348<= std::abs(eta) && std::abs(eta)<0.435){ det = et * (sqrt(0.0605*0.0605 + (1.07/sqrt(et))*(1.07/sqrt(et)) + (1.84e-07/et)*(1.84e-07/et))); de = 1.0/sin(2 * atan(exp(-(0.348+0.435)/2))) * det; } - if(0.435<=abs(eta) && abs(eta)<0.522){ + if(0.435<= std::abs(eta) && std::abs(eta)<0.522){ det = et * (sqrt(0.059*0.059 + (1.08/sqrt(et))*(1.08/sqrt(et)) + (9.06e-09/et)*(9.06e-09/et))); de = 1.0/sin(2 * atan(exp(-(0.435+0.522)/2))) * det; } - if(0.522<=abs(eta) && abs(eta)<0.609){ + if(0.522<= std::abs(eta) && std::abs(eta)<0.609){ det = et * (sqrt(0.0577*0.0577 + (1.08/sqrt(et))*(1.08/sqrt(et)) + (5.46e-06/et)*(5.46e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.522+0.609)/2))) * det; } - if(0.609<=abs(eta) && abs(eta)<0.696){ + if(0.609<= std::abs(eta) && std::abs(eta)<0.696){ det = et * (sqrt(0.0525*0.0525 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (4.05e-05/et)*(4.05e-05/et))); de = 1.0/sin(2 * atan(exp(-(0.609+0.696)/2))) * det; } - if(0.696<=abs(eta) && abs(eta)<0.783){ + if(0.696<= std::abs(eta) && std::abs(eta)<0.783){ det = et * (sqrt(0.0582*0.0582 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (1.17e-05/et)*(1.17e-05/et))); de = 1.0/sin(2 * atan(exp(-(0.696+0.783)/2))) * det; } - if(0.783<=abs(eta) && abs(eta)<0.870){ + if(0.783<= std::abs(eta) && std::abs(eta)<0.870){ det = et * (sqrt(0.0649*0.0649 + (1.08/sqrt(et))*(1.08/sqrt(et)) + (7.85e-06/et)*(7.85e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.783+0.870)/2))) * det; } - if(0.870<=abs(eta) && abs(eta)<0.957){ + if(0.870<= std::abs(eta) && std::abs(eta)<0.957){ det = et * (sqrt(0.0654*0.0654 + (1.1/sqrt(et))*(1.1/sqrt(et)) + (1.09e-07/et)*(1.09e-07/et))); de = 1.0/sin(2 * atan(exp(-(0.870+0.957)/2))) * det; } - if(0.957<=abs(eta) && abs(eta)<1.044){ + if(0.957<= std::abs(eta) && std::abs(eta)<1.044){ det = et * (sqrt(0.0669*0.0669 + (1.11/sqrt(et))*(1.11/sqrt(et)) + (1.87e-06/et)*(1.87e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.957+1.044)/2))) * det; } - if(1.044<=abs(eta) && abs(eta)<1.131){ + if(1.044<= std::abs(eta) && std::abs(eta)<1.131){ det = et * (sqrt(0.0643*0.0643 + (1.15/sqrt(et))*(1.15/sqrt(et)) + (2.76e-05/et)*(2.76e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.044+1.131)/2))) * det; } - if(1.131<=abs(eta) && abs(eta)<1.218){ + if(1.131<= std::abs(eta) && std::abs(eta)<1.218){ det = et * (sqrt(0.0645*0.0645 + (1.16/sqrt(et))*(1.16/sqrt(et)) + (1.04e-06/et)*(1.04e-06/et))); de = 1.0/sin(2 * atan(exp(-(1.131+1.218)/2))) * det; } - if(1.218<=abs(eta) && abs(eta)<1.305){ + if(1.218<= std::abs(eta) && std::abs(eta)<1.305){ det = et * (sqrt(0.0637*0.0637 + (1.19/sqrt(et))*(1.19/sqrt(et)) + (1.08e-07/et)*(1.08e-07/et))); de = 1.0/sin(2 * atan(exp(-(1.218+1.305)/2))) * det; } - if(1.305<=abs(eta) && abs(eta)<1.392){ + if(1.305<= std::abs(eta) && std::abs(eta)<1.392){ det = et * (sqrt(0.0695*0.0695 + (1.21/sqrt(et))*(1.21/sqrt(et)) + (5.75e-06/et)*(5.75e-06/et))); de = 1.0/sin(2 * atan(exp(-(1.305+1.392)/2))) * det; } - if(1.392<=abs(eta) && abs(eta)<1.479){ + if(1.392<= std::abs(eta) && std::abs(eta)<1.479){ det = et * (sqrt(0.0748*0.0748 + (1.2/sqrt(et))*(1.2/sqrt(et)) + (5.15e-08/et)*(5.15e-08/et))); de = 1.0/sin(2 * atan(exp(-(1.392+1.479)/2))) * det; } - if(1.479<=abs(eta) && abs(eta)<1.566){ + if(1.479<= std::abs(eta) && std::abs(eta)<1.566){ det = et * (sqrt(0.0624*0.0624 + (1.23/sqrt(et))*(1.23/sqrt(et)) + (2.28e-05/et)*(2.28e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.479+1.566)/2))) * det; } - if(1.566<=abs(eta) && abs(eta)<1.653){ + if(1.566<= std::abs(eta) && std::abs(eta)<1.653){ det = et * (sqrt(0.0283*0.0283 + (1.25/sqrt(et))*(1.25/sqrt(et)) + (4.79e-07/et)*(4.79e-07/et))); de = 1.0/sin(2 * atan(exp(-(1.566+1.653)/2))) * det; } - if(1.653<=abs(eta) && abs(eta)<1.740){ + if(1.653<= std::abs(eta) && std::abs(eta)<1.740){ det = et * (sqrt(0.0316*0.0316 + (1.21/sqrt(et))*(1.21/sqrt(et)) + (5e-05/et)*(5e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.653+1.740)/2))) * det; } - if(1.740<=abs(eta) && abs(eta)<1.830){ + if(1.740<= std::abs(eta) && std::abs(eta)<1.830){ det = et * (sqrt(2.29e-07*2.29e-07 + (1.2/sqrt(et))*(1.2/sqrt(et)) + (1.71e-05/et)*(1.71e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.740+1.830)/2))) * det; } - if(1.830<=abs(eta) && abs(eta)<1.930){ + if(1.830<= std::abs(eta) && std::abs(eta)<1.930){ det = et * (sqrt(5.18e-09*5.18e-09 + (1.14/sqrt(et))*(1.14/sqrt(et)) + (1.7/et)*(1.7/et))); de = 1.0/sin(2 * atan(exp(-(1.830+1.930)/2))) * det; } - if(1.930<=abs(eta) && abs(eta)<2.043){ + if(1.930<= std::abs(eta) && std::abs(eta)<2.043){ det = et * (sqrt(2.17e-07*2.17e-07 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (2.08/et)*(2.08/et))); de = 1.0/sin(2 * atan(exp(-(1.930+2.043)/2))) * det; } - if(2.043<=abs(eta) && abs(eta)<2.172){ + if(2.043<= std::abs(eta) && std::abs(eta)<2.172){ det = et * (sqrt(3.65e-07*3.65e-07 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (1.63/et)*(1.63/et))); de = 1.0/sin(2 * atan(exp(-(2.043+2.172)/2))) * det; } - if(2.172<=abs(eta) && abs(eta)<2.322){ + if(2.172<= std::abs(eta) && std::abs(eta)<2.322){ det = et * (sqrt(2.02e-07*2.02e-07 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (1.68/et)*(1.68/et))); de = 1.0/sin(2 * atan(exp(-(2.172+2.322)/2))) * det; } - if(2.322<=abs(eta) && abs(eta)<2.500){ + if(2.322<= std::abs(eta) && std::abs(eta)<2.500){ det = et * (sqrt(5.27e-07*5.27e-07 + (1.12/sqrt(et))*(1.12/sqrt(et)) + (1.78/et)*(1.78/et))); de = 1.0/sin(2 * atan(exp(-(2.322+2.500)/2))) * det; } diff --git a/HHKinFit/src/HHKinFitMaster.cpp b/HHKinFit/src/HHKinFitMaster.cpp index 01a817f4..26e7ba9e 100644 --- a/HHKinFit/src/HHKinFitMaster.cpp +++ b/HHKinFit/src/HHKinFitMaster.cpp @@ -386,132 +386,132 @@ HHKinFitMaster::GetBjetResolution(double eta, double et){ double det=0; double de=10; - if(0.000<=abs(eta) && abs(eta)<0.087){ + if(0.000<= std::abs(eta) && std::abs(eta)<0.087){ det = et * (sqrt(0.0686*0.0686 + (1.03/sqrt(et))*(1.03/sqrt(et)) + (1.68/et)*(1.68/et))); de = 1.0/sin(2 * atan(exp(-(0.000+0.087)/2))) * det; } - if(0.087<=abs(eta) && abs(eta)<0.174){ + if(0.087<= std::abs(eta) && std::abs(eta)<0.174){ det = et * (sqrt(0.0737*0.0737 + (1.01/sqrt(et))*(1.01/sqrt(et)) + (1.74/et)*(1.74/et))); de = 1.0/sin(2 * atan(exp(-(0.087+0.174)/2))) * det; } - if(0.174<=abs(eta) && abs(eta)<0.261){ + if(0.174<= std::abs(eta) && std::abs(eta)<0.261){ det = et * (sqrt(0.0657*0.0657 + (1.07/sqrt(et))*(1.07/sqrt(et)) + (5.16e-06/et)*(5.16e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.174+0.261)/2))) * det; } - if(0.261<=abs(eta) && abs(eta)<0.348){ + if(0.261<= std::abs(eta) && std::abs(eta)<0.348){ det = et * (sqrt(0.062*0.062 + (1.07/sqrt(et))*(1.07/sqrt(et)) + (0.000134/et)*(0.000134/et))); de = 1.0/sin(2 * atan(exp(-(0.261+0.348)/2))) * det; } - if(0.348<=abs(eta) && abs(eta)<0.435){ + if(0.348<= std::abs(eta) && std::abs(eta)<0.435){ det = et * (sqrt(0.0605*0.0605 + (1.07/sqrt(et))*(1.07/sqrt(et)) + (1.84e-07/et)*(1.84e-07/et))); de = 1.0/sin(2 * atan(exp(-(0.348+0.435)/2))) * det; } - if(0.435<=abs(eta) && abs(eta)<0.522){ + if(0.435<= std::abs(eta) && std::abs(eta)<0.522){ det = et * (sqrt(0.059*0.059 + (1.08/sqrt(et))*(1.08/sqrt(et)) + (9.06e-09/et)*(9.06e-09/et))); de = 1.0/sin(2 * atan(exp(-(0.435+0.522)/2))) * det; } - if(0.522<=abs(eta) && abs(eta)<0.609){ + if(0.522<= std::abs(eta) && std::abs(eta)<0.609){ det = et * (sqrt(0.0577*0.0577 + (1.08/sqrt(et))*(1.08/sqrt(et)) + (5.46e-06/et)*(5.46e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.522+0.609)/2))) * det; } - if(0.609<=abs(eta) && abs(eta)<0.696){ + if(0.609<= std::abs(eta) && std::abs(eta)<0.696){ det = et * (sqrt(0.0525*0.0525 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (4.05e-05/et)*(4.05e-05/et))); de = 1.0/sin(2 * atan(exp(-(0.609+0.696)/2))) * det; } - if(0.696<=abs(eta) && abs(eta)<0.783){ + if(0.696<= std::abs(eta) && std::abs(eta)<0.783){ det = et * (sqrt(0.0582*0.0582 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (1.17e-05/et)*(1.17e-05/et))); de = 1.0/sin(2 * atan(exp(-(0.696+0.783)/2))) * det; } - if(0.783<=abs(eta) && abs(eta)<0.870){ + if(0.783<= std::abs(eta) && std::abs(eta)<0.870){ det = et * (sqrt(0.0649*0.0649 + (1.08/sqrt(et))*(1.08/sqrt(et)) + (7.85e-06/et)*(7.85e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.783+0.870)/2))) * det; } - if(0.870<=abs(eta) && abs(eta)<0.957){ + if(0.870<= std::abs(eta) && std::abs(eta)<0.957){ det = et * (sqrt(0.0654*0.0654 + (1.1/sqrt(et))*(1.1/sqrt(et)) + (1.09e-07/et)*(1.09e-07/et))); de = 1.0/sin(2 * atan(exp(-(0.870+0.957)/2))) * det; } - if(0.957<=abs(eta) && abs(eta)<1.044){ + if(0.957<= std::abs(eta) && std::abs(eta)<1.044){ det = et * (sqrt(0.0669*0.0669 + (1.11/sqrt(et))*(1.11/sqrt(et)) + (1.87e-06/et)*(1.87e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.957+1.044)/2))) * det; } - if(1.044<=abs(eta) && abs(eta)<1.131){ + if(1.044<= std::abs(eta) && std::abs(eta)<1.131){ det = et * (sqrt(0.0643*0.0643 + (1.15/sqrt(et))*(1.15/sqrt(et)) + (2.76e-05/et)*(2.76e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.044+1.131)/2))) * det; } - if(1.131<=abs(eta) && abs(eta)<1.218){ + if(1.131<= std::abs(eta) && std::abs(eta)<1.218){ det = et * (sqrt(0.0645*0.0645 + (1.16/sqrt(et))*(1.16/sqrt(et)) + (1.04e-06/et)*(1.04e-06/et))); de = 1.0/sin(2 * atan(exp(-(1.131+1.218)/2))) * det; } - if(1.218<=abs(eta) && abs(eta)<1.305){ + if(1.218<= std::abs(eta) && std::abs(eta)<1.305){ det = et * (sqrt(0.0637*0.0637 + (1.19/sqrt(et))*(1.19/sqrt(et)) + (1.08e-07/et)*(1.08e-07/et))); de = 1.0/sin(2 * atan(exp(-(1.218+1.305)/2))) * det; } - if(1.305<=abs(eta) && abs(eta)<1.392){ + if(1.305<= std::abs(eta) && std::abs(eta)<1.392){ det = et * (sqrt(0.0695*0.0695 + (1.21/sqrt(et))*(1.21/sqrt(et)) + (5.75e-06/et)*(5.75e-06/et))); de = 1.0/sin(2 * atan(exp(-(1.305+1.392)/2))) * det; } - if(1.392<=abs(eta) && abs(eta)<1.479){ + if(1.392<= std::abs(eta) && std::abs(eta)<1.479){ det = et * (sqrt(0.0748*0.0748 + (1.2/sqrt(et))*(1.2/sqrt(et)) + (5.15e-08/et)*(5.15e-08/et))); de = 1.0/sin(2 * atan(exp(-(1.392+1.479)/2))) * det; } - if(1.479<=abs(eta) && abs(eta)<1.566){ + if(1.479<= std::abs(eta) && std::abs(eta)<1.566){ det = et * (sqrt(0.0624*0.0624 + (1.23/sqrt(et))*(1.23/sqrt(et)) + (2.28e-05/et)*(2.28e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.479+1.566)/2))) * det; } - if(1.566<=abs(eta) && abs(eta)<1.653){ + if(1.566<= std::abs(eta) && std::abs(eta)<1.653){ det = et * (sqrt(0.0283*0.0283 + (1.25/sqrt(et))*(1.25/sqrt(et)) + (4.79e-07/et)*(4.79e-07/et))); de = 1.0/sin(2 * atan(exp(-(1.566+1.653)/2))) * det; } - if(1.653<=abs(eta) && abs(eta)<1.740){ + if(1.653<= std::abs(eta) && std::abs(eta)<1.740){ det = et * (sqrt(0.0316*0.0316 + (1.21/sqrt(et))*(1.21/sqrt(et)) + (5e-05/et)*(5e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.653+1.740)/2))) * det; } - if(1.740<=abs(eta) && abs(eta)<1.830){ + if(1.740<= std::abs(eta) && std::abs(eta)<1.830){ det = et * (sqrt(2.29e-07*2.29e-07 + (1.2/sqrt(et))*(1.2/sqrt(et)) + (1.71e-05/et)*(1.71e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.740+1.830)/2))) * det; } - if(1.830<=abs(eta) && abs(eta)<1.930){ + if(1.830<= std::abs(eta) && std::abs(eta)<1.930){ det = et * (sqrt(5.18e-09*5.18e-09 + (1.14/sqrt(et))*(1.14/sqrt(et)) + (1.7/et)*(1.7/et))); de = 1.0/sin(2 * atan(exp(-(1.830+1.930)/2))) * det; } - if(1.930<=abs(eta) && abs(eta)<2.043){ + if(1.930<= std::abs(eta) && std::abs(eta)<2.043){ det = et * (sqrt(2.17e-07*2.17e-07 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (2.08/et)*(2.08/et))); de = 1.0/sin(2 * atan(exp(-(1.930+2.043)/2))) * det; } - if(2.043<=abs(eta) && abs(eta)<2.172){ + if(2.043<= std::abs(eta) && std::abs(eta)<2.172){ det = et * (sqrt(3.65e-07*3.65e-07 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (1.63/et)*(1.63/et))); de = 1.0/sin(2 * atan(exp(-(2.043+2.172)/2))) * det; } - if(2.172<=abs(eta) && abs(eta)<2.322){ + if(2.172<= std::abs(eta) && std::abs(eta)<2.322){ det = et * (sqrt(2.02e-07*2.02e-07 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (1.68/et)*(1.68/et))); de = 1.0/sin(2 * atan(exp(-(2.172+2.322)/2))) * det; } - if(2.322<=abs(eta) && abs(eta)<2.500){ + if(2.322<= std::abs(eta) && std::abs(eta)<2.500){ det = et * (sqrt(5.27e-07*5.27e-07 + (1.12/sqrt(et))*(1.12/sqrt(et)) + (1.78/et)*(1.78/et))); de = 1.0/sin(2 * atan(exp(-(2.322+2.500)/2))) * det; } diff --git a/HHKinFit/src/HHTauInputKinFitMaster.cpp b/HHKinFit/src/HHTauInputKinFitMaster.cpp index 085ae0fc..53a658da 100644 --- a/HHKinFit/src/HHTauInputKinFitMaster.cpp +++ b/HHKinFit/src/HHTauInputKinFitMaster.cpp @@ -235,132 +235,132 @@ HHTauInputKinFitMaster::GetBjetResoultion(double eta, double et){ double det=0; double de=10; - if(0.000<=abs(eta) && abs(eta)<0.087){ + if(0.000<= std::abs(eta) && std::abs(eta)<0.087){ det = et * (sqrt(0.0686*0.0686 + (1.03/sqrt(et))*(1.03/sqrt(et)) + (1.68/et)*(1.68/et))); de = 1.0/sin(2 * atan(exp(-(0.000+0.087)/2))) * det; } - if(0.087<=abs(eta) && abs(eta)<0.174){ + if(0.087<= std::abs(eta) && std::abs(eta)<0.174){ det = et * (sqrt(0.0737*0.0737 + (1.01/sqrt(et))*(1.01/sqrt(et)) + (1.74/et)*(1.74/et))); de = 1.0/sin(2 * atan(exp(-(0.087+0.174)/2))) * det; } - if(0.174<=abs(eta) && abs(eta)<0.261){ + if(0.174<= std::abs(eta) && std::abs(eta)<0.261){ det = et * (sqrt(0.0657*0.0657 + (1.07/sqrt(et))*(1.07/sqrt(et)) + (5.16e-06/et)*(5.16e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.174+0.261)/2))) * det; } - if(0.261<=abs(eta) && abs(eta)<0.348){ + if(0.261<= std::abs(eta) && std::abs(eta)<0.348){ det = et * (sqrt(0.062*0.062 + (1.07/sqrt(et))*(1.07/sqrt(et)) + (0.000134/et)*(0.000134/et))); de = 1.0/sin(2 * atan(exp(-(0.261+0.348)/2))) * det; } - if(0.348<=abs(eta) && abs(eta)<0.435){ + if(0.348<= std::abs(eta) && std::abs(eta)<0.435){ det = et * (sqrt(0.0605*0.0605 + (1.07/sqrt(et))*(1.07/sqrt(et)) + (1.84e-07/et)*(1.84e-07/et))); de = 1.0/sin(2 * atan(exp(-(0.348+0.435)/2))) * det; } - if(0.435<=abs(eta) && abs(eta)<0.522){ + if(0.435<= std::abs(eta) && std::abs(eta)<0.522){ det = et * (sqrt(0.059*0.059 + (1.08/sqrt(et))*(1.08/sqrt(et)) + (9.06e-09/et)*(9.06e-09/et))); de = 1.0/sin(2 * atan(exp(-(0.435+0.522)/2))) * det; } - if(0.522<=abs(eta) && abs(eta)<0.609){ + if(0.522<= std::abs(eta) && std::abs(eta)<0.609){ det = et * (sqrt(0.0577*0.0577 + (1.08/sqrt(et))*(1.08/sqrt(et)) + (5.46e-06/et)*(5.46e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.522+0.609)/2))) * det; } - if(0.609<=abs(eta) && abs(eta)<0.696){ + if(0.609<= std::abs(eta) && std::abs(eta)<0.696){ det = et * (sqrt(0.0525*0.0525 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (4.05e-05/et)*(4.05e-05/et))); de = 1.0/sin(2 * atan(exp(-(0.609+0.696)/2))) * det; } - if(0.696<=abs(eta) && abs(eta)<0.783){ + if(0.696<= std::abs(eta) && std::abs(eta)<0.783){ det = et * (sqrt(0.0582*0.0582 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (1.17e-05/et)*(1.17e-05/et))); de = 1.0/sin(2 * atan(exp(-(0.696+0.783)/2))) * det; } - if(0.783<=abs(eta) && abs(eta)<0.870){ + if(0.783<= std::abs(eta) && std::abs(eta)<0.870){ det = et * (sqrt(0.0649*0.0649 + (1.08/sqrt(et))*(1.08/sqrt(et)) + (7.85e-06/et)*(7.85e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.783+0.870)/2))) * det; } - if(0.870<=abs(eta) && abs(eta)<0.957){ + if(0.870<= std::abs(eta) && std::abs(eta)<0.957){ det = et * (sqrt(0.0654*0.0654 + (1.1/sqrt(et))*(1.1/sqrt(et)) + (1.09e-07/et)*(1.09e-07/et))); de = 1.0/sin(2 * atan(exp(-(0.870+0.957)/2))) * det; } - if(0.957<=abs(eta) && abs(eta)<1.044){ + if(0.957<= std::abs(eta) && std::abs(eta)<1.044){ det = et * (sqrt(0.0669*0.0669 + (1.11/sqrt(et))*(1.11/sqrt(et)) + (1.87e-06/et)*(1.87e-06/et))); de = 1.0/sin(2 * atan(exp(-(0.957+1.044)/2))) * det; } - if(1.044<=abs(eta) && abs(eta)<1.131){ + if(1.044<= std::abs(eta) && std::abs(eta)<1.131){ det = et * (sqrt(0.0643*0.0643 + (1.15/sqrt(et))*(1.15/sqrt(et)) + (2.76e-05/et)*(2.76e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.044+1.131)/2))) * det; } - if(1.131<=abs(eta) && abs(eta)<1.218){ + if(1.131<= std::abs(eta) && std::abs(eta)<1.218){ det = et * (sqrt(0.0645*0.0645 + (1.16/sqrt(et))*(1.16/sqrt(et)) + (1.04e-06/et)*(1.04e-06/et))); de = 1.0/sin(2 * atan(exp(-(1.131+1.218)/2))) * det; } - if(1.218<=abs(eta) && abs(eta)<1.305){ + if(1.218<= std::abs(eta) && std::abs(eta)<1.305){ det = et * (sqrt(0.0637*0.0637 + (1.19/sqrt(et))*(1.19/sqrt(et)) + (1.08e-07/et)*(1.08e-07/et))); de = 1.0/sin(2 * atan(exp(-(1.218+1.305)/2))) * det; } - if(1.305<=abs(eta) && abs(eta)<1.392){ + if(1.305<= std::abs(eta) && std::abs(eta)<1.392){ det = et * (sqrt(0.0695*0.0695 + (1.21/sqrt(et))*(1.21/sqrt(et)) + (5.75e-06/et)*(5.75e-06/et))); de = 1.0/sin(2 * atan(exp(-(1.305+1.392)/2))) * det; } - if(1.392<=abs(eta) && abs(eta)<1.479){ + if(1.392<= std::abs(eta) && std::abs(eta)<1.479){ det = et * (sqrt(0.0748*0.0748 + (1.2/sqrt(et))*(1.2/sqrt(et)) + (5.15e-08/et)*(5.15e-08/et))); de = 1.0/sin(2 * atan(exp(-(1.392+1.479)/2))) * det; } - if(1.479<=abs(eta) && abs(eta)<1.566){ + if(1.479<= std::abs(eta) && std::abs(eta)<1.566){ det = et * (sqrt(0.0624*0.0624 + (1.23/sqrt(et))*(1.23/sqrt(et)) + (2.28e-05/et)*(2.28e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.479+1.566)/2))) * det; } - if(1.566<=abs(eta) && abs(eta)<1.653){ + if(1.566<= std::abs(eta) && std::abs(eta)<1.653){ det = et * (sqrt(0.0283*0.0283 + (1.25/sqrt(et))*(1.25/sqrt(et)) + (4.79e-07/et)*(4.79e-07/et))); de = 1.0/sin(2 * atan(exp(-(1.566+1.653)/2))) * det; } - if(1.653<=abs(eta) && abs(eta)<1.740){ + if(1.653<= std::abs(eta) && std::abs(eta)<1.740){ det = et * (sqrt(0.0316*0.0316 + (1.21/sqrt(et))*(1.21/sqrt(et)) + (5e-05/et)*(5e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.653+1.740)/2))) * det; } - if(1.740<=abs(eta) && abs(eta)<1.830){ + if(1.740<= std::abs(eta) && std::abs(eta)<1.830){ det = et * (sqrt(2.29e-07*2.29e-07 + (1.2/sqrt(et))*(1.2/sqrt(et)) + (1.71e-05/et)*(1.71e-05/et))); de = 1.0/sin(2 * atan(exp(-(1.740+1.830)/2))) * det; } - if(1.830<=abs(eta) && abs(eta)<1.930){ + if(1.830<= std::abs(eta) && std::abs(eta)<1.930){ det = et * (sqrt(5.18e-09*5.18e-09 + (1.14/sqrt(et))*(1.14/sqrt(et)) + (1.7/et)*(1.7/et))); de = 1.0/sin(2 * atan(exp(-(1.830+1.930)/2))) * det; } - if(1.930<=abs(eta) && abs(eta)<2.043){ + if(1.930<= std::abs(eta) && std::abs(eta)<2.043){ det = et * (sqrt(2.17e-07*2.17e-07 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (2.08/et)*(2.08/et))); de = 1.0/sin(2 * atan(exp(-(1.930+2.043)/2))) * det; } - if(2.043<=abs(eta) && abs(eta)<2.172){ + if(2.043<= std::abs(eta) && std::abs(eta)<2.172){ det = et * (sqrt(3.65e-07*3.65e-07 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (1.63/et)*(1.63/et))); de = 1.0/sin(2 * atan(exp(-(2.043+2.172)/2))) * det; } - if(2.172<=abs(eta) && abs(eta)<2.322){ + if(2.172<= std::abs(eta) && std::abs(eta)<2.322){ det = et * (sqrt(2.02e-07*2.02e-07 + (1.09/sqrt(et))*(1.09/sqrt(et)) + (1.68/et)*(1.68/et))); de = 1.0/sin(2 * atan(exp(-(2.172+2.322)/2))) * det; } - if(2.322<=abs(eta) && abs(eta)<2.500){ + if(2.322<= std::abs(eta) && std::abs(eta)<2.500){ det = et * (sqrt(5.27e-07*5.27e-07 + (1.12/sqrt(et))*(1.12/sqrt(et)) + (1.78/et)*(1.78/et))); de = 1.0/sin(2 * atan(exp(-(2.322+2.500)/2))) * det; } diff --git a/HHKinFit/src/PSMath.cpp b/HHKinFit/src/PSMath.cpp index 4e73258d..6e167950 100644 --- a/HHKinFit/src/PSMath.cpp +++ b/HHKinFit/src/PSMath.cpp @@ -339,7 +339,7 @@ PSMath::PSNewtonAnalyzer (Int_t np, Double_t a[], Double_t alimit[][2], if (printlevel>0) std::cout << "PSNewton Analyzer check 3" << std::endl; // cout << "ip " << ip << " H " << H[ip*np+ip] << " h " << h[ip] << " g " << g[ip] // << " H[ip*np+ip] * h[ip] " << H[ip*np+ip] * h[ip] - // << " 0.07 * abs(g[ip]) " << 0.07 * abs(g[ip]) << endl; + // << " 0.07 * std::abs(g[ip]) " << 0.07 * std::abs(g[ip]) << endl; break; } } diff --git a/HHbbTauTau.files b/HHbbTauTau.files index 3e6495dd..84166fef 100644 --- a/HHbbTauTau.files +++ b/HHbbTauTau.files @@ -361,3 +361,6 @@ RunTools/srm_tools/srmusr-mv RunTools/srm_tools/srmusr-rm RunTools/srm_tools/srmusr-rmdir RunTools/srm_tools/srmusr-rmfiles +PrintTools/include/CMS_lumi.h +PrintTools/include/HttStyles.h +RunTools/print_control_plots.sh diff --git a/PatProduction/interface/PatVertex.h b/PatProduction/interface/PatVertex.h index 606ec67f..927ad0e6 100644 --- a/PatProduction/interface/PatVertex.h +++ b/PatProduction/interface/PatVertex.h @@ -1,8 +1,8 @@ /*! * \file PatVertex.h * \brief Definition of PatVertex class which contains analysis-level definiton of a vertex. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-27 created * * Copyright 2014 Konstantin Androsov , diff --git a/PatProduction/plugins/ElectronsUserEmbedder.cc b/PatProduction/plugins/ElectronsUserEmbedder.cc index 5c63fd09..95d7530d 100644 --- a/PatProduction/plugins/ElectronsUserEmbedder.cc +++ b/PatProduction/plugins/ElectronsUserEmbedder.cc @@ -2,8 +2,8 @@ * \file ElectronsUserEmbedder.cc * \author Original author: Cesare Calabria * \date Tue Nov 22 17:00:17 CET 2011 created - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Cesare Calabria * Copyright 2014 Konstantin Androsov , diff --git a/PatProduction/plugins/JetUserEmbedder.cc b/PatProduction/plugins/JetUserEmbedder.cc index 53730f43..47cbdce2 100644 --- a/PatProduction/plugins/JetUserEmbedder.cc +++ b/PatProduction/plugins/JetUserEmbedder.cc @@ -2,8 +2,8 @@ * \file JetUserEmbedder.cc * \author Original author: Cesare Calabria * \date Tue Nov 22 17:00:17 CET 2011 created - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Cesare Calabria * Copyright 2014 Konstantin Androsov , diff --git a/PatProduction/plugins/MuonsUserEmbedded.cc b/PatProduction/plugins/MuonsUserEmbedded.cc index 94307d57..cc61fa94 100644 --- a/PatProduction/plugins/MuonsUserEmbedded.cc +++ b/PatProduction/plugins/MuonsUserEmbedded.cc @@ -2,8 +2,8 @@ * \file MuonsUserEmbedded.cc * \author Original author: Cesare Calabria * \date Tue Nov 22 12:02:59 CET 2011 created - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Cesare Calabria * Copyright 2014 Konstantin Androsov , diff --git a/PatProduction/plugins/PatVertexProducer.cc b/PatProduction/plugins/PatVertexProducer.cc index 20434a78..65d995f9 100644 --- a/PatProduction/plugins/PatVertexProducer.cc +++ b/PatProduction/plugins/PatVertexProducer.cc @@ -1,8 +1,8 @@ /*! * \file PatVertexProducer.cc * \brief Definition of PatVertexProducer class which produces analysis-level pat::Vertex objects from reco::Vertexes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-27 created * * Copyright 2014 Konstantin Androsov , diff --git a/PatProduction/plugins/SkimFilter.cc b/PatProduction/plugins/SkimFilter.cc index 3cc8935e..ef1dab53 100644 --- a/PatProduction/plugins/SkimFilter.cc +++ b/PatProduction/plugins/SkimFilter.cc @@ -2,8 +2,8 @@ * \file SkimFilter.cc * \brief Definition of SkimFilter class which applies skim for X->HH->bbTauTau PAT event selection. * \author Rosamaria Venditti (INFN Bari, Bari University) - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-30 created * * Copyright 2014 Rosamaria Venditti, diff --git a/PatProduction/python/patElectrons.py b/PatProduction/python/patElectrons.py index 2f3b21bc..685efa20 100644 --- a/PatProduction/python/patElectrons.py +++ b/PatProduction/python/patElectrons.py @@ -1,8 +1,8 @@ ## @package patElectrons # Configuration file that defines parameters related to PAT Electron objects. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/patJets.py b/PatProduction/python/patJets.py index ccc943ac..84ecf8be 100644 --- a/PatProduction/python/patJets.py +++ b/PatProduction/python/patJets.py @@ -1,8 +1,8 @@ ## @package patJets # Configuration file that defines parameters related to PAT Jet objects. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/patMET.py b/PatProduction/python/patMET.py index 8ec7deba..e51dded7 100644 --- a/PatProduction/python/patMET.py +++ b/PatProduction/python/patMET.py @@ -1,8 +1,8 @@ ## @package patMET # Configuration file that defines parameters related to PAT MET objects. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/patMuons.py b/PatProduction/python/patMuons.py index 6e22bedd..e4a84c23 100644 --- a/PatProduction/python/patMuons.py +++ b/PatProduction/python/patMuons.py @@ -1,8 +1,8 @@ ## @package patMuons # Configuration file that defines parameters related to PAT Muon objects. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/patOptions.py b/PatProduction/python/patOptions.py index f47e3167..519216b6 100644 --- a/PatProduction/python/patOptions.py +++ b/PatProduction/python/patOptions.py @@ -1,8 +1,8 @@ ## @package patOptions # Configuration file that defines command-line options for PATtoople production for X->HH->bbTauTau analysis. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/patTaus.py b/PatProduction/python/patTaus.py index ab0a62ea..327cfd1e 100644 --- a/PatProduction/python/patTaus.py +++ b/PatProduction/python/patTaus.py @@ -1,8 +1,8 @@ ## @package patTaus # Configuration file that defines parameters related to PAT Tau objects. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/patTrigger.py b/PatProduction/python/patTrigger.py index 429f9958..c19e82d9 100644 --- a/PatProduction/python/patTrigger.py +++ b/PatProduction/python/patTrigger.py @@ -1,8 +1,8 @@ ## @package patTrigger # Configuration file that defines parameters related to PAT Trigger objects. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/patTuple.py b/PatProduction/python/patTuple.py index eab7a161..48bcf125 100644 --- a/PatProduction/python/patTuple.py +++ b/PatProduction/python/patTuple.py @@ -1,8 +1,8 @@ ## @package patTuple # Configuration file to produce PAT-tuples and ROOT-tuples for X->HH->bbTauTau analysis. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/patVertices.py b/PatProduction/python/patVertices.py index c026a177..cfbb6bc8 100644 --- a/PatProduction/python/patVertices.py +++ b/PatProduction/python/patVertices.py @@ -1,8 +1,8 @@ ## @package patVertices # Configuration file that defines parameters related to PAT Vertex objects. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/skimFilter.py b/PatProduction/python/skimFilter.py index 39523bbc..e5bd9871 100644 --- a/PatProduction/python/skimFilter.py +++ b/PatProduction/python/skimFilter.py @@ -2,8 +2,8 @@ # Configuration file that defines a filter to skim events for X->HH->bbTauTau analysis. # # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/PatProduction/python/treeProduction.py b/PatProduction/python/treeProduction.py index d0baffbe..368e5107 100644 --- a/PatProduction/python/treeProduction.py +++ b/PatProduction/python/treeProduction.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/PatProduction/src/classes.h b/PatProduction/src/classes.h index 807a4e7b..97a7c766 100644 --- a/PatProduction/src/classes.h +++ b/PatProduction/src/classes.h @@ -1,8 +1,8 @@ /*! * \file classes.h * \brief Definition of PatProduction classes for which ROOT dictionary should be made. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-27 created * * Copyright 2014 Konstantin Androsov , diff --git a/PrintTools/include/CMS_lumi.h b/PrintTools/include/CMS_lumi.h new file mode 100644 index 00000000..6ff72b68 --- /dev/null +++ b/PrintTools/include/CMS_lumi.h @@ -0,0 +1,201 @@ +#pragma once + +#include "TPad.h" +#include "TLatex.h" +#include "TLine.h" +#include "TBox.h" +#include "TASImage.h" + +namespace cms_tdr { + +// +// Global variables +// + +TString cmsText = "CMS"; +float cmsTextFont = 61; // default is helvetic-bold + +bool writeExtraText = false; +TString extraText = "Preliminary"; +float extraTextFont = 52; // default is helvetica-italics + +// text sizes and text offsets with respect to the top frame +// in unit of the top margin size +float lumiTextSize = 0.6; +float lumiTextOffset = 0.2; +float cmsTextSize = 0.75; +float cmsTextOffset = 0.1; // only used in outOfFrame version + +float relPosX = 0.045; +float relPosY = 0.035; +float relExtraDY = 1.2; + +// ratio of "CMS" and extra text size +float extraOverCmsTextSize = 0.76; + +TString lumi_13TeV = "20.1 fb^{-1}"; +TString lumi_8TeV = "19.7 fb^{-1}"; +TString lumi_7TeV = "5.1 fb^{-1}"; + +bool drawLogo = false; + +//void CMS_lumi( TPad* pad, int iPeriod=3, int iPosX=10 ); + +void +CMS_lumi( TPad* pad, int iPeriod = 3, int iPosX = 10 ) +{ + bool outOfFrame = false; + if( iPosX/10==0 ) + { + outOfFrame = true; + } + int alignY_=3; + int alignX_=2; + if( iPosX/10==0 ) alignX_=1; + if( iPosX==0 ) alignX_=1; + if( iPosX==0 ) alignY_=1; + if( iPosX/10==1 ) alignX_=1; + if( iPosX/10==2 ) alignX_=2; + if( iPosX/10==3 ) alignX_=3; + if( iPosX == 0 ) relPosX = 0.12; + int align_ = 10*alignX_ + alignY_; + + float H = pad->GetWh(); + float W = pad->GetWw(); + float l = pad->GetLeftMargin(); + float t = pad->GetTopMargin(); + float r = pad->GetRightMargin(); + float b = pad->GetBottomMargin(); + // float e = 0.025; + + pad->cd(); + + TString lumiText; + if( iPeriod==1 ) + { + lumiText += lumi_7TeV; + lumiText += " (7 TeV)"; + } + else if ( iPeriod==2 ) + { + lumiText += lumi_8TeV; + lumiText += " (8 TeV)"; + } + else if( iPeriod==3 ) + { + lumiText = lumi_8TeV; + lumiText += " (8 TeV)"; + lumiText += " + "; + lumiText += lumi_7TeV; + lumiText += " (7 TeV)"; + } + else if ( iPeriod==4 ) + { + lumiText += lumi_13TeV; + lumiText += " (13 TeV)"; + } + else if ( iPeriod==7 ) + { + if( outOfFrame ) lumiText += "#scale[0.85]{"; + lumiText += lumi_13TeV; + lumiText += " (13 TeV)"; + lumiText += " + "; + lumiText += lumi_8TeV; + lumiText += " (8 TeV)"; + lumiText += " + "; + lumiText += lumi_7TeV; + lumiText += " (7 TeV)"; + if( outOfFrame) lumiText += "}"; + } + else if ( iPeriod==12 ) + { + lumiText += "8 TeV"; + } + +// std::cout << lumiText << std::endl; + + TLatex latex; + latex.SetNDC(); + latex.SetTextAngle(0); + latex.SetTextColor(kBlack); + + float extraTextSize = extraOverCmsTextSize*cmsTextSize; + + latex.SetTextFont(42); + latex.SetTextAlign(31); + latex.SetTextSize(lumiTextSize*t); + latex.DrawLatex(1-r,1-t+lumiTextOffset*t,lumiText); + + if( outOfFrame ) + { + latex.SetTextFont(cmsTextFont); + latex.SetTextAlign(11); + latex.SetTextSize(cmsTextSize*t); + latex.DrawLatex(l,1-t+lumiTextOffset*t,cmsText); + } + + pad->cd(); + + float posX_=0; + if( iPosX%10<=1 ) + { + posX_ = l + relPosX*(1-l-r); + } + else if( iPosX%10==2 ) + { + posX_ = l + 0.5*(1-l-r); + } + else if( iPosX%10==3 ) + { + posX_ = 1-r - relPosX*(1-l-r); + } + float posY_ = 1-t - relPosY*(1-t-b); + if( !outOfFrame ) + { + if( drawLogo ) + { + posX_ = l + 0.045*(1-l-r)*W/H; + posY_ = 1-t - 0.045*(1-t-b); + float xl_0 = posX_; + float yl_0 = posY_ - 0.15; + float xl_1 = posX_ + 0.15*H/W; + float yl_1 = posY_; + TASImage* CMS_logo = new TASImage("CMS-BW-label.png"); + TPad* pad_logo = new TPad("logo","logo", xl_0, yl_0, xl_1, yl_1 ); + pad_logo->Draw(); + pad_logo->cd(); + CMS_logo->Draw("X"); + pad_logo->Modified(); + pad->cd(); + } + else + { + latex.SetTextFont(cmsTextFont); + latex.SetTextSize(cmsTextSize*t); + latex.SetTextAlign(align_); + latex.DrawLatex(posX_, posY_, cmsText); + if( writeExtraText ) + { + latex.SetTextFont(extraTextFont); + latex.SetTextAlign(align_); + latex.SetTextSize(extraTextSize*t); + latex.DrawLatex(posX_, posY_- relExtraDY*cmsTextSize*t, extraText); + } + } + } + else if( writeExtraText ) + { + if( iPosX==0) + { + posX_ = l + relPosX*(1-l-r); + posY_ = 1-t+lumiTextOffset*t; + } + latex.SetTextFont(extraTextFont); + latex.SetTextSize(extraTextSize*t); + latex.SetTextAlign(align_); + latex.DrawLatex(posX_, posY_, extraText); + } + return; +} + +} // cms_tdr diff --git a/PrintTools/include/HttStyles.h b/PrintTools/include/HttStyles.h index e5aac434..34ab6fdb 100644 --- a/PrintTools/include/HttStyles.h +++ b/PrintTools/include/HttStyles.h @@ -1,5 +1,4 @@ -#ifndef HttStyles_h -#define HttStyles_h +#pragma once #include #include @@ -8,6 +7,7 @@ #include #include +namespace htt_style { /// define common styles void SetStyle(); /// create a canveas in common style (default is square) @@ -25,4 +25,217 @@ void SetLegendStyle(TLegend* leg); /// add CMSPreliminary logo, lumi and channel void CMSPrelim(const char* dataset, const char* channel, double lowX=0.4, double lowY=0.74); -#endif +void SetStyle() +{ + TStyle *HttStyle = new TStyle("Htt-Style","The Perfect Style for Plots ;-)"); + gStyle = HttStyle; + + // Canvas + HttStyle->SetCanvasColor (0); + HttStyle->SetCanvasBorderSize(10); + HttStyle->SetCanvasBorderMode(0); + HttStyle->SetCanvasDefH (700); + HttStyle->SetCanvasDefW (700); + HttStyle->SetCanvasDefX (100); + HttStyle->SetCanvasDefY (100); + + // color palette for 2D temperature plots + HttStyle->SetPalette(1,0); + + // Pads + HttStyle->SetPadColor (0); + HttStyle->SetPadBorderSize (10); + HttStyle->SetPadBorderMode (0); + HttStyle->SetPadBottomMargin(0.13); + HttStyle->SetPadTopMargin (0.08); + HttStyle->SetPadLeftMargin (0.15); + HttStyle->SetPadRightMargin (0.05); + HttStyle->SetPadGridX (0); + HttStyle->SetPadGridY (0); + HttStyle->SetPadTickX (1); + HttStyle->SetPadTickY (1); + + // Frames + HttStyle->SetLineWidth(3); + HttStyle->SetFrameFillStyle ( 0); + HttStyle->SetFrameFillColor ( 0); + HttStyle->SetFrameLineColor ( 1); + HttStyle->SetFrameLineStyle ( 0); + HttStyle->SetFrameLineWidth ( 2); + HttStyle->SetFrameBorderSize(10); + HttStyle->SetFrameBorderMode( 0); + + // Histograms + HttStyle->SetHistFillColor(2); + HttStyle->SetHistFillStyle(0); + HttStyle->SetHistLineColor(1); + HttStyle->SetHistLineStyle(0); + HttStyle->SetHistLineWidth(3); + HttStyle->SetNdivisions(505, "X"); + + // Functions + HttStyle->SetFuncColor(1); + HttStyle->SetFuncStyle(0); + HttStyle->SetFuncWidth(2); + + // Various + HttStyle->SetMarkerStyle(20); + HttStyle->SetMarkerColor(kBlack); + HttStyle->SetMarkerSize (1.1); + + HttStyle->SetTitleBorderSize(0); + HttStyle->SetTitleFillColor (0); + HttStyle->SetTitleX (0.2); + + HttStyle->SetTitleSize (0.055,"X"); + HttStyle->SetTitleOffset(1.200,"X"); + HttStyle->SetLabelOffset(0.005,"X"); + HttStyle->SetLabelSize (0.040,"X"); + HttStyle->SetLabelFont (42 ,"X"); + + HttStyle->SetStripDecimals(kFALSE); + HttStyle->SetLineStyleString(11,"20 10"); + + HttStyle->SetTitleSize (0.055,"Y"); + HttStyle->SetTitleOffset(1.600,"Y"); + HttStyle->SetLabelOffset(0.010,"Y"); + HttStyle->SetLabelSize (0.040,"Y"); + HttStyle->SetLabelFont (42 ,"Y"); + + HttStyle->SetTextSize (0.055); + HttStyle->SetTextFont (42); + + HttStyle->SetStatFont (42); + HttStyle->SetTitleFont (42); + HttStyle->SetTitleFont (42,"X"); + HttStyle->SetTitleFont (42,"Y"); + + HttStyle->SetOptStat (0); + return; +} + +TCanvas* MakeCanvas(const char* name, const char *title, int dX, int dY) +{ + // Start with a canvas + TCanvas *canvas = new TCanvas(name,title,0,0,dX,dY); + // General overall stuff + canvas->SetFillColor (0); + canvas->SetBorderMode (0); + canvas->SetBorderSize (10); + // Set margins to reasonable defaults + canvas->SetLeftMargin (0.18); + canvas->SetRightMargin (0.05); + canvas->SetTopMargin (0.08); + canvas->SetBottomMargin (0.15); + // Setup a frame which makes sense + canvas->SetFrameFillStyle (0); + canvas->SetFrameLineStyle (0); + canvas->SetFrameBorderMode(0); + canvas->SetFrameBorderSize(10); + canvas->SetFrameFillStyle (0); + canvas->SetFrameLineStyle (0); + canvas->SetFrameBorderMode(0); + canvas->SetFrameBorderSize(10); + + return canvas; +} + +void InitSubPad(TPad* pad, int i) +{ + pad->cd(i); + TPad *tmpPad = (TPad*) pad->GetPad(i); + tmpPad->SetLeftMargin (0.18); + tmpPad->SetTopMargin (0.05); + tmpPad->SetRightMargin (0.07); + tmpPad->SetBottomMargin(0.15); + return; +} + +void InitSignal(TH1 *hist) +{ + hist->SetFillStyle(0.); + hist->SetLineStyle(11); + hist->SetLineWidth(3.); + hist->SetLineColor(kBlue); + //hist->SetLineColor(kBlue+3); +} + +void InitHist(TH1 *hist, const char *xtit, const char *ytit, int color, int style) +{ + hist->SetXTitle(xtit); + hist->SetYTitle(ytit); + hist->SetLineColor(kBlack); + hist->SetLineWidth( 3.); + hist->SetFillColor(color ); + hist->SetFillStyle(style ); + hist->SetTitleSize (0.055,"Y"); + hist->SetTitleOffset(1.600,"Y"); + hist->SetLabelOffset(0.014,"Y"); + hist->SetLabelSize (0.040,"Y"); + hist->SetLabelFont (42 ,"Y"); + hist->SetTitleSize (0.055,"X"); + hist->SetTitleOffset(1.300,"X"); + hist->SetLabelOffset(0.014,"X"); + hist->SetLabelSize (0.040,"X"); + hist->SetLabelFont (42 ,"X"); + hist->SetMarkerStyle(20); + hist->SetMarkerColor(color); + hist->SetMarkerSize (0.6); + hist->GetYaxis()->SetTitleFont(42); + hist->GetXaxis()->SetTitleFont(42); + hist->SetTitle(""); + return; +} + +void InitData(TH1* hist) +{ + hist->SetMarkerStyle(20.); + hist->SetMarkerSize (1.3); + hist->SetLineWidth ( 3.); +} + +void SetLegendStyle(TLegend* leg) +{ + leg->SetFillStyle (0); + leg->SetFillColor (0); + leg->SetBorderSize(0); +} + +void CMSPrelim(const char* dataset, const char* channel, double lowX, double lowY) +{ + /* + TPaveText* cmsprel = new TPaveText(lowX, lowY+0.06, lowX+0.30, lowY+0.16, "NDC"); + cmsprel->SetBorderSize( 0 ); + cmsprel->SetFillStyle( 0 ); + cmsprel->SetTextAlign( 12 ); + cmsprel->SetTextSize ( 0.03 ); + cmsprel->SetTextColor( 1 ); + cmsprel->SetTextFont ( 62 ); + cmsprel->AddText("CMS"); + cmsprel->Draw(); + + TPaveText* lumi = new TPaveText(lowX+0.08, lowY+0.061, lowX+0.45, lowY+0.161, "NDC"); + */ + + TPaveText* lumi = new TPaveText(lowX, lowY+0.06, lowX+0.30, lowY+0.16, "NDC"); + lumi->SetBorderSize( 0 ); + lumi->SetFillStyle( 0 ); + lumi->SetTextAlign( 12 ); + lumi->SetTextSize ( 0.035 ); + lumi->SetTextColor( 1 ); + lumi->SetTextFont ( 62 ); + lumi->AddText(dataset); + lumi->Draw(); + + TPaveText* chan = new TPaveText(lowX+0.68, lowY+0.061, lowX+0.80, lowY+0.161, "NDC"); + chan->SetBorderSize( 0 ); + chan->SetFillStyle( 0 ); + chan->SetTextAlign( 12 ); + chan->SetTextSize ( 0.04 ); + chan->SetTextColor( 1 ); + chan->SetTextFont ( 62 ); + chan->AddText(channel); + chan->Draw(); +} + +} // namespace htt_style diff --git a/PrintTools/include/RootPrintSource.h b/PrintTools/include/RootPrintSource.h index 76781d6d..a7d547a1 100644 --- a/PrintTools/include/RootPrintSource.h +++ b/PrintTools/include/RootPrintSource.h @@ -1,7 +1,7 @@ /*! * \file RootPrintSource.h * \brief Definition of histogram source classes and page layot options that are used to print ROOT histograms. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * * Copyright 2013, 2014 Konstantin Androsov * diff --git a/PrintTools/include/RootPrintToPdf.h b/PrintTools/include/RootPrintToPdf.h index 70904b80..bb5d1d20 100644 --- a/PrintTools/include/RootPrintToPdf.h +++ b/PrintTools/include/RootPrintToPdf.h @@ -1,7 +1,7 @@ /*! * \file RootPrintToPdf.h * \brief Print ROOT histograms to PDF. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * * Copyright 2013, 2014 Konstantin Androsov * @@ -43,10 +43,38 @@ namespace root_ext { class PdfPrinter { public: - PdfPrinter(const std::string& _output_file_name) - : canvas(new TCanvas("","",700,700)), output_file_name(_output_file_name), n_pages(0) + PdfPrinter(const std::string& _output_file_name, bool _verbose = false) + : canvas(new TCanvas("","",50, 50, 700, 700)), output_file_name(_output_file_name), n_pages(0), + verbose(_verbose) { +// int W = 700; +// int H = 700; + +// int H_ref = 700; +// int W_ref = 700; + +// float T = 0.08*H_ref; +// float B = 0.12*H_ref; +// float L = 0.12*W_ref; +// float R = 0.04*W_ref; + + canvas->SetFillColor(0); + canvas->SetBorderMode(0); + canvas->SetFrameFillStyle(0); + canvas->SetFrameLineColor(kWhite); + canvas->SetFrameBorderMode(0); +// canvas->SetLeftMargin( L/W ); +// canvas->SetRightMargin( R/W ); +// canvas->SetTopMargin( T/H ); +// canvas->SetBottomMargin( B/H ); +// canvas->SetTickx(0); +// canvas->SetTicky(0); + + const Int_t old_gErrorIgnoreLevel = gErrorIgnoreLevel; + if(!verbose) + gErrorIgnoreLevel = kWarning; canvas->Print((output_file_name + "[").c_str()); + gErrorIgnoreLevel = old_gErrorIgnoreLevel; } template @@ -106,7 +134,8 @@ class PdfPrinter { } canvas->Print((output_file_name+"]").c_str()); gErrorIgnoreLevel = old_gErrorIgnoreLevel; - std::cout << "Info in : pdf file " << output_file_name << " has been closed" << std::endl; + if(verbose) + std::cout << "Info in : pdf file " << output_file_name << " has been closed" << std::endl; } private: @@ -147,6 +176,7 @@ class PdfPrinter { std::shared_ptr canvas; std::string output_file_name; size_t n_pages; + bool verbose; }; } // namespace root_ext diff --git a/PrintTools/include/RootPrintTools.h b/PrintTools/include/RootPrintTools.h index fe2ed263..e5484cf2 100644 --- a/PrintTools/include/RootPrintTools.h +++ b/PrintTools/include/RootPrintTools.h @@ -1,7 +1,7 @@ /*! * \file RootPrintTools.h * \brief Contains useful functions to print histograms with ROOT. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * * Copyright 2013, 2014 Konstantin Androsov * diff --git a/PrintTools/include/StackedPlotDescriptor.h b/PrintTools/include/StackedPlotDescriptor.h index 2ddc6fa9..4d096daf 100644 --- a/PrintTools/include/StackedPlotDescriptor.h +++ b/PrintTools/include/StackedPlotDescriptor.h @@ -1,8 +1,8 @@ /*! * \file StackedPlotDescriptor.h * \brief Code to produce stacked plots using CMS preliminary style. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-09-16 created * * Copyright 2014 Konstantin Androsov , @@ -33,12 +33,14 @@ #include #include #include +#include #include "RootPrintSource.h" -#include "TdrStyle.h" +#include "../include/TdrStyle.h" +#include "../include/CMS_lumi.h" #include "AnalysisBase/include/SmartHistogram.h" -#include "../source/HttStyles.cc" +#include "../include/HttStyles.h" namespace analysis { @@ -49,12 +51,10 @@ class StackedPlotDescriptor { typedef std::vector hist_ptr_vector; StackedPlotDescriptor(const std::string& page_title, bool draw_title, const std::string& channelNameLatex, - const std::string& _categoryName, bool _draw_ratio, bool _drawBKGerrors, - bool _divide_by_BinWidth = true) + 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")), channelText(new TPaveText(0.2, 0.85, 0.25, 0.89, "NDC")), channelName(channelNameLatex), - categoryName(_categoryName), draw_ratio(_draw_ratio), drawBKGerrors(_drawBKGerrors), - divide_by_BinWidth(_divide_by_BinWidth) + categoryName(_categoryName), draw_ratio(_draw_ratio), drawBKGerrors(_drawBKGerrors) { page.side.fit_range_x = false; page.title = page_title; @@ -72,7 +72,7 @@ class StackedPlotDescriptor { if (page.layout.has_title) { page.side.layout.main_pad = root_ext::Box(0.02,0.02,0.95,0.94); } else { - page.side.layout.main_pad = root_ext::Box(0.02,0.02,1,1); + page.side.layout.main_pad = root_ext::Box(0.,0., 1, 1); } } @@ -84,38 +84,40 @@ class StackedPlotDescriptor { } legend->SetFillColor(0); - legend->SetTextSize(0.023); - legend->SetTextFont(62); + legend->SetTextSize(0.026); + legend->SetTextFont(42); legend->SetFillStyle (0); legend->SetFillColor (0); legend->SetBorderSize(0); - text->SetTextSize(0.03); + text->SetTextSize(0.05); text->SetTextFont(62); text->SetFillColor(0); text->SetBorderSize(0); text->SetMargin(0.01); text->SetTextAlign(12); // align left - text->AddText(0.01,0.05, "CMS, 19.7 fb^{-1} at 8 TeV"); + std::ostringstream ss_text; + ss_text << channelName << ", " << categoryName; + 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()); - - channelText->SetTextSize(0.08); //0.05 - channelText->SetTextFont(62); - channelText->SetFillColor(0); - channelText->SetBorderSize(0); - channelText->SetMargin(0.01); - channelText->SetTextAlign(12); // align left - channelText->SetX1(0.21); - channelText->SetY1(0.82); - channelText->AddText(channelName.c_str()); +// 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()); + +// channelText->SetTextSize(0.08); //0.05 +// channelText->SetTextFont(62); +// channelText->SetFillColor(0); +// channelText->SetBorderSize(0); +// channelText->SetMargin(0.01); +// channelText->SetTextAlign(12); // align left +// channelText->SetX1(0.21); +// channelText->SetY1(0.82); +// channelText->AddText(channelName.c_str()); } const std::string& GetTitle() const { return page.title; } @@ -174,9 +176,9 @@ class StackedPlotDescriptor { void Draw(TCanvas& canvas) { - //cms_tdr::setTDRStyle(); - SetStyle(); - gStyle->SetLineStyleString(11,"20 10"); + cms_tdr::setTDRStyle(); +// htt_style::SetStyle(); +// gStyle->SetLineStyleString(11,"20 10"); if(page.layout.has_title) { TPaveLabel *title = root_ext::Adapter::NewPaveLabel(page.layout.title_box, page.title); @@ -188,11 +190,34 @@ class StackedPlotDescriptor { main_pad->SetLogx(); if(page.side.use_log_scaleY) main_pad->SetLogy(); + + int W = 700; + int H = 700; + + int H_ref = 700; + int W_ref = 700; + + float T = 0.08*H_ref; + float B = 0.14*H_ref; + float L = 0.18*W_ref; + float R = 0.05*W_ref; + +// main_pad->SetFillColor(0); +// main_pad->SetBorderMode(0); +// main_pad->SetFrameFillStyle(0); +// main_pad->SetFrameBorderMode(0); + main_pad->SetLeftMargin( L/W ); + 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->Draw(); main_pad->cd(); if (data_histogram) - legend->AddEntry(data_histogram.get(), data_histogram->GetLegendTitle().c_str(), "LP"); + legend->AddEntry(data_histogram.get(), data_histogram->GetLegendTitle().c_str(), "PE"); 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) @@ -234,17 +259,18 @@ class StackedPlotDescriptor { } else { stack->GetXaxis()->SetTitle(page.side.axis_titleX.c_str()); - stack->GetXaxis()->SetTitleOffset(1.05); //1.05 - stack->GetXaxis()->SetTitleSize(0.055); //0.04 + stack->GetXaxis()->SetTitleOffset(1.00); //1.05 +// stack->GetXaxis()->SetTitleSize(0.055); //0.04 stack->GetXaxis()->SetLabelSize(0.04); - stack->GetXaxis()->SetTitleFont(62); //62 + stack->GetXaxis()->SetLabelOffset(0.015); +// stack->GetXaxis()->SetTitleFont(42); //62 } - stack->GetYaxis()->SetTitleSize(0.055); //0.05 - stack->GetYaxis()->SetTitleOffset(1.45); //1.45 +// stack->GetYaxis()->SetTitleSize(0.055); //0.05 + stack->GetYaxis()->SetTitleOffset(1.4); //1.45 stack->GetYaxis()->SetLabelSize(0.04); stack->GetYaxis()->SetTitle(page.side.axis_titleY.c_str()); - stack->GetYaxis()->SetTitleFont(62); //62 +// stack->GetYaxis()->SetTitleFont(42); //62 if (drawBKGerrors){ sum_backgound_histogram->SetMarkerSize(0); @@ -260,13 +286,18 @@ class StackedPlotDescriptor { if(data_histogram) { data_histogram->SetMarkerStyle(20); - data_histogram->SetMarkerSize(1.1); - data_histogram->Draw("samepPE0"); + data_histogram->SetMarkerSize(1); + data_histogram->Draw("samepPE0X0"); } text->Draw("same"); - channelText->Draw("same"); - categoryText->Draw("same"); +// channelText->Draw("same"); +// categoryText->Draw("same"); + + cms_tdr::writeExtraText = true; + cms_tdr::extraText = TString("Unpublished"); + cms_tdr::CMS_lumi(main_pad.get(), 2, 11); + legend->Draw("same"); @@ -317,6 +348,8 @@ class StackedPlotDescriptor { canvas.cd(); main_pad->Draw(); + canvas.RedrawAxis(); + canvas.GetFrame()->Draw(); canvas.cd(); if (data_histogram && draw_ratio) @@ -329,7 +362,7 @@ class StackedPlotDescriptor { hist_ptr histogram(new Histogram(original_histogram)); histogram->SetLineColor(root_ext::colorMapName.at("black")); histogram->SetLineWidth(1.); - if (divide_by_BinWidth) + if (histogram->NeedToDivideByBinWidth()) ReweightWithBinWidth(histogram); UpdateDrawInfo(histogram); return histogram; @@ -382,7 +415,7 @@ class StackedPlotDescriptor { std::string channelName; std::string categoryName; bool draw_ratio; - bool drawBKGerrors, divide_by_BinWidth; + bool drawBKGerrors; }; } // namespace analysis diff --git a/PrintTools/include/TdrStyle.h b/PrintTools/include/TdrStyle.h index d2cc29c9..d20d1144 100755 --- a/PrintTools/include/TdrStyle.h +++ b/PrintTools/include/TdrStyle.h @@ -3,18 +3,21 @@ #include namespace cms_tdr { + // tdrGrid: Turns the grid lines on (true) or off (false) -//void tdrGrid(bool gridOn) { -// tdrStyle->SetPadGridX(gridOn); -// tdrStyle->SetPadGridY(gridOn); -//} +/* +void tdrGrid(bool gridOn) { + tdrStyle->SetPadGridX(gridOn); + tdrStyle->SetPadGridY(gridOn); +} -//// fixOverlay: Redraws the axis +// fixOverlay: Redraws the axis -//void fixOverlay() { -// gPad->RedrawAxis(); -//} +void fixOverlay() { + gPad->RedrawAxis(); +} +*/ void setTDRStyle() { TStyle *tdrStyle = new TStyle("tdrStyle","Style for P-TDR"); @@ -56,9 +59,9 @@ void setTDRStyle() { // tdrStyle->SetNumberContours(Int_t number = 20); tdrStyle->SetEndErrorSize(2); -// tdrStyle->SetErrorMarker(20); - tdrStyle->SetErrorX(0.5); - + // tdrStyle->SetErrorMarker(20); + //tdrStyle->SetErrorX(0.); + tdrStyle->SetMarkerStyle(20); //For the fit/function: @@ -92,7 +95,7 @@ void setTDRStyle() { tdrStyle->SetPadTopMargin(0.05); tdrStyle->SetPadBottomMargin(0.13); tdrStyle->SetPadLeftMargin(0.16); - tdrStyle->SetPadRightMargin(0.05); + tdrStyle->SetPadRightMargin(0.02); // For the Global title: @@ -155,6 +158,9 @@ void setTDRStyle() { // tdrStyle->SetTimeOffset(Double_t toffset); // tdrStyle->SetHistMinimumZero(kTRUE); + tdrStyle->SetHatchesLineWidth(5); + tdrStyle->SetHatchesSpacing(0.05); + tdrStyle->cd(); } diff --git a/PrintTools/source/HttStyles.cc b/PrintTools/source/HttStyles.cc deleted file mode 100644 index f6e3f85a..00000000 --- a/PrintTools/source/HttStyles.cc +++ /dev/null @@ -1,214 +0,0 @@ -#include "../include/HttStyles.h" - -void SetStyle() -{ - TStyle *HttStyle = new TStyle("Htt-Style","The Perfect Style for Plots ;-)"); - gStyle = HttStyle; - - // Canvas - HttStyle->SetCanvasColor (0); - HttStyle->SetCanvasBorderSize(10); - HttStyle->SetCanvasBorderMode(0); - HttStyle->SetCanvasDefH (700); - HttStyle->SetCanvasDefW (700); - HttStyle->SetCanvasDefX (100); - HttStyle->SetCanvasDefY (100); - - // color palette for 2D temperature plots - HttStyle->SetPalette(1,0); - - // Pads - HttStyle->SetPadColor (0); - HttStyle->SetPadBorderSize (10); - HttStyle->SetPadBorderMode (0); - HttStyle->SetPadBottomMargin(0.13); - HttStyle->SetPadTopMargin (0.08); - HttStyle->SetPadLeftMargin (0.15); - HttStyle->SetPadRightMargin (0.05); - HttStyle->SetPadGridX (0); - HttStyle->SetPadGridY (0); - HttStyle->SetPadTickX (1); - HttStyle->SetPadTickY (1); - - // Frames - HttStyle->SetLineWidth(3); - HttStyle->SetFrameFillStyle ( 0); - HttStyle->SetFrameFillColor ( 0); - HttStyle->SetFrameLineColor ( 1); - HttStyle->SetFrameLineStyle ( 0); - HttStyle->SetFrameLineWidth ( 2); - HttStyle->SetFrameBorderSize(10); - HttStyle->SetFrameBorderMode( 0); - - // Histograms - HttStyle->SetHistFillColor(2); - HttStyle->SetHistFillStyle(0); - HttStyle->SetHistLineColor(1); - HttStyle->SetHistLineStyle(0); - HttStyle->SetHistLineWidth(3); - HttStyle->SetNdivisions(505, "X"); - - // Functions - HttStyle->SetFuncColor(1); - HttStyle->SetFuncStyle(0); - HttStyle->SetFuncWidth(2); - - // Various - HttStyle->SetMarkerStyle(20); - HttStyle->SetMarkerColor(kBlack); - HttStyle->SetMarkerSize (1.1); - - HttStyle->SetTitleBorderSize(0); - HttStyle->SetTitleFillColor (0); - HttStyle->SetTitleX (0.2); - - HttStyle->SetTitleSize (0.055,"X"); - HttStyle->SetTitleOffset(1.200,"X"); - HttStyle->SetLabelOffset(0.005,"X"); - HttStyle->SetLabelSize (0.040,"X"); - HttStyle->SetLabelFont (42 ,"X"); - - HttStyle->SetStripDecimals(kFALSE); - HttStyle->SetLineStyleString(11,"20 10"); - - HttStyle->SetTitleSize (0.055,"Y"); - HttStyle->SetTitleOffset(1.600,"Y"); - HttStyle->SetLabelOffset(0.010,"Y"); - HttStyle->SetLabelSize (0.040,"Y"); - HttStyle->SetLabelFont (42 ,"Y"); - - HttStyle->SetTextSize (0.055); - HttStyle->SetTextFont (42); - - HttStyle->SetStatFont (42); - HttStyle->SetTitleFont (42); - HttStyle->SetTitleFont (42,"X"); - HttStyle->SetTitleFont (42,"Y"); - - HttStyle->SetOptStat (0); - return; -} - -TCanvas* MakeCanvas(const char* name, const char *title, int dX, int dY) -{ - // Start with a canvas - TCanvas *canvas = new TCanvas(name,title,0,0,dX,dY); - // General overall stuff - canvas->SetFillColor (0); - canvas->SetBorderMode (0); - canvas->SetBorderSize (10); - // Set margins to reasonable defaults - canvas->SetLeftMargin (0.18); - canvas->SetRightMargin (0.05); - canvas->SetTopMargin (0.08); - canvas->SetBottomMargin (0.15); - // Setup a frame which makes sense - canvas->SetFrameFillStyle (0); - canvas->SetFrameLineStyle (0); - canvas->SetFrameBorderMode(0); - canvas->SetFrameBorderSize(10); - canvas->SetFrameFillStyle (0); - canvas->SetFrameLineStyle (0); - canvas->SetFrameBorderMode(0); - canvas->SetFrameBorderSize(10); - - return canvas; -} - -void InitSubPad(TPad* pad, int i) -{ - pad->cd(i); - TPad *tmpPad = (TPad*) pad->GetPad(i); - tmpPad->SetLeftMargin (0.18); - tmpPad->SetTopMargin (0.05); - tmpPad->SetRightMargin (0.07); - tmpPad->SetBottomMargin(0.15); - return; -} - -void InitSignal(TH1 *hist) -{ - hist->SetFillStyle(0.); - hist->SetLineStyle(11); - hist->SetLineWidth(3.); - hist->SetLineColor(kBlue); - //hist->SetLineColor(kBlue+3); -} - -void InitHist(TH1 *hist, const char *xtit, const char *ytit, int color, int style) -{ - hist->SetXTitle(xtit); - hist->SetYTitle(ytit); - hist->SetLineColor(kBlack); - hist->SetLineWidth( 3.); - hist->SetFillColor(color ); - hist->SetFillStyle(style ); - hist->SetTitleSize (0.055,"Y"); - hist->SetTitleOffset(1.600,"Y"); - hist->SetLabelOffset(0.014,"Y"); - hist->SetLabelSize (0.040,"Y"); - hist->SetLabelFont (42 ,"Y"); - hist->SetTitleSize (0.055,"X"); - hist->SetTitleOffset(1.300,"X"); - hist->SetLabelOffset(0.014,"X"); - hist->SetLabelSize (0.040,"X"); - hist->SetLabelFont (42 ,"X"); - hist->SetMarkerStyle(20); - hist->SetMarkerColor(color); - hist->SetMarkerSize (0.6); - hist->GetYaxis()->SetTitleFont(42); - hist->GetXaxis()->SetTitleFont(42); - hist->SetTitle(""); - return; -} - -void InitData(TH1* hist) -{ - hist->SetMarkerStyle(20.); - hist->SetMarkerSize (1.3); - hist->SetLineWidth ( 3.); -} - -void SetLegendStyle(TLegend* leg) -{ - leg->SetFillStyle (0); - leg->SetFillColor (0); - leg->SetBorderSize(0); -} - -void CMSPrelim(const char* dataset, const char* channel, double lowX, double lowY) -{ - /* - TPaveText* cmsprel = new TPaveText(lowX, lowY+0.06, lowX+0.30, lowY+0.16, "NDC"); - cmsprel->SetBorderSize( 0 ); - cmsprel->SetFillStyle( 0 ); - cmsprel->SetTextAlign( 12 ); - cmsprel->SetTextSize ( 0.03 ); - cmsprel->SetTextColor( 1 ); - cmsprel->SetTextFont ( 62 ); - cmsprel->AddText("CMS"); - cmsprel->Draw(); - - TPaveText* lumi = new TPaveText(lowX+0.08, lowY+0.061, lowX+0.45, lowY+0.161, "NDC"); - */ - - TPaveText* lumi = new TPaveText(lowX, lowY+0.06, lowX+0.30, lowY+0.16, "NDC"); - lumi->SetBorderSize( 0 ); - lumi->SetFillStyle( 0 ); - lumi->SetTextAlign( 12 ); - lumi->SetTextSize ( 0.035 ); - lumi->SetTextColor( 1 ); - lumi->SetTextFont ( 62 ); - lumi->AddText(dataset); - lumi->Draw(); - - TPaveText* chan = new TPaveText(lowX+0.68, lowY+0.061, lowX+0.80, lowY+0.161, "NDC"); - chan->SetBorderSize( 0 ); - chan->SetFillStyle( 0 ); - chan->SetTextAlign( 12 ); - chan->SetTextSize ( 0.04 ); - chan->SetTextColor( 1 ); - chan->SetTextFont ( 62 ); - chan->AddText(channel); - chan->Draw(); -} diff --git a/PrintTools/source/Print_Histogram.C b/PrintTools/source/Print_Histogram.C index 5a09b17b..0dcfeb6a 100644 --- a/PrintTools/source/Print_Histogram.C +++ b/PrintTools/source/Print_Histogram.C @@ -1,8 +1,8 @@ /*! * \file Print_Histogram.C * \brief Print histograms with specified name superimposing several files. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-04 created * * Copyright 2014 Konstantin Androsov , diff --git a/PrintTools/source/Print_Selection.C b/PrintTools/source/Print_Selection.C index ddac4154..ceb0c66f 100644 --- a/PrintTools/source/Print_Selection.C +++ b/PrintTools/source/Print_Selection.C @@ -1,8 +1,8 @@ /*! * \file Print_Selection.C * \brief Print event selection histograms. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-02-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/PrintTools/source/Print_SmartHistogram.C b/PrintTools/source/Print_SmartHistogram.C index 160d3b42..dd2d30e5 100644 --- a/PrintTools/source/Print_SmartHistogram.C +++ b/PrintTools/source/Print_SmartHistogram.C @@ -1,8 +1,8 @@ /*! * \file Print_SmartHistogram.C * \brief Print smart histograms with specified name superimposing several files. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-03 created * * Copyright 2014 Konstantin Androsov , diff --git a/PrintTools/source/Print_Stack.C b/PrintTools/source/Print_Stack.C index 3826cfdc..0adf3ad3 100644 --- a/PrintTools/source/Print_Stack.C +++ b/PrintTools/source/Print_Stack.C @@ -1,8 +1,8 @@ /*! * \file Print_Stack.C * \brief Print stack with specified name superimposing several files. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-03 created * * Copyright 2014 Konstantin Androsov , @@ -55,11 +55,9 @@ public: Print_Stack(const std::string& source_cfg, const std::string& anaDataFileName, const std::string& output_path, const std::string& channel_name, const std::string& id_selection, const std::string& _hist_name, const std::string& signal_list, bool _is_blind = false, bool _draw_ratio = true, - bool _draw_bkg_errors = false, bool _use_log_y = false, bool _divide_by_BinWidth = true, - double _max_y_sf = 1.1) + bool _draw_bkg_errors = false) : anaDataReader(anaDataFileName), hist_name(_hist_name), is_blind(_is_blind), draw_ratio(_draw_ratio), - draw_bkg_errors(_draw_bkg_errors), use_log_y(_use_log_y), divide_by_BinWidth(_divide_by_BinWidth), - max_y_sf(_max_y_sf) + draw_bkg_errors(_draw_bkg_errors) { gROOT->SetMustClean(kFALSE); @@ -99,27 +97,20 @@ public: private: void PrintStackedPlots(const analysis::FlatAnalyzerDataMetaId_noName& id, analysis::EventCategory eventCategory) { - typedef root_ext::SmartHistogram SmartHistogram; - typedef std::shared_ptr SmartHistogramPtr; - std::set histogram_set; - std::ostringstream ss_title; ss_title << id << ": " << hist_name; analysis::StackedPlotDescriptor stackDescriptor(ss_title.str(), false, analysis::detail::ChannelNameMapLatex.at(channel), - //analysis::detail::eventCategoryNamesMap.at(eventCategory), eventCategoryMap.at(eventCategory), - draw_ratio, draw_bkg_errors,divide_by_BinWidth); + draw_ratio, draw_bkg_errors); for(const analysis::DataCategory* category : dataCategories->GetAllCategories()) { if(!category->draw) continue; const analysis::FlatAnalyzerDataId full_id = id.MakeId(category->name); - const TH1D* original_histogram = anaDataReader.GetHistogram(full_id, hist_name); - if(!original_histogram) continue; - SmartHistogramPtr histogram(new SmartHistogram(*original_histogram, use_log_y, max_y_sf)); - histogram_set.insert(histogram); + const auto histogram = anaDataReader.GetHistogram(full_id, channel, hist_name); + if(!histogram) continue; if(category->IsSignal() && id.eventCategory != analysis::EventCategory::TwoJets_Inclusive) stackDescriptor.AddSignalHistogram(*histogram, category->title, category->color, @@ -197,6 +188,7 @@ private: { using analysis::EventSubCategory; using analysis::FlatAnalyzerData; + using analysis::FlatAnalyzerData_semileptonic; static const std::vector< std::vector< std::pair > > blindingRegions = { { { std::numeric_limits::max(), std::numeric_limits::lowest() } }, @@ -206,7 +198,7 @@ private: }; static const std::map histogramsToBlind = { - { FlatAnalyzerData::m_sv_Name(), 1 }, { FlatAnalyzerData::m_vis_Name(), 1 }, + { FlatAnalyzerData_semileptonic::m_sv_Name(), 1 }, { FlatAnalyzerData::m_vis_Name(), 1 }, { FlatAnalyzerData::m_bb_Name(), 1 }, { FlatAnalyzerData::m_ttbb_Name(), 2 }, { FlatAnalyzerData::m_ttbb_kinfit_Name(), 2 }, { FlatAnalyzerData::m_bb_slice_Name(), 3 } }; @@ -235,6 +227,58 @@ private: analysis::FlatAnalyzerDataMetaId_noName meta_id; LoopOptions loop_options; std::string hist_name; - bool is_blind, draw_ratio, draw_bkg_errors, use_log_y, divide_by_BinWidth; - double max_y_sf; + bool is_blind, draw_ratio, draw_bkg_errors; +}; + + +namespace make_tools { +template +struct Factory; + +template<> +struct Factory { + static Print_Stack* Make(int argc, char *argv[]) + { + if(argc != 11) + throw std::runtime_error("Invalid number of command line arguments."); + + int n = 0; + const std::string source_cfg = argv[++n]; + const std::string anaDataFileName = argv[++n]; + const std::string output_path = argv[++n]; + const std::string channel_name = argv[++n]; + const std::string id_selection = argv[++n]; + const std::string hist_name = argv[++n]; + const std::string signal_list = argv[++n]; + const bool is_blind = ReadParameter(argv[++n], "is_blind"); + const bool draw_ratio = ReadParameter(argv[++n], "draw_ratio"); + const bool draw_bkg_errors = ReadParameter(argv[++n], "draw_bkg_errors"); + + return new Print_Stack(source_cfg, anaDataFileName, output_path, channel_name, id_selection, hist_name, + signal_list, is_blind, draw_ratio, draw_bkg_errors); + } + +private: + template + static Param ReadParameter(const std::string& value, const std::string& param_name) + { + try { + char c; + Param param; + std::istringstream ss_param(value); + ss_param.exceptions(std::istream::failbit | std::istream::badbit); + ss_param >> std::boolalpha; + ss_param >> c; + if(c != '@') + throw std::istream::failure("Expected '@' before the parameter value."); + ss_param >> param; + return param; + } catch(std::istream::failure& e) { + std::ostringstream ss; + ss << "Unable to parse parameter '" << param_name << "' from string '" << value << "'.\n" << e.what(); + throw std::runtime_error(ss.str()); + } + } }; +} // make_tools + diff --git a/PrintTools/source/Print_SyncPlots.C b/PrintTools/source/Print_SyncPlots.C index c6f85646..288ee21c 100644 --- a/PrintTools/source/Print_SyncPlots.C +++ b/PrintTools/source/Print_SyncPlots.C @@ -1,8 +1,8 @@ /*! * \file Print_SyncPlots.C * \brief Print control plots that were selected to synchronize produced tree-toople. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-28 created * * Copyright 2014 Konstantin Androsov , diff --git a/PrintTools/source/Print_TreeBranch.C b/PrintTools/source/Print_TreeBranch.C index afedb79d..e4af302a 100644 --- a/PrintTools/source/Print_TreeBranch.C +++ b/PrintTools/source/Print_TreeBranch.C @@ -1,8 +1,8 @@ /*! * \file Print_TreeBranch.C * \brief Print histogram for a tree branch with a specified name superimposing several files. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-03 created * * Copyright 2014 Konstantin Androsov , diff --git a/RunTools/batch.sh b/RunTools/batch.sh index 09a5a0e1..290c0b15 100644 --- a/RunTools/batch.sh +++ b/RunTools/batch.sh @@ -2,8 +2,8 @@ # # \file batch.sh # \brief Definition of a function that submit jobs on batch. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/check_crab_duplicates.sh b/RunTools/check_crab_duplicates.sh index 74abe4d1..0871f797 100755 --- a/RunTools/check_crab_duplicates.sh +++ b/RunTools/check_crab_duplicates.sh @@ -2,8 +2,8 @@ # # \file check_crab_duplicates.sh # \brief Check if there are duplicated files in CRAB output and, if needed, remove older duplicates. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/check_finished_tree.sh b/RunTools/check_finished_tree.sh index c9381285..07e06cde 100755 --- a/RunTools/check_finished_tree.sh +++ b/RunTools/check_finished_tree.sh @@ -2,8 +2,8 @@ # # \file check_finished_tree.sh # \brief Check which jobs were finished with success and copy jobs that are not successful in a new directory. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/collect_partial_jobs.sh b/RunTools/collect_partial_jobs.sh index c5e614da..bff44c13 100755 --- a/RunTools/collect_partial_jobs.sh +++ b/RunTools/collect_partial_jobs.sh @@ -2,8 +2,8 @@ # # \file collect_partial_jobs.sh # \brief Collect partially finished TREE-production jobs and create text dataset-files for successful jobs. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/generate_file_list.sh b/RunTools/generate_file_list.sh index ca4d9c6a..17864b11 100755 --- a/RunTools/generate_file_list.sh +++ b/RunTools/generate_file_list.sh @@ -2,8 +2,8 @@ # # \file generate_file_list.sh # \brief Generate a set of text files that contain list of all the files from a chosen dataset. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/hadd_analysis.sh b/RunTools/hadd_analysis.sh index c68c32dc..62c80eb4 100755 --- a/RunTools/hadd_analysis.sh +++ b/RunTools/hadd_analysis.sh @@ -2,8 +2,8 @@ # # \file hadd_analysis.sh # \brief Apply hadd command to all analysis output ROOT files and place the results into the output directory. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/make.sh b/RunTools/make.sh index eeb20fee..06c98c54 100755 --- a/RunTools/make.sh +++ b/RunTools/make.sh @@ -2,8 +2,8 @@ # # \file make.sh # \brief Compile program executable for a given C++ file, passing command line arguments into the main object constructor. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2013, 2014 Konstantin Androsov , # Maria Teresa Grippo @@ -88,7 +88,7 @@ int main() g++ -std=c++0x -Wall $COMPILE_FLAGS \ -I. -I$CMSSW_BASE/src -I$CMSSW_RELEASE_BASE/src -I$ROOT_INCLUDE_PATH -I$BOOST_INCLUDE_PATH \ - $( root-config --libs ) -lMathMore -lGenVector -lTMVA -L$BOOST_BASE/lib \ + $( root-config --libs ) -lMathMore -lGenVector -lTMVA -lASImage -L$BOOST_BASE/lib \ -o $EXE_NAME $CODE_OUT RESULT=$? diff --git a/RunTools/make_withFactory.sh b/RunTools/make_withFactory.sh index 3ade6be5..18bac37c 100755 --- a/RunTools/make_withFactory.sh +++ b/RunTools/make_withFactory.sh @@ -2,8 +2,8 @@ # # \file make_withFactory.sh # \brief Compile program executable for a given C++ file, creating the main object using make_tools::Factory class. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) g++ -std=c++0x -Wall -O3 \ -I. -I$CMSSW_BASE/src -I$CMSSW_RELEASE_BASE/src -I$ROOT_INCLUDE_PATH -I$BOOST_INCLUDE_PATH \ - $( root-config --libs ) -lMathMore -lGenVector \ + $( root-config --libs ) -lMathMore -lGenVector -lASImage \ -o $EXE_NAME $CODE_OUT RESULT=$? diff --git a/RunTools/print_control_plots.sh b/RunTools/print_control_plots.sh new file mode 100755 index 00000000..6fb2a674 --- /dev/null +++ b/RunTools/print_control_plots.sh @@ -0,0 +1,126 @@ +#!/bin/bash +# +# \file print_control_plots.sh +# \brief Print all control plots to put to the AN. +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) +# +# Copyright 2015 Konstantin Androsov , +# Maria Teresa Grippo +# +# This file is part of X->HH->bbTauTau. +# +# X->HH->bbTauTau is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# X->HH->bbTauTau is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with X->HH->bbTauTau. If not, see . + +if [ $# -ne 2 ] ; then + echo "Usage: input_file output_path" + exit +fi + +INPUT_FILE=$1 +OUTPUT_PATH=$2 + +SOURCE_CFG="Analysis/config/sources.cfg" +CHANNEL_NAME="tauTau" +SIGNAL_NAME="ggHhh300" +IS_BLIND=false +DRAW_RATIO=false +DRAW_BKG_ERRORS=true +USE_LOG_Y=false + +SEL_2JET="2jets/NoCuts/OS_Isolated/Central" +SEL_0TAG_NO_MASS_CUT="2jets0btag/NoCuts/OS_Isolated/Central" +SEL_1TAG_NO_MASS_CUT="2jets1btag/NoCuts/OS_Isolated/Central" +SEL_2TAG_NO_MASS_CUT="2jets2btag/NoCuts/OS_Isolated/Central" +SEL_0TAG_MASS_CUT="2jets0btag/MassWindow/OS_Isolated/Central" +SEL_1TAG_MASS_CUT="2jets1btag/MassWindow/OS_Isolated/Central" +SEL_2TAG_MASS_CUT="2jets2btag/MassWindow/OS_Isolated/Central" + +if [ ! -f "$INPUT_FILE" ] ; then + echo "ERROR: input file '$INPUT_FILE' not found." + exit +fi + +if [ ! -d "$OUTPUT_PATH" ] ; then + echo "ERROR: output path '$OUTPUT_PATH' not found." + exit +fi + +MAKE_PATH="./RunTools/make_withFactory.sh" +CMD_NAME="Print_Stack" +EXE_NAME="$OUTPUT_PATH/$CMD_NAME" + +$MAKE_PATH $OUTPUT_PATH $CMD_NAME $CMD_NAME +RESULT=$? +if [ $RESULT -ne 0 ] ; then + echo "Compilation of $EXE_NAME failed with an error code $RESULT." + exit +fi + +function print_plot { + local PLOT_NAME=$1 + local SELECTION=$2 + local OUTPUT_DIR=$3 + local OUTPUT_NAME=$4 + echo "Printing $PLOT_NAME in $SELECTION ..." + $EXE_NAME $SOURCE_CFG $INPUT_FILE $OUTPUT_PATH $CHANNEL_NAME $SELECTION $PLOT_NAME $SIGNAL_NAME \ + "@$IS_BLIND" "@$DRAW_RATIO" "@$DRAW_BKG_ERRORS" + RESULT=$? + if [ $RESULT -ne 0 ] ; then + exit + fi + local SELECTION_SUFFIX=$( echo $SELECTION | sed 's/\//_/g' ) + local RESULT_FILE_PATH="$OUTPUT_PATH/${CHANNEL_NAME}_${PLOT_NAME}_${SELECTION_SUFFIX}.pdf" + if [ ! -f "$RESULT_FILE_PATH" ] ; then + echo "ERROR: Output file '$RESULT_FILE_PATH' not found." + exit + fi + local OUTPUT_DIR_PATH="$OUTPUT_PATH/$OUTPUT_DIR" + mkdir -p $OUTPUT_DIR_PATH + local OUTPUT_FILE_PATH="$OUTPUT_DIR_PATH/$OUTPUT_NAME.pdf" + mv $RESULT_FILE_PATH $OUTPUT_FILE_PATH +} + +print_plot "MET" $SEL_2JET "ControlPlots/tautau" "inclusive_MET" +print_plot "csv_b1" $SEL_2JET "ControlPlots/tautau" "inclusive_csv_b1" +print_plot "csv_b2" $SEL_2JET "ControlPlots/tautau" "inclusive_csv_b2" +print_plot "eta_1" $SEL_2JET "ControlPlots/tautau" "inclusive_eta_1" +print_plot "eta_2" $SEL_2JET "ControlPlots/tautau" "inclusive_eta_2" +print_plot "eta_b1" $SEL_2JET "ControlPlots/tautau" "inclusive_eta_b1" +print_plot "eta_b2" $SEL_2JET "ControlPlots/tautau" "inclusive_eta_b2" +print_plot "pt_1" $SEL_2JET "ControlPlots/tautau" "inclusive_pt_1" +print_plot "pt_2" $SEL_2JET "ControlPlots/tautau" "inclusive_pt_2" +print_plot "pt_b1" $SEL_2JET "ControlPlots/tautau" "inclusive_pt_b1" +print_plot "pt_b2" $SEL_2JET "ControlPlots/tautau" "inclusive_pt_b2" + +#print_plot "m_ttbb_kinfit" $SEL_0TAG_MASS_CUT "MassPlots/tautau" "0tag_m_H_kinfit_masscut" +print_plot "m_ttbb_kinfit" $SEL_0TAG_NO_MASS_CUT "MassPlots/tautau" "0tag_m_H_kinfit_no_mass_cut" +print_plot "m_ttbb" $SEL_0TAG_NO_MASS_CUT "MassPlots/tautau" "0tag_m_H_no_kinfit_no_mass_cut" +print_plot "m_bb" $SEL_0TAG_NO_MASS_CUT "MassPlots/tautau" "0tag_m_bb" +print_plot "m_sv" $SEL_0TAG_NO_MASS_CUT "MassPlots/tautau" "0tag_m_sv" + +#print_plot "m_ttbb_kinfit" $SEL_1TAG_MASS_CUT "MassPlots/tautau" "1tag_m_H_kinfit_masscut" +print_plot "m_ttbb_kinfit" $SEL_1TAG_NO_MASS_CUT "MassPlots/tautau" "1tag_m_H_kinfit_no_mass_cut" +print_plot "m_ttbb" $SEL_1TAG_NO_MASS_CUT "MassPlots/tautau" "1tag_m_H_no_kinfit_no_mass_cut" +print_plot "m_bb" $SEL_1TAG_NO_MASS_CUT "MassPlots/tautau" "1tag_m_bb" +print_plot "m_sv" $SEL_1TAG_NO_MASS_CUT "MassPlots/tautau" "1tag_m_sv" + +#print_plot "m_ttbb_kinfit" $SEL_2TAG_MASS_CUT "MassPlots/tautau" "2tag_m_H_kinfit_masscut" +print_plot "m_ttbb_kinfit" $SEL_2TAG_NO_MASS_CUT "MassPlots/tautau" "2tag_m_H_kinfit_no_mass_cut" +print_plot "m_ttbb" $SEL_2TAG_NO_MASS_CUT "MassPlots/tautau" "2tag_m_H_no_kinfit_no_mass_cut" +print_plot "m_bb" $SEL_2TAG_NO_MASS_CUT "MassPlots/tautau" "2tag_m_bb" +print_plot "m_sv" $SEL_2TAG_NO_MASS_CUT "MassPlots/tautau" "2tag_m_sv" + + +rm -f $EXE_NAME diff --git a/RunTools/python/readFileList.py b/RunTools/python/readFileList.py index a7635a17..28da76e5 100644 --- a/RunTools/python/readFileList.py +++ b/RunTools/python/readFileList.py @@ -1,8 +1,8 @@ ## @package readFileList # Definition of the function to read intput file list from a text file. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/python/skimRiccardo.py b/RunTools/python/skimRiccardo.py index 7e22dfe2..ab3c869d 100755 --- a/RunTools/python/skimRiccardo.py +++ b/RunTools/python/skimRiccardo.py @@ -1,8 +1,8 @@ ## @package skimRiccardo # Definition of the function to skim events from CERN sync tuples. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/replica.sh b/RunTools/replica.sh index fed0bcb6..527039b9 100755 --- a/RunTools/replica.sh +++ b/RunTools/replica.sh @@ -2,8 +2,8 @@ # # \file replica.sh # \brief Run data replica between sites using lcg-cp. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/replica_xrd.sh b/RunTools/replica_xrd.sh index 41104884..fb7d14d9 100755 --- a/RunTools/replica_xrd.sh +++ b/RunTools/replica_xrd.sh @@ -2,8 +2,8 @@ # # \file replica_xrd.sh # \brief Run data replica between sites using xrdcp. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/resubmitAna_jobs.sh b/RunTools/resubmitAna_jobs.sh index d02c34c6..d45bd3ea 100755 --- a/RunTools/resubmitAna_jobs.sh +++ b/RunTools/resubmitAna_jobs.sh @@ -2,8 +2,8 @@ # # \file resubmitAna_jobs.sh # \brief Resubmit failed analysis jobs on batch. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/resubmit_jobs.sh b/RunTools/resubmit_jobs.sh index 8288e296..4a4c9248 100755 --- a/RunTools/resubmit_jobs.sh +++ b/RunTools/resubmit_jobs.sh @@ -2,8 +2,8 @@ # # \file resubmit_jobs.sh # \brief Resubmit failed jobs on batch. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/runAnalysis.sh b/RunTools/runAnalysis.sh index a93dc9e5..444e270e 100755 --- a/RunTools/runAnalysis.sh +++ b/RunTools/runAnalysis.sh @@ -2,8 +2,8 @@ # # \file runAnalysis.sh # \brief Run analysis jobs with environment setup and output redirection. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/runPatProducer.sh b/RunTools/runPatProducer.sh index 60d4b5a0..022b61be 100755 --- a/RunTools/runPatProducer.sh +++ b/RunTools/runPatProducer.sh @@ -2,8 +2,8 @@ # # \file runPatProducer.sh # \brief Run PAT-production jobs with environment setup and output redirection. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/runTreeProducer.sh b/RunTools/runTreeProducer.sh index 5291db34..17828b20 100755 --- a/RunTools/runTreeProducer.sh +++ b/RunTools/runTreeProducer.sh @@ -2,8 +2,8 @@ # # \file runTreeProducer.sh # \brief Run TREE production jobs with environment setup and output redirection. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/scan_trees.sh b/RunTools/scan_trees.sh index e18e13bc..9a8a3518 100755 --- a/RunTools/scan_trees.sh +++ b/RunTools/scan_trees.sh @@ -2,7 +2,7 @@ # # \file scan_trees.sh # \brief Scan root files in the given directory for the specified event. -# \author Konstantin Androsov (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) # \date 2014-11-25 created # # Copyright 2014 Konstantin Androsov diff --git a/RunTools/source/Scan.C b/RunTools/source/Scan.C index 0dc3b878..027411b5 100644 --- a/RunTools/source/Scan.C +++ b/RunTools/source/Scan.C @@ -1,7 +1,7 @@ /*! * \file Scan.C * \brief ROOT macro to scan analysis tree file for the specified event. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * \date 2014-11-25 created * * Copyright 2014 Konstantin Androsov diff --git a/RunTools/submitAllAnalysis.sh b/RunTools/submitAllAnalysis.sh index 0ef92e93..b51bba7b 100755 --- a/RunTools/submitAllAnalysis.sh +++ b/RunTools/submitAllAnalysis.sh @@ -2,8 +2,8 @@ # # \file submitAllAnalysis.sh # \brief Submit all available analysis datasets on batch. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/submitAnalysis_Batch.sh b/RunTools/submitAnalysis_Batch.sh index c4a54aec..f8f32b18 100755 --- a/RunTools/submitAnalysis_Batch.sh +++ b/RunTools/submitAnalysis_Batch.sh @@ -2,8 +2,8 @@ # # \file submitAnalysis_Batch.sh # \brief Submit analysis jobs for a given dataset on batch. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/submitMultiAnalysis_Batch.sh b/RunTools/submitMultiAnalysis_Batch.sh index 3afdd95e..88fb1727 100755 --- a/RunTools/submitMultiAnalysis_Batch.sh +++ b/RunTools/submitMultiAnalysis_Batch.sh @@ -2,8 +2,8 @@ # # \file submitAnalysis_Batch.sh # \brief Submit analysis jobs for a given dataset on batch for all analysis channels. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/submitPatProducer_Batch.sh b/RunTools/submitPatProducer_Batch.sh index 69811491..124c46d6 100755 --- a/RunTools/submitPatProducer_Batch.sh +++ b/RunTools/submitPatProducer_Batch.sh @@ -2,8 +2,8 @@ # # \file submitPatProducer_Batch.sh # \brief Submit PAT production jobs for a given dataset on batch. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/RunTools/submitTreeProducer_Batch.sh b/RunTools/submitTreeProducer_Batch.sh index ca28e90d..f131b25d 100755 --- a/RunTools/submitTreeProducer_Batch.sh +++ b/RunTools/submitTreeProducer_Batch.sh @@ -2,8 +2,8 @@ # # \file submitTreeProducer_Batch.sh # \brief Submit TREE production jobs for a given dataset on batch. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/TreeProduction/interface/Electron.h b/TreeProduction/interface/Electron.h index ce2f4c5f..bba0f2d1 100644 --- a/TreeProduction/interface/Electron.h +++ b/TreeProduction/interface/Electron.h @@ -1,8 +1,8 @@ /*! * \file Electoron.h * \brief Definiton of ntuple::ElectronTree and ntuple::Electron classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/Event.h b/TreeProduction/interface/Event.h index 7f4a8bab..bd8bc4d3 100644 --- a/TreeProduction/interface/Event.h +++ b/TreeProduction/interface/Event.h @@ -1,8 +1,8 @@ /*! * \file Event.h * \brief Definiton of ntuple::EventTree and ntuple::Event classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/GenEvent.h b/TreeProduction/interface/GenEvent.h index eb61b069..20ecef98 100644 --- a/TreeProduction/interface/GenEvent.h +++ b/TreeProduction/interface/GenEvent.h @@ -1,8 +1,8 @@ /*! * \file GenEvent.h * \brief Definiton of ntuple::GenEventTree and ntuple::GenEvent classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/GenJet.h b/TreeProduction/interface/GenJet.h index 20f1a8dd..5d877616 100644 --- a/TreeProduction/interface/GenJet.h +++ b/TreeProduction/interface/GenJet.h @@ -1,8 +1,8 @@ /*! * \file GenJet.h * \brief Definiton of ntuple::GenJetTree and ntuple::GenJet classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/GenMET.h b/TreeProduction/interface/GenMET.h index dd6ad989..818f35bd 100644 --- a/TreeProduction/interface/GenMET.h +++ b/TreeProduction/interface/GenMET.h @@ -1,8 +1,8 @@ /*! * \file GenMET.h * \brief Definiton of ntuple::GenMETTree and ntuple::GenMET classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/GenParticle.h b/TreeProduction/interface/GenParticle.h index 4728a02d..b05c20c6 100644 --- a/TreeProduction/interface/GenParticle.h +++ b/TreeProduction/interface/GenParticle.h @@ -1,8 +1,8 @@ /*! * \file GenParticle.h * \brief Definiton of ntuple::GenParticleTree and ntuple::GenParticle classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-24 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/Jet.h b/TreeProduction/interface/Jet.h index 7950f4af..a183d62b 100644 --- a/TreeProduction/interface/Jet.h +++ b/TreeProduction/interface/Jet.h @@ -1,8 +1,8 @@ /*! * \file Jet.h * \brief Definiton of ntuple::JetTree and ntuple::Jet classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-25 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/MET.h b/TreeProduction/interface/MET.h index 4bb20c47..49e00488 100644 --- a/TreeProduction/interface/MET.h +++ b/TreeProduction/interface/MET.h @@ -1,8 +1,8 @@ /*! * \file MET.h * \brief Definiton of ntuple::METTree and ntuple::MET classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-25 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/Muon.h b/TreeProduction/interface/Muon.h index 5531ec68..55488cdc 100644 --- a/TreeProduction/interface/Muon.h +++ b/TreeProduction/interface/Muon.h @@ -1,8 +1,8 @@ /*! * \file Muon.h * \brief Definiton of ntuple::MuonTree and ntuple::Muon classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-25 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/PFCand.h b/TreeProduction/interface/PFCand.h index a62efc33..9fc97dec 100644 --- a/TreeProduction/interface/PFCand.h +++ b/TreeProduction/interface/PFCand.h @@ -1,8 +1,8 @@ /*! * \file PFCand.h * \brief Definiton of ntuple::PFCandTree and ntuple::PFCand classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-05-30 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/SmartTree.h b/TreeProduction/interface/SmartTree.h index 290d28f9..6aec2d31 100644 --- a/TreeProduction/interface/SmartTree.h +++ b/TreeProduction/interface/SmartTree.h @@ -1,7 +1,7 @@ /*! * \file SmartTree.h * \brief Definition of SmartTree class. - * \author Konstantin Androsov (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) * * Copyright 2013, 2014 Konstantin Androsov * diff --git a/TreeProduction/interface/Tau.h b/TreeProduction/interface/Tau.h index 12f9c7ac..bb9025fe 100644 --- a/TreeProduction/interface/Tau.h +++ b/TreeProduction/interface/Tau.h @@ -1,8 +1,8 @@ /*! * \file Tau.h * \brief Definiton of ntuple::TauTree and ntuple::Tau classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-25 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/Track.h b/TreeProduction/interface/Track.h index 7a206482..9342dd59 100644 --- a/TreeProduction/interface/Track.h +++ b/TreeProduction/interface/Track.h @@ -1,8 +1,8 @@ /*! * \file Track.h * \brief Definiton of ntuple::TrackTree and ntuple::Track classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-25 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/Trigger.h b/TreeProduction/interface/Trigger.h index 843554a9..947c83fa 100644 --- a/TreeProduction/interface/Trigger.h +++ b/TreeProduction/interface/Trigger.h @@ -1,8 +1,8 @@ /*! * \file Trigger.h * \brief Definiton of ntuple::TriggerTree and ntuple::Trigger classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-25 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/TriggerObject.h b/TreeProduction/interface/TriggerObject.h index cdde51f5..5126fa59 100644 --- a/TreeProduction/interface/TriggerObject.h +++ b/TreeProduction/interface/TriggerObject.h @@ -1,8 +1,8 @@ /*! * \file TriggerObject.h * \brief Definiton of ntuple::TriggerObjectTree and ntuple::TriggerObject classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-25 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/TriggerTools.h b/TreeProduction/interface/TriggerTools.h index 68647662..f8914433 100644 --- a/TreeProduction/interface/TriggerTools.h +++ b/TreeProduction/interface/TriggerTools.h @@ -1,8 +1,8 @@ /*! * \file TriggerTools.h * \brief Definiton of tools to work with embedded trigger information. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-04-29 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/interface/Vertex.h b/TreeProduction/interface/Vertex.h index d3eecc5f..9705e2c2 100644 --- a/TreeProduction/interface/Vertex.h +++ b/TreeProduction/interface/Vertex.h @@ -1,8 +1,8 @@ /*! * \file Vertex.h * \brief Definiton of ntuple::VertexTree and ntuple::Vertex classes. - * \author Konstantin Androsov (Siena University, INFN Pisa) - * \author Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Konstantin Androsov (University of Siena, INFN Pisa) + * \author Maria Teresa Grippo (University of Siena, INFN Pisa) * \date 2014-03-25 created * * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/ElectronBlock.cc b/TreeProduction/plugins/ElectronBlock.cc index 3443022e..c1bd53ef 100644 --- a/TreeProduction/plugins/ElectronBlock.cc +++ b/TreeProduction/plugins/ElectronBlock.cc @@ -1,8 +1,8 @@ /*! * \file ElectronsBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/EventBlock.cc b/TreeProduction/plugins/EventBlock.cc index f6fd4b1c..98703b40 100644 --- a/TreeProduction/plugins/EventBlock.cc +++ b/TreeProduction/plugins/EventBlock.cc @@ -1,8 +1,8 @@ /*! * \file EventBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/GenEventBlock.cc b/TreeProduction/plugins/GenEventBlock.cc index 608db712..ada9f877 100644 --- a/TreeProduction/plugins/GenEventBlock.cc +++ b/TreeProduction/plugins/GenEventBlock.cc @@ -1,8 +1,8 @@ /*! * \file GenEventBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/GenJetBlock.cc b/TreeProduction/plugins/GenJetBlock.cc index eb899adb..12abe8a7 100644 --- a/TreeProduction/plugins/GenJetBlock.cc +++ b/TreeProduction/plugins/GenJetBlock.cc @@ -1,8 +1,8 @@ /*! * \file GenJetBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/GenMETBlock.cc b/TreeProduction/plugins/GenMETBlock.cc index 5ed26327..1e4b1302 100644 --- a/TreeProduction/plugins/GenMETBlock.cc +++ b/TreeProduction/plugins/GenMETBlock.cc @@ -1,8 +1,8 @@ /*! * \file GenMETBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/GenParticleBlock.cc b/TreeProduction/plugins/GenParticleBlock.cc index 6e8d14a4..5068820c 100644 --- a/TreeProduction/plugins/GenParticleBlock.cc +++ b/TreeProduction/plugins/GenParticleBlock.cc @@ -1,8 +1,8 @@ /*! * \file GenParticleBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/JetBlock.cc b/TreeProduction/plugins/JetBlock.cc index d7e7a8e2..53138251 100644 --- a/TreeProduction/plugins/JetBlock.cc +++ b/TreeProduction/plugins/JetBlock.cc @@ -1,8 +1,8 @@ /*! * \file JetBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/METBlock.cc b/TreeProduction/plugins/METBlock.cc index 0d8bdac5..63ea367c 100644 --- a/TreeProduction/plugins/METBlock.cc +++ b/TreeProduction/plugins/METBlock.cc @@ -1,8 +1,8 @@ /*! * \file METBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/MuonBlock.cc b/TreeProduction/plugins/MuonBlock.cc index 0b653ddd..cc5b42eb 100644 --- a/TreeProduction/plugins/MuonBlock.cc +++ b/TreeProduction/plugins/MuonBlock.cc @@ -1,8 +1,8 @@ /*! * \file MuonBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/PFCandBlock.cc b/TreeProduction/plugins/PFCandBlock.cc index 6001c347..abf1230f 100644 --- a/TreeProduction/plugins/PFCandBlock.cc +++ b/TreeProduction/plugins/PFCandBlock.cc @@ -1,8 +1,8 @@ /*! * \file PFCandBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/TauBlock.cc b/TreeProduction/plugins/TauBlock.cc index a9a3cbca..cfb76a18 100644 --- a/TreeProduction/plugins/TauBlock.cc +++ b/TreeProduction/plugins/TauBlock.cc @@ -1,8 +1,8 @@ /*! * \file TauBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/TrackBlock.cc b/TreeProduction/plugins/TrackBlock.cc index 0a934185..68dd7639 100644 --- a/TreeProduction/plugins/TrackBlock.cc +++ b/TreeProduction/plugins/TrackBlock.cc @@ -1,8 +1,8 @@ /*! * \file TrackBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/TriggerBlock.cc b/TreeProduction/plugins/TriggerBlock.cc index d52b191b..2c6e4ba4 100644 --- a/TreeProduction/plugins/TriggerBlock.cc +++ b/TreeProduction/plugins/TriggerBlock.cc @@ -1,8 +1,8 @@ /*! * \file TriggerBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/TriggerObjectBlock.cc b/TreeProduction/plugins/TriggerObjectBlock.cc index 035ef684..2a927bd0 100644 --- a/TreeProduction/plugins/TriggerObjectBlock.cc +++ b/TreeProduction/plugins/TriggerObjectBlock.cc @@ -1,8 +1,8 @@ /*! * \file TriggerObjectBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/plugins/VertexBlock.cc b/TreeProduction/plugins/VertexBlock.cc index 146cf525..e1fad3ef 100644 --- a/TreeProduction/plugins/VertexBlock.cc +++ b/TreeProduction/plugins/VertexBlock.cc @@ -1,8 +1,8 @@ /*! * \file VertexBlock.cc * \author Original author: Subir Sarkar - * \author Contributing author: Konstantin Androsov (Siena University, INFN Pisa) - * \author Contributing author: Maria Teresa Grippo (Siena University, INFN Pisa) + * \author Contributing author: Konstantin Androsov (University of Siena, INFN Pisa) + * \author Contributing author: Maria Teresa Grippo (University of Siena, INFN Pisa) * * Copyright 2011 Subir Sarkar * Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/ElectronBlock_cfi.py b/TreeProduction/python/ElectronBlock_cfi.py index b2125746..fa8868a5 100644 --- a/TreeProduction/python/ElectronBlock_cfi.py +++ b/TreeProduction/python/ElectronBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/EventBlock_cfi.py b/TreeProduction/python/EventBlock_cfi.py index cde403b4..3a553082 100644 --- a/TreeProduction/python/EventBlock_cfi.py +++ b/TreeProduction/python/EventBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/GenEventBlock_cfi.py b/TreeProduction/python/GenEventBlock_cfi.py index eaef81d9..d3c26fb0 100644 --- a/TreeProduction/python/GenEventBlock_cfi.py +++ b/TreeProduction/python/GenEventBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/GenJetBlock_cfi.py b/TreeProduction/python/GenJetBlock_cfi.py index 7f5c326b..77ace844 100644 --- a/TreeProduction/python/GenJetBlock_cfi.py +++ b/TreeProduction/python/GenJetBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/GenMETBlock_cfi.py b/TreeProduction/python/GenMETBlock_cfi.py index 94baf03d..f3f3bc1d 100644 --- a/TreeProduction/python/GenMETBlock_cfi.py +++ b/TreeProduction/python/GenMETBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/GenParticleBlock_cfi.py b/TreeProduction/python/GenParticleBlock_cfi.py index 3e2754fb..47712daf 100644 --- a/TreeProduction/python/GenParticleBlock_cfi.py +++ b/TreeProduction/python/GenParticleBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/JetBlock_cfi.py b/TreeProduction/python/JetBlock_cfi.py index eaed00d6..d3288dd8 100644 --- a/TreeProduction/python/JetBlock_cfi.py +++ b/TreeProduction/python/JetBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/METBlock_cfi.py b/TreeProduction/python/METBlock_cfi.py index bd24fb30..a4e7932f 100644 --- a/TreeProduction/python/METBlock_cfi.py +++ b/TreeProduction/python/METBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/MuonBlock_cfi.py b/TreeProduction/python/MuonBlock_cfi.py index 43cfda3e..0df6d149 100644 --- a/TreeProduction/python/MuonBlock_cfi.py +++ b/TreeProduction/python/MuonBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/PFCandBlock_cfi.py b/TreeProduction/python/PFCandBlock_cfi.py index 8351c196..38859bd7 100644 --- a/TreeProduction/python/PFCandBlock_cfi.py +++ b/TreeProduction/python/PFCandBlock_cfi.py @@ -1,8 +1,8 @@ ## @package PFCandBlock_cfi # Configuration file that defines the producer of ROOT-tuple for PF candidates. # -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/TreeProduction/python/TauBlock_cfi.py b/TreeProduction/python/TauBlock_cfi.py index 1480e227..2da738a9 100644 --- a/TreeProduction/python/TauBlock_cfi.py +++ b/TreeProduction/python/TauBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/TrackBlock_cfi.py b/TreeProduction/python/TrackBlock_cfi.py index 1b55142a..6318b2dc 100644 --- a/TreeProduction/python/TrackBlock_cfi.py +++ b/TreeProduction/python/TrackBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/TreeContentConfig_cff.py b/TreeProduction/python/TreeContentConfig_cff.py index 7f362068..163d9b99 100644 --- a/TreeProduction/python/TreeContentConfig_cff.py +++ b/TreeProduction/python/TreeContentConfig_cff.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/TriggerBlock_cfi.py b/TreeProduction/python/TriggerBlock_cfi.py index 601968c8..da56b493 100644 --- a/TreeProduction/python/TriggerBlock_cfi.py +++ b/TreeProduction/python/TriggerBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/TriggerObjectBlock_cfi.py b/TreeProduction/python/TriggerObjectBlock_cfi.py index 23be0f69..ab8ff8df 100644 --- a/TreeProduction/python/TriggerObjectBlock_cfi.py +++ b/TreeProduction/python/TriggerObjectBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/VertexBlock_cfi.py b/TreeProduction/python/VertexBlock_cfi.py index ba9f652c..3eb46ab2 100644 --- a/TreeProduction/python/VertexBlock_cfi.py +++ b/TreeProduction/python/VertexBlock_cfi.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/TreeProduction/python/treeProducer.py b/TreeProduction/python/treeProducer.py index 35806f7e..bf450e17 100644 --- a/TreeProduction/python/treeProducer.py +++ b/TreeProduction/python/treeProducer.py @@ -3,8 +3,8 @@ # # \author Subir Sarkar # \author Rosamaria Venditti (INFN Bari, Bari University) -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2011-2013 Subir Sarkar, Rosamaria Venditti (INFN Bari, Bari University) # Copyright 2014 Konstantin Androsov , diff --git a/debug.sh b/debug.sh index 09aa3668..69060293 100755 --- a/debug.sh +++ b/debug.sh @@ -2,8 +2,8 @@ # # \file debug.sh # \brief Compile and run C++ file with a specified name, passing to it command line arguments in debug mode. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/env.sh b/env.sh index 9ddeea4a..4e1aa1b1 100644 --- a/env.sh +++ b/env.sh @@ -2,8 +2,8 @@ # # \file env.sh # \brief Setup analysis environment. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo diff --git a/runx.sh b/runx.sh index 8d261072..b2795160 100755 --- a/runx.sh +++ b/runx.sh @@ -2,8 +2,8 @@ # # \file runx.sh # \brief Compile and run C++ file with a specified name, passing to it command line arguments. -# \author Konstantin Androsov (Siena University, INFN Pisa) -# \author Maria Teresa Grippo (Siena University, INFN Pisa) +# \author Konstantin Androsov (University of Siena, INFN Pisa) +# \author Maria Teresa Grippo (University of Siena, INFN Pisa) # # Copyright 2014 Konstantin Androsov , # Maria Teresa Grippo