diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py index 945f1a4f20f67a7ad93b99f98a36757ccf7979cf..d7b11270df0bf9adab36b22ace519dafb217caae 100644 --- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py +++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py @@ -292,6 +292,9 @@ def PixelOverlayDigitizationBasicCfg(flags, **kwargs): if flags.Concurrency.NumThreads > 0: kwargs.setdefault("Cardinality", flags.Concurrency.NumThreads) + # Set common overlay extra inputs + kwargs.setdefault("ExtraInputs", flags.Overlay.ExtraInputs) + PixelDigitization = CompFactory.PixelDigitization acc.addEventAlgo(PixelDigitization(name="PixelOverlayDigitization", **kwargs)) return acc diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfigNew.py b/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfigNew.py index 8a5b7fe474481ef5796054b766fed02e36add527..7a92eaf373e89230236263b836c34471df178318 100644 --- a/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfigNew.py +++ b/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfigNew.py @@ -267,6 +267,9 @@ def SCT_OverlayDigitizationBasicCfg(flags, **kwargs): if flags.Concurrency.NumThreads > 0: kwargs.setdefault('Cardinality', flags.Concurrency.NumThreads) + # Set common overlay extra inputs + kwargs.setdefault("ExtraInputs", flags.Overlay.ExtraInputs) + SCT_Digitization = CompFactory.SCT_Digitization acc.addEventAlgo(SCT_Digitization(name="SCT_OverlayDigitization", **kwargs)) return acc diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py index 7bc0e54b04db8e48749f927d3352f68e01d89239..ce05e45bdc9702f38a206afecb16019c86080f89 100644 --- a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py +++ b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py @@ -157,6 +157,9 @@ def TRT_OverlayDigitizationBasicCfg(flags, **kwargs): if flags.Concurrency.NumThreads > 0: kwargs.setdefault("Cardinality", flags.Concurrency.NumThreads) + # Set common overlay extra inputs + kwargs.setdefault("ExtraInputs", flags.Overlay.ExtraInputs) + TRTDigitization = CompFactory.TRTDigitization acc.addEventAlgo(TRTDigitization(name="TRT_OverlayDigitization", **kwargs)) return acc diff --git a/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py index 86ebbc9504648436bb5134b1fc98a3227fb5a0b7..fde64aeb334cab7d5a2eb3c405009748a814ed4a 100644 --- a/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py +++ b/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py @@ -108,6 +108,9 @@ def CSC_OverlayDigitizationBasicCfg(flags, **kwargs): if flags.Concurrency.NumThreads > 0: kwargs.setdefault("Cardinality", flags.Concurrency.NumThreads) + # Set common overlay extra inputs + kwargs.setdefault("ExtraInputs", flags.Overlay.ExtraInputs) + CscDigitBuilder = CompFactory.CscDigitBuilder acc.addEventAlgo(CscDigitBuilder(name="CscOverlayDigitBuilder", **kwargs)) return acc diff --git a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py index 3c2875333e122e445c570c342606bac43c86f06f..d96a17968c7cc33aad477b198c004e2032ea65c1 100644 --- a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py @@ -117,6 +117,9 @@ def MDT_OverlayDigitizationBasicCfg(flags, **kwargs): if flags.Concurrency.NumThreads > 0: kwargs.setdefault("Cardinality", flags.Concurrency.NumThreads) + # Set common overlay extra inputs + kwargs.setdefault("ExtraInputs", flags.Overlay.ExtraInputs) + MDT_Digitizer = CompFactory.MDT_Digitizer acc.addEventAlgo(MDT_Digitizer(name="MDT_OverlayDigitizer", **kwargs)) return acc diff --git a/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py index e941cfcf3b7f13b054104d153c872927a7f3ac0e..6dc10969574cb583c57f9cd7cc012f55ef94634d 100644 --- a/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py +++ b/MuonSpectrometer/MuonConfig/python/RPC_DigitizationConfig.py @@ -131,6 +131,9 @@ def RPC_OverlayDigitizationBasicCfg(flags, **kwargs): if flags.Concurrency.NumThreads > 0: kwargs.setdefault("Cardinality", flags.Concurrency.NumThreads) + # Set common overlay extra inputs + kwargs.setdefault("ExtraInputs", flags.Overlay.ExtraInputs) + RPC_Digitizer = CompFactory.RPC_Digitizer acc.addEventAlgo(RPC_Digitizer(name="RPC_OverlayDigitizer", **kwargs)) return acc diff --git a/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py index dcf3178a509db12840083734e3ce0079930f7fb6..6c938eeadb35f7b8d4d94f076c68c4f9b3347c3d 100644 --- a/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py +++ b/MuonSpectrometer/MuonConfig/python/TGC_DigitizationConfig.py @@ -90,6 +90,9 @@ def TGC_OverlayDigitizationBasicCfg(flags, **kwargs): if flags.Concurrency.NumThreads > 0: kwargs.setdefault("Cardinality", flags.Concurrency.NumThreads) + # Set common overlay extra inputs + kwargs.setdefault("ExtraInputs", flags.Overlay.ExtraInputs) + TGCDigitizer = CompFactory.TGCDigitizer acc.addEventAlgo(TGCDigitizer(name="TGC_OverlayDigitizer", **kwargs)) return acc diff --git a/Simulation/Overlay/OverlayConfiguration/python/OverlayConfigFlags.py b/Simulation/Overlay/OverlayConfiguration/python/OverlayConfigFlags.py index 510c51b16546f5c1945a4d435b4437284cf8c29d..9d525da325a37f8d7a66bee18e65f49c32438a07 100644 --- a/Simulation/Overlay/OverlayConfiguration/python/OverlayConfigFlags.py +++ b/Simulation/Overlay/OverlayConfiguration/python/OverlayConfigFlags.py @@ -15,6 +15,8 @@ def createOverlayConfigFlags(): flags.addFlag("Overlay.BkgPrefix", "Bkg_") # Overlay signal StoreGate key prefix flags.addFlag("Overlay.SigPrefix", "Sig_") + # Overlay extra input dependencies + flags.addFlag("Overlay.ExtraInputs", [("McEventCollection", "TruthEvent")]) # Name of MC EvtStore to overlay flags.addFlag("Overlay.Legacy.EventStore", "BkgEvent_0_SG") return flags