From 120131adaeb06632acc56b8d79c0fc2933d9011c Mon Sep 17 00:00:00 2001
From: Chenjia Zhang <chenjia.zhang@cern.ch>
Date: Fri, 23 Sep 2022 16:47:35 +0200
Subject: [PATCH] Change 'Name' for Derived Conditions in CaloFuturePIDs
---
.../src/SelectiveBremMatchAlg.cpp | 22 ++++++++++++-------
.../src/SelectiveElectronMatchAlg.cpp | 7 +++++-
.../src/SelectiveTrackMatchAlg.cpp | 7 +++++-
3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/CaloFuture/CaloFuturePIDs/src/SelectiveBremMatchAlg.cpp b/CaloFuture/CaloFuturePIDs/src/SelectiveBremMatchAlg.cpp
index b3d4591aee7..3de199d96b9 100644
--- a/CaloFuture/CaloFuturePIDs/src/SelectiveBremMatchAlg.cpp
+++ b/CaloFuture/CaloFuturePIDs/src/SelectiveBremMatchAlg.cpp
@@ -168,14 +168,20 @@ namespace LHCb::Calo {
// ============================================================================
SelectiveBremMatchAlg::SelectiveBremMatchAlg( const std::string& name, ISvcLocator* pSvc )
- : MultiTransformer( name, pSvc,
- // Inputs
- {KeyValue( "Detector", {CaloFutureAlgUtils::DeCaloFutureLocation( "Ecal" )} ),
- KeyValue( "InputHypos", {CaloFutureAlgUtils::CaloFutureHypoLocation( "Photons" )} ),
- KeyValue( "InputDigits", {CaloDigitLocation::Ecal} ), KeyValue( "TracksInCalo", "" ),
- KeyValue( "cellSizeCovariances", {"AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
- // Outputs
- {KeyValue( "OutputMatchTable", {} ), KeyValue( "OutputEnergyTable", {} )} ) {}
+ : MultiTransformer(
+ name, pSvc,
+ // Inputs
+ {KeyValue( "Detector", {CaloFutureAlgUtils::DeCaloFutureLocation( "Ecal" )} ),
+ KeyValue( "InputHypos", {CaloFutureAlgUtils::CaloFutureHypoLocation( "Photons" )} ),
+ KeyValue( "InputDigits", {CaloDigitLocation::Ecal} ), KeyValue( "TracksInCalo", "" ),
+#ifdef USE_DD4HEP
+ KeyValue( "cellSizeCovariances", {"/world:AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
+#else
+ KeyValue( "cellSizeCovariances", {"AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
+#endif
+ // Outputs
+ {KeyValue( "OutputMatchTable", {} ), KeyValue( "OutputEnergyTable", {} )} ) {
+ }
// ============================================================================
// Initialization of algorithm / tool
diff --git a/CaloFuture/CaloFuturePIDs/src/SelectiveElectronMatchAlg.cpp b/CaloFuture/CaloFuturePIDs/src/SelectiveElectronMatchAlg.cpp
index 7b4073a6910..544ed2e736d 100644
--- a/CaloFuture/CaloFuturePIDs/src/SelectiveElectronMatchAlg.cpp
+++ b/CaloFuture/CaloFuturePIDs/src/SelectiveElectronMatchAlg.cpp
@@ -176,10 +176,15 @@ namespace LHCb::Calo {
{KeyValue( "Detector", {CaloFutureAlgUtils::DeCaloFutureLocation( "Ecal" )} ),
KeyValue( "InputHypos", {LHCb::CaloFutureAlgUtils::CaloFutureHypoLocation( "Electrons" )} ),
KeyValue( "InputTracks2Clusters", "" ),
+#ifdef USE_DD4HEP
+ KeyValue( "XCorrections", {"/world:AlgorithmSpecific-" + name + "-xcorrections"} ),
+#else
KeyValue( "XCorrections", {"AlgorithmSpecific-" + name + "-xcorrections"} ),
+#endif
KeyValue( "Magnet", LHCb::Det::Magnet::det_path )},
// Outputs
- {KeyValue( "Output", "" )} ) {}
+ {KeyValue( "Output", "" )} ) {
+ }
// ============================================================================
// Initialization of algorithm / tool
diff --git a/CaloFuture/CaloFuturePIDs/src/SelectiveTrackMatchAlg.cpp b/CaloFuture/CaloFuturePIDs/src/SelectiveTrackMatchAlg.cpp
index f827c7b6142..156a37ec38a 100644
--- a/CaloFuture/CaloFuturePIDs/src/SelectiveTrackMatchAlg.cpp
+++ b/CaloFuture/CaloFuturePIDs/src/SelectiveTrackMatchAlg.cpp
@@ -104,9 +104,14 @@ namespace LHCb::Calo {
{KeyValue( "Detector", {CaloFutureAlgUtils::DeCaloFutureLocation( "Ecal" )} ),
KeyValue( "InputClusters", {CaloFutureAlgUtils::CaloFutureClusterLocation( "Ecal" )} ),
KeyValue( "InputTracksInCalo", "" ),
+#ifdef USE_DD4HEP
+ KeyValue( "cellSizeCovariances", {"/world:AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
+#else
KeyValue( "cellSizeCovariances", {"AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
+#endif
// Outputs
- {KeyValue( "Output", {CaloFutureAlgUtils::CaloFutureIdLocation( "ClusterMatch" )} )} ) {}
+ {KeyValue( "Output", {CaloFutureAlgUtils::CaloFutureIdLocation( "ClusterMatch" )} )} ) {
+ }
// ============================================================================
// Initialization of algorithm / tool
--
GitLab