athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-25T12:18:34+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70041Draft: TriggerEDMRun3: AODCOMM removal Round 2 (ATR-28561, ATR-28781), Unuse...2024-03-25T12:18:34+01:00Claire AntelDraft: TriggerEDMRun3: AODCOMM removal Round 2 (ATR-28561, ATR-28781), Unused/empty AOD removal (ATR-29047)`TriggerEDMRun3`:
- Remove `HLT_TopoCaloClustersFS` from AOD
- Relabel UTT containers AODCOMM->AODFULL: `HLT_dEdxTrk`, `HLT_DisTrkCand`
- Relabel EGamma Fast obj containers AODCOMM->AODFULL: `HLT_FastPhotons`, `HLT_FastElectrons`, `HL...`TriggerEDMRun3`:
- Remove `HLT_TopoCaloClustersFS` from AOD
- Relabel UTT containers AODCOMM->AODFULL: `HLT_dEdxTrk`, `HLT_DisTrkCand`
- Relabel EGamma Fast obj containers AODCOMM->AODFULL: `HLT_FastPhotons`, `HLT_FastElectrons`, `HLT_FastElectrons_LRT`
- Removing never used Jet/BJet/BPhys containers from all but BS: `HLT_AntiKt4EMTopo/PFlowJets_subresjesgscIS_ftf_BTaggingSecVtx`, `HLT_AntiKt4EMTopo/PFlowJets_subresjesgscIS_ftf_BTaggingJFVtx`, `HLT_DiElecPrecision`, `HLT_NoMuonDiElecPrecision`, several jet containers.
`TrigAnalysisTest`:
- adjust ART Run3DQ tests to use `Trigger.AODEDMSet='ESD'`: `test_trigAna_RDOtoRun3DQ_v1Dev_build.py`, `test_trigAna_RDOtoRun3DQ_v1Dev_grid.py`
This is so that they don't break after removing HLT containers from AOD that are being monitored (At TIER0, do DQ step in RAWtoALL, thus remains unaffected).https://gitlab.cern.ch/atlas/athena/-/merge_requests/68582Draft: [ATR-28536][ATR-28717] Working towards a trigger EDM refactor and inte...2024-02-19T10:57:11+01:00Tim MartinDraft: [ATR-28536][ATR-28717] Working towards a trigger EDM refactor and integrating R4 into the EDM (part B)Follows from !68370
I would like some input on these proposed changes, cc @cantel, @okuprash, @wiedenma, @fwinkl before un-drafting (also I am trampling over some bjet changes I need to undo before un-drafting)
Here in part B, I aim to...Follows from !68370
I would like some input on these proposed changes, cc @cantel, @okuprash, @wiedenma, @fwinkl before un-drafting (also I am trampling over some bjet changes I need to undo before un-drafting)
Here in part B, I aim to make the following changes
* Change the signature of `getTriggerEDMList` to require the config flags (but make it such that it doesn't crash if you supply `None` for some e.g. standalone test use cases). Update all clients.
* Introduce a new function, `getRawTriggerEDMList` which takes `flags`. Every user of the `TriggerEDMRun3.TriggerHLTListRun3` should obtain this list via this function such that every client gets a consistent copy. Updated all clients.
* Mark the internal functions inside `TriggerEDM` with an initial underscore.
* Removed unused functions inside `TriggerEDM`.
* Move the `addExtraCollectionsToEDMList` function from the `TriggerEDMRun3` file to the `TriggerEDM` file.
To follow in the next part:
* Attempt to refactor `addHLTNavigationToEDMList` using the new `flags.Trigger.ExtraEDMFunction` - this will be hard...
* Add caching to the `getRawTriggerEDMList` function.
* Make it harder to obtain `TriggerEDMRun3.TriggerHLTListRun3` without going via `getRawTriggerEDMList(flags, 3)`, maybe wrap this list in a simple class.
* Connect up the Run 4 EDM file