From 7c3640d4448bbe55161169d7a8c75826ae19c6d0 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Fri, 14 Apr 2017 07:48:30 +0000
Subject: [PATCH] Properly support AddCaloDigi flag but keep the current
defauls for raw data
Former-commit-id: 6ecd0d6596ae832497f7cf0f54d0d092de5d010c
---
.../share/CaloOverlay_jobOptions.py | 4 +++-
.../share/OverlayOutputItemList_jobOptions.py | 16 ++++++++++------
.../share/skeleton.OverlayPool_tf.py | 1 +
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py
index 4975e4fe39e3..20318d8a41e7 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py
@@ -66,7 +66,9 @@ if DetFlags.overlay.Tile_on():
include( "TileIdCnv/TileIdCnv_jobOptions.py" )
include( "TileConditions/TileConditions_jobOptions.py" )
- include("TileSimAlgs/TileDigitization_jobOptions.py")
+ include( "TileSimAlgs/TileDigitization_jobOptions.py" )
+ include( "TileL2Algs/TileL2Algs_jobOptions.py" )
+
job.TileHitVecToCnt.DigitizationTool.RndmEvtOverlay = True
theTileDigitsMaker.RndmEvtOverlay = True
if readBS and isRealData:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/OverlayOutputItemList_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/OverlayOutputItemList_jobOptions.py
index cc48257919af..b651cecd6313 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/OverlayOutputItemList_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/OverlayOutputItemList_jobOptions.py
@@ -2,6 +2,7 @@ include.block ( "EventOverlayJobTransforms/OverlayOutputItemList_jobOptions.py"
from AthenaCommon.AppMgr import ServiceMgr
from AthenaCommon.DetFlags import DetFlags
+from Digitization.DigitizationFlags import digitizationFlags
# The output - overlay
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
@@ -42,7 +43,6 @@ if DetFlags.overlay.pixel_on():
outStream.ItemList += ["InDetBSErrContainer#*"]
if DetFlags.overlay.SCT_on():
outStream.ItemList += ["SCT_RDO_Container#*"]
- outStream.ItemList += ["SCT_RDO_Container#*"]
if DetFlags.overlay.TRT_on():
outStream.ItemList += ["TRT_RDO_Container#*"]
outStream.ItemList += ["TRT_BSIdErrContainer#*"]
@@ -50,14 +50,18 @@ if DetFlags.overlay.TRT_on():
if DetFlags.overlay.LAr_on():
outStream.ItemList+=["LArRawChannelContainer#*"]
- outStream.ItemList+=["LArDigitContainer#LArDigitContainer_MC_Thinned"]
+ if 'AddCaloDigi' in digitizationFlags.experimentalDigi():
+ outStream.ItemList+=["LArDigitContainer#*"]
+ else:
+ outStream.ItemList+=["LArDigitContainer#LArDigitContainer_MC_Thinned"]
outStream.ItemList+=["LArFebErrorSummary#*"]
if DetFlags.overlay.Tile_on():
- if isRealData:
- outStream.ItemList += [ "TileDigitsContainer#*" ]
- else:
- outStream.ItemList += [ "TileDigitsContainer#TileDigitsFlt" ]
outStream.ItemList += [ "TileRawChannelContainer#*" ]
+ if isRealData or 'AddCaloDigi' in digitizationFlags.experimentalDigi():
+ outStream.ItemList += [ "TileDigitsContainer#*" ]
+ else:
+ outStream.ItemList += [ "TileDigitsContainer#TileDigitsFlt" ]
+ outStream.ItemList += [ "TileL2Container#TileL2Cnt" ]
if DetFlags.overlay.CSC_on():
outStream.ItemList += [ "CscRawDataContainer#*" ]
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py
index 14af8c5b599b..1187d404c578 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py
@@ -58,6 +58,7 @@ if hasattr(runArgs,"digiSeedOffset1"): digitizationFlags.rndmSeedOffset1=int(run
if hasattr(runArgs,"digiSeedOffset2"): digitizationFlags.rndmSeedOffset2=int(runArgs.digiSeedOffset2)
if hasattr(runArgs,"samplingFractionDbTag"): digitizationFlags.physicsList=runArgs.samplingFractionDbTag
if hasattr(runArgs,"digiRndmSvc"): digitizationFlags.rndmSvc=runArgs.digiRndmSvc
+if hasattr(runArgs, "AddCaloDigi"): digitizationFlags.experimentalDigi+=["AddCaloDigi"]
readBS = False
if hasattr(runArgs, 'ReadByteStream'):
--
GitLab