Revert "Merge branch 'calo-containers' into '21.0'"

This reverts commit 5c17579c, reversing
changes made to 66157e9a.

Simulation/Digitization/python/DigiOutput.py

@@ -131,9 +131,8 @@ def getStreamRDO_ItemList(log):
     # Calorimeter Output
     if DetFlags.digitize.LAr_on():
         if DetFlags.writeRDOPool.LAr_on():
-            if not digitizationFlags.PileUpPremixing:
-                StreamRDO_ItemList+=["LArRawChannelContainer#*"]
-            if 'AddCaloDigi' in digitizationFlags.experimentalDigi() or digitizationFlags.PileUpPremixing:
+            StreamRDO_ItemList+=["LArRawChannelContainer#*"]
+            if 'AddCaloDigi' in digitizationFlags.experimentalDigi():
                 StreamRDO_ItemList+=["LArDigitContainer#*"]
             else:
                 StreamRDO_ItemList+=["LArDigitContainer#LArDigitContainer_MC_Thinned"]
@@ -142,9 +141,8 @@ def getStreamRDO_ItemList(log):
             StreamRDO_ItemList+=["LArHitContainer#HGTDDigitContainer_MC"]
     if DetFlags.digitize.Tile_on():
         if DetFlags.writeRDOPool.Tile_on():
-            if not digitizationFlags.PileUpPremixing:
-                StreamRDO_ItemList+=["TileRawChannelContainer#*"]
-            if 'AddCaloDigi' in digitizationFlags.experimentalDigi() or digitizationFlags.PileUpPremixing:
+            StreamRDO_ItemList+=["TileRawChannelContainer#*"]
+            if 'AddCaloDigi' in digitizationFlags.experimentalDigi():
                 StreamRDO_ItemList+=["TileDigitsContainer#*"]
             else:
                 StreamRDO_ItemList+=["TileDigitsContainer#TileDigitsFlt"]