Merge branch 'SC-March31' into 'master'

changing SuperCell container name

See merge request atlas/athena!42193

LArCalorimeter/LArROD/python/LArSuperCellBuilderAlgDefault.py

@@ -33,7 +33,7 @@ def LArSuperCellBuilderAlgDefault():
    theSelf.ShapeKey='LArShapeSC'
    theSelf.PedestalKey='LArPedestalSC'
    theSelf.OFCKey='LArOFCSC'
-   theSelf.CaloCellKey='TestSCell'
+   theSelf.CaloCellKey='SCell'
    theSelf.LArDigitKey='LArDigitSCL2'
    theSelf.useDB=False
    theSelf.IsSuperCell=True

LArCalorimeter/LArROD/share/LArSuperCellEnable.py

@@ -10,6 +10,6 @@ from LArROD.LArSCellGetter import LArSCellGetter
 theLArSCellGetter = LArSCellGetter()
 
 streamRDO.ItemList+=["LArDigitContainer#LArDigitSCL2"]
-streamRDO.ItemList+=["CaloCellContainer#TestSCell"]
+streamRDO.ItemList+=["CaloCellContainer#SCell"]
 topSequence.remove(streamRDO)
 topSequence += streamRDO