diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfig.py b/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfig.py index 3d9ec7a072ce801067ae843341e5ca9b8f84ce40..efeba22b22474a433802cec7a2560523e6058f5f 100644 --- a/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfig.py +++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfig.py @@ -126,7 +126,9 @@ 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 globalflags.isOverlay() and globalflags.DataSource == 'geant4': + if digitizationFlags.PileUpPremixing: + kwargs.setdefault("DataCompressionMode", 3) + elif globalflags.isOverlay() and globalflags.DataSource == 'geant4': kwargs.setdefault("DataCompressionMode", 2) elif (jobproperties.Beam.bunchSpacing() <= 50): kwargs.setdefault("DataCompressionMode", 1) @@ -199,8 +201,13 @@ def commonFaserSCT_DigitizationConfig(name,**kwargs): def FaserSCT_DigitizationTool(name="FaserSCT_DigitizationTool", **kwargs): from Digitization.DigitizationFlags import digitizationFlags - kwargs.setdefault("OutputObjectName", "SCT_RDOs") - kwargs.setdefault("OutputSDOName", "SCT_SDO_Map") + 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("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 a4bd9fb2c54f97e9983106eb6743c00bb772e585..95d6b690ce2a9579c10d9c8e60f3daa614dc4e8b 100644 --- a/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py +++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/python/FaserSCT_DigitizationConfigNew.py @@ -58,8 +58,12 @@ def FaserSCT_DigitizationCommonCfg(flags, name="FaserSCT_DigitizationToolCommon" def FaserSCT_DigitizationToolCfg(flags, name="FaserSCT_DigitizationTool", **kwargs): """Return ComponentAccumulator with configured FaserSCT digitization tool""" - kwargs.setdefault("OutputObjectName", "SCT_RDOs") - kwargs.setdefault("OutputSDOName", "SCT_SDO_Map") + 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("HardScatterSplittingMode", 0) return FaserSCT_DigitizationCommonCfg(flags, name, **kwargs) @@ -190,7 +194,9 @@ 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 False and flags.Input.isMC: # obsolete(?) Overlay flag + if flags.Digitization.PileUpPremixing: + kwargs.setdefault("DataCompressionMode", 3) + elif False and flags.Input.isMC: # obsolete(?) Overlay flag kwargs.setdefault("DataCompressionMode", 2) elif flags.Beam.BunchSpacing <= 50: kwargs.setdefault("DataCompressionMode", 1)