Add postInclude to force use of Module level Pixel Masking

InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt

@@ -15,3 +15,4 @@ atlas_add_component( PixelConditionsAlgorithms
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py )

InnerDetector/InDetConditions/PixelConditionsAlgorithms/share/postInclude.UsePixelModuleLevelMask.py

+# Force the job to use the Pixel Module-level mask implemented via the
+# FE-level masking code. See https://gitlab.cern.ch/atlas/athena/-/merge_requests/45356
+
+from IOVDbSvc.CondDB import conddb
+from AthenaCommon.GlobalFlags import globalflags
+if (globalflags.DataSource=='data' and conddb.dbdata == 'CONDBR2'):  # for data overlay
+    conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-RUN2-DATA-UPD4-05")
+else:
+    conddb.addOverride("/PIXEL/PixelModuleFeMask","PixelModuleFeMask-SIM-MC16-000-03")

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_heavy_ion.sh

@@ -22,7 +22,7 @@ Digi_tf.py \
 --preExec 'all:rec.doHIP.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(0.0);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(25);' 'HITtoRDO:from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.overrideMetadata+=["PhysicsList"]' \
 --preInclude 'all:LArConfiguration/LArConfigRun2Old_NoPileup.py' 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py' \
 --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:from AthenaCommon import CfgGetter;mergeMcEventCollTool=CfgGetter.getPublicTool("MergeMcEventCollTool").DoSlimming=False' \
---postInclude 'all:PyJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' \
+--postInclude 'all:PyJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py,PixelConditionsAlgorithms/postInclude.UsePixelModuleLevelMask.py' \
 --geometryVersion ATLAS-R2-2015-03-01-00 \
 --conditionsTag all:OFLCOND-MC15c-SDR-15 \
 --DataRunNumber 295000 \