Skip to content
Snippets Groups Projects
Commit 8e346792 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'R22_PhysValMon' into 'master' 

tau physval monitoring: merge TauHistUtils into TauDQA, and start cleanup

See merge request atlas/athena!38911
parents bb187223 c4d88f7c
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!38911tau physval monitoring: merge TauHistUtils into TauDQA, and start cleanup
Hide whitespace changes
Inline Side-by-side
Showing
with 289 additions and 112 deletions
PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt
+ 1
− 1
View file @ 8e346792
......@@ -11,5 +11,5 @@ atlas_add_component( TauDQA
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaBaseComps
AthenaMonitoringLib TauAnalysisToolsLib TauHistUtils xAODJet xAODEgamma
AthenaMonitoringLib TauAnalysisToolsLib TrkValHistUtils xAODJet xAODEgamma
xAODTau xAODTruth )
PhysicsAnalysis/TauID/TauHistUtils/src/EVetoPlots.cxx → PhysicsAnalysis/TauID/TauDQA/src/EVetoPlots.cxx
+ 26
− 27
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TauHistUtils/EVetoPlots.h"
#include "EVetoPlots.h"
namespace Tau{
......@@ -12,13 +12,13 @@ EVetoPlots::EVetoPlots(PlotBase* pParent, std::string sDir, std::string sTauJetC
m_EMRadius(nullptr),
m_IsoFrac(nullptr),
m_CentFrac(nullptr),
m_id_BDTEleScore(nullptr),
m_pt_eleBDTloose(nullptr),
m_pt_eleBDTmed(nullptr),
m_pt_eleBDTtight(nullptr),
m_pt_eleBDTlooseHighPt(nullptr),
m_pt_eleBDTmedHighPt(nullptr),
m_pt_eleBDTtightHighPt(nullptr),
m_id_RNNEleScore(nullptr),
m_pt_eleRNNloose(nullptr),
m_pt_eleRNNmed(nullptr),
m_pt_eleRNNtight(nullptr),
m_pt_eleRNNlooseHighPt(nullptr),
m_pt_eleRNNmedHighPt(nullptr),
m_pt_eleRNNtightHighPt(nullptr),
m_sTauJetContainerName(sTauJetContainerName)
{
}
......@@ -35,14 +35,13 @@ void EVetoPlots::initializePlots(){
m_IsoFrac = Book1D("IsoFrac",m_sTauJetContainerName + " Iso Frac; Iso Frac; # Part",20,0,1.);
m_CentFrac = Book1D("CentFrac",m_sTauJetContainerName + " Cent Frac; Cent Frac; # Part",20,0,1.);
m_id_BDTEleScore = Book1D("id_BDTEleScore",m_sTauJetContainerName + " BDTEleScore ; BDTEleScore; # Tau",10,0.,1.05);
m_pt_eleBDTloose = Book1D("Pt_eleBDTloose",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,150.);
m_pt_eleBDTmed = Book1D("Pt_eleBDTmed",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,150.);
m_pt_eleBDTtight = Book1D("Pt_eleBDTtight",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,150.);
m_pt_eleBDTlooseHighPt = Book1D("Pt_eleBDTlooseHighPt",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,1500.);
m_pt_eleBDTmedHighPt = Book1D("Pt_eleBDTmedHighPt",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,1500.);
m_pt_eleBDTtightHighPt = Book1D("Pt_eleBDTtightHighPt",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,1500.);
m_id_RNNEleScore = Book1D("id_RNNEleScore",m_sTauJetContainerName + " RNNEleScore ; RNNEleScore; # Tau",10,0.,1.05);
m_pt_eleRNNloose = Book1D("Pt_eleRNNloose",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,150.);
m_pt_eleRNNmed = Book1D("Pt_eleRNNmed",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,150.);
m_pt_eleRNNtight = Book1D("Pt_eleRNNtight",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,150.);
m_pt_eleRNNlooseHighPt = Book1D("Pt_eleRNNlooseHighPt",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,1500.);
m_pt_eleRNNmedHighPt = Book1D("Pt_eleRNNmedHighPt",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,1500.);
m_pt_eleRNNtightHighPt = Book1D("Pt_eleRNNtightHighPt",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,1500.);
}
void EVetoPlots::fill(const xAOD::TauJet& tau) {
......@@ -62,18 +61,18 @@ void EVetoPlots::fill(const xAOD::TauJet& tau) {
test=tau.detail(xAOD::TauJetParameters::centFrac, avariable);
if (test) m_CentFrac->Fill(avariable,1.);
if(tau.hasDiscriminant(xAOD::TauJetParameters::BDTEleScore) )m_id_BDTEleScore->Fill(tau.discriminant(xAOD::TauJetParameters::BDTEleScore));
if ( tau.isTau(xAOD::TauJetParameters::EleBDTLoose) ) {
m_pt_eleBDTloose ->Fill(tau.pt()/1000.0, 1.0);
m_pt_eleBDTlooseHighPt->Fill(tau.pt()/1000.0, 1.0);
if(tau.hasDiscriminant(xAOD::TauJetParameters::RNNEleScore) )m_id_RNNEleScore->Fill(tau.discriminant(xAOD::TauJetParameters::RNNEleScore));
if ( tau.isTau(xAOD::TauJetParameters::EleRNNLoose) ) {
m_pt_eleRNNloose ->Fill(tau.pt()/1000.0, 1.0);
m_pt_eleRNNlooseHighPt->Fill(tau.pt()/1000.0, 1.0);
}
if ( tau.isTau(xAOD::TauJetParameters::EleBDTMedium) ) {
m_pt_eleBDTmed ->Fill(tau.pt()/1000.0, 1.0);
m_pt_eleBDTmedHighPt->Fill(tau.pt()/1000.0, 1.0);
if ( tau.isTau(xAOD::TauJetParameters::EleRNNMedium) ) {
m_pt_eleRNNmed ->Fill(tau.pt()/1000.0, 1.0);
m_pt_eleRNNmedHighPt->Fill(tau.pt()/1000.0, 1.0);
}
if ( tau.isTau(xAOD::TauJetParameters::EleBDTTight) ) {
m_pt_eleBDTtight ->Fill(tau.pt()/1000.0, 1.0);
m_pt_eleBDTtightHighPt->Fill(tau.pt()/1000.0, 1.0);
if ( tau.isTau(xAOD::TauJetParameters::EleRNNTight) ) {
m_pt_eleRNNtight ->Fill(tau.pt()/1000.0, 1.0);
m_pt_eleRNNtightHighPt->Fill(tau.pt()/1000.0, 1.0);
}
}
......
PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/EVetoPlots.h → PhysicsAnalysis/TauID/TauDQA/src/EVetoPlots.h
+ 10
− 10
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUHISTUTILS_EVETOPLOTS_H
#define TAUHISTUTILS_EVETOPLOTS_H
#ifndef TAUDQA_EVETOPLOTS_H
#define TAUDQA_EVETOPLOTS_H
#include "TrkValHistUtils/PlotBase.h"
#include "xAODTau/TauJet.h"
......@@ -20,13 +20,13 @@ class EVetoPlots: public PlotBase {
TH1* m_EMRadius;
TH1* m_IsoFrac;
TH1* m_CentFrac;
TH1* m_id_BDTEleScore;
TH1* m_pt_eleBDTloose;
TH1* m_pt_eleBDTmed;
TH1* m_pt_eleBDTtight;
TH1* m_pt_eleBDTlooseHighPt;
TH1* m_pt_eleBDTmedHighPt;
TH1* m_pt_eleBDTtightHighPt;
TH1* m_id_RNNEleScore;
TH1* m_pt_eleRNNloose;
TH1* m_pt_eleRNNmed;
TH1* m_pt_eleRNNtight;
TH1* m_pt_eleRNNlooseHighPt;
TH1* m_pt_eleRNNmedHighPt;
TH1* m_pt_eleRNNtightHighPt;
private:
void initializePlots();
......
PhysicsAnalysis/TauID/TauHistUtils/src/EfficiencyPtPlots.cxx → PhysicsAnalysis/TauID/TauDQA/src/EfficiencyPtPlots.cxx
+ 76
− 0
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TauHistUtils/EfficiencyPtPlots.h"
#include "EfficiencyPtPlots.h"
namespace Tau{
EfficiencyPtPlots::EfficiencyPtPlots(PlotBase* pParent, std::string sDir, std::string sTauJetContainerName):
PlotBase(pParent, sDir),
m_eff_pt_jetBDTloose(nullptr),
m_eff_pt_jetBDTmed(nullptr),
m_eff_pt_jetBDTtight(nullptr),
m_eff_jetBDTloose(nullptr),
m_eff_jetBDTmed(nullptr),
m_eff_jetBDTtight(nullptr),
m_eff_pt_jetRNNloose(nullptr),
m_eff_pt_jetRNNmed(nullptr),
m_eff_pt_jetRNNtight(nullptr),
m_eff_jetRNNloose(nullptr),
m_eff_jetRNNmed(nullptr),
m_eff_jetRNNtight(nullptr),
m_sTauJetContainerName(sTauJetContainerName)
{
}
......@@ -24,50 +24,50 @@ EfficiencyPtPlots::~EfficiencyPtPlots()
void EfficiencyPtPlots::initializePlots()
{
m_eff_pt_jetBDTloose = BookTProfile("Eff_Pt_jetBDTloose"," Matched Tau loose eff in pt; pt; eff", 20, 0., 150.0);
m_eff_pt_jetBDTmed = BookTProfile("Eff_Pt_jetBDTmed","Matched Tau med eff in pt; pt; eff", 20, 0.0, 150.0);
m_eff_pt_jetBDTtight = BookTProfile("Eff_Pt_jetBDTtight","Matched Tau tight eff in pt; pt; eff", 20, 0.0, 150.0);
m_eff_pt_jetBDTlooseHighPt = BookTProfile("Eff_Pt_jetBDTlooseHightPt"," Matched Tau loose eff in pt; pt; eff", 20, 0.0, 1500.0);
m_eff_pt_jetBDTmedHighPt = BookTProfile("Eff_Pt_jetBDTmedHightPt","Matched Tau med eff in pt; pt; eff", 20, 0.0, 1500.0);
m_eff_pt_jetBDTtightHighPt = BookTProfile("Eff_Pt_jetBDTtightHightPt","Matched Tau tight eff in pt; pt; eff", 20, 0.0, 1500.0);
m_eff_jetBDTloose = BookTProfile("Eff_jetBDTloose"," Matched Tau loose eff total; bin; eff",3,-1.5,1.5);
m_eff_jetBDTmed = BookTProfile("Eff_jetBDTmed","Matched Tau med eff total; bin; eff",3,-1.5,1.5);
m_eff_jetBDTtight = BookTProfile("Eff_jetBDTtight","Matched Tau tight eff total; bin; eff",3,-1.5,1.5);
m_eff_pt_jetRNNloose = BookTProfile("Eff_Pt_jetRNNloose"," Matched Tau loose eff in pt; pt; eff", 20, 0., 150.0);
m_eff_pt_jetRNNmed = BookTProfile("Eff_Pt_jetRNNmed","Matched Tau med eff in pt; pt; eff", 20, 0.0, 150.0);
m_eff_pt_jetRNNtight = BookTProfile("Eff_Pt_jetRNNtight","Matched Tau tight eff in pt; pt; eff", 20, 0.0, 150.0);
m_eff_pt_jetRNNlooseHighPt = BookTProfile("Eff_Pt_jetRNNlooseHightPt"," Matched Tau loose eff in pt; pt; eff", 20, 0.0, 1500.0);
m_eff_pt_jetRNNmedHighPt = BookTProfile("Eff_Pt_jetRNNmedHightPt","Matched Tau med eff in pt; pt; eff", 20, 0.0, 1500.0);
m_eff_pt_jetRNNtightHighPt = BookTProfile("Eff_Pt_jetRNNtightHightPt","Matched Tau tight eff in pt; pt; eff", 20, 0.0, 1500.0);
m_eff_jetRNNloose = BookTProfile("Eff_jetRNNloose"," Matched Tau loose eff total; bin; eff",3,-1.5,1.5);
m_eff_jetRNNmed = BookTProfile("Eff_jetRNNmed","Matched Tau med eff total; bin; eff",3,-1.5,1.5);
m_eff_jetRNNtight = BookTProfile("Eff_jetRNNtight","Matched Tau tight eff total; bin; eff",3,-1.5,1.5);
}
void EfficiencyPtPlots::fill(const xAOD::TauJet& tau)
{
if ( tau.isTau(xAOD::TauJetParameters::JetBDTSigLoose) ) {
m_eff_pt_jetBDTloose ->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_pt_jetBDTlooseHighPt->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_jetBDTloose ->Fill(0.0, 1.0, 1.0);
if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigLoose) ) {
m_eff_pt_jetRNNloose ->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_pt_jetRNNlooseHighPt->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_jetRNNloose ->Fill(0.0, 1.0, 1.0);
}
else {
m_eff_pt_jetBDTloose ->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_pt_jetBDTlooseHighPt->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_jetBDTloose ->Fill(0.0, 0.0, 1.0);
m_eff_pt_jetRNNloose ->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_pt_jetRNNlooseHighPt->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_jetRNNloose ->Fill(0.0, 0.0, 1.0);
}
if ( tau.isTau(xAOD::TauJetParameters::JetBDTSigMedium) ) {
m_eff_pt_jetBDTmed ->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_pt_jetBDTmedHighPt->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_jetBDTmed ->Fill(0.0, 1.0, 1.0);
if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigMedium) ) {
m_eff_pt_jetRNNmed ->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_pt_jetRNNmedHighPt->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_jetRNNmed ->Fill(0.0, 1.0, 1.0);
}
else {
m_eff_pt_jetBDTmed ->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_pt_jetBDTmedHighPt->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_jetBDTmed ->Fill(0.0, 0.0, 1.0);
m_eff_pt_jetRNNmed ->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_pt_jetRNNmedHighPt->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_jetRNNmed ->Fill(0.0, 0.0, 1.0);
}
if ( tau.isTau(xAOD::TauJetParameters::JetBDTSigTight) ) {
m_eff_pt_jetBDTtight ->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_pt_jetBDTtightHighPt->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_jetBDTtight ->Fill(0.0, 1.0, 1.0);
if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigTight) ) {
m_eff_pt_jetRNNtight ->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_pt_jetRNNtightHighPt->Fill(tau.pt()/1000, 1.0, 1.0);
m_eff_jetRNNtight ->Fill(0.0, 1.0, 1.0);
}
else {
m_eff_pt_jetBDTtight ->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_pt_jetBDTtightHighPt->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_jetBDTtight ->Fill(0.0, 0.0, 1.0);
m_eff_pt_jetRNNtight ->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_pt_jetRNNtightHighPt->Fill(tau.pt()/1000, 0.0, 1.0);
m_eff_jetRNNtight ->Fill(0.0, 0.0, 1.0);
}
}
......
PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/EfficiencyPtPlots.h → PhysicsAnalysis/TauID/TauDQA/src/EfficiencyPtPlots.h
+ 38
− 0
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUHISTUTILS_EFFICIENCYPTPLOTS_H
#define TAUHISTUTILS_EFFICIENCYPTPLOTS_H
#ifndef TAUDQA_EFFICIENCYPTPLOTS_H
#define TAUDQA_EFFICIENCYPTPLOTS_H
#include "TrkValHistUtils/PlotBase.h"
#include "TauHistUtils/ParamPlots.h"
#include "ParamPlots.h"
#include "xAODTau/TauJet.h"
#include "xAODTau/TauDefs.h"
namespace Tau{
......@@ -18,16 +17,16 @@ class EfficiencyPtPlots: public PlotBase {
virtual ~EfficiencyPtPlots();
void fill(const xAOD::TauJet& tau);
TProfile* m_eff_pt_jetBDTloose;
TProfile* m_eff_pt_jetBDTmed;
TProfile* m_eff_pt_jetBDTtight;
TProfile* m_eff_pt_jetBDTlooseHighPt;
TProfile* m_eff_pt_jetBDTmedHighPt;
TProfile* m_eff_pt_jetBDTtightHighPt;
TProfile* m_eff_jetBDTloose;
TProfile* m_eff_jetBDTmed;
TProfile* m_eff_jetBDTtight;
TProfile* m_eff_pt_jetRNNloose;
TProfile* m_eff_pt_jetRNNmed;
TProfile* m_eff_pt_jetRNNtight;
TProfile* m_eff_pt_jetRNNlooseHighPt;
TProfile* m_eff_pt_jetRNNmedHighPt;
TProfile* m_eff_pt_jetRNNtightHighPt;
TProfile* m_eff_jetRNNloose;
TProfile* m_eff_jetRNNmed;
TProfile* m_eff_jetRNNtight;
private:
void initializePlots();
......
PhysicsAnalysis/TauID/TauHistUtils/src/GeneralTauPlots.cxx → PhysicsAnalysis/TauID/TauDQA/src/GeneralTauPlots.cxx
+ 92
− 0
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TauHistUtils/GeneralTauPlots.h"
#include "GeneralTauPlots.h"
namespace Tau{
......@@ -13,14 +13,7 @@ GeneralTauPlots::GeneralTauPlots(PlotBase* pParent, std::string sDir, std::strin
m_tauCharge(nullptr),
m_tauNCoreTracks(nullptr),
m_tauNWideTracks(nullptr),
m_id_BDTJetScore(nullptr),
m_id_BDTJetScoreSigTrans(nullptr),
m_pt_jetBDTloose(nullptr),
m_pt_jetBDTmed(nullptr),
m_pt_jetBDTtight(nullptr),
m_pt_jetBDTlooseHighPt(nullptr),
m_pt_jetBDTmedHighPt(nullptr),
m_pt_jetBDTtightHighPt(nullptr),
m_ptHighPt(nullptr),
m_RNNScore(nullptr),
m_RNNScoreSigTrans(nullptr),
m_ptRNNVeryLoose(nullptr),
......@@ -40,92 +33,37 @@ GeneralTauPlots::~GeneralTauPlots()
}
void GeneralTauPlots::initializePlots(){
// m_oParamPlots.initialize();
m_tauCharge = Book1D("Charge",m_sTauJetContainerName + " Tau charge; charge; # Taus",7,-3.,4.);
m_tauNCoreTracks = Book1D("NCoreTracks",m_sTauJetContainerName + " Tau n core tracks; nCore; # Taus",10,0.,10.);
m_tauNWideTracks = Book1D("NWideTracks",m_sTauJetContainerName + " Tau n wide tracks; nWide; # Taus",10,0.,10.);
m_id_BDTJetScore = Book1D(
"id_BDTJetScore", m_sTauJetContainerName
+ " BDTJetScore ; BDTJetScore; # Tau", 10, -1.01, 1.01);
m_id_BDTJetScoreSigTrans = Book1D(
"id_BDTJetScoreSigTrans", m_sTauJetContainerName
+ " BDTJetScoreSigTrans ; BDTJetScoreSigTrans; # Tau", 10, 0.0, 1.01);
m_pt_jetBDTloose = Book1D("Pt_jetBDTloose",m_sTauJetContainerName + " Loose tau pt; pt; # Taus",20, 0.0, 150.0);
m_pt_jetBDTmed = Book1D("Pt_jetBDTmed",m_sTauJetContainerName + " Medium tau pt; pt; # Taus",20, 0.0, 150.0);
m_pt_jetBDTtight = Book1D("Pt_jetBDTtigth",m_sTauJetContainerName + " Tight tau pt; pt; # Taus",20, 0.0, 150.0);
m_pt_jetBDTlooseHighPt = Book1D("Pt_jetBDTlooseHighPt",m_sTauJetContainerName + " Loose tau pt; pt; # Taus", 20, 0.0, 1500.0);
m_pt_jetBDTmedHighPt = Book1D("Pt_jetBDTmedHighPt",m_sTauJetContainerName + " Medium tau pt; pt; # Taus", 20, 0.0, 1500.0);
m_pt_jetBDTtightHighPt = Book1D("Pt_jetBDTtigthHighPt",m_sTauJetContainerName + " Tight tau pt; pt; # Taus", 20, 0.0, 1500.0);
m_RNNScore = Book1D("RNNJetScore", m_sTauJetContainerName
+" RNNJetScore;RNNJetScore;# Tau", 10, -1.01, 1.01);
m_RNNScoreSigTrans = Book1D("RNNJetScoreSigTrans", m_sTauJetContainerName
+" RNNJetScoreSigTrans;RNNJetScoreSigTrans;"
+"# Tau", 10, -1.01, 1.01);
m_ptRNNVeryLoose = Book1D("ptRNNSigVeryLoose",m_sTauJetContainerName
+" RNNSigVeryLoose; pt; # Taus",
20, 0.0, 150.0);
m_ptRNNVeryLooseHighPt = Book1D("ptRNNSigVeryLooseHighPt",
m_sTauJetContainerName
+" RNNSigVeryLooseHighPt"+"; pt; # Taus",
20, 0.0, 1500.0);
m_ptRNNLoose = Book1D("ptRNNSigLoose",m_sTauJetContainerName
+" RNNSigLoose; pt; # Taus", 20, 0.0, 150.0);
m_ptRNNLooseHighPt = Book1D("ptRNNSigLooseHighPt", m_sTauJetContainerName
+" RNNSigLooseHighPt; pt"+"; # Taus",
20, 0.0, 1500.0);
m_ptRNNMedium = Book1D("ptRNNSigMedium",m_sTauJetContainerName
+" RNNSigMedium; pt; # Taus", 20, 0.0, 150.0);
m_ptRNNMediumHighPt = Book1D("ptRNNSigMediumHighPt", m_sTauJetContainerName
+" RNNSigMediumHighPt; pt"+"; # Taus",
20, 0.0, 1500.0);
m_ptRNNTight = Book1D("ptRNNSigTight",m_sTauJetContainerName
+" RNNSigTight; pt; # Taus", 20, 0.0, 150.0);
m_ptRNNTightHighPt = Book1D("ptRNNSigTightHighPt", m_sTauJetContainerName
+" RNNSigTightHighPt; pt"+"; # Taus",
20, 0.0, 1500.0);
m_ptHighPt = Book1D("ptHighPt", m_sTauJetContainerName+" HighPt"+"; pt; # Taus",20, 0.0, 1500.0);
m_RNNScore = Book1D("RNNJetScore", m_sTauJetContainerName+" RNNJetScore;RNNJetScore;# Tau", 10, -1.01, 1.01);
m_RNNScoreSigTrans = Book1D("RNNJetScoreSigTrans", m_sTauJetContainerName+" RNNJetScoreSigTrans;RNNJetScoreSigTrans;"+"# Tau", 10, -1.01, 1.01);
m_ptRNNVeryLoose = Book1D("ptRNNSigVeryLoose", m_sTauJetContainerName+" RNNSigVeryLoose; pt; # Taus",20, 0.0, 150.0);
m_ptRNNVeryLooseHighPt = Book1D("ptRNNSigVeryLooseHighPt", m_sTauJetContainerName+" RNNSigVeryLooseHighPt"+"; pt; # Taus",20, 0.0, 1500.0);
m_ptRNNLoose = Book1D("ptRNNSigLoose",m_sTauJetContainerName+" RNNSigLoose; pt; # Taus", 20, 0.0, 150.0);
m_ptRNNLooseHighPt = Book1D("ptRNNSigLooseHighPt", m_sTauJetContainerName+" RNNSigLooseHighPt; pt"+"; # Taus",20, 0.0, 1500.0);
m_ptRNNMedium = Book1D("ptRNNSigMedium",m_sTauJetContainerName+" RNNSigMedium; pt; # Taus", 20, 0.0, 150.0);
m_ptRNNMediumHighPt = Book1D("ptRNNSigMediumHighPt", m_sTauJetContainerName+" RNNSigMediumHighPt; pt"+"; # Taus",20, 0.0, 1500.0);
m_ptRNNTight = Book1D("ptRNNSigTight",m_sTauJetContainerName+" RNNSigTight; pt; # Taus", 20, 0.0, 150.0);
m_ptRNNTightHighPt = Book1D("ptRNNSigTightHighPt", m_sTauJetContainerName+" RNNSigTightHighPt; pt"+"; # Taus",20, 0.0, 1500.0);
}
void GeneralTauPlots::fill(const xAOD::TauJet& tau) {
m_oParamPlots.fill(tau);
m_tauCharge->Fill(tau.charge(), 1.);
m_tauNCoreTracks->Fill(tau.nTracks(), 1.);
// m_tauNWideTracks->Fill(tau.nWideTracks(), 1.);
// BDT
m_tauNWideTracks->Fill(tau.nTracks(xAOD::TauJetParameters::classifiedIsolation), 1.); //
if( tau.hasDiscriminant(xAOD::TauJetParameters::BDTJetScore) ) {
m_id_BDTJetScore->Fill(
tau.discriminant(xAOD::TauJetParameters::BDTJetScore)
);
}
if( tau.hasDiscriminant(xAOD::TauJetParameters::BDTJetScoreSigTrans) ) {
m_id_BDTJetScoreSigTrans->Fill(
tau.discriminant(xAOD::TauJetParameters::BDTJetScoreSigTrans)
);
}
if ( tau.isTau(xAOD::TauJetParameters::JetBDTSigLoose) ) {
m_pt_jetBDTloose -> Fill(tau.pt()/1000, 1.0);
m_pt_jetBDTlooseHighPt -> Fill(tau.pt()/1000, 1.0);
}
if ( tau.isTau(xAOD::TauJetParameters::JetBDTSigMedium) ) {
m_pt_jetBDTmed -> Fill(tau.pt()/1000, 1.0);
m_pt_jetBDTmedHighPt -> Fill(tau.pt()/1000, 1.0);
}
if ( tau.isTau(xAOD::TauJetParameters::JetBDTSigTight) ) {
m_pt_jetBDTtight -> Fill(tau.pt()/1000, 1.0);
m_pt_jetBDTtightHighPt -> Fill(tau.pt()/1000, 1.0);
}
m_tauNWideTracks->Fill(tau.nTracks(xAOD::TauJetParameters::classifiedIsolation), 1.);
m_ptHighPt->Fill(tau.pt()/1000, 1.);
// RNN
SG::AuxElement::ConstAccessor<float> acc_RNNJetScore("RNNJetScore");
static const SG::AuxElement::ConstAccessor<float> acc_RNNJetScore("RNNJetScore");
if ( acc_RNNJetScore.isAvailable(tau) &&
tau.hasDiscriminant(xAOD::TauJetParameters::RNNJetScore) ) {
float rnnScore = tau.discriminant(xAOD::TauJetParameters::RNNJetScore);
if ( rnnScore > -2.0 ) m_RNNScore->Fill(rnnScore);
}
SG::AuxElement::ConstAccessor<float> acc_RNNJetScoreSigTrans("RNNJetScoreSigTrans");
static const SG::AuxElement::ConstAccessor<float> acc_RNNJetScoreSigTrans("RNNJetScoreSigTrans");
if ( acc_RNNJetScoreSigTrans.isAvailable(tau) &&
tau.hasDiscriminant(xAOD::TauJetParameters::RNNJetScoreSigTrans) ) {
float rnnScore = tau.discriminant(xAOD::TauJetParameters::RNNJetScoreSigTrans);
......
PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/GeneralTauPlots.h → PhysicsAnalysis/TauID/TauDQA/src/GeneralTauPlots.h
+ 5
− 15
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUHISTUTILS_GENERALTAUPLOTS_H
#define TAUHISTUTILS_GENERALTAUPLOTS_H
#ifndef TAUDQA_GENERALTAUPLOTS_H
#define TAUDQA_GENERALTAUPLOTS_H
#include "TrkValHistUtils/PlotBase.h"
#include "TauHistUtils/ParamPlots.h"
#include "ParamPlots.h"
#include "xAODTau/TauJet.h"
#include "xAODTau/TauDefs.h"
namespace Tau{
......@@ -23,16 +22,7 @@ class GeneralTauPlots: public PlotBase {
TH1* m_tauCharge;
TH1* m_tauNCoreTracks;
TH1* m_tauNWideTracks;
// BDT
TH1* m_id_BDTJetScore;
TH1* m_id_BDTJetScoreSigTrans;
TH1* m_pt_jetBDTloose;
TH1* m_pt_jetBDTmed;
TH1* m_pt_jetBDTtight;
TH1* m_pt_jetBDTlooseHighPt;
TH1* m_pt_jetBDTmedHighPt;
TH1* m_pt_jetBDTtightHighPt;
TH1* m_ptHighPt;
// RNN
TH1* m_RNNScore;
......
PhysicsAnalysis/TauID/TauHistUtils/src/Had1ProngPlots.cxx → PhysicsAnalysis/TauID/TauDQA/src/Had1ProngPlots.cxx
+ 2
− 2
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TauHistUtils/Had1ProngPlots.h"
#include "Had1ProngPlots.h"
namespace Tau{
......
PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Had1ProngPlots.h → PhysicsAnalysis/TauID/TauDQA/src/Had1ProngPlots.h
+ 3
− 3
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUHISTUTILS_HAD1PRONGPLOTS_H
#define TAUHISTUTILS_HAD1PRONGPLOTS_H
#ifndef TAUDQA_HAD1PRONGPLOTS_H
#define TAUDQA_HAD1PRONGPLOTS_H
#include "GeneralTauPlots.h"
#include "xAODTau/TauJet.h"
......
PhysicsAnalysis/TauID/TauHistUtils/src/Had3ProngPlots.cxx → PhysicsAnalysis/TauID/TauDQA/src/Had3ProngPlots.cxx
+ 2
− 2
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TauHistUtils/Had3ProngPlots.h"
#include "Had3ProngPlots.h"
namespace Tau{
......
PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Had3ProngPlots.h → PhysicsAnalysis/TauID/TauDQA/src/Had3ProngPlots.h
+ 3
− 3
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUHISTUTILS_HAD3PRONGPLOTS_H
#define TAUHISTUTILS_HAD3PRONGPLOTS_H
#ifndef TAUDQA_HAD3PRONGPLOTS_H
#define TAUDQA_HAD3PRONGPLOTS_H
#include "GeneralTauPlots.h"
#include "xAODTau/TauJet.h"
......
PhysicsAnalysis/TauID/TauHistUtils/src/Migration.cxx → PhysicsAnalysis/TauID/TauDQA/src/Migration.cxx
+ 1
− 1
View file @ 8e346792
......@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TauHistUtils/Migration.h"
#include "Migration.h"
namespace Tau{
......
PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Migration.h → PhysicsAnalysis/TauID/TauDQA/src/Migration.h
+ 5
− 6
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUHISTUTILS_MIGRATION_H
#define TAUHISTUTILS_MIGRATION_H
#ifndef TAUDQA_MIGRATION_H
#define TAUDQA_MIGRATION_H
#include "TrkValHistUtils/PlotBase.h"
#include "TauHistUtils/ParamPlots.h"
#include "xAODTau/TauDefs.h"
#include "ParamPlots.h"
#include "xAODTau/TauJet.h"
#include "xAODPFlow/versions/PFO_v1.h"
#include "xAODPFlow/PFO.h"
namespace Tau{
......
PhysicsAnalysis/TauID/TauHistUtils/src/NewCorePlots.cxx → PhysicsAnalysis/TauID/TauDQA/src/NewCorePlots.cxx
+ 2
− 2
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TauHistUtils/NewCorePlots.h"
#include "NewCorePlots.h"
namespace Tau{
......
PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/NewCorePlots.h → PhysicsAnalysis/TauID/TauDQA/src/NewCorePlots.h
+ 3
− 3
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUHISTUTILS_NEWCOREPLOTS_H
#define TAUHISTUTILS_NEWCOREPLOTS_H
#ifndef TAUDQA_NEWCOREPLOTS_H
#define TAUDQA_NEWCOREPLOTS_H
#include "GeneralTauPlots.h"
#include "xAODTau/TauJet.h"
......
PhysicsAnalysis/TauID/TauHistUtils/src/ParamPlots.cxx → PhysicsAnalysis/TauID/TauDQA/src/ParamPlots.cxx
+ 2
− 2
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TauHistUtils/ParamPlots.h"
#include "ParamPlots.h"
namespace Tau{
......
PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/ParamPlots.h → PhysicsAnalysis/TauID/TauDQA/src/ParamPlots.h
+ 4
− 4
View file @ 8e346792
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUHISTUTILS_PARAMPLOTS_H
#define TAUHISTUTILS_PARAMPLOTS_H
#ifndef TAUDQA_PARAMPLOTS_H
#define TAUDQA_PARAMPLOTS_H
#include "TrkValHistUtils/PlotBase.h"
#include "xAODBase/IParticle.h"
......@@ -30,6 +30,6 @@ class ParamPlots:public PlotBase {
}
#endif // TRKVALHISTUTILS_PARAMPLOTS_H
#endif // TAUDQA_PARAMPLOTS_H
PhysicsAnalysis/TauID/TauHistUtils/src/RecoTauPlots.cxx → PhysicsAnalysis/TauID/TauDQA/src/RecoTauPlots.cxx
+ 1
− 3
View file @ 8e346792
......@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TauHistUtils/RecoTauPlots.h"
#include "RecoTauPlots.h"
namespace Tau{
......@@ -30,8 +30,6 @@ namespace Tau{
m_pantau_CellBasedInput_BDTVar_Neutral_Ratio_EtOverEtAllConsts(nullptr),
m_pantau_CellBasedInput_BDTVar_Neutral_Shots_NPhotonsInSeed(nullptr),
m_pantau_CellBasedInput_BDTVar_Combined_DeltaR1stNeutralTo1stCharged(nullptr),
m_id_BDTJetScore(nullptr),
m_id_BDTEleScore(nullptr),
m_sTauJetContainerName(sTauJetContainerName)
{
}
......
PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/RecoTauPlots.h → PhysicsAnalysis/TauID/TauDQA/src/RecoTauPlots.h
+ 4
− 9
View file @ 8e346792
......@@ -2,14 +2,13 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUHISTUTILS_RECOTAUPLOTS_H
#define TAUHISTUTILS_RECOTAUPLOTS_H
#ifndef TAUDQA_RECOTAUPLOTS_H
#define TAUDQA_RECOTAUPLOTS_H
#include "TrkValHistUtils/PlotBase.h"
#include "TauHistUtils/ParamPlots.h"
#include "xAODTau/TauDefs.h"
#include "ParamPlots.h"
#include "xAODTau/TauJet.h"
#include "xAODPFlow/versions/PFO_v1.h"
#include "xAODPFlow/PFO.h"
namespace Tau{
......@@ -47,10 +46,6 @@ class RecoTauPlots: public PlotBase {
TH1* m_pantau_CellBasedInput_BDTVar_Neutral_Shots_NPhotonsInSeed;
TH1* m_pantau_CellBasedInput_BDTVar_Combined_DeltaR1stNeutralTo1stCharged;
// BDT output
TH1* m_id_BDTJetScore;
TH1* m_id_BDTEleScore;
private:
void initializePlots();
......
PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.h
+ 9
− 19
View file @ 8e346792
......@@ -6,16 +6,15 @@
#define TAUDQA_TAUVALIDATIONPLOTS_H
// PlotBase objects
#include "TauHistUtils/ParamPlots.h"
#include "TauHistUtils/GeneralTauPlots.h"
#include "TauHistUtils/Had1ProngPlots.h"
#include "TauHistUtils/Had3ProngPlots.h"
#include "TauHistUtils/EVetoPlots.h"
#include "TauHistUtils/RecoTauPlots.h"
#include "TauHistUtils/NewCorePlots.h"
#include "TauHistUtils/BDTinputPlots.h"
#include "TauHistUtils/Migration.h"
#include "TauHistUtils/EfficiencyPtPlots.h"
#include "ParamPlots.h"
#include "GeneralTauPlots.h"
#include "Had1ProngPlots.h"
#include "Had3ProngPlots.h"
#include "EVetoPlots.h"
#include "RecoTauPlots.h"
#include "NewCorePlots.h"
#include "Migration.h"
#include "EfficiencyPtPlots.h"
#include "xAODJet/JetContainer.h"
#include "xAODEgamma/ElectronContainer.h"
......@@ -83,15 +82,6 @@ class TauValidationPlots:public PlotBase {
Tau::NewCorePlots m_oNewCoreMatchedPlots;
Tau::NewCorePlots m_oNewCoreFakePlots;
// All tau BDT scrore and input variables
// Tau::BDTinputPlots m_oBDTinputPlotsRec;
// Tau::BDTinputPlots m_oBDTinputPlotsMatched;
// Tau::BDTinputPlots m_oBDTinputPlotsFakes;
// Tau::BDTinputPlots m_oBDTinputPlotsElec;
//Migration Matrix plots
Tau::Migration m_oMigrationPlots;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment