From c079951273bc30a43411124af55d35eecdee638c Mon Sep 17 00:00:00 2001
From: Susumu Oda <Susumu.Oda@cern.ch>
Date: Fri, 9 Feb 2018 17:30:26 +0100
Subject: [PATCH] Remove default instances of SCT_ConditionsSummarySvcSetup and
SCT_FlaggedConditionsSvcSetup.
---
.../python/SCT_ConditionsSummarySvcSetup.py | 2 --
.../python/SCT_FlaggedConditionSvcSetup.py | 2 --
.../InDetRecExample/share/InDetRecConditionsAccess.py | 6 ++++--
.../InDetTrigRecExample/python/InDetTrigConfigConditions.py | 6 ++++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/python/SCT_ConditionsSummarySvcSetup.py b/InnerDetector/InDetConditions/SCT_ConditionsServices/python/SCT_ConditionsSummarySvcSetup.py
index 1444ffd54c3..f395e435b50 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/python/SCT_ConditionsSummarySvcSetup.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/python/SCT_ConditionsSummarySvcSetup.py
@@ -25,5 +25,3 @@ class SCT_ConditionsSummarySvcSetup:
def setup(self):
self.setSvc()
-
-sct_ConditionsSummarySvcSetup = SCT_ConditionsSummarySvcSetup()
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/python/SCT_FlaggedConditionSvcSetup.py b/InnerDetector/InDetConditions/SCT_ConditionsServices/python/SCT_FlaggedConditionSvcSetup.py
index 1078cf43341..77976a7062c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/python/SCT_FlaggedConditionSvcSetup.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/python/SCT_FlaggedConditionSvcSetup.py
@@ -25,5 +25,3 @@ class SCT_FlaggedConditionSvcSetup:
def setup(self):
self.setSvc()
-
-sct_FlaggedConditionSvcSetup = SCT_FlaggedConditionSvcSetup()
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index 0f191e62d60..f7599dc2633 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -178,7 +178,8 @@ if DetFlags.haveRIO.pixel_on():
if DetFlags.haveRIO.SCT_on():
# Load conditions summary service
- from SCT_ConditionsServices.SCT_ConditionsSummarySvcSetup import sct_ConditionsSummarySvcSetup
+ from SCT_ConditionsServices.SCT_ConditionsSummarySvcSetup import SCT_ConditionsSummarySvcSetup
+ sct_ConditionsSummarySvcSetup = SCT_ConditionsSummarySvcSetup()
sct_ConditionsSummarySvcSetup.setup()
InDetSCT_ConditionsSummarySvc = sct_ConditionsSummarySvcSetup.getSvc()
if (InDetFlags.doPrintConfigurables()):
@@ -225,7 +226,8 @@ if DetFlags.haveRIO.SCT_on():
print InDetSCT_ReadCalibDataSvc
# Load flagged condition service
- from SCT_ConditionsServices.SCT_FlaggedConditionSvcSetup import sct_FlaggedConditionSvcSetup
+ from SCT_ConditionsServices.SCT_FlaggedConditionSvcSetup import SCT_FlaggedConditionSvcSetup
+ sct_FlaggedConditionSvcSetup = SCT_FlaggedConditionSvcSetup()
sct_FlaggedConditionSvcSetup.setup()
InDetSCT_FlaggedConditionSvc = sct_FlaggedConditionSvcSetup.getSvc()
if (InDetFlags.doPrintConfigurables()):
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
index f39aab406f2..696a74cbe61 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
@@ -274,7 +274,8 @@ class SCT_ConditionsServicesSetup:
def initSummarySvc(self, instanceName):
"Init summary conditions servic"
- from SCT_ConditionsServices.SCT_ConditionsSummarySvcSetup import sct_ConditionsSummarySvcSetup
+ from SCT_ConditionsServices.SCT_ConditionsSummarySvcSetup import SCT_ConditionsSummarySvcSetup
+ sct_ConditionsSummarySvcSetup = SCT_ConditionsSummarySvcSetup()
sct_ConditionsSummarySvcSetup.setSvcName(instanceName)
sct_ConditionsSummarySvcSetup.setup()
summarySvc = sct_ConditionsSummarySvcSetup.getSvc()
@@ -283,7 +284,8 @@ class SCT_ConditionsServicesSetup:
def initFlaggedSvc(self, instanceName):
"Init flagged conditions service"
- from SCT_ConditionsServices.SCT_FlaggedConditionSvcSetup import sct_FlaggedConditionSvcSetup
+ from SCT_ConditionsServices.SCT_FlaggedConditionSvcSetup import SCT_FlaggedConditionSvcSetup
+ sct_FlaggedConditionSvcSetup = SCT_FlaggedConditionSvcSetup()
sct_FlaggedConditionSvcSetup.setSvcName(instanceName)
sct_FlaggedConditionSvcSetup.setup()
flaggedSvc = sct_FlaggedConditionSvcSetup.getSvc()
--
GitLab