From e3618136445af13ef15eb5ff804a62ff3e9228cc Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Fri, 13 Aug 2021 21:37:30 +0000
Subject: [PATCH] Fix for removed pileup flag
---
.../python/FaserSCT_DigitizationConfig.py | 13 +++----------
.../python/FaserSCT_DigitizationConfigNew.py | 12 +++---------
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfig.py b/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfig.py
index efeba22b2..3d9ec7a07 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfig.py
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfig.py
@@ -126,9 +126,7 @@ def getFaserSCT_FrontEnd(name="FaserSCT_FrontEnd", **kwargs):
kwargs.setdefault("SCT_ReadCalibChipDataTool", sct_ReadCalibChipDataToolSetup.getTool())
# DataCompressionMode: 1 is level mode x1x (default), 2 is edge mode 01x, 3 is expanded any hit xxx
from AthenaCommon.BeamFlags import jobproperties
- if digitizationFlags.PileUpPremixing:
- kwargs.setdefault("DataCompressionMode", 3)
- elif globalflags.isOverlay() and globalflags.DataSource == 'geant4':
+ if globalflags.isOverlay() and globalflags.DataSource == 'geant4':
kwargs.setdefault("DataCompressionMode", 2)
elif (jobproperties.Beam.bunchSpacing() <= 50):
kwargs.setdefault("DataCompressionMode", 1)
@@ -201,13 +199,8 @@ def commonFaserSCT_DigitizationConfig(name,**kwargs):
def FaserSCT_DigitizationTool(name="FaserSCT_DigitizationTool", **kwargs):
from Digitization.DigitizationFlags import digitizationFlags
- if digitizationFlags.PileUpPremixing and 'OverlayMT' in digitizationFlags.experimentalDigi():
- from OverlayCommonAlgs.OverlayFlags import overlayFlags
- kwargs.setdefault("OutputObjectName", overlayFlags.bkgPrefix() + "SCT_RDOs")
- kwargs.setdefault("OutputSDOName", overlayFlags.bkgPrefix() + "SCT_SDO_Map")
- else:
- kwargs.setdefault("OutputObjectName", "SCT_RDOs")
- kwargs.setdefault("OutputSDOName", "SCT_SDO_Map")
+ kwargs.setdefault("OutputObjectName", "SCT_RDOs")
+ kwargs.setdefault("OutputSDOName", "SCT_SDO_Map")
# kwargs.setdefault("HardScatterSplittingMode", 0)
return commonFaserSCT_DigitizationConfig(name,**kwargs)
diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py b/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py
index 95d6b690c..a4bd9fb2c 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py
@@ -58,12 +58,8 @@ def FaserSCT_DigitizationCommonCfg(flags, name="FaserSCT_DigitizationToolCommon"
def FaserSCT_DigitizationToolCfg(flags, name="FaserSCT_DigitizationTool", **kwargs):
"""Return ComponentAccumulator with configured FaserSCT digitization tool"""
- if flags.Digitization.PileUpPremixing:
- kwargs.setdefault("OutputObjectName", flags.Overlay.BkgPrefix + "SCT_RDOs")
- kwargs.setdefault("OutputSDOName", flags.Overlay.BkgPrefix + "SCT_SDO_Map")
- else:
- kwargs.setdefault("OutputObjectName", "SCT_RDOs")
- kwargs.setdefault("OutputSDOName", "SCT_SDO_Map")
+ kwargs.setdefault("OutputObjectName", "SCT_RDOs")
+ kwargs.setdefault("OutputSDOName", "SCT_SDO_Map")
#kwargs.setdefault("HardScatterSplittingMode", 0)
return FaserSCT_DigitizationCommonCfg(flags, name, **kwargs)
@@ -194,9 +190,7 @@ def FaserSCT_FrontEndCfg(flags, name="FaserSCT_FrontEnd", **kwargs):
acc = FaserSCT_ReadCalibChipDataCfg(flags)
kwargs.setdefault("SCT_ReadCalibChipDataTool", acc.popPrivateTools())
# DataCompressionMode: 1 is level mode x1x (default), 2 is edge mode 01x, 3 is expanded any hit xxx
- if flags.Digitization.PileUpPremixing:
- kwargs.setdefault("DataCompressionMode", 3)
- elif False and flags.Input.isMC: # obsolete(?) Overlay flag
+ if False and flags.Input.isMC: # obsolete(?) Overlay flag
kwargs.setdefault("DataCompressionMode", 2)
elif flags.Beam.BunchSpacing <= 50:
kwargs.setdefault("DataCompressionMode", 1)
--
GitLab