Skip to content

Pseudomerge of TrigEDMConfig from rel 21 to master

Catrin Bernius requested to merge bernius/athena:bernius_05_Apr_TrigEDMConfig_to_master into master

ATR-19410: Pseudomerge of Trigger/TriggerCommon/TrigEDMConfig from rel 21 to master Commands used as instructed in the jira, in particluar: git-package-pseudomerge.py
--packages Trigger/TriggerCommon/TrigEDMConfig
--source upstream/21.3
--target upstream/master
--stage 1

Resolved conflicts in two files:

  • Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
  • Trigger/TriggerCommon/TrigEDMConfig/python/testEDM.py

testEDM.py: resolved addition of AODBLSSLIM TriggerEDM.py: various additions of containers, removal of variables or addition of AODBLSSLIM to the list of formats

Tagging @hartj and @rbielski

Not done (don't think this is necessary): update of Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root

Merge request reports