diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py
index 901cf8b9aa427b41372b6e2388b4bf95833a59e6..9b5bb95d94bb28c874db7577d3bf7cff2891442c 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py
@@ -8,3 +8,8 @@ def getSCTLorentzAngleTool(name="SCTLorentzAngleTool", **kwargs):
kwargs.setdefault("DetectorName", "SCT")
from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
return CfgMgr.SiLorentzAngleTool(name, **kwargs)
+
+def getPixelLorentzAngleTool(name="PixelLorentzAngleTool", **kwargs):
+ kwargs.setdefault("DetectorName", "PIXEL")
+ from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+ return CfgMgr.SiLorentzAngleTool(name, **kwargs)
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py
index 289c4d7135ad79345aee080e0bcbfefc76d67794..77499920a0588387ccc65c6ada9f38092ab4552c 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py
@@ -5,3 +5,4 @@
from AthenaCommon.CfgGetter import addTool
addTool("SiLorentzAngleSvc.SiLorentzAngleSvcConfig.getSCTLorentzAngleTool", "SCTLorentzAngleTool")
+addTool("SiLorentzAngleSvc.SiLorentzAngleSvcConfig.getPixelLorentzAngleTool", "PixelLorentzAngleTool")
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
index cc9fb5c020d57cc742a6d43d9b2e45bfb5b5b9c9..7282ddce35ea48e165a84f455208764a6b1d555d 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
@@ -20,7 +20,8 @@ class PixelConditionsServicesSetup:
self.svcMgr = ServiceMgr
from AthenaCommon.AppMgr import ToolSvc
self.toolSvc = ToolSvc
-
+ self.summaryTool = None
+
self.isData = False
from AthenaCommon.GlobalFlags import globalflags
if globalflags.DataSource() == 'data':
@@ -70,11 +71,14 @@ class PixelConditionsServicesSetup:
conddb.addFolder(PixelDBInstance, PixelHVFolder, className="CondAttrListCollection")
if not conddb.folderRequested(PixelTempFolder):
conddb.addFolder(PixelDBInstance, PixelTempFolder, className="CondAttrListCollection")
- if (self.isData):
+
+ if not self.onlineMode: #this is only for testing in offline like setup
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATE"):
conddb.addFolder("DCS_OFL", "/PIXEL/DCS/FSMSTATE", className="CondAttrListCollection")
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATUS"):
conddb.addFolder("DCS_OFL", "/PIXEL/DCS/FSMSTATUS", className="CondAttrListCollection")
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondStateAlg
+ condSeq += PixelDCSCondStateAlg(name="PixelDCSCondStateAlg")
from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
@@ -85,9 +89,6 @@ class PixelConditionsServicesSetup:
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondTempAlg
condSeq += PixelDCSCondTempAlg(name="PixelDCSCondTempAlg", ReadKey=PixelTempFolder)
- if (self.isData):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondStateAlg
- condSeq += PixelDCSCondStateAlg(name="PixelDCSCondStateAlg")
from PixelConditionsTools.PixelConditionsToolsConf import PixelDCSConditionsTool
TrigPixelDCSConditionsTool = PixelDCSConditionsTool(name="PixelDCSConditionsTool", UseDB=self.useDCS, IsDATA=self.isData)
@@ -109,9 +110,7 @@ class PixelConditionsServicesSetup:
TrigPixelConditionsSummaryTool.IsActiveStatus = [ 'OK', 'WARNING' ]
ToolSvc += TrigPixelConditionsSummaryTool
-
- print "STSTST"
- print TrigPixelConditionsSummaryTool
+ self.summaryTool = TrigPixelConditionsSummaryTool
if self._print: print TrigPixelConditionsSummaryTool
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py
index af58280867ed2277079286168fe9cea8dfcdcd40..634f51769ae5fe79b4b4eefcb1a37548f1457e79 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py
@@ -214,17 +214,6 @@ class TRT_TrigSeededTrackFinder_EF( InDet__TRT_TrigSeededTrackFinder ):
ToolSvc += InDetTrigTRT_SeededSiRoadMaker
if (InDetTrigFlags.doPrintConfigurables()):
print InDetTrigTRT_SeededSiRoadMaker
- # Condition algorithm for InDet__SiDetElementsRoadMaker_xk
- from AthenaCommon.AlgSequence import AthSequencer
- condSeq = AthSequencer("AthCondSeq")
- if not hasattr(condSeq, "InDet__SiDetElementsRoadCondAlg_xk"):
- IBLDistFolderKey = "/Indet/IBLDist"
- from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
- if athenaCommonFlags.isOnline():
- IBLDistFolderKey = "/Indet/Onl/IBLDist"
- from SiDetElementsRoadTool_xk.SiDetElementsRoadTool_xkConf import InDet__SiDetElementsRoadCondAlg_xk
- condSeq += InDet__SiDetElementsRoadCondAlg_xk(name = "InDet__SiDetElementsRoadCondAlg_xk",
- IBLDistFolderKey = IBLDistFolderKey)
# Local combinatorial track finding using space point seed and detector element road
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigSiComTrackFinder
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
index 269b7dec25bf664f8bcbd31f56f9b871e054da54..94f6ffc8ca02c9a7cf2f041fef7b2140208805b5 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
@@ -17,7 +17,11 @@ from AthenaCommon.DetFlags import DetFlags
from AthenaCommon.Logging import logging
log = logging.getLogger("InDetTrigConfigRecLoadTools.py")
-from InDetTrigRecExample.InDetTrigConditionsAccess import PixelConditionsSetup
+from InDetTrigRecExample.InDetTrigConditionsAccess import PixelConditionsSetup, SCT_ConditionsSetup
+from AthenaCommon.CfgGetter import getPublicTool
+TrigPixelLorentzAngleTool = getPublicTool("PixelLorentzAngleTool")
+TrigSCTLorentzAngleTool = getPublicTool("SCTLorentzAngleTool")
+# to be changed to TrigSCTLorentzAngleTool = getPrivateTool("SCTLorentzAngleTool") next
if not hasattr(ToolSvc, "SCTLorentzAngleTool"):
from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
@@ -34,8 +38,8 @@ InDetTrigClusterMakerTool = \
PixelOfflineCalibSvc = PixelConditionsSetup.instanceName('PixelOfflineCalibSvc'),
#pixLorentzAnleSvc = "InDetTrigPixLorentzAngleSvc",
#UseLorentzAngleCorrections = False
- PixelLorentzAngleTool = ToolSvc.InDetTrigPixelLorentzAngleTool,
- SCTLorentzAngleTool = ToolSvc.SCTLorentzAngleTool
+ PixelLorentzAngleTool = TrigPixelLorentzAngleTool,
+ SCTLorentzAngleTool = TrigSCTLorentzAngleTool
)
if (InDetTrigFlags.doPrintConfigurables()):
print InDetTrigClusterMakerTool
@@ -62,11 +66,7 @@ ToolSvc += SCT_TrigSpacePointTool
#
# ----------- control loading of ROT_creator
#
-
if InDetTrigFlags.loadRotCreator():
- if not hasattr(ToolSvc, "SCTLorentzAngleTool"):
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
- sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
#4 clusterOnTrack Tools
#
@@ -74,7 +74,7 @@ if InDetTrigFlags.loadRotCreator():
SCT_ClusterOnTrackTool = InDet__SCT_ClusterOnTrackTool ("SCT_ClusterOnTrackTool",
CorrectionStrategy = 0, # do correct position bias
ErrorStrategy = 2, # do use phi dependent errors
- LorentzAngleTool = ToolSvc.SCTLorentzAngleTool)
+ LorentzAngleTool = TrigSCTLorentzAngleTool)
ToolSvc += SCT_ClusterOnTrackTool
if (InDetTrigFlags.doPrintConfigurables()):
@@ -96,7 +96,7 @@ if InDetTrigFlags.loadRotCreator():
from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as geoFlags
if ( not geoFlags.Run() in ["RUN2", "RUN3"] ) :
TrigNnClusterizationFactory = InDet__NnClusterizationFactory( name = "TrigNnClusterizationFactory",
- PixelLorentzAngleTool= ToolSvc.InDetTrigPixelLorentzAngleTool,
+ PixelLorentzAngleTool= TrigPixelLorentzAngleTool,
NetworkToHistoTool = NeuralNetworkToHistoTool,
doRunI = True,
useToT = False,
@@ -108,7 +108,7 @@ if InDetTrigFlags.loadRotCreator():
LoadWithTrackNetwork = True)
else:
TrigNnClusterizationFactory = InDet__NnClusterizationFactory( name = "TrigNnClusterizationFactory",
- PixelLorentzAngleTool= ToolSvc.InDetTrigPixelLorentzAngleTool,
+ PixelLorentzAngleTool= TrigPixelLorentzAngleTool,
NetworkToHistoTool = NeuralNetworkToHistoTool,
LoadNoTrackNetwork = True,
useToT = InDetTrigFlags.doNNToTCalibration(),
@@ -132,7 +132,7 @@ if InDetTrigFlags.loadRotCreator():
InDetTrigPixelClusterOnTrackTool = InDet__PixelClusterOnTrackTool("InDetTrigPixelClusterOnTrackTool",
PixelOfflineCalibSvc=PixelConditionsSetup.instanceName('PixelOfflineCalibSvc'),
ErrorStrategy = 2,
- LorentzAngleTool = ToolSvc.InDetTrigPixelLorentzAngleTool,
+ LorentzAngleTool = TrigPixelLorentzAngleTool,
NnClusterizationFactory= TrigNnClusterizationFactory,
)
@@ -146,7 +146,7 @@ if InDetTrigFlags.loadRotCreator():
InDetTrigBroadSCT_ClusterOnTrackTool = InDet__SCT_ClusterOnTrackTool ("InDetTrigBroadSCT_ClusterOnTrackTool",
CorrectionStrategy = 0, # do correct position bias
ErrorStrategy = 0, # do use broad errors
- LorentzAngleTool = ToolSvc.SCTLorentzAngleTool)
+ LorentzAngleTool = TrigSCTLorentzAngleTool)
ToolSvc += InDetTrigBroadSCT_ClusterOnTrackTool
if (InDetTrigFlags.doPrintConfigurables()):
print InDetTrigBroadSCT_ClusterOnTrackTool
@@ -156,7 +156,7 @@ if InDetTrigFlags.loadRotCreator():
InDetTrigBroadPixelClusterOnTrackTool = InDet__PixelClusterOnTrackTool("InDetTrigBroadPixelClusterOnTrackTool",
PixelOfflineCalibSvc=PixelConditionsSetup.instanceName('PixelOfflineCalibSvc'),
ErrorStrategy = 0,
- LorentzAngleTool = ToolSvc.InDetTrigPixelLorentzAngleTool,
+ LorentzAngleTool = TrigPixelLorentzAngleTool,
NnClusterizationFactory= TrigNnClusterizationFactory
)
ToolSvc += InDetTrigBroadPixelClusterOnTrackTool
@@ -632,10 +632,8 @@ if InDetTrigFlags.loadFitter():
print InDetTrigTrackFitterTRT
-if DetFlags.haveRIO.pixel_on():
- InDetTrigPixelConditionsSummaryTool = ToolSvc.InDetTrigPixelConditionsSummaryTool
-else:
- InDetTrigPixelConditionsSummaryTool = None
+
+InDetTrigPixelConditionsSummaryTool = PixelConditionsSetup.summaryTool
if DetFlags.haveRIO.SCT_on():
from InDetTrigRecExample.InDetTrigConditionsAccess import SCT_ConditionsSetup
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 0a8cc3960c46af3742ec5ae8a53d8ebb23a46356..34d6f744fb9b8428f1cd2b49301c9226263dbbb2 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -470,7 +470,7 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
InDetTrigSiComTrackFinder_FTF = InDetTrigSiComTrackFinder.clone("InDetTrigSiComTrackFinder_FTF")
from InDetTrigRecExample.InDetTrigConditionsAccess import SCT_ConditionsSetup
from SCT_ConditionsTools.SCT_ConditionsToolsConf import SCT_ConditionsSummaryTool
- InDetTrigSiComTrackFinder_FTF.SctSummaryTool = SCT_ConditionsSummaryTool(SCT_ConditionsSetup.instanceName('InDetSCT_ConditionsSummaryTool'))
+ InDetTrigSiComTrackFinder_FTF.SctSummaryTool = SCT_ConditionsSummaryTool(SCT_ConditionsSetup.instanceName('InDetSCT_ConditionsSummaryToolWithoutFlagged'))
ToolSvc += InDetTrigSiComTrackFinder_FTF
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
index 90b18294278c45d38679bf776fc09fe8f50df819..b5ac5973e493d63cc31c22d3b205a93ab175e2e9 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
@@ -119,19 +119,16 @@ def makeInDetAlgs():
viewAlgs.append(InDetTRTRawDataProvider)
- # SCTLorentzAngleTool for ClusterMakerTool
- if not hasattr(ToolSvc, "SCTLorentzAngleTool"):
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
- sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
-
#Pixel clusterisation
+ from InDetTrigRecExample.InDetTrigConfigRecLoadTools import TrigPixelLorentzAngleTool, TrigSCTLorentzAngleTool
from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
- PixelCalibSvc = None,
- PixelOfflineCalibSvc = None,
- UsePixelCalibCondDB = False,
- SCTLorentzAngleTool = ToolSvc.SCTLorentzAngleTool)
+ PixelCalibSvc = None,
+ PixelOfflineCalibSvc = None,
+ UsePixelCalibCondDB = False,
+ SCTLorentzAngleTool = TrigSCTLorentzAngleTool,
+ PixelLorentzAngleTool = TrigPixelLorentzAngleTool)
ToolSvc += InDetClusterMakerTool
@@ -164,10 +161,11 @@ def makeInDetAlgs():
viewAlgs.append(InDetPixelClusterization)
- from SCT_ConditionsTools.SCT_FlaggedConditionToolSetup import SCT_FlaggedConditionToolSetup
- sct_FlaggedConditionToolSetup = SCT_FlaggedConditionToolSetup()
- sct_FlaggedConditionToolSetup.setup()
- InDetSCT_FlaggedConditionTool = sct_FlaggedConditionToolSetup.getTool()
+ # TODO - it should work in principle but generates run time errors for the moment
+ # from SCT_ConditionsTools.SCT_FlaggedConditionToolSetup import SCT_FlaggedConditionToolSetup
+ # sct_FlaggedConditionToolSetup = SCT_FlaggedConditionToolSetup()
+ # sct_FlaggedConditionToolSetup.setup()
+ # InDetSCT_FlaggedConditionTool = sct_FlaggedConditionToolSetup.getTool()
from SCT_ConditionsTools.SCT_ConditionsSummaryToolSetup import SCT_ConditionsSummaryToolSetup
sct_ConditionsSummaryToolSetup = SCT_ConditionsSummaryToolSetup()
@@ -177,8 +175,9 @@ def makeInDetAlgs():
condTools = []
for condToolHandle in InDetSCT_ConditionsSummaryTool.ConditionsTools:
condTool = condToolHandle.typeAndName
+ print condTool
if condTool not in condTools:
- if condTool != InDetSCT_FlaggedConditionTool.getFullName():
+ if condTool != "SCT_FlaggedConditionTool/InDetSCT_FlaggedConditionTool":
condTools.append(condTool)
sct_ConditionsSummaryToolSetupWithoutFlagged = SCT_ConditionsSummaryToolSetup()
sct_ConditionsSummaryToolSetupWithoutFlagged.setToolName("InDetSCT_ConditionsSummaryToolWithoutFlagged")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/egammaMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/egammaMenuDefs.py
index 4be327b0c1b9baeeb8d8d41d11af498974b2d51e..e0b0912ba64a0439c7f2002ddcc875c6108e0870 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/egammaMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/egammaMenuDefs.py
@@ -8,11 +8,6 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
import AthenaCommon.CfgMgr as CfgMgr
-#workaround to prevent online trigger folders to be enabled
-from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
-InDetTrigFlags.useConditionsClasses.set_Value_and_Lock(False)
-
-
from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doCaloSeededBrem = False
InDetFlags.InDet25nsec = True
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py
index ddb386622e1a12d518e0f2b35935db88e9ee960b..086cd624eec71683e21e7ccc4f14919ebee3c580 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py
@@ -15,9 +15,6 @@ import AthenaCommon.CfgGetter as CfgGetter
from AthenaCommon.CfgGetter import getPublicTool, getPublicToolClone
from AthenaCommon import CfgMgr
-### workaround to prevent online trigger folders to be enabled ###
-from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
-InDetTrigFlags.useConditionsClasses.set_Value_and_Lock(False)
from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doCaloSeededBrem = False
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
index f7079dd617655acd52d977dba66bbc6440b9e542..318c2e2a9f4f9837f62bb376558a3aedb683c776 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
@@ -34,11 +34,6 @@ allViewAlgorithms = AthSequencer(viewNodeName, Sequential=False, ModeOR=False, S
if TriggerFlags.doID:
- #workaround to prevent online trigger folders to be enabled
- from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
- InDetTrigFlags.useConditionsClasses.set_Value_and_Lock(False)
-
-
from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doCaloSeededBrem = False
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index e4b5837ae369e1abf5db496331ba86660c6cc9f6..d88312ec05add31239005872372b7db2e29b358a 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -4,10 +4,6 @@
include("TrigUpgradeTest/testHLT_MT.py")
-#workaround to prevent online trigger folders to be enabled
-from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
-InDetTrigFlags.useConditionsClasses.set_Value_and_Lock(False)
-
from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doCaloSeededBrem = False
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
index 19a14449768896f0e303e8212102960b1bee7a9e..af589dd02da16cdd19b13bce3549cfb0699c4262 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
@@ -8,6 +8,7 @@ include("TrigUpgradeTest/testHLT_MT.py")
from AthenaCommon.DetFlags import DetFlags
+
### Set muon sequence ###
if not 'doL2SA' in dir():
doL2SA=True
@@ -20,13 +21,8 @@ if not 'doEFSA' in dir():
### workaround to prevent online trigger folders to be enabled ###
if doL2CB or doL2ISO:
- from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
- InDetTrigFlags.useConditionsClasses.set_Value_and_Lock(False)
-
from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doCaloSeededBrem = False
-
- from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.InDet25nsec = True
InDetFlags.doPrimaryVertex3DFinding = False
InDetFlags.doPrintConfigurables = False