From c177519c159e747d84a9050ae70734eb4388c5f7 Mon Sep 17 00:00:00 2001
From: tkharlam <tatyana.kharlamova@cern.ch>
Date: Fri, 24 Mar 2017 08:20:22 +0100
Subject: [PATCH] Fix Pixel, MDT, RPC and CSC data RDO keys
The patch fixes RDOKeys for sub-systems RawDataProviders migrated to DataHandles. Pixel(ATLASSIM-3257), MDT, RPC and CSC data containers are read successfully during overlay procedure.
Former-commit-id: 8369ba184889c443bf79166d7be7b5209794e69b
---
.../share/InnerDetectorOverlay_jobOptions.py | 2 +-
.../EventOverlayJobTransforms/share/MuonOverlay_jobOptions.py | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py
index 2e4e63503d9..479bc45c9d7 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py
@@ -29,7 +29,7 @@ if DetFlags.overlay.pixel_on() or DetFlags.overlay.SCT_on() or DetFlags.overlay.
indetovl.do_Pixel = True
if readBS and isRealData:
- job.InDetPixelRawDataProvider.EvtStore = "OriginalEvent_SG"
+ job.InDetPixelRawDataProvider.RDOKey = "OriginalEvent_SG/PixelRDOs"
#ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "PixelRDO_Container/PixelRDOs" ]
#ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "Trk::PixelClusterContainer/PixelOnlineClusters" ]
else:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/MuonOverlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/MuonOverlay_jobOptions.py
index 9af52da34bf..dbf0dbc7e90 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/MuonOverlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/MuonOverlay_jobOptions.py
@@ -40,6 +40,7 @@ if DetFlags.overlay.MDT_on() or DetFlags.overlay.CSC_on() or DetFlags.overlay.RP
if DetFlags.overlay.CSC_on():
if readBS:
ToolSvc.CscRawDataProviderTool.EvtStore = "OriginalEvent_SG"
+ ToolSvc.CscRawDataProviderTool.RdoLocation = "OriginalEvent_SG/CSCRDO"
include ( "CscOverlay/CscOverlay_jobOptions.py" )
job.CscOverlay.IsByteStream = readBS
job.CscOverlay.DataStore = "OriginalEvent_SG"
@@ -62,6 +63,7 @@ if DetFlags.overlay.MDT_on() or DetFlags.overlay.CSC_on() or DetFlags.overlay.RP
if readBS:
ToolSvc.MdtRawDataProviderTool.EvtStore = "OriginalEvent_SG"
+ ToolSvc.MdtRawDataProviderTool.RdoLocation = "OriginalEvent_SG/MDTCSM"
job.MdtOverlay.ConvertRDOToDigitTool.RetrievePrivateCopy = False
#job.MdtOverlay.OutputLevel = VERBOSE
@@ -76,6 +78,7 @@ if DetFlags.overlay.MDT_on() or DetFlags.overlay.CSC_on() or DetFlags.overlay.RP
#job.RpcOverlay.DataStore = "BkgEvent_2_SG"
if readBS:
ToolSvc.RpcRawDataProviderTool.EvtStore = "OriginalEvent_SG"
+ ToolSvc.RpcRawDataProviderTool.RdoLocation = "OriginalEvent_SG/RPCPAD"
job.RpcOverlay.ConvertRDOToDigitTool.RetrievePrivateCopy = False
#job.RpcOverlay.OutputLevel = VERBOSE
#job.RpcDigitToRpcRDO.OutputLevel = VERBOSE
@@ -89,6 +92,7 @@ if DetFlags.overlay.MDT_on() or DetFlags.overlay.CSC_on() or DetFlags.overlay.RP
#job.TgcOverlay.DataStore = "BkgEvent_2_SG"
if readBS:
ToolSvc.TgcRawDataProviderTool.EvtStore = "OriginalEvent_SG"
+ #ToolSvc.TgcRawDataProviderTool.RdoLocation = "OriginalEvent_SG/TGC_DIGITS"
job.TgcOverlay.ConvertRDOToDigitTool.RetrievePrivateCopy = False
# storegate dump
--
GitLab