Skip to content
Snippets Groups Projects
Commit 298bf245 authored by Andrea Coccaro's avatar Andrea Coccaro
Browse files

Merge branch 'CA-legacy-l1-reco' into '22.0'

Enable legacy L1Calo/L1Topo reco in CA for Run3 data

See merge request !57189
parents f917f47f b11a6f32
4 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!572112022-10-03: daily merge of 22.0 into master,!57189Enable legacy L1Calo/L1Topo reco in CA for Run3 data
...@@ -49,14 +49,6 @@ def TriggerRecoCfg(flags): ...@@ -49,14 +49,6 @@ def TriggerRecoCfg(flags):
elif flags.Trigger.EDMVersion in [1, 2]: elif flags.Trigger.EDMVersion in [1, 2]:
acc.merge( Run1Run2BSExtractionCfg(flags) ) acc.merge( Run1Run2BSExtractionCfg(flags) )
from AnalysisTriggerAlgs.AnalysisTriggerAlgsCAConfig import RoIBResultToxAODCfg
xRoIBResultAcc, _ = RoIBResultToxAODCfg(flags)
acc.merge( xRoIBResultAcc )
if flags.Input.Format is Format.BS:
from L1TopoByteStream.L1TopoByteStreamConfig import L1TopoRawDataContainerBSCnvCfg
acc.merge( L1TopoRawDataContainerBSCnvCfg(flags) )
from TrigDecisionMaker.TrigDecisionMakerConfig import Run1Run2DecisionMakerCfg from TrigDecisionMaker.TrigDecisionMakerConfig import Run1Run2DecisionMakerCfg
acc.merge (Run1Run2DecisionMakerCfg(flags) ) acc.merge (Run1Run2DecisionMakerCfg(flags) )
...@@ -65,6 +57,16 @@ def TriggerRecoCfg(flags): ...@@ -65,6 +57,16 @@ def TriggerRecoCfg(flags):
else: else:
raise RuntimeError("Invalid EDMVersion=%s " % flags.Trigger.EDMVersion) raise RuntimeError("Invalid EDMVersion=%s " % flags.Trigger.EDMVersion)
# Legacy L1Calo, L1Topo reco
if flags.Trigger.enableL1CaloLegacy:
from AnalysisTriggerAlgs.AnalysisTriggerAlgsCAConfig import RoIBResultToxAODCfg
xRoIBResultAcc, _ = RoIBResultToxAODCfg(flags)
acc.merge( xRoIBResultAcc )
if flags.Input.Format is Format.BS:
from L1TopoByteStream.L1TopoByteStreamConfig import L1TopoRawDataContainerBSCnvCfg
acc.merge( L1TopoRawDataContainerBSCnvCfg(flags) )
if flags.Output.doWriteESD or flags.Output.doWriteAOD: if flags.Output.doWriteESD or flags.Output.doWriteAOD:
acc.merge(TriggerEDMCfg(flags)) acc.merge(TriggerEDMCfg(flags))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment