diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayBS_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayBS_tf.py index 3b3bbd495a745b5a515c476695ca2280a63f66f3..2f932b4720132324941d6dc80f54497ad5f954b9 100644 --- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayBS_tf.py +++ b/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(): diff --git a/LArCalorimeter/LArDigitization/python/LArDigitizationConfig.py b/LArCalorimeter/LArDigitization/python/LArDigitizationConfig.py index 3143da57ab00012aeab06a0df69213c14a3bd508..3d6e9b778508f231d59bdc194a0458d7ee31bb77 100644 --- a/LArCalorimeter/LArDigitization/python/LArDigitizationConfig.py +++ b/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 diff --git a/LArCalorimeter/LArDigitization/python/LArPileUpToolDefault.py b/LArCalorimeter/LArDigitization/python/LArPileUpToolDefault.py index 470b8c8ce126186278920f9cb772c73669185e87..32e3c134dac967b3246eeba04178bb15ab063e67 100644 --- a/LArCalorimeter/LArDigitization/python/LArPileUpToolDefault.py +++ b/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"