[ATLMCPROD-11689] Improve EDM auto config for Run 4

Tim Martinrequested to merge
tamartin/athena:edmConfigR4_24.0 into 24.0

Found via [ATLMCPROD-11689] that the auto-configuration of the EDM flag wasn't working for R4 as anticipated due to a explicit flags.Trigger.EDMVersion = 3 in runHLT.py

Removing this highlighted that the current logic for "run 4 is run 3 + some extra stuff" was incomplete as a call to obtain the raw EDM is also used to configure the collapsing of EventView collections at the end of the HLT.

The code to merge the R3 and R4 lists was hence moved down one level from getTriggerEDMList to getRawTriggerEDMList

cc @cantel

Merge request reports