Commit 8efc58f0 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'overlay/output2' into 'master'

Improve overlay output configuration

See merge request atlas/athena!30524
parents 1ca54864 4b21e48c
......@@ -19,7 +19,7 @@ def EventInfoCnvAlgCfg(flags, name="EventInfoCnvAlg",
# TODO: luminosity
xAODMaker__EventInfoCnvAlg=CompFactory.xAODMaker__EventInfoCnvAlg
xAODMaker__EventInfoCnvAlg = CompFactory.xAODMaker__EventInfoCnvAlg
alg = xAODMaker__EventInfoCnvAlg(name, **kwargs)
acc.addEventAlgo(alg)
......@@ -28,8 +28,7 @@ def EventInfoCnvAlgCfg(flags, name="EventInfoCnvAlg",
def EventInfoOverlayAlgCfg(flags, name="EventInfoOverlay", **kwargs):
"""Return a ComponentAccumulator for EventInfoOverlay algorithm"""
acc = ComponentAccumulator()
acc = ComponentAccumulator()
kwargs.setdefault("BkgInputKey", flags.Overlay.BkgPrefix + "EventInfo")
kwargs.setdefault("SignalInputKey", flags.Overlay.SigPrefix + "EventInfo")
......@@ -38,7 +37,7 @@ def EventInfoOverlayAlgCfg(flags, name="EventInfoOverlay", **kwargs):
kwargs.setdefault("DataOverlay", flags.Overlay.DataOverlay)
# Do the xAOD::EventInfo overlay
xAODMaker__EventInfoOverlay=CompFactory.xAODMaker__EventInfoOverlay
xAODMaker__EventInfoOverlay = CompFactory.xAODMaker__EventInfoOverlay
alg = xAODMaker__EventInfoOverlay(name, **kwargs)
acc.addEventAlgo(alg)
......@@ -54,18 +53,19 @@ def EventInfoOverlayAlgCfg(flags, name="EventInfoOverlay", **kwargs):
def EventInfoOverlayOutputCfg(flags, **kwargs):
"""Return event info overlay output configuration"""
acc = ComponentAccumulator()
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc = OutputStreamCfg(flags, "RDO")
if flags.Output.doWriteRDO:
acc.merge(OutputStreamCfg(flags, "RDO"))
# Add signal output
if flags.Output.doWriteRDO_SGNL:
outConfig = OutputStreamCfg(flags, "RDO_SGNL",
ItemList=[
"xAOD::EventInfo#Sig_EventInfo",
"xAOD::EventAuxInfo#Sig_EventInfoAux."
])
acc.merge(outConfig)
acc.merge(OutputStreamCfg(flags, "RDO_SGNL",
ItemList=[
"xAOD::EventInfo#Sig_EventInfo",
"xAOD::EventAuxInfo#Sig_EventInfoAux."
]))
return acc
......
......@@ -45,10 +45,17 @@ def PixelOverlayAlgCfg(flags, name="PixelOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"PixelRDO_Container#PixelRDOs"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"PixelRDO_Container#PixelRDOs"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"PixelRDO_Container#" + flags.Overlay.SigPrefix + "PixelRDOs"
]))
return acc
......@@ -70,10 +77,17 @@ def PixelTruthOverlayCfg(flags, name="PixelSDOOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"InDetSimDataCollection#PixelSDO_Map"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"InDetSimDataCollection#PixelSDO_Map"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"InDetSimDataCollection#" + flags.Overlay.SigPrefix + "PixelSDO_Map"
]))
return acc
......
......@@ -89,10 +89,17 @@ def SCTOverlayAlgCfg(flags, name="SCTOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"SCT_RDO_Container#SCT_RDOs"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"SCT_RDO_Container#SCT_RDOs"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"SCT_RDO_Container#" + flags.Overlay.SigPrefix + "SCT_RDOs"
]))
return acc
......@@ -114,10 +121,17 @@ def SCTTruthOverlayCfg(flags, name="SCTSDOOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"InDetSimDataCollection#SCT_SDO_Map"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"InDetSimDataCollection#SCT_SDO_Map"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"InDetSimDataCollection#" + flags.Overlay.SigPrefix + "SCT_SDO_Map"
]))
return acc
......
......@@ -73,10 +73,17 @@ def TRTOverlayAlgCfg(flags, name="TRTOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"TRT_RDO_Container#TRT_RDOs"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"TRT_RDO_Container#TRT_RDOs"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"TRT_RDO_Container#" + flags.Overlay.SigPrefix + "TRT_RDOs"
]))
return acc
......@@ -101,10 +108,17 @@ def TRTTruthOverlayCfg(flags, name="TRTSDOOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"InDetSimDataCollection#TRT_SDO_Map"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"InDetSimDataCollection#TRT_SDO_Map"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"InDetSimDataCollection#" + flags.Overlay.SigPrefix + "TRT_SDO_Map"
]))
return acc
......
......@@ -24,10 +24,6 @@ args = parser.parse_args()
# Configure
defaultTestFlags(ConfigFlags, args)
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
ConfigFlags.Output.RDO_SGNLFileName = "myRDO_SGNL.pool.root"
postprocessAndLockFlags(ConfigFlags, args)
# Construct our accumulator to run
......
......@@ -24,10 +24,6 @@ args = parser.parse_args()
# Configure
defaultTestFlags(ConfigFlags, args)
ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
ConfigFlags.Output.RDO_SGNLFileName = "myRDO_SGNL.pool.root"
postprocessAndLockFlags(ConfigFlags, args)
# Construct our accumulator to run
......
......@@ -40,10 +40,17 @@ def CscOverlayAlgCfg(flags, name="CscOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"CscRawDataContainer#CSCRDO"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"CscRawDataContainer#CSCRDO"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"CscRawDataContainer#" + flags.Overlay.SigPrefix + "CSCRDO"
]))
return acc
......@@ -69,10 +76,17 @@ def CscTruthOverlayCfg(flags, name="CscTruthOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"CscSimDataCollection#CSC_SDO"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"CscSimDataCollection#CSC_SDO"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"CscSimDataCollection#" + flags.Overlay.SigPrefix + "CSC_SDO"
]))
return acc
......
......@@ -35,10 +35,17 @@ def MdtOverlayAlgCfg(flags, name="MdtOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"MdtCsmContainer#MDTCSM"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"MdtCsmContainer#MDTCSM"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"MdtCsmContainer#" + flags.Overlay.SigPrefix + "MDTCSM"
]))
return acc
......@@ -64,10 +71,17 @@ def MdtTruthOverlayCfg(flags, name="MdtTruthOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"MuonSimDataCollection#MDT_SDO"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"MuonSimDataCollection#MDT_SDO"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"MuonSimDataCollection#" + flags.Overlay.SigPrefix + "MDT_SDO"
]))
return acc
......
......@@ -33,10 +33,17 @@ def RpcOverlayAlgCfg(flags, name="RpcOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"RpcPadContainer#RPCPAD"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"RpcPadContainer#RPCPAD"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"RpcPadContainer#" + flags.Overlay.SigPrefix + "RPCPAD"
]))
return acc
......@@ -62,10 +69,17 @@ def RpcTruthOverlayCfg(flags, name="RpcTruthOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"MuonSimDataCollection#RPC_SDO"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"MuonSimDataCollection#RPC_SDO"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"MuonSimDataCollection#" + flags.Overlay.SigPrefix + "RPC_SDO"
]))
return acc
......
......@@ -33,10 +33,17 @@ def TgcOverlayAlgCfg(flags, name="TgcOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"TgcRdoContainer#TGCRDO"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"TgcRdoContainer#TGCRDO"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"TgcRdoContainer#" + flags.Overlay.SigPrefix + "TGCRDO"
]))
return acc
......@@ -62,10 +69,17 @@ def TgcTruthOverlayCfg(flags, name="TgcTruthOverlay", **kwargs):
acc.addEventAlgo(alg)
# Setup output
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"MuonSimDataCollection#TGC_SDO"
]))
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"MuonSimDataCollection#TGC_SDO"
]))
if flags.Output.doWriteRDO_SGNL:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"MuonSimDataCollection#" + flags.Overlay.SigPrefix + "TGC_SDO"
]))
return acc
......
......@@ -96,7 +96,10 @@ def defaultTestFlags(configFlags, args):
configFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-20"
configFlags.Overlay.DataOverlay = False
if args.output:
configFlags.Output.RDOFileName = args.output
if args.output == 'None':
configFlags.Output.RDOFileName = ''
else:
configFlags.Output.RDOFileName = args.output
if args.outputSig:
configFlags.Output.RDO_SGNLFileName = args.outputSig
setupOverlayTestDetectorFlags(configFlags, args.detectors if 'detectors' in args else None)
......
......@@ -12,18 +12,20 @@ def CopyCaloCalibrationHitContainerAlgCfg(flags, collectionName, name="CopyCaloC
acc = ComponentAccumulator()
kwargs.setdefault("collectionName", collectionName)
kwargs.setdefault("SignalInputKey", flags.Overlay.SigPrefix + collectionName)
kwargs.setdefault("SignalInputKey",
flags.Overlay.SigPrefix + collectionName)
kwargs.setdefault("OutputKey", collectionName)
# Copy CaloCalibrationHitContainer
CopyCaloCalibrationHitContainer=CompFactory.CopyCaloCalibrationHitContainer
CopyCaloCalibrationHitContainer = CompFactory.CopyCaloCalibrationHitContainer
alg = CopyCaloCalibrationHitContainer(name + collectionName, **kwargs)
acc.addEventAlgo(alg)
# Re-map signal address
from SGComps.AddressRemappingConfig import AddressRemappingCfg
acc.merge(AddressRemappingCfg([
"CaloCalibrationHitContainer#" + collectionName + "->" + flags.Overlay.SigPrefix + collectionName
"CaloCalibrationHitContainer#"
+ collectionName + "->" + flags.Overlay.SigPrefix + collectionName
]))
return acc
......@@ -33,11 +35,12 @@ def CopyInTimeJetTruthInfoCfg(flags, name="CopyInTimeJetTruthInfo", **kwargs):
"""Return a ComponentAccumulator for the in-time pile-up jets copying"""
acc = ComponentAccumulator()
kwargs.setdefault("BkgInputKey", flags.Overlay.BkgPrefix + "InTimeAntiKt4TruthJets")
kwargs.setdefault("BkgInputKey",
flags.Overlay.BkgPrefix + "InTimeAntiKt4TruthJets")
kwargs.setdefault("OutputKey", "InTimeAntiKt4TruthJets")
# Copy jets
CopyJetTruthInfo=CompFactory.CopyJetTruthInfo
CopyJetTruthInfo = CompFactory.CopyJetTruthInfo
alg = CopyJetTruthInfo(name, **kwargs)
acc.addEventAlgo(alg)
......@@ -48,11 +51,12 @@ def CopyOutOfTimeJetTruthInfoCfg(flags, name="CopyOutOfTimeJetTruthInfo", **kwar
"""Return a ComponentAccumulator for the out-of-time pile-up jets copying"""
acc = ComponentAccumulator()
kwargs.setdefault("BkgInputKey", flags.Overlay.BkgPrefix + "OutOfTimeAntiKt4TruthJets")
kwargs.setdefault("BkgInputKey",
flags.Overlay.BkgPrefix + "OutOfTimeAntiKt4TruthJets")
kwargs.setdefault("OutputKey", "OutOfTimeAntiKt4TruthJets")
# Copy jets
CopyJetTruthInfo=CompFactory.CopyJetTruthInfo
CopyJetTruthInfo = CompFactory.CopyJetTruthInfo
alg = CopyJetTruthInfo(name, **kwargs)
acc.addEventAlgo(alg)
......@@ -67,7 +71,7 @@ def CopyJetTruthInfoAlgsCfg(flags, **kwargs):
return acc
def CopyMcEventCollectionAlgCfg(flags, name = "CopyMcEventCollection", **kwargs):
def CopyMcEventCollectionAlgCfg(flags, name="CopyMcEventCollection", **kwargs):
"""Return a ComponentAccumulator for the CopyMcEventCollection algorithm"""
acc = ComponentAccumulator()
......@@ -77,12 +81,13 @@ def CopyMcEventCollectionAlgCfg(flags, name = "CopyMcEventCollection", **kwargs)
# Disable background for data overlay
kwargs.setdefault("BkgInputKey", "")
else:
kwargs.setdefault("BkgInputKey", "" + flags.Overlay.BkgPrefix + "TruthEvent")
kwargs.setdefault("BkgInputKey",
flags.Overlay.BkgPrefix + "TruthEvent")
kwargs.setdefault("SignalInputKey", flags.Overlay.SigPrefix + "TruthEvent")
kwargs.setdefault("OutputKey", "TruthEvent")
# Merge and copy McEventCollection
CopyMcEventCollection=CompFactory.CopyMcEventCollection
CopyMcEventCollection = CompFactory.CopyMcEventCollection
alg = CopyMcEventCollection(name, **kwargs)
acc.addEventAlgo(alg)
......@@ -95,25 +100,27 @@ def CopyMcEventCollectionAlgCfg(flags, name = "CopyMcEventCollection", **kwargs)
return acc
def CopyTimingsAlgCfg(flags, name = "CopyTimings", **kwargs):
def CopyTimingsAlgCfg(flags, name="CopyTimings", **kwargs):
"""Return a ComponentAccumulator for the CopyTimings algorithm"""
acc = ComponentAccumulator()
# Disable background copying
kwargs.setdefault("BkgInputKey", "")
kwargs.setdefault("SignalInputKey", flags.Overlay.SigPrefix + "EVNTtoHITS_timings")
kwargs.setdefault("SignalInputKey",
flags.Overlay.SigPrefix + "EVNTtoHITS_timings")
kwargs.setdefault("OutputKey", "EVNTtoHITS_timings")
# Copy RecoTimingObj
CopyTimings=CompFactory.CopyTimings
CopyTimings = CompFactory.CopyTimings
alg = CopyTimings(name, **kwargs)
acc.addEventAlgo(alg)
# Re-map signal address
from SGComps.AddressRemappingConfig import AddressRemappingCfg
acc.merge(AddressRemappingCfg([
"RecoTimingObj#EVNTtoHITS_timings->" + flags.Overlay.SigPrefix + "EVNTtoHITS_timings"
"RecoTimingObj#EVNTtoHITS_timings->"
+ flags.Overlay.SigPrefix + "EVNTtoHITS_timings"
]))
return acc
......@@ -124,18 +131,20 @@ def CopyTrackRecordCollectionAlgCfg(flags, collectionName, name="CopyTrackRecord
acc = ComponentAccumulator()
kwargs.setdefault("collectionName", collectionName)
kwargs.setdefault("SignalInputKey", flags.Overlay.SigPrefix + collectionName)
kwargs.setdefault("SignalInputKey",
flags.Overlay.SigPrefix + collectionName)
kwargs.setdefault("OutputKey", collectionName)
# Copy TrackRecordCollection
CopyTrackRecordCollection=CompFactory.CopyTrackRecordCollection
CopyTrackRecordCollection = CompFactory.CopyTrackRecordCollection
alg = CopyTrackRecordCollection(name + collectionName, **kwargs)
acc.addEventAlgo(alg)
# Re-map signal address
from SGComps.AddressRemappingConfig import AddressRemappingCfg
acc.merge(AddressRemappingCfg([
"TrackRecordCollection#" + collectionName + "->" + flags.Overlay.SigPrefix + collectionName
"TrackRecordCollection#"
+ collectionName + "->" + flags.Overlay.SigPrefix + collectionName
]))
return acc
......@@ -143,79 +152,95 @@ def CopyTrackRecordCollectionAlgCfg(flags, collectionName, name="CopyTrackRecord
def CopyCaloCalibrationHitContainerOutputCfg(flags, collectionName, **kwargs):
"""Return CopyCaloCalibrationHitContainer output configuration"""
acc = ComponentAccumulator()
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc = OutputStreamCfg(flags, "RDO",
ItemList=["CaloCalibrationHitContainer#" + collectionName])
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"CaloCalibrationHitContainer#" + collectionName
]))
# Add signal output
if flags.Output.doWriteRDO_SGNL:
outConfig = OutputStreamCfg(flags, "RDO_SGNL",
ItemList=["CaloCalibrationHitContainer#" + flags.Overlay.SigPrefix + collectionName])
acc.merge(outConfig)
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO_SGNL", ItemList=[
"CaloCalibrationHitContainer#" + flags.Overlay.SigPrefix + collectionName
]))
return acc
def CopyJetTruthInfoOutputCfg(flags, **kwargs):
"""Return CopyTimings output configuration"""
acc = ComponentAccumulator()
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc = OutputStreamCfg(flags, "RDO",
ItemList=[
"xAOD::JetContainer#InTimeAntiKt4TruthJets",
"xAOD::JetAuxContainer#InTimeAntiKt4TruthJetsAux.",
"xAOD::JetContainer#OutOfTimeAntiKt4TruthJets",
"xAOD::JetAuxContainer#OutOfTimeAntiKt4TruthJetsAux."
])
if flags.Output.doWriteRDO:
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
acc.merge(OutputStreamCfg(flags, "RDO", ItemList=[
"xAOD::JetContainer#InTimeAntiKt4TruthJets",
"xAOD::JetAuxContainer#InTimeAntiKt4TruthJetsAux.",
"xAOD::JetContainer#OutOfTimeAntiKt4TruthJets",
"xAOD::JetAuxContainer#OutOfTimeAntiKt4TruthJetsAux."
]))
return acc
def CopyMcEventCollectionOutputCfg(flags, **kwargs):
"""Return CopyMcEventCollection output configuration"""
acc = ComponentAccumulator()