Merge branch 'digi/addcalodigi' into 'master'

Add 'AddCaloDigi' flag to the new configuration

See merge request atlas/athena!35351

LArCalorimeter/LArDigitization/python/LArDigitizationConfigNew.py

@@ -154,17 +154,18 @@ def LArOutputCfg(flags):
     acc = ComponentAccumulator()
     if flags.Output.doWriteRDO:
         ItemList = []
-        if flags.Digitization.PileUpPremixing:
-            ItemList += ["LArDigitContainer#" + flags.Overlay.BkgPrefix + "LArDigitContainer_MC"]
+        if flags.Digitization.AddCaloDigi:
+            ItemList.append("LArDigitContainer#*")
+        elif flags.Digitization.PileUpPremixing:
+            ItemList.append("LArDigitContainer#" + flags.Overlay.BkgPrefix + "LArDigitContainer_MC")
         else:
-            ItemList += [
-                "LArRawChannelContainer#LArRawChannels",
-                "LArDigitContainer#LArDigitContainer_MC_Thinned"
-            ]
+            ItemList.append("LArDigitContainer#LArDigitContainer_MC_Thinned")
+        if not flags.Digitization.PileUpPremixing:
+            ItemList.append("LArRawChannelContainer#LArRawChannels")
         if flags.Detector.SimulateHGTD:
-            ItemList += ["LArHitContainer#HGTDDigitContainer_MC"]
+            ItemList.append("LArHitContainer#HGTDDigitContainer_MC")
         if flags.Digitization.TruthOutput:
-            ItemList += ["CaloCalibrationHitContainer#*"]
+            ItemList.append("CaloCalibrationHitContainer#*")
             acc.merge(TruthDigitizationOutputCfg(flags))
         acc.merge(OutputStreamCfg(flags, "RDO", ItemList))
     return acc

Simulation/Digitization/python/DigitizationConfigFlags.py

@@ -63,6 +63,8 @@ def createDigitizationCfgFlags():
     flags.addFlag("Digitization.TRTRangeCut", lambda prevFlags : float(GetFileMD(prevFlags.Input.Files).get('TRTRangeCut', 0.05)))
     # Write out truth information?
     flags.addFlag("Digitization.TruthOutput", False)
+    # Write out calorimeter digits
+    flags.addFlag("Digitization.AddCaloDigi", False)
     # Integer offset to random seed initialisation
     flags.addFlag("Digitization.RandomSeedOffset", 0)
     return flags

TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py

@@ -148,8 +148,10 @@ def TileDigitsMakerOutputCfg(flags, **kwargs):
             tileDigitsContainer = tileDigitsMaker.getDefaultProperty('TileFilteredContainer')
 
     tileDigitsContainer = tileDigitsContainer.split('+').pop()
-    outputItemList = ['TileDigitsContainer#' + tileDigitsContainer]
-    
+    if flags.Digitization.AddCaloDigi:
+        outputItemList = ['TileDigitsContainer#*']
+    else:
+        outputItemList = ['TileDigitsContainer#' + tileDigitsContainer]
 
     if flags.Output.doWriteRDO:
         if flags.Digitization.TruthOutput: