diff --git a/.vscode/settings.json b/.vscode/settings.json
index e1ebff53d0f2fd9393ab50de18c0ec7621a8c277..9e064cbadf44c21c8396d21d9bc8fcced7d4f060 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,5 +3,6 @@
"ms-vscode.cpptools",
"twxs.cmake"
],
- "remote.SSH.lockfilesInTmp": true
+ "remote.SSH.lockfilesInTmp": true,
+ "python.formatting.provider": "black"
}
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index 3dc09335320267828ffc3f67393944a8520330c4..5e5f50775388dee7f5913a03aea10c14c977c212 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -27,26 +27,28 @@ _basicServicesToCreateOrder=("CoreDumpSvc/CoreDumpSvc", "GeoModelSvc/GeoModelSvc
-def printProperties(msg, c, nestLevel = 0, printDefaults=False):
+def printProperties(msg, c, nestLevel = 0, printDefaults=False, onlyComponents=False):
# Iterate in sorted order.
propnames= sorted(c._descriptors.keys())
for propname in propnames:
if not printDefaults and not c.is_property_set(propname):
continue
+
propval=getattr(c,propname)
# Ignore empty lists
if isinstance(propval,(GaudiConfig2.semantics._ListHelper,GaudiConfig2.semantics._DictHelper)) and propval.data is None:
continue
# Printing EvtStore could be relevant for Views?
- if propname in ["DetStore","EvtStore"]:
+ if not c.is_property_set(propname) and propname in ["DetStore","EvtStore", "AuditFinalize", "AuditInitialize", "AuditReinitialize", "AuditRestart", "AuditStart", "AuditStop", "AuditTools", "ExtraInputs", "ExtraOutputs"]:
continue
if isinstance( propval, GaudiConfig2.Configurable ):
msg.info( " "*nestLevel +" * {0}: {1}/{2}".format(propname, propval.__cpp_type__, propval.getName()))
printProperties(msg, propval, nestLevel+3)
continue
+ propstr=""
if isinstance(propval,GaudiHandles.PublicToolHandleArray):
ths = [th.getName() for th in propval]
propstr = "PublicToolHandleArray([ {0} ])".format(', '.join(ths))
@@ -55,9 +57,12 @@ def printProperties(msg, c, nestLevel = 0, printDefaults=False):
propstr = "PrivateToolHandleArray([ {0} ])".format(', '.join(ths))
elif isinstance(propval,GaudiHandles.GaudiHandle): # Any other handle
propstr = "Handle( {0} )".format(propval.typeAndName)
- else:
- propstr = str(propval)
- msg.info( " "*nestLevel +" * {0}: {1}".format(propname,propstr))
+ elif not onlyComponents:
+ propstr = str(propval)
+ if propstr:
+ msg.info( " "*nestLevel +" * {}: {} {}".format(propname,
+ propstr,
+ "set" if c.is_property_set(propname) else "default"))
return
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index 824f723041c9f115b6d64f84318ad68402794926..98fc65feaf2c84ffc1d063d4f1da01b3e4098ff4 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -371,7 +371,7 @@ def PixelDCSCondHVAlgCfg(flags, name="PixelDCSCondHVAlg", **kwargs):
kwargs.update( ReadKey="/PIXEL/HLT/DCS/HV")
acc.merge(addFolders(flags, kwargs["ReadKey"], "PIXEL_ONL", className="CondAttrListCollection"))
else:
- kwargs.update( ReadKey="/PIXEL/HLT/DCS/HV")
+ kwargs.update( ReadKey="/PIXEL/DCS/HV")
acc.merge(addFolders(flags, kwargs["ReadKey"], "DCS_OFL", className="CondAttrListCollection"))
kwargs.setdefault("WriteKey", "PixelDCSHVCondData")
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_DCSConditionsConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_DCSConditionsConfig.py
index bc0bc84f7f670410f61565a9b81f47dd246a248c..fcacdc6cc9f6d40fcc6ed3046c2656b4a073ce4b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_DCSConditionsConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_DCSConditionsConfig.py
@@ -24,7 +24,7 @@ def SCT_DCSConditionsCfg(flags, name="InDetSCT_DCSConditions", **kwargs):
hvFolder = kwargs.get("hvFolder", dcsFolder + "/HV")
tempFolder = kwargs.get("tempFolder", dcsFolder + "/MODTEMP")
stateFolder = kwargs.get("stateFolder", dcsFolder + "/CHANSTAT")
- ReadAllDBFolders = kwargs.get("ReadAllDBFolders", True)
+ ReadAllDBFolders = kwargs.get("ReadAllDBFolders", not flags.Common.isOnline)
ReturnHVTemp = kwargs.get("ReturnHVTemp", True)
# Condition algorithms
diff --git a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
index 5c209c69a1bea97909782d97084c9cafa83cb550..6388e610fa01b5542187437769c401af5a30be13 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
@@ -560,6 +560,10 @@ def MuonClusterSegmentFinderToolCfg(flags, **kwargs):
result.merge(acc)
kwargs.setdefault("SegmentAmbiguityTool", ambi)
+ from MuonConfiguration.MuonRecToolsConfig import MuonTrackToSegmentToolCfg
+ acc = MuonTrackToSegmentToolCfg(flags)
+ kwargs.setdefault( "TrackToSegmentTool", results.popToolsAndMerge(acc))
+
# FIXME - remaining tools
result.setPrivateTools(Muon__MuonClusterSegmentFinderTool(**kwargs))
return result
@@ -600,6 +604,10 @@ def MuonClusterSegmentFinderCfg(flags, **kwargs):
result.merge(acc)
kwargs.setdefault("TrackCleaner", cleaner)
+ from MuonConfig.MuonRecToolsConfig import MuonTrackToSegmentToolCfg
+ acc = MuonTrackToSegmentToolCfg(flags)
+ kwargs.setdefault( "TrackToSegmentTool", result.popToolsAndMerge(acc))
+
result.addPublicTool(Muon__MuonClusterSegmentFinder(**kwargs),primary=True)
return result
diff --git a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
index ba8ae693d27500d19edcf0ce93cc4ddc99c54da2..d08ecc569532233ad50978b7ee5b9dc65d1cf9bd 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
@@ -144,9 +144,9 @@ def MooTrackBuilderCfg(flags, name="MooTrackBuilderTemplate", **kwargs):
hole_recovery_tool = acc.getPrimary()
result.addPublicTool(hole_recovery_tool)
result.merge(acc)
- kwargs.setdefault("HitRecoveryTool", hole_recovery_tool)
+ kwargs.setdefault("HitRecoveryTool", hole_recovery_tool)
kwargs.setdefault("ChamberHoleRecoveryTool", hole_recovery_tool) # FIXME? Remove duplicate from cxx?
-
+
acc = MagneticFieldSvcCfg(flags)
result.merge(acc)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
index 8ea8f89391f6064cff6ddb238dd5c5476f6f9e11..1dd401b5ed824d3022f42804d1373bdd404dcc76 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_newJO.py
@@ -53,6 +53,7 @@ setupMenuModule.setupMenu(flags)
flags.Exec.MaxEvents=50
flags.Input.isMC = False
flags.Common.isOnline=True
+flags.IOVDb.GlobalTag="CONDBR2-HLTP-2018-01"
flags.Concurrency.NumThreads=1