From ade096d0ec9cab164fea08e698d1b670bf6f5023 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 18 Jan 2019 16:15:29 +0100
Subject: [PATCH] TileSimAlgs: Fix TileDQstatusAlg configuration.
Fix for TileBeamInfoProvider->TileDQstatusAlg conversion.
---
.../share/TileDigiCommon_jobOptions.py | 28 ++++++++++++-------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py
index 92381b16979..ff4eed4937c 100644
--- a/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py
+++ b/TileCalorimeter/TileSimAlgs/share/TileDigiCommon_jobOptions.py
@@ -187,19 +187,27 @@ if doTileDigitToRawChannel:
elif jobproperties.TileRecFlags.doTileMF():
TileRawChannelBuilderMF.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ if TileRawChannelBuilderOpt2Filter:
+ TileRawChannelBuilderOpt2Filter.DSPContainer = ''
+ if TileRawChannelBuilderOptATLAS:
+ TileRawChannelBuilderOptATLAS.DSPContainer = ''
+ if TileRawChannelBuilderMF:
+ TileRawChannelBuilderMF.DSPContainer = ''
- if jobproperties.TileRecFlags.doTileMF():
- print TileRawChannelBuilderMF
- if jobproperties.TileRecFlags.doTileOptATLAS():
- print TileRawChannelBuilderOptATLAS
- if jobproperties.TileRecFlags.doTileOpt2():
- print TileRawChannelBuilderOpt2Filter
+# Change default parameters for TileDQstatusAlg.
+from TileRecUtils.TileDQstatusAlgDefault import TileDQstatusAlgDefault
+dqstatus = TileDQstatusAlgDefault()
+dqstatus.TileBeamElemContainer=""; # disable reading of trigger type from BeamElem container
+dqstatus.TileDigitsContainer=""; # disable checking of Digits container size for bi-gain mode
+dqstatus.TileRawChannelContainer=""; # disable checking of DQstatus for simulated data
- from TileRecUtils.TileDQstatusAlgDefault import TileDQstatusAlgDefault
- dqstatus = TileDQstatusAlgDefault()
#
include( "TileSimAlgs/TileSamplingFraction_jobOptions.py" )
-
-
+if jobproperties.TileRecFlags.doTileMF():
+ print TileRawChannelBuilderMF
+if jobproperties.TileRecFlags.doTileOptATLAS():
+ print TileRawChannelBuilderOptATLAS
+if jobproperties.TileRecFlags.doTileOpt2():
+ print TileRawChannelBuilderOpt2Filter
--
GitLab