From 50c3e6203138c60fa49400a764d2dbfb399eed3d Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 15:56:10 +0200
Subject: [PATCH] 'CMakeLists.txt' (AnalysisExamples-02-24-15)
* Tagging AnalysisExamples-02-24-15.
* Fix clang warings: remove unused warnings.
---
.../AnalysisExamples/CMakeLists.txt | 61 +++++++++++++++++++
.../AnalysisExamples/src/JetTagAna.cxx | 7 +--
.../AnalysisExamples/src/JetTagAna.h | 6 +-
.../src/MiscellaneousExamples.cxx | 2 +-
4 files changed, 67 insertions(+), 9 deletions(-)
create mode 100644 PhysicsAnalysis/AnalysisCommon/AnalysisExamples/CMakeLists.txt
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/CMakeLists.txt
new file mode 100644
index 00000000000..498f13a2bd4
--- /dev/null
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/CMakeLists.txt
@@ -0,0 +1,61 @@
+################################################################################
+# Package: AnalysisExamples
+################################################################################
+
+# Declare the package name:
+atlas_subdir( AnalysisExamples )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+ Calorimeter/CaloEvent
+ Control/AthenaBaseComps
+ Control/AthenaKernel
+ Control/Navigation
+ Control/SGTools
+ Control/StoreGate
+ Event/NavFourMom
+ Event/xAOD/xAODEventInfo
+ Event/xAOD/xAODTracking
+ GaudiKernel
+ Generators/GenAnalysisTools/TruthHelper
+ Generators/GeneratorObjects
+ PhysicsAnalysis/AnalysisCommon/AnalysisTools
+ PhysicsAnalysis/AnalysisCommon/AnalysisUtils
+ PhysicsAnalysis/AnalysisCommon/CompositeParticleEvent
+ PhysicsAnalysis/AnalysisCommon/ParticleEvent
+ PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
+ PhysicsAnalysis/JetTagging/JetTagEvent
+ PhysicsAnalysis/JetTagging/JetTagInfo
+ PhysicsAnalysis/MuonID/MuonIDEvent
+ PhysicsAnalysis/TruthParticleID/McParticleEvent
+ PhysicsAnalysis/TruthParticleID/McParticleKernel
+ Reconstruction/Jet/JetEvent
+ Reconstruction/MuonIdentification/muonEvent
+ Reconstruction/Particle
+ Reconstruction/ParticleTruth
+ Reconstruction/RecoTools/RecoToolInterfaces
+ Reconstruction/egamma/egammaEvent
+ Tracking/TrkEvent/VxVertex
+ Tracking/TrkVertexFitter/TrkVKalVrtFitter
+ Trigger/TrigAnalysis/TrigDecisionTool
+ Trigger/TrigEvent/TrigInDetEvent
+ Trigger/TrigEvent/TrigParticle
+ Trigger/TrigEvent/TrigSteeringEvent )
+
+# External dependencies:
+find_package( CLHEP )
+find_package( HepMC )
+find_package( HepPDT )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
+
+# Component(s) in the package:
+atlas_add_component( AnalysisExamples
+ src/*.cxx
+ src/components/*.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloEvent AthenaBaseComps AthenaKernel Navigation SGTools StoreGateLib SGtests NavFourMom xAODEventInfo xAODTracking GaudiKernel TruthHelper GeneratorObjects AthAnalysisToolsLib AnalysisUtilsLib ParticleEvent AnalysisTriggerEvent JetTagEvent JetTagInfo MuonIDEvent McParticleEvent McParticleKernel JetEvent muonEvent Particle ParticleTruth RecoToolInterfaces egammaEvent VxVertex TrkVKalVrtFitterLib TrigDecisionToolLib TrigInDetEvent TrigParticle TrigSteeringEvent )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py )
+
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx
index 165438ec31d..68f779e14c0 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx
@@ -232,8 +232,6 @@ JetTagAna::JetTagAna(const std::string& name,
m_h_rej_upur_ET(),
m_h_rej_upur_eta(),
m_h_rej_upur_phi(),
- m_eventNumber(0),
- m_runNumber(0),
m_njet(0),
m_jet_phi(),
m_jet_eta(),
@@ -261,8 +259,7 @@ JetTagAna::JetTagAna(const std::string& name,
m_ntrackj(),
m_nmuonj(),
p_nt1(nullptr),
- m_UseTupleSET(false),
- m_particleTable(nullptr)
+ m_UseTupleSET(false)
{
declareProperty("JetContainer", m_particleJetContainerName = "Cone4H1TowerJets");
declareProperty("MCParticleContainer", m_truthParticleContainerName = "SpclMC");
@@ -824,7 +821,7 @@ StatusCode JetTagAna::execute() {
<< " weight2D= " << wi2D
<< " weight3D= " << wi3D
<< " probJetProb= " << piJP
- << " grade= " << (std::string)grd
+ << " grade= " << grd.gradeString()
<< (vzero ? " fromV0 " : "") );
if(trk) {
ATH_MSG_VERBOSE ( " track pT= " << trk->pt()
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.h b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.h
index e11094c814b..fab005a0139 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.h
@@ -253,8 +253,8 @@ class JetTagAna : public AthAlgorithm {
// tag ntuple variables:
static const int m_maxjet = 80;
- int m_eventNumber;
- int m_runNumber;
+ //int m_eventNumber;
+ //int m_runNumber;
//
int m_njet;
@@ -285,7 +285,7 @@ class JetTagAna : public AthAlgorithm {
//
double getTotWeight(double,double);
const HepMC::GenParticle* getTruth(const Rec::TrackParticle* myTrackParticle,const TrackParticleTruthCollection* mcpartTES,const Rec::TrackParticleContainer* trackTES);
- const HepPDT::ParticleDataTable* m_particleTable;
+ //const HepPDT::ParticleDataTable* m_particleTable;
};
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/MiscellaneousExamples.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/MiscellaneousExamples.cxx
index 9007c47b412..d89a0736441 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/MiscellaneousExamples.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/MiscellaneousExamples.cxx
@@ -38,7 +38,7 @@ bool selectParticle(MiscellaneousExamples *self, const ParticleVect &jj);
/// some user defined constants
static const double mW = 80.4*CLHEP::GeV;
-static const double topMass = 175.0*CLHEP::GeV;
+//static const double topMass = 175.0*CLHEP::GeV;
using namespace Analysis;
--
GitLab