diff --git a/PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt b/PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt
index 2d3d731430971df6fe35a4a60a30bcad3ceef3ca..5dd3957ef80d87daff2749bd1b2c5298710e9abe 100644
--- a/PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt
+++ b/PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt
@@ -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 )
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/EVetoPlots.cxx b/PhysicsAnalysis/TauID/TauDQA/src/EVetoPlots.cxx
similarity index 52%
rename from PhysicsAnalysis/TauID/TauHistUtils/src/EVetoPlots.cxx
rename to PhysicsAnalysis/TauID/TauDQA/src/EVetoPlots.cxx
index c3be60b1db1b7e3391ee064fba2ec11aabb2d457..0efd318653179536f2310a725cf181035bb5cb97 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/EVetoPlots.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/EVetoPlots.cxx
@@ -1,8 +1,8 @@
 /*
-  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);
   }
 
 }
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/EVetoPlots.h b/PhysicsAnalysis/TauID/TauDQA/src/EVetoPlots.h
similarity index 59%
rename from PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/EVetoPlots.h
rename to PhysicsAnalysis/TauID/TauDQA/src/EVetoPlots.h
index 1ff5648c0c729028eac58492b1642f95acb6efc9..7593701c9f676ec8adf4a7c9715c5a9400fe2c00 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/EVetoPlots.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/EVetoPlots.h
@@ -1,9 +1,9 @@
 /*
-  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();
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/EfficiencyPtPlots.cxx b/PhysicsAnalysis/TauID/TauDQA/src/EfficiencyPtPlots.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..8abc1ad4350d8004761cc9a9c161f61afd3479a9
--- /dev/null
+++ b/PhysicsAnalysis/TauID/TauDQA/src/EfficiencyPtPlots.cxx
@@ -0,0 +1,76 @@
+/*
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "EfficiencyPtPlots.h"
+                       
+namespace Tau{
+
+EfficiencyPtPlots::EfficiencyPtPlots(PlotBase* pParent, std::string sDir, std::string sTauJetContainerName):
+   PlotBase(pParent, sDir),
+   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)
+{	
+}
+
+EfficiencyPtPlots::~EfficiencyPtPlots()
+{
+}
+
+void EfficiencyPtPlots::initializePlots()
+{
+   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::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_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::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_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::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_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);
+   }
+
+}
+
+
+}
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/EfficiencyPtPlots.h b/PhysicsAnalysis/TauID/TauDQA/src/EfficiencyPtPlots.h
new file mode 100644
index 0000000000000000000000000000000000000000..afb497ecf24e8569f455dfbeff7e7d41d7f55e7e
--- /dev/null
+++ b/PhysicsAnalysis/TauID/TauDQA/src/EfficiencyPtPlots.h
@@ -0,0 +1,38 @@
+/*
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TAUDQA_EFFICIENCYPTPLOTS_H
+#define TAUDQA_EFFICIENCYPTPLOTS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "ParamPlots.h"
+#include "xAODTau/TauJet.h"
+
+namespace Tau{
+
+class EfficiencyPtPlots: public PlotBase {
+  public:
+    EfficiencyPtPlots(PlotBase *pParent, std::string sDir, std::string sTauJetContainerName);
+    virtual ~EfficiencyPtPlots();
+
+    void fill(const xAOD::TauJet& tau);
+    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();
+    std::string m_sTauJetContainerName;
+};
+
+}
+
+#endif
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/GeneralTauPlots.cxx b/PhysicsAnalysis/TauID/TauDQA/src/GeneralTauPlots.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..595f1248a927579fd0c806580e0a4c094145f4d1
--- /dev/null
+++ b/PhysicsAnalysis/TauID/TauDQA/src/GeneralTauPlots.cxx
@@ -0,0 +1,92 @@
+/*
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#include "GeneralTauPlots.h"
+
+namespace Tau{
+
+GeneralTauPlots::GeneralTauPlots(PlotBase* pParent, std::string sDir, std::string sTauJetContainerName):
+   PlotBase(pParent, sDir),
+   m_oParamPlots(this, "", sTauJetContainerName),
+   m_tauCharge(nullptr),
+   m_tauNCoreTracks(nullptr),
+   m_tauNWideTracks(nullptr),
+   m_ptHighPt(nullptr),
+   m_RNNScore(nullptr),
+   m_RNNScoreSigTrans(nullptr),
+   m_ptRNNVeryLoose(nullptr),
+   m_ptRNNLoose(nullptr),
+   m_ptRNNMedium(nullptr),
+   m_ptRNNTight(nullptr),
+   m_ptRNNVeryLooseHighPt(nullptr),
+   m_ptRNNLooseHighPt(nullptr),
+   m_ptRNNMediumHighPt(nullptr),
+   m_ptRNNTightHighPt(nullptr),
+   m_sTauJetContainerName(sTauJetContainerName)
+{	
+}
+
+GeneralTauPlots::~GeneralTauPlots()
+{
+}
+
+void GeneralTauPlots::initializePlots(){
+
+   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_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.nTracks(xAOD::TauJetParameters::classifiedIsolation), 1.);
+  m_ptHighPt->Fill(tau.pt()/1000, 1.);
+
+  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);
+  }
+  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);
+     if ( rnnScore > -2.0 ) m_RNNScoreSigTrans->Fill(rnnScore);
+  }
+  if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigVeryLoose) ) {
+     m_ptRNNVeryLoose      ->Fill(tau.pt()/1000, 1.0);
+     m_ptRNNVeryLooseHighPt->Fill(tau.pt()/1000, 1.0);
+  }
+  if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigLoose) ) {
+     m_ptRNNLoose      ->Fill(tau.pt()/1000, 1.0);
+     m_ptRNNLooseHighPt->Fill(tau.pt()/1000, 1.0);
+  }
+  if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigMedium) ) {
+     m_ptRNNMedium      ->Fill(tau.pt()/1000, 1.0);
+     m_ptRNNMediumHighPt->Fill(tau.pt()/1000, 1.0);
+  }
+  if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigTight) ) {
+     m_ptRNNTight      ->Fill(tau.pt()/1000, 1.0);
+     m_ptRNNTightHighPt->Fill(tau.pt()/1000, 1.0);
+  }
+
+}
+
+
+}
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/GeneralTauPlots.h b/PhysicsAnalysis/TauID/TauDQA/src/GeneralTauPlots.h
similarity index 64%
rename from PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/GeneralTauPlots.h
rename to PhysicsAnalysis/TauID/TauDQA/src/GeneralTauPlots.h
index 172366a2bc7efb487cd1900046529a2160349ed9..363c8c1bd015463b5334154d0f8824e6630d8c67 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/GeneralTauPlots.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/GeneralTauPlots.h
@@ -1,14 +1,13 @@
 /*
-  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;
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/Had1ProngPlots.cxx b/PhysicsAnalysis/TauID/TauDQA/src/Had1ProngPlots.cxx
similarity index 97%
rename from PhysicsAnalysis/TauID/TauHistUtils/src/Had1ProngPlots.cxx
rename to PhysicsAnalysis/TauID/TauDQA/src/Had1ProngPlots.cxx
index a99d8ea456bf8672b4dea462c090dacd23a3c27a..ce39502211218bd48a90aaa59917981df2503c06 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/Had1ProngPlots.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/Had1ProngPlots.cxx
@@ -1,8 +1,8 @@
 /*
-  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{
 
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Had1ProngPlots.h b/PhysicsAnalysis/TauID/TauDQA/src/Had1ProngPlots.h
similarity index 86%
rename from PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Had1ProngPlots.h
rename to PhysicsAnalysis/TauID/TauDQA/src/Had1ProngPlots.h
index 165d1a64792971776306630863816a705ee88e8c..a9b7d025ddf224092ea8ae00b514686a122ad0ea 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Had1ProngPlots.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/Had1ProngPlots.h
@@ -1,9 +1,9 @@
 /*
-  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"
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/Had3ProngPlots.cxx b/PhysicsAnalysis/TauID/TauDQA/src/Had3ProngPlots.cxx
similarity index 97%
rename from PhysicsAnalysis/TauID/TauHistUtils/src/Had3ProngPlots.cxx
rename to PhysicsAnalysis/TauID/TauDQA/src/Had3ProngPlots.cxx
index cb0f384d358fa469330262d3590fde031c52839c..5645f2367fbca48d306201e12193efbe6e4e924f 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/Had3ProngPlots.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/Had3ProngPlots.cxx
@@ -1,8 +1,8 @@
 /*
-  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{
 
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Had3ProngPlots.h b/PhysicsAnalysis/TauID/TauDQA/src/Had3ProngPlots.h
similarity index 84%
rename from PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Had3ProngPlots.h
rename to PhysicsAnalysis/TauID/TauDQA/src/Had3ProngPlots.h
index f0e5dc17fc51063c58e3db5afb10507a33c4cc27..c3dfde466e2beaa0d06035d050c7ce6bbd6f3756 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Had3ProngPlots.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/Had3ProngPlots.h
@@ -1,9 +1,9 @@
 /*
-  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"
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/Migration.cxx b/PhysicsAnalysis/TauID/TauDQA/src/Migration.cxx
similarity index 99%
rename from PhysicsAnalysis/TauID/TauHistUtils/src/Migration.cxx
rename to PhysicsAnalysis/TauID/TauDQA/src/Migration.cxx
index 339915de29da2e5c9a0f4c421a14655a825a7c40..c5ebacd3a7bb61f41b0ff9e7431381f45fbd11ed 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/Migration.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/Migration.cxx
@@ -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{
 
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Migration.h b/PhysicsAnalysis/TauID/TauDQA/src/Migration.h
similarity index 83%
rename from PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Migration.h
rename to PhysicsAnalysis/TauID/TauDQA/src/Migration.h
index 0344ab925382d2db1fc996b34e02cf5ada4fa0ae..e521ff66841a66d12c6bbb6352cb7f21479f9109 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/Migration.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/Migration.h
@@ -1,15 +1,14 @@
 /*
-  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{
 
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/NewCorePlots.cxx b/PhysicsAnalysis/TauID/TauDQA/src/NewCorePlots.cxx
similarity index 99%
rename from PhysicsAnalysis/TauID/TauHistUtils/src/NewCorePlots.cxx
rename to PhysicsAnalysis/TauID/TauDQA/src/NewCorePlots.cxx
index 141597a7653c99d8b522f639ba42f65c55edc5d2..2ea57f730be967fc5119931cc97079555de3b74d 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/NewCorePlots.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/NewCorePlots.cxx
@@ -1,8 +1,8 @@
 /*
-  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{
 
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/NewCorePlots.h b/PhysicsAnalysis/TauID/TauDQA/src/NewCorePlots.h
similarity index 90%
rename from PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/NewCorePlots.h
rename to PhysicsAnalysis/TauID/TauDQA/src/NewCorePlots.h
index fbd27c40fc65d91a4b306a9ec84281e8b8a47373..9a169f31f89122e77c5c0161748320c4a1a23829 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/NewCorePlots.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/NewCorePlots.h
@@ -1,9 +1,9 @@
 /*
-  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"
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/ParamPlots.cxx b/PhysicsAnalysis/TauID/TauDQA/src/ParamPlots.cxx
similarity index 92%
rename from PhysicsAnalysis/TauID/TauHistUtils/src/ParamPlots.cxx
rename to PhysicsAnalysis/TauID/TauDQA/src/ParamPlots.cxx
index 5e7b3bc1e4e00c44c41552f0701f8262a5d94d60..9426d1329bb02583c355da02b9bff5205b4d5bc9 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/ParamPlots.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/ParamPlots.cxx
@@ -1,8 +1,8 @@
 /*
-  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{
 
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/ParamPlots.h b/PhysicsAnalysis/TauID/TauDQA/src/ParamPlots.h
similarity index 74%
rename from PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/ParamPlots.h
rename to PhysicsAnalysis/TauID/TauDQA/src/ParamPlots.h
index 11627c1380bf0a0217c75c7905e1b2ae50f4dcad..94f1b38b4c44f77f5cb75029fb30b8917228144d 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/ParamPlots.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/ParamPlots.h
@@ -1,9 +1,9 @@
 /*
-  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
 
 
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/RecoTauPlots.cxx b/PhysicsAnalysis/TauID/TauDQA/src/RecoTauPlots.cxx
similarity index 99%
rename from PhysicsAnalysis/TauID/TauHistUtils/src/RecoTauPlots.cxx
rename to PhysicsAnalysis/TauID/TauDQA/src/RecoTauPlots.cxx
index d95f0ebd73ee969ef2d9e2eafd49f79571fb4d9a..dd0e4ddc7edc132123b1ededc6452221d3c4cde3 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/RecoTauPlots.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/RecoTauPlots.cxx
@@ -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)
   {
   }
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/RecoTauPlots.h b/PhysicsAnalysis/TauID/TauDQA/src/RecoTauPlots.h
similarity index 88%
rename from PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/RecoTauPlots.h
rename to PhysicsAnalysis/TauID/TauDQA/src/RecoTauPlots.h
index 261e18e73bc3e14b9c8c27eb22328717ab74b9cb..89f1cbbaace35f7c59153b5fe2c23f72cc65b679 100644
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/RecoTauPlots.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/RecoTauPlots.h
@@ -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();
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.h b/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.h
index 98c67ed0b60670ad2643c599bd6cb142325ae748..dc9227ed1aa7b8e6d8259f2bec5a182e575a6446 100644
--- a/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.h
@@ -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;		
 
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/CMakeLists.txt b/PhysicsAnalysis/TauID/TauHistUtils/CMakeLists.txt
deleted file mode 100644
index 4b62d008e8d112ed26fae2f54d55294cefbf47dd..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauHistUtils/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( TauHistUtils )
-
-# Component(s) in the package:
-atlas_add_library( TauHistUtils
-                   src/*.cxx
-		           PUBLIC_HEADERS TauHistUtils
-                   LINK_LIBRARIES xAODBase xAODPFlow xAODTau TrkValHistUtils)
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/BDTinputPlots.h b/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/BDTinputPlots.h
deleted file mode 100644
index b523ee91723e15271387c701ed6ad104122b4981..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/BDTinputPlots.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TAUHISTUTILS_BDTINPUTPLOTS_H
-#define TAUHISTUTILS_BDTINPUTPLOTS_H
-
-#include "TrkValHistUtils/PlotBase.h"
-#include "TauHistUtils/ParamPlots.h"
-#include "xAODTau/TauDefs.h" 
-#include "xAODTau/TauJet.h"
-#include "xAODPFlow/versions/PFO_v1.h"
-
-namespace Tau{
-
-class BDTinputPlots: public PlotBase {
-  public:
-    BDTinputPlots(PlotBase *pParent, std::string sDir, std::string sTauJetContainerName);
-    virtual ~BDTinputPlots();
-    void fill(const xAOD::TauJet& tau);
-    // BDT output
-
-    TH1* m_id_BDTJetScore;
-    TH1* m_id_BDTEleScore;
-    TH1* m_pt_eleBDTloose;
-    TH1* m_pt_eleBDTmed;
-    TH1* m_pt_eleBDTtight;
-    TH1* m_pt_jetBDTloose;
-    TH1* m_pt_jetBDTmed;
-    TH1* m_pt_jetBDTtight;
-
-  private:
-    void initializePlots();
-    std::string m_sTauJetContainerName;
-};
-
-}
-
-#endif
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/EfficiencyPtPlots.h b/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/EfficiencyPtPlots.h
deleted file mode 100644
index ade7ba15a6ac5b131d3ba1f3ff05204b8f11885d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauHistUtils/TauHistUtils/EfficiencyPtPlots.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TAUHISTUTILS_EFFICIENCYPTPLOTS_H
-#define TAUHISTUTILS_EFFICIENCYPTPLOTS_H
-
-#include "TrkValHistUtils/PlotBase.h"
-#include "TauHistUtils/ParamPlots.h"
-#include "xAODTau/TauJet.h"
-#include "xAODTau/TauDefs.h"
-
-namespace Tau{
-
-class EfficiencyPtPlots: public PlotBase {
-  public:
-    EfficiencyPtPlots(PlotBase *pParent, std::string sDir, std::string sTauJetContainerName);
-    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;
-
-  private:
-    void initializePlots();
-    std::string m_sTauJetContainerName;
-};
-
-}
-
-#endif
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/BDTinputPlots.cxx b/PhysicsAnalysis/TauID/TauHistUtils/src/BDTinputPlots.cxx
deleted file mode 100644
index 56e6f874eddb879cb1f75c5ecae4141c6b1cab12..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/BDTinputPlots.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TauHistUtils/BDTinputPlots.h"
-
-namespace Tau{
-
-BDTinputPlots::BDTinputPlots(PlotBase* pParent, std::string sDir, std::string sTauJetContainerName):
-   PlotBase(pParent, sDir),
-   m_id_BDTJetScore(nullptr),
-   m_id_BDTEleScore(nullptr),
-   m_pt_eleBDTloose(nullptr),
-   m_pt_eleBDTmed(nullptr),
-   m_pt_eleBDTtight(nullptr),
-   m_pt_jetBDTloose(nullptr),
-   m_pt_jetBDTmed(nullptr),
-   m_pt_jetBDTtight(nullptr),
-   m_sTauJetContainerName(sTauJetContainerName)
-{
-}
-
-
-
-BDTinputPlots::~BDTinputPlots()
-{
-}
-
-
-void BDTinputPlots::initializePlots(){
-
-	/*+++++++++++++++++++++++++++++++++++++++++++++++++
-	  +++++++++++++++++++BDT OUTPUT+++++++++++++++++++++
-	  +++++++++++++++++++++++++++++++++++++++++++++++++*/
-
-	m_id_BDTJetScore = Book1D("id_BDTJetScore",m_sTauJetContainerName + " BDTJetScore ; BDTJetScore; # Tau",10,0.,1.05);
-	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.,300.);
-	m_pt_eleBDTmed   = Book1D("Pt_eleBDTmed",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,300.);
-	m_pt_eleBDTtight = Book1D("Pt_eleBDTtight",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,300.);
-	m_pt_jetBDTloose = Book1D("Pt_jetBDTloose",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,300.);
-	m_pt_jetBDTmed   = Book1D("Pt_jetBDTmed",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,300.);
-	m_pt_jetBDTtight = Book1D("Pt_jetBDTtigth",m_sTauJetContainerName + " Tau pt; pt; # Taus",20,0.,300.);
-
-
-
-}
-
-void BDTinputPlots::fill(const xAOD::TauJet& thisTau) {
-
-	/*+++++++++++++++++++++++++++++++++++++++++++++++++
-	  +++++++++++++++++++BDT OUTPUT+++++++++++++++++++++
-	  +++++++++++++++++++++++++++++++++++++++++++++++++*/
-
-	if( thisTau.hasDiscriminant(xAOD::TauJetParameters::BDTJetScore) )m_id_BDTJetScore->Fill(thisTau.discriminant(xAOD::TauJetParameters::BDTJetScore));
-	if( thisTau.hasDiscriminant(xAOD::TauJetParameters::BDTEleScore) )m_id_BDTEleScore->Fill(thisTau.discriminant(xAOD::TauJetParameters::BDTEleScore));
-	if(thisTau.isTau(xAOD::TauJetParameters::JetBDTSigLoose))   m_pt_eleBDTloose->Fill( thisTau.pt()/1000,1);
-	if(thisTau.isTau(xAOD::TauJetParameters::JetBDTSigMedium))  m_pt_eleBDTmed  ->Fill( thisTau.pt()/1000,1);
-	if(thisTau.isTau(xAOD::TauJetParameters::JetBDTSigTight))   m_pt_eleBDTtight->Fill( thisTau.pt()/1000,1);
-	if(thisTau.isTau(xAOD::TauJetParameters::EleBDTLoose))      m_pt_jetBDTloose->Fill( thisTau.pt()/1000,1);
-	if(thisTau.isTau(xAOD::TauJetParameters::EleBDTMedium))     m_pt_jetBDTmed  ->Fill( thisTau.pt()/1000,1);
-	if(thisTau.isTau(xAOD::TauJetParameters::EleBDTTight))      m_pt_jetBDTtight->Fill( thisTau.pt()/1000,1);
-
-}
-
-}
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/EfficiencyPtPlots.cxx b/PhysicsAnalysis/TauID/TauHistUtils/src/EfficiencyPtPlots.cxx
deleted file mode 100644
index b48cb72af1ff4bc61b5e44c131beccaadb4a9a96..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/EfficiencyPtPlots.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TauHistUtils/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_sTauJetContainerName(sTauJetContainerName)
-{	
-}
-
-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);
-}
-
-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);
-   }
-   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);
-   }
-   
-   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);
-   }
-   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);
-   }
-
-   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);
-   }
-   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);
-   }
-
-}
-
-
-}
diff --git a/PhysicsAnalysis/TauID/TauHistUtils/src/GeneralTauPlots.cxx b/PhysicsAnalysis/TauID/TauHistUtils/src/GeneralTauPlots.cxx
deleted file mode 100644
index dcb60b3f3af48b3e97dadc5837325de2f84746f1..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauHistUtils/src/GeneralTauPlots.cxx
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include "TauHistUtils/GeneralTauPlots.h"
-
-namespace Tau{
-
-GeneralTauPlots::GeneralTauPlots(PlotBase* pParent, std::string sDir, std::string sTauJetContainerName):
-   PlotBase(pParent, sDir),
-   m_oParamPlots(this, "", sTauJetContainerName),
-   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_RNNScore(nullptr),
-   m_RNNScoreSigTrans(nullptr),
-   m_ptRNNVeryLoose(nullptr),
-   m_ptRNNLoose(nullptr),
-   m_ptRNNMedium(nullptr),
-   m_ptRNNTight(nullptr),
-   m_ptRNNVeryLooseHighPt(nullptr),
-   m_ptRNNLooseHighPt(nullptr),
-   m_ptRNNMediumHighPt(nullptr),
-   m_ptRNNTightHighPt(nullptr),
-   m_sTauJetContainerName(sTauJetContainerName)
-{	
-}
-
-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);
-
-}
-
-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);
-  }
-
-  // RNN
-  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");
-  if ( acc_RNNJetScoreSigTrans.isAvailable(tau) &&
-       tau.hasDiscriminant(xAOD::TauJetParameters::RNNJetScoreSigTrans) ) {
-     float rnnScore = tau.discriminant(xAOD::TauJetParameters::RNNJetScoreSigTrans);
-     if ( rnnScore > -2.0 ) m_RNNScoreSigTrans->Fill(rnnScore);
-  }
-  if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigVeryLoose) ) {
-     m_ptRNNVeryLoose      ->Fill(tau.pt()/1000, 1.0);
-     m_ptRNNVeryLooseHighPt->Fill(tau.pt()/1000, 1.0);
-  }
-  if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigLoose) ) {
-     m_ptRNNLoose      ->Fill(tau.pt()/1000, 1.0);
-     m_ptRNNLooseHighPt->Fill(tau.pt()/1000, 1.0);
-  }
-  if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigMedium) ) {
-     m_ptRNNMedium      ->Fill(tau.pt()/1000, 1.0);
-     m_ptRNNMediumHighPt->Fill(tau.pt()/1000, 1.0);
-  }
-  if ( tau.isTau(xAOD::TauJetParameters::JetRNNSigTight) ) {
-     m_ptRNNTight      ->Fill(tau.pt()/1000, 1.0);
-     m_ptRNNTightHighPt->Fill(tau.pt()/1000, 1.0);
-  }
-
-}
-
-
-}