diff --git a/PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt b/PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt
index 46cf6b861ee317679e1ca4bfcbecdf98696e5d36..2d3d731430971df6fe35a4a60a30bcad3ceef3ca 100644
--- a/PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt
+++ b/PhysicsAnalysis/TauID/TauDQA/CMakeLists.txt
@@ -1,33 +1,15 @@
-################################################################################
-# Package: TauDQA
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TauDQA )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODJet
- Event/xAOD/xAODTau
- Event/xAOD/xAODTruth
- PhysicsAnalysis/TauID/TauHistUtils
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- Tracking/TrkValidation/TrkValHistUtils )
-
# External dependencies:
-find_package( HepMC )
-find_package( HepPDT )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_component( TauDQA
- src/*.cxx
- src/components/*.cxx
- INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel AthenaBaseComps AthenaMonitoringLib xAODEgamma xAODJet xAODTau xAODTruth TauHistUtils McParticleEvent TrkValHistUtils TauAnalysisToolsLib )
-
+ src/*.h src/*.cxx src/components/*.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaBaseComps
+ AthenaMonitoringLib TauAnalysisToolsLib TauHistUtils xAODJet xAODEgamma
+ xAODTau xAODTruth )
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/PhysValTau.cxx b/PhysicsAnalysis/TauID/TauDQA/src/PhysValTau.cxx
index 8202cb34952227f892e1204fab002f2ad3324b93..449780e738261893d7d8e4d77333ee88f4a0a014 100644
--- a/PhysicsAnalysis/TauID/TauDQA/src/PhysValTau.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/PhysValTau.cxx
@@ -1,7 +1,7 @@
/////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// PhysValTau.cxx
@@ -10,7 +10,7 @@
///////////////////////////////////////////////////////////////////
// PhysVal includes
-#include "../share/PhysValTau.h"
+#include "PhysValTau.h"
// STL includes
#include <vector>
@@ -24,7 +24,6 @@
#include "xAODTruth/TruthParticleContainer.h"
#include "xAODTruth/TruthParticle.h"
#include "AthenaBaseComps/AthCheckMacros.h"
-#include "xAODRootAccess/TEvent.h"
///////////////////////////////////////////////////////////////////
// Public methods:
@@ -53,11 +52,6 @@ PhysValTau::PhysValTau(const std::string& type,
declareProperty("NominalTauSelectionTool", m_nomiTauSel);
}
-// Destructor
-///////////////
-PhysValTau::~PhysValTau()
-{}
-
// Athena algtool's Hooks
////////////////////////////
StatusCode PhysValTau::initialize()
diff --git a/PhysicsAnalysis/TauID/TauDQA/share/PhysValTau.h b/PhysicsAnalysis/TauID/TauDQA/src/PhysValTau.h
similarity index 67%
rename from PhysicsAnalysis/TauID/TauDQA/share/PhysValTau.h
rename to PhysicsAnalysis/TauID/TauDQA/src/PhysValTau.h
index fc1606954626e4dbc0ffad10b43073c2d8c70364..2cebc7d14ef5aade489fea2c1465b101785b9f83 100644
--- a/PhysicsAnalysis/TauID/TauDQA/share/PhysValTau.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/PhysValTau.h
@@ -1,33 +1,28 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-// PhysValTau.h
-// Header file for class PhysValTau
-// Author: S.Binet<binet@cern.ch>
-///////////////////////////////////////////////////////////////////
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
#ifndef TAUDQA_PHYSVALTAU_H
#define TAUDQA_PHYSVALTAU_H
// STL includes
+#include <memory>
#include <string>
#include <vector>
// FrameWork includes
#include "GaudiKernel/ServiceHandle.h"
-#include "AsgTools/ToolHandle.h"
+#include "GaudiKernel/ToolHandle.h"
// Local includes
#include "AthenaMonitoring/ManagedMonitorToolBase.h"
-#include "TauValidationPlots.h"
#include "TauAnalysisTools/ITauTruthMatchingTool.h"
#include "TauAnalysisTools/ITauSelectionTool.h"
-#include <TLorentzVector.h>
-//Additional includes
+// Local includes
+#include "TauValidationPlots.h"
#include "RecoTypes.h"
-// Forward declaration
-
-//namespace PhysVal {
-
class PhysValTau
: public ManagedMonitorToolBase
{
@@ -35,41 +30,21 @@ class PhysValTau
// Public methods:
///////////////////////////////////////////////////////////////////
public:
-
- // Copy constructor:
-
/// Constructor with parameters:
PhysValTau( const std::string& type,
const std::string& name,
const IInterface* parent );
- /// Destructor:
- virtual ~PhysValTau();
-
// Athena algtool's Hooks
virtual StatusCode initialize();
virtual StatusCode bookHistograms();
virtual StatusCode fillHistograms();
virtual StatusCode procHistograms();
-
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Non-const methods:
- ///////////////////////////////////////////////////////////////////
-
-
///////////////////////////////////////////////////////////////////
// Private data:
///////////////////////////////////////////////////////////////////
private:
-
- /// Default constructor:
- PhysValTau();
-
// Containers
//std::string m_TruthParticleContainerName;
std::string m_TauJetContainerName;
@@ -97,11 +72,4 @@ class PhysValTau
};
-// I/O operators
-//////////////////////
-
-///////////////////////////////////////////////////////////////////
-// Inline methods:
-///////////////////////////////////////////////////////////////////
-//}
#endif //> !TAUDQA_PHYSVALTAU_H
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/RecoTypes.cxx b/PhysicsAnalysis/TauID/TauDQA/src/RecoTypes.cxx
deleted file mode 100644
index eab945cc2586abcc9aac2afea1cef476ffe076d3..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauDQA/src/RecoTypes.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include "../share/RecoTypes.h"
-
-// RecoTypes::DecayMode GetTrueMode(Comp_Tau* trueTau) {
-// int nCharged = trueTau->GetNumChargedPions();
-// int nNeutral = trueTau->GetNumNeutralPions();
-// return RecoTypes::GetDecayMode(nCharged, nNeutral);
-// }
-
-// RecoTypes::DecayMode GetRecoMode(Comp_TauFromAlg* recoTau) {
-// int nCharged = recoTau->GetNumChargedPions();
-// int nNeutral = recoTau->GetNumNeutralPions();
-// return RecoTypes::GetDecayMode(nCharged, nNeutral);
-// }
diff --git a/PhysicsAnalysis/TauID/TauDQA/share/RecoTypes.h b/PhysicsAnalysis/TauID/TauDQA/src/RecoTypes.h
similarity index 97%
rename from PhysicsAnalysis/TauID/TauDQA/share/RecoTypes.h
rename to PhysicsAnalysis/TauID/TauDQA/src/RecoTypes.h
index c5eb655720c609b198109bedf0fbfeb97df4320e..c7dc25f59dc5ec2be158b02f827129008cc38e4e 100644
--- a/PhysicsAnalysis/TauID/TauDQA/share/RecoTypes.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/RecoTypes.h
@@ -1,4 +1,7 @@
-
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
#ifndef RECOTYPES_H_
#define RECOTYPES_H_
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.cxx b/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.cxx
index 8b80c4553c905493a9603d9a681c1f6a5fb34ee0..1e55d8a1c36a0b2359752e3e66f0f2f23a92fb73 100644
--- a/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.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 "../share/TauValidationPlots.h"
+#include "TauValidationPlots.h"
TauValidationPlots::TauValidationPlots(PlotBase* pParent, std::string sDir, std::string sTauJetContainerName):
PlotBase(pParent, sDir),
diff --git a/PhysicsAnalysis/TauID/TauDQA/share/TauValidationPlots.h b/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.h
similarity index 95%
rename from PhysicsAnalysis/TauID/TauDQA/share/TauValidationPlots.h
rename to PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.h
index 126cd4f772eb336d1f855119950356f19f5dfe1f..98c67ed0b60670ad2643c599bd6cb142325ae748 100644
--- a/PhysicsAnalysis/TauID/TauDQA/share/TauValidationPlots.h
+++ b/PhysicsAnalysis/TauID/TauDQA/src/TauValidationPlots.h
@@ -1,5 +1,9 @@
-#ifndef MUONPHYSVALMONITORING_MUONVALIDATIONPLOTS_H
-#define MUONPHYSVALMONITORING_MUONVALIDATIONPLOTS_H
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
+#ifndef TAUDQA_TAUVALIDATIONPLOTS_H
+#define TAUDQA_TAUVALIDATIONPLOTS_H
// PlotBase objects
#include "TauHistUtils/ParamPlots.h"
@@ -123,4 +127,4 @@ class TauValidationPlots:public PlotBase {
};
-#endif
+#endif // not TAUDQA_TAUVALIDATIONPLOTS_H
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx b/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx
index 062350b8b12551b08a4c1cd9b723ca5d4d12a42a..e08e2940f7958e38cf168f90165685cd8dad5584 100644
--- a/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx
@@ -1,4 +1,6 @@
-#include "../../share/PhysValTau.h"
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#include "../PhysValTau.h"
DECLARE_COMPONENT( PhysValTau )