Store subtracted calo cells instead of AllCalo when HI reco and cell subtraction

Store subtracted calo cells instead of AllCalo when HI reco and cell subtraction

Calorimeter/CaloRec/python/CaloCellMakerConfig.py

@@ -57,7 +57,7 @@ def CaloCellMakerCfg(flags):
 
     result.addEventAlgo(cellAlgo, primary=True)
 
-    outputContainers = ["CaloCellContainer#AllCalo"]
+    outputContainers = [f'CaloCellContainer#{flags.Egamma.Keys.Input.CaloCells}']
     if flags.GeoModel.Run in [LHCPeriod.Run1, LHCPeriod.Run2, LHCPeriod.Run3]:
         outputContainers += ["TileCellContainer#MBTSContainer"]
     if flags.GeoModel.Run is LHCPeriod.Run2:

Calorimeter/CaloRec/python/CaloRecoConfig.py

@@ -70,11 +70,10 @@ def CaloRecoCfg(flags, clustersname=None):
         from TileRecAlgs.MBTSTimeDiffEventInfoAlgConfig import MBTSTimeDiffEventInfoAlgCfg
         result.merge(MBTSTimeDiffEventInfoAlgCfg(flags))
 
-
-    #Configure AOD Cell-Thinning based on samplings:
-    from CaloRec.CaloThinCellsBySamplingAlgConfig import CaloThinCellsBySamplingAlgCfg
-    result.merge(CaloThinCellsBySamplingAlgCfg(flags,'StreamAOD', ['TileGap3']))
-    
+    if not flags.HeavyIon.Egamma.doSubtractedClusters:
+        #Configure AOD Cell-Thinning based on samplings:
+        from CaloRec.CaloThinCellsBySamplingAlgConfig import CaloThinCellsBySamplingAlgCfg
+        result.merge(CaloThinCellsBySamplingAlgCfg(flags,'StreamAOD', ['TileGap3']))
 
     return result