From 2d5bd050105c9410171adb0f80f4a2619edf0daf Mon Sep 17 00:00:00 2001
From: Nicolas Koehler <nicolas.koehler@cern.ch>
Date: Fri, 5 Mar 2021 15:12:19 +0000
Subject: [PATCH 1/4] don't call PathResolverFindCalibFile in constructor
---
.../src/CaloMuonLikelihoodTool.cxx | 36 +++++++------------
1 file changed, 12 insertions(+), 24 deletions(-)
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
index b1057e176e11..08cd9638908c 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "CaloTrkMuIdTools/CaloMuonLikelihoodTool.h"
@@ -25,19 +25,8 @@
// CaloMuonLikelihoodTool constructor
///////////////////////////////////////////////////////////////////////////////
CaloMuonLikelihoodTool::CaloMuonLikelihoodTool(const std::string& type, const std::string& name, const IInterface* parent) :
- AthAlgTool(type,name,parent),
- m_fileNames{
- PathResolverFindCalibFile( "CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.A0.root"),
- PathResolverFindCalibFile( "CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.A1.root"),
- PathResolverFindCalibFile( "CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.A2.root"),
- PathResolverFindCalibFile( "CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.B0.root"),
- PathResolverFindCalibFile( "CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.B1.root"),
- PathResolverFindCalibFile( "CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.B2.root"),
- PathResolverFindCalibFile( "CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.C0.root"),
- PathResolverFindCalibFile( "CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.C1.root"),
- PathResolverFindCalibFile( "CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.C2.root")
-}
-{
+ AthAlgTool(type,name,parent),
+ m_fileNames() {
declareInterface<ICaloMuonLikelihoodTool>(this);
declareProperty("RootFileNames", m_fileNames);
}
@@ -47,21 +36,20 @@ CaloMuonLikelihoodTool::CaloMuonLikelihoodTool(const std::string& type, const st
///////////////////////////////////////////////////////////////////////////////
StatusCode CaloMuonLikelihoodTool::initialize() {
ATH_MSG_INFO("Initializing " << name());
-
ATH_CHECK(m_caloExtensionTool.retrieve());
-
- if (m_fileNames.size()!=9) {
- ATH_MSG_FATAL("Number of input ROOT files should be 9!");
- return StatusCode::FAILURE;
- }
-
+ m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.A0.root"));
+ m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.A1.root"));
+ m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.A2.root"));
+ m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.B0.root"));
+ m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.B1.root"));
+ m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.B2.root"));
+ m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.C0.root"));
+ m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.C1.root"));
+ m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.C2.root"));
ATH_CHECK(retrieveHistograms());
-
return StatusCode::SUCCESS;
}
-
-
///////////////////////////////////////////////////////////////////////////////
// CaloMuonLikelihoodTool::retrieveHistograms
///////////////////////////////////////////////////////////////////////////////
--
GitLab
From 4aa0d25aff5f99360258e48f999b95eae3c1479b Mon Sep 17 00:00:00 2001
From: Nicolas Koehler <nicolas.koehler@cern.ch>
Date: Fri, 5 Mar 2021 15:28:25 +0000
Subject: [PATCH 2/4] address comments
---
.../CaloTrkMuIdTools/CaloMuonLikelihoodTool.h | 4 ++-
.../src/CaloMuonLikelihoodTool.cxx | 26 ++++++++++---------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h
index 204787a6c7d3..f9c9348b39aa 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOTRKMUIDTOOLS_CALOMUONLIKELIHOODTOOL_H
@@ -44,6 +44,8 @@ private:
mutable std::atomic_int m_cnt_warn{0};
ToolHandle <Trk::IParticleCaloExtensionTool> m_caloExtensionTool{this, "ParticleCaloExtensionTool", ""};
+ Gaudi::Property<std::string> m_calibRelease{this,"CalibRelease",m_calibRelease,"CaloTrkMuIdTools/cutBased_release21"};
+
std::vector<std::string> m_fileNames;
};
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
index 08cd9638908c..5cdaba13365a 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
@@ -15,6 +15,7 @@
#include "TFile.h"
#include "TH1F.h"
+#include <TString.h> // for Form
#include <string>
#include <iostream>
@@ -26,9 +27,8 @@
///////////////////////////////////////////////////////////////////////////////
CaloMuonLikelihoodTool::CaloMuonLikelihoodTool(const std::string& type, const std::string& name, const IInterface* parent) :
AthAlgTool(type,name,parent),
- m_fileNames() {
- declareInterface<ICaloMuonLikelihoodTool>(this);
- declareProperty("RootFileNames", m_fileNames);
+ m_fileNames() {
+ declareInterface<ICaloMuonLikelihoodTool>(this);
}
///////////////////////////////////////////////////////////////////////////////
@@ -37,15 +37,17 @@ CaloMuonLikelihoodTool::CaloMuonLikelihoodTool(const std::string& type, const st
StatusCode CaloMuonLikelihoodTool::initialize() {
ATH_MSG_INFO("Initializing " << name());
ATH_CHECK(m_caloExtensionTool.retrieve());
- m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.A0.root"));
- m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.A1.root"));
- m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.A2.root"));
- m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.B0.root"));
- m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.B1.root"));
- m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.B2.root"));
- m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.C0.root"));
- m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.C1.root"));
- m_fileNames.push_back(PathResolverFindCalibFile("CaloTrkMuIdTools/cutBased_release21/CaloMuonLikelihood.PDF.C2.root"));
+ m_fileNames = {
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.A0.root",m_calibRelease.c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.A1.root",m_calibRelease.c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.A2.root",m_calibRelease.c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.B0.root",m_calibRelease.c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.B1.root",m_calibRelease.c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.B2.root",m_calibRelease.c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.C0.root",m_calibRelease.c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.C1.root",m_calibRelease.c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.C2.root",m_calibRelease.c_str()))
+ };
ATH_CHECK(retrieveHistograms());
return StatusCode::SUCCESS;
}
--
GitLab
From 025d779e36b7e333c1ee3e8836ff182eebc043c8 Mon Sep 17 00:00:00 2001
From: Nicolas Koehler <nicolas.koehler@cern.ch>
Date: Fri, 5 Mar 2021 15:34:50 +0000
Subject: [PATCH 3/4] fix typo
---
.../CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h
index f9c9348b39aa..3ed962ac2b33 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h
@@ -44,7 +44,7 @@ private:
mutable std::atomic_int m_cnt_warn{0};
ToolHandle <Trk::IParticleCaloExtensionTool> m_caloExtensionTool{this, "ParticleCaloExtensionTool", ""};
- Gaudi::Property<std::string> m_calibRelease{this,"CalibRelease",m_calibRelease,"CaloTrkMuIdTools/cutBased_release21"};
+ Gaudi::Property<std::string> m_calibRelease{this,"CalibRelease","CaloTrkMuIdTools/cutBased_release21"};
std::vector<std::string> m_fileNames;
};
--
GitLab
From eda05b153c01893650b01a513c2947640797622f Mon Sep 17 00:00:00 2001
From: Nicolas Koehler <nicolas.koehler@cern.ch>
Date: Fri, 5 Mar 2021 20:01:54 +0000
Subject: [PATCH 4/4] use value()
---
.../src/CaloMuonLikelihoodTool.cxx | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
index 5cdaba13365a..af6786e50504 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
@@ -38,15 +38,15 @@ StatusCode CaloMuonLikelihoodTool::initialize() {
ATH_MSG_INFO("Initializing " << name());
ATH_CHECK(m_caloExtensionTool.retrieve());
m_fileNames = {
- PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.A0.root",m_calibRelease.c_str())),
- PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.A1.root",m_calibRelease.c_str())),
- PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.A2.root",m_calibRelease.c_str())),
- PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.B0.root",m_calibRelease.c_str())),
- PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.B1.root",m_calibRelease.c_str())),
- PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.B2.root",m_calibRelease.c_str())),
- PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.C0.root",m_calibRelease.c_str())),
- PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.C1.root",m_calibRelease.c_str())),
- PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.C2.root",m_calibRelease.c_str()))
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.A0.root",m_calibRelease.value().c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.A1.root",m_calibRelease.value().c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.A2.root",m_calibRelease.value().c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.B0.root",m_calibRelease.value().c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.B1.root",m_calibRelease.value().c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.B2.root",m_calibRelease.value().c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.C0.root",m_calibRelease.value().c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.C1.root",m_calibRelease.value().c_str())),
+ PathResolverFindCalibFile(Form("%s/CaloMuonLikelihood.PDF.C2.root",m_calibRelease.value().c_str()))
};
ATH_CHECK(retrieveHistograms());
return StatusCode::SUCCESS;
--
GitLab