From e6a69671f7a1e8ffebc64a870cc5800f37a6318d Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 25 Jan 2017 03:16:57 +0100
Subject: [PATCH] 'Make IClusterCellWeightTool::LoadConditionsData optional.'
(CaloInterface-01-00-15)
* Tagging CaloInterface-01-00-15.
* CaloInterface/IClusterCellWeightTool.h: Make LoadConditionsData
optional.
2017-01-24 Vakho Tsulaia <tsulaia@cern.ch>
* Tagging CaloInterface-01-00-14
* Dropping the obsolete IClusterClassificationTool::LoadConditionsData()
Former-commit-id: 4f2c9f67813190be0ff0392bc2e5920807924b4c
---
.../CaloInterface/CaloInterface/IClusterCellWeightTool.h | 4 +++-
.../CaloInterface/CaloInterface/IClusterClassificationTool.h | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Calorimeter/CaloInterface/CaloInterface/IClusterCellWeightTool.h b/Calorimeter/CaloInterface/CaloInterface/IClusterCellWeightTool.h
index 732593e9ca5..0a15b2a9a3b 100755
--- a/Calorimeter/CaloInterface/CaloInterface/IClusterCellWeightTool.h
+++ b/Calorimeter/CaloInterface/CaloInterface/IClusterCellWeightTool.h
@@ -38,7 +38,9 @@ class IClusterCellWeightTool : virtual public IAlgTool
* to implement it. */
virtual StatusCode weight(xAOD::CaloCluster* thisCluster) const = 0;
- virtual StatusCode LoadConditionsData(IOVSVC_CALLBACK_ARGS) =0;
+ // Now obsolete.
+ virtual StatusCode LoadConditionsData(IOVSVC_CALLBACK_ARGS)
+ { return StatusCode::SUCCESS; }
};
#endif
diff --git a/Calorimeter/CaloInterface/CaloInterface/IClusterClassificationTool.h b/Calorimeter/CaloInterface/CaloInterface/IClusterClassificationTool.h
index e450250d0b6..0fc6d59bf9d 100755
--- a/Calorimeter/CaloInterface/CaloInterface/IClusterClassificationTool.h
+++ b/Calorimeter/CaloInterface/CaloInterface/IClusterClassificationTool.h
@@ -40,8 +40,6 @@ class IClusterClassificationTool : virtual public IAlgTool
* to implement it. */
virtual CaloRecoStatus::StatusIndicator classify(xAOD::CaloCluster* thisCluster) const = 0;
- virtual StatusCode LoadConditionsData(IOVSVC_CALLBACK_ARGS) =0;
-
};
#endif
--
GitLab