Commit bdef58f0 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'larrodflags.LArConfiguration-20190603' into 'master'

LArConfiguration: More LAr ROD flags.

See merge request atlas/athena!23895
parents 20d2b9dd 421954d1
......@@ -34,12 +34,23 @@ def createLArConfigFlags():
lcf.addFlag("LAr.ForceIOVRunNumber", "")
# Include Shape folder
lcf.addFlag("LAr.UseShape", True)
# Number of samples in LAr digitization + ROD emulation
lcf.addFlag("LAr.RODnSamples", 5)
# Index of first sample in LAr digitization + ROD emulation
lcf.addFlag("LAr.RODFirstSample", 0)
# DataBase server string
lcf.addFlag("LAr.DBConnection", "")
# Number of samples in LAr digitization + ROD emulation
lcf.addFlag("LAr.ROD.nSamples", 5)
# Index of first sample in LAr digitization + ROD emulation
lcf.addFlag("LAr.ROD.FirstSample", 0)
# Force using the highest gain autocorrelation function
# when doing OFC optimization
lcf.addFlag("LAr.ROD.UseHighestGainAutoCorr", False)
# Flag not to use pileup noise neither average constrain in EMB and EMEC-OW,
# and both pileup noise and average constrain everywhere else
lcf.addFlag("LAr.ROD.DoOFCMixedOptimization", False)
### option to use average constraint in OFC computation
### 0 = not use Delta, 1 = only EMECIW/HEC/FCAL, 2 = all , 3 = only EMECIW
lcf.addFlag("LAr.ROD.UseDelta", 0)
return lcf
......
......@@ -106,8 +106,8 @@ def LArPileUpToolCfg(flags, name="LArPileUpTool", **kwargs):
# if doing MC+MC overlay
if flags.Input.isMC and flags.Detector.OverlayLAr:
kwargs.setdefault("isMcOverlay", True)
kwargs.setdefault("Nsamples", flags.LAr.RODnSamples)
kwargs.setdefault("firstSample", flags.LAr.RODFirstSample)
kwargs.setdefault("Nsamples", flags.LAr.ROD.nSamples)
kwargs.setdefault("firstSample", flags.LAr.ROD.FirstSample)
if flags.Detector.OverlayLAr:
kwargs.setdefault("RandomDigitContainer", "LArDigitContainer_MC")
# cosmics digitization
......
......@@ -40,7 +40,7 @@ def LArAutoCorrNoiseCondAlgCfg(flags, name="LArAutoCorrNoiseCondAlg", **kwargs):
"""Return ComponentAccumulator with configured LArAutoCorrNoiseCondAlg"""
acc = LArOnOffIdMappingCfg(flags)
acc.merge(LArMCSymCondAlgCfg(flags))
kwargs.setdefault("nSampl", flags.LAr.RODnSamples)
kwargs.setdefault("nSampl", flags.LAr.ROD.nSamples)
acc.addCondAlgo(LArAutoCorrNoiseCondAlg(name, **kwargs))
return acc
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment