Merge branch 'fixATLASSIM-3913' into 'master'

Adjust ConditionsAlgs used during LArDigitization for BS Overlay jobs

Closes ATLASSIM-3913

See merge request atlas/athena!15832

Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayBS_tf.py

@@ -227,9 +227,9 @@ ServiceMgr.MessageSvc.OutputLevel = INFO
 ServiceMgr.MessageSvc.Format = "% F%45W%S%7W%R%T %0W%M"
 
 if hasattr(runArgs, 'fSampltag'):
-    #conddb.addFolder("LAR","/LAR/ElecCalib/fSampl/Symmetry")
-    #conddb.addOverride( "/LAR/ElecCalib/fSampl/Symmetry", runArgs.fSampltag + digitizationFlags.physicsList.get_Value() )
-    conddb.addFolderWithTag("LAR_OFL","/LAR/ElecCalibMC/fSampl", runArgs.fSampltag + digitizationFlags.physicsList.get_Value(),force=True,forceMC=True) 
+    conddb.addFolderWithTag("LAR_OFL","/LAR/ElecCalibMC/fSampl", runArgs.fSampltag + digitizationFlags.physicsList.get_Value(),force=True,forceMC=True,className="LArfSamplMC") 
+
+
 else:
     raise RuntimeError ("--fSampltag not specified on command-line - see --help message")
 #if DetFlags.overlay.Signal_on():

LArCalorimeter/LArDigitization/python/LArDigitizationConfig.py

@@ -124,8 +124,9 @@ def getLArPileUpTool(name='LArPileUpTool', **kwargs): ## useLArFloat()=True,isOv
 
 
     # AutoCorrNoiseCondAlgo
-    from LArRecUtils.LArAutoCorrNoiseCondAlgDefault import LArAutoCorrNoiseCondAlgDefault
-    LArAutoCorrNoiseCondAlgDefault()
+    if not isOverlay():
+        from LArRecUtils.LArAutoCorrNoiseCondAlgDefault import LArAutoCorrNoiseCondAlgDefault
+        LArAutoCorrNoiseCondAlgDefault()
 
     # bad channel masking
     from LArBadChannelTool.LArBadChannelToolConf import LArBadChannelMasker

LArCalorimeter/LArDigitization/python/LArPileUpToolDefault.py

@@ -6,6 +6,12 @@ from AthenaCommon.Logging import logging
 
 def LArPileUpToolDefault(useLArFloat=True,isOverlay=False,outputKey='LArDigitContainer_MC',outputKey_DigiHSTruth='LArDigitContainer_DigiHSTruth',name='LArPileUpToolDefault'):
 
+    if isOverlay:
+        #For all other cases, this is already done by LArConditionsCommon_MC_jobOptions.py
+        from LArRecUtils.LArRecUtilsConf import LArSymConditionsAlg_LArfSamplMC_LArfSamplSym_ as LArfSamplSymAlg
+        condSeq = AthSequencer("AthCondSeq")
+        condSeq+=LArfSamplSymAlg(ReadKey="LArfSampl",WriteKey="LArfSamplSym")
+
     try:
         from AthenaCommon import CfgGetter
         theTool = CfgGetter.getPublicTool("LArPileUpTool")
@@ -13,6 +19,8 @@ def LArPileUpToolDefault(useLArFloat=True,isOverlay=False,outputKey='LArDigitCon
         theTool.DigitContainer_DigiHSTruth = outputKey_DigiHSTruth
         from Digitization.DigitizationFlags import digitizationFlags
         theTool.DoDigiTruthReconstruction = digitizationFlags.doDigiTruth()
+
+
     except Exception as configException:
         print configException
         print "ERROR Problem with configuration"