athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-18T12:15:00+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/698842024-03-18: merge of 24.0 into main2024-03-18T12:15:00+01:00Frank Winklmeier2024-03-18: merge of 24.0 into mainThis sweep contains the following MRs:
* !69804 Drop SlimmingHelper legacy config ~BTagging, ~Derivation, ~InnerDetector, ~JetEtmiss, ~L1Calo, ~Trigger
* !69823 Updating pixel calibration - Adding recovery step ~InnerDetector
* !69824...This sweep contains the following MRs:
* !69804 Drop SlimmingHelper legacy config ~BTagging, ~Derivation, ~InnerDetector, ~JetEtmiss, ~L1Calo, ~Trigger
* !69823 Updating pixel calibration - Adding recovery step ~InnerDetector
* !69824 L1calo monitoring updates (main GfexSimMonitoring) ~DQ, ~L1Calo, ~Trigger
* !69817 Port updates to splash items from P1 ~L1Calo, ~Trigger, ~TriggerMenu
* !69830 Trigger: fix flake8 configuration ~EFTracking, ~JetEtmiss, ~Tau, ~Trigger, ~TriggerEDM, ~TriggerID, ~TriggerJet, ~TriggerMenu, ~TriggerMinBias
* !69831 TauTrig: move from INFO to DEBUG message (ATR-28972) ~Tau, ~Trigger
* !69812 TrigT1CaloFexPerf: delete legacy job options ~L1Calo, ~Trigger
* !69815 TrigT1CaloCalib: delete legacy job options ~DQ, ~L1Calo, ~Overlay, ~Trigger
* !69826 TrigT1CaloMonitoringTools: delete legacy LVL1CaloMonFlags ~DQ, ~L1Calo, ~Trigger
* !69827 Calo: remove a number of unused/obsolete python files ~Calorimeter, ~Trigger
* !69828 TriggerTest: fixes for fastMenuDiff test ~Trigger
* !69841 Change the message level in muon hypo for passthrough mode ~Trigger
* !69843 ControlTest: delete unused legacy tests ~Testhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69830Trigger: fix flake8 configuration2024-03-18T07:55:54+01:00Frank WinklmeierTrigger: fix flake8 configurationTo enable a disabled flake8 extension (e.g. `ALT900`) one has to use `--extend-extensions` not `--extend-select`. This meant that these checks were never running. Also fix the resulting warnings.
Relates to ATR-28970.To enable a disabled flake8 extension (e.g. `ALT900`) one has to use `--extend-extensions` not `--extend-select`. This meant that these checks were never running. Also fix the resulting warnings.
Relates to ATR-28970.https://gitlab.cern.ch/atlas/athena/-/merge_requests/691252024-02-22: merge of 24.0 into main2024-02-22T13:48:48+01:00Frank Winklmeier2024-02-22: merge of 24.0 into mainThis sweep contains the following MRs:
* !69102 TrigInDetConfig: remove usage of ConfigurableCABehavior ~Trigger, ~TriggerID
* !69114 Update test_q443.sh to use correct CA option ~Tools
* !69103 TriggerMenuMT: remove legacy menu suppo...This sweep contains the following MRs:
* !69102 TrigInDetConfig: remove usage of ConfigurableCABehavior ~Trigger, ~TriggerID
* !69114 Update test_q443.sh to use correct CA option ~Tools
* !69103 TriggerMenuMT: remove legacy menu support from MET.ConfigHelpers ~JetEtmiss, ~Trigger, ~TriggerMenu
* !69090 clean up in the tau chains and addition of PhI items in the P1 Menu, ATR-28842 ATR-28839 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69029 Clean up legacy configs in DerivationFrameworkJetEtMiss + JetJvtEfficiency ~Derivation, ~JetEtmiss, ~Reconstruction
* !69084 Clean up legacy MET monitoring ~DQ, ~JetEtmiss, ~Reconstruction
* !69085 Clean up legacy METUtilities ~JetEtmiss, ~Reconstruction
* !69086 Clean up legacy METReconstruction ~JetEtmiss, ~Reconstruction
* !69083 Clean up legacy RecBackgroundAlgs ~Reconstruction
* !69025 SCT_ConditionsTools legacy config clean up ~DQ, ~InnerDetector
* !69074 DecisionHandling+TrigPartialEventBuilding: remove support for legacy menu ~Trigger
* !68989 Implement HLT tau preselection ~BTagging, ~DQ, ~JetEtmiss, ~Tau, ~Trigger, ~TriggerEDM, ~TriggerJet, ~TriggerMenu, ~changes-trigger-counts
* !69068 ATR-28783: Cleanup after legacy removal on release 24.0 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69065 Add TrigInDetAnalysis 2D efficiencies and the completed error calculation ~Trigger
* !69082 gFEX MET fix ~L1Calo, ~Trigger
* !69026 xAODTrigMuonCnv legacy config clean up ~EDM, ~MuonSpectrometer, ~Trigger
* !69073 TriggerMenuMT: remove legacy JSON generation code ~Trigger, ~TriggerMenu
* !69072 Fixing out-of-bounds warning in static analysis ~L1Calo, ~Trigger
* !69067 TriggerMenuMT: further cleanup of legacy code ~JetEtmiss, ~Trigger, ~TriggerMenu
* !69045 Only setup trigger acceleration tool and service for running FTF in GPU mode ~ITk, ~Trigger, ~TriggerID
* !69058 Reverting back to MT for muon and ttbar ITk FTF trigger tests ~ITk, ~Trigger
* !69057 Correct tag for the online folder /MDT/Onl/MM/CABLING ~MuonSpectrometer
* !68940 Configure monitoring for BeamSpot post-processing script ~DQ, ~InnerDetector
* !69036 Activate IDPVM ART test for release 24 ~InnerDetector, ~Tracking
* !68999 Remove old style VP1 configuration ~EventDisplay
* !69024 SCT_Cabling legacy config clean up ~InnerDetector
* !69022 InDetPrepRawDataToxAOD legacy config clean up ~InnerDetector
* !69021 PixelRawDataByteStreamCnv legacy config clean up ~InnerDetector
* !69020 SiClusterizationTool legacy config clean up ~InnerDetector
* !69019 IDPVM legacy config clean up ~InnerDetector, ~JetEtmiss, ~Tracking
* !69005 LUCID_Digitization: Clean-up obsolete job options ~Digitization, ~ForwardDetectors
* !69004 RPC_Digitization: Clean-up obsolete job options ~Digitization, ~MuonSpectrometer
* !68993 Remove legacy Campaigns and RunDependentSimData/Comps job options ~Digitization, ~Simulation, ~Tools
* !69027 PixelConditionsTools legacy config clean up ~InnerDetector
* !69038 Clean up legacy configs in egammaPerformance ~DQ, ~Egamma, ~Reconstruction
* !68975 Removal of legacy config for DAOD production - part 5 ~Derivation, ~Tools
* !69028 TRT_ConditionsAlgs legacy config clean up ~InnerDetector
* !69035 Fix HitAnalysis configs import ~Simulation
The following MRs have been reverted:
* !69049 MuonPhaseII -- Remove unit tests ~MuonSpectrometer, ~Upgrade, ~sweep:ignorehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68989Implement HLT tau preselection2024-02-22T10:49:23+01:00Chris PollardImplement HLT tau preselectionImplementing the tau-based (jet) preselection into the HLT.
This still needs some validation, but at least it runs in the trigger ARTests with an example chain. Based largely on the work of @jdavidso !
CC trigger experts: @gipezzul @sm...Implementing the tau-based (jet) preselection into the HLT.
This still needs some validation, but at least it runs in the trigger ARTests with an example chain. Based largely on the work of @jdavidso !
CC trigger experts: @gipezzul @smwang @miochoa @xingguo @lbeemste @lshi @lidiaz @astruebi
CC bbtautau people: @bmoser @pbokan @abetti @kleney @vdaohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68641TriggerEDMRun3: 2023/2024 YETS AODCOMM container removal - Round 1 (ATR-28561)2024-02-08T14:49:45+01:00Claire AntelTriggerEDMRun3: 2023/2024 YETS AODCOMM container removal - Round 1 (ATR-28561)Removes the following AODCOMM-marked containers from AOD, following confirmation from signature coordinators in ATR-28561:
```
'xAOD::TrigEMClusterContainer#HLT_LArPS_AllCaloEMClusters'
'xAOD::TrigEMClusterAuxContainer#HLT_LArPS_AllCaloE...Removes the following AODCOMM-marked containers from AOD, following confirmation from signature coordinators in ATR-28561:
```
'xAOD::TrigEMClusterContainer#HLT_LArPS_AllCaloEMClusters'
'xAOD::TrigEMClusterAuxContainer#HLT_LArPS_AllCaloEMClustersAux.'
'xAOD::TrigEMClusterContainer#HLT_LArPS_AllCaloClusters'
'xAOD::TrigEMClusterAuxContainer#HLT_LArPS_AllCaloClustersAux.'
'xAOD::CaloClusterContainer#HLT_CaloEMClusters_FWD'
'xAOD::CaloClusterTrigAuxContainer#HLT_CaloEMClusters_FWDAux.'
```
```
'xAOD::JetContainer#HLT_jet_seed'
'xAOD::JetAuxContainer#HLT_jet_seedAux.'
```
```
'xAOD::JetContainer#HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalib'
'xAOD::JetAuxContainer#HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAux.'
'xAOD::JetContainer#HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftf'
'xAOD::JetAuxContainer#HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAux.'
```
```
'xAOD::VertexContainer#HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf_BTaggingSecVtx'
'xAOD::VertexAuxContainer#HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf_BTaggingSecVtxAux.'
'xAOD::BTagVertexContainer#HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf_BTaggingJFVtx'
'xAOD::BTagVertexAuxContainer#HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf_BTaggingJFVtxAux.'
```
This is Round 1. To be followed up by Round 2: Relabbeling of some AODCOMM containers to AODFULL, possible removal of containers still under discussion and possible entire removal of AODCOMM label.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68443Precision GN2 in HLT2024-02-05T09:36:30+01:00Lucas BezioPrecision GN2 in HLTAddition of a new preicision b-tagger GN220240122 in the HLT code.
Tagging @sfranche @cantel @lshi @lbeemsteAddition of a new preicision b-tagger GN220240122 in the HLT code.
Tagging @sfranche @cantel @lshi @lbeemstehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68370[ATR-28717] Initial refactor of trigger EDM toward R42024-02-05T14:25:13+01:00Tim Martin[ATR-28717] Initial refactor of trigger EDM toward R4Initial part of the refactor
* Move `recordable` out of the R3 file and into a more central place.
* Avoids unneeded run-dependence in signature configuration code
* For now assuming R3, but maybe in the future we pass the `flag...Initial part of the refactor
* Move `recordable` out of the R3 file and into a more central place.
* Avoids unneeded run-dependence in signature configuration code
* For now assuming R3, but maybe in the future we pass the `flags` here too
* sed update the large number of importers of this function
* Move `Alias` and `InViews` structs to a new `TrigEDMDefs` file, for importing into the R3 and R4 files (cannot go into TrigEDM, circular dependencies)
* Add empty R4 file
Follow-up MRs will integrate the new R4 file, and do some additional refactoring for R3.
Limited testing so far due to large number of touched packages.
cc @cantelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68273Adding fastGN2 scores2024-02-09T11:16:00+01:00Lucas BezioAdding fastGN2 scoresAdding fastGN2 inference into BJetFlavourTaggingConfig.py and adding outputs for preselection.
Marked as draft because `PATH_TO_FAST_GN2` in the dev area needs to be confirmed by @lbeemste
Tagging @sfranche & @cantelAdding fastGN2 inference into BJetFlavourTaggingConfig.py and adding outputs for preselection.
Marked as draft because `PATH_TO_FAST_GN2` in the dev area needs to be confirmed by @lbeemste
Tagging @sfranche & @cantelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68172[ATR-28687] eFEX Tau algorithm switch and new EDM naming convention for L1 ta...2024-03-04T17:41:24+01:00David Reikher[ATR-28687] eFEX Tau algorithm switch and new EDM naming convention for L1 tau RoIsThe `L1_eTauRoI`/`L1_eTauBDTRoI` naming convention for tau RoIs produced by the heuristic/BDT algorithms, respectively was changed to `L1_eTauRoI/L1_eTauRoIAlt`. A switch was added to the configuration to select which algorithm is the ac...The `L1_eTauRoI`/`L1_eTauBDTRoI` naming convention for tau RoIs produced by the heuristic/BDT algorithms, respectively was changed to `L1_eTauRoI/L1_eTauRoIAlt`. A switch was added to the configuration to select which algorithm is the active one and which is the alternative.
The change was tested by running a derivation on a data file with either BDT or Heuristic set to active and verifying the algorithm version bit in the TOBs in subsequent analysis code running on the derivation.
Tagging @will @thompsonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67574Adding EGamPEBTLA EventBuildingType and Stream + Adding Reconstruction tag to...2024-02-16T18:48:55+01:00Marco MontellaAdding EGamPEBTLA EventBuildingType and Stream + Adding Reconstruction tag to RAWtoDAOD_TLA skeletonThis MR implements the new EGamPEBTLA BuildingType for DiPhoton PEB+TLA. A number of chains have been defined in the Dev Menu with the novel EBT. All stream to the newly defined EGamPEBTLA stream.
The MR also contains a first (and not f...This MR implements the new EGamPEBTLA BuildingType for DiPhoton PEB+TLA. A number of chains have been defined in the Dev Menu with the novel EBT. All stream to the newly defined EGamPEBTLA stream.
The MR also contains a first (and not fully working) pass at defining a reconstruction procedure for EGamPEBTLA into DAOD_TLAEGAMPEB within Reco_tf and related scripts. More details on what's currently not working in the comments.
Tagging @khoohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67490Correcting for the factor in the outputs of the DIPZ regression in Athena2023-11-30T20:34:46+01:00Chris PollardCorrecting for the factor in the outputs of the DIPZ regression in AthenaThe original current DIPZ output from Athena has a factor of "50" in the outputs that we want to get rid of. Thus we derived another neural network with an extral layer that does such change and validated it. We defined the output of the...The original current DIPZ output from Athena has a factor of "50" in the outputs that we want to get rid of. Thus we derived another neural network with an extral layer that does such change and validated it. We defined the output of the network with a new timestamp. Here, we modified the files that use DIPZ with the new timestamped variable name, and also pointed athena to the location of the new json file.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67409Fixing view containers' name2023-11-28T16:40:15+01:00Debottam Bakshi GuptaFixing view containers' nameAs mentioned in ATR-28569 this MR is fixing view container nameAs mentioned in ATR-28569 this MR is fixing view container namehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67260Inclusion of functions to produce clusters containers related to Ringer2023-11-23T12:34:42+01:00Denis Oliveira DamazioInclusion of functions to produce clusters containers related to RingerInclusion of functions to produce clusters containers related to Ringer. These functions can be called from Pre/Post Exec in a transform.Inclusion of functions to produce clusters containers related to Ringer. These functions can be called from Pre/Post Exec in a transform.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67227Fix muon view collection names in trigger EDM config2023-11-20T16:16:30+01:00Savanna ShawFix muon view collection names in trigger EDM configUpdating the view collection names for the muon isolation views to match what is actually created (fixing a mistake from the CA migration in https://gitlab.cern.ch/atlas/athena/-/merge_requests/67093).
Also removing some view collection ...Updating the view collection names for the muon isolation views to match what is actually created (fixing a mistake from the CA migration in https://gitlab.cern.ch/atlas/athena/-/merge_requests/67093).
Also removing some view collection names that were part of the legacy config and so are now no longer produced.
Fixes ATR-28539.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67217Remove references to AODLARGE, AODSMALL2023-11-20T09:03:18+01:00Tim MartinRemove references to AODLARGE, AODSMALLcc @cantel
Small one, noted a couple of references still to AODSMALL, AODLARGE from the R3 AMG planning doc.
It was decided not to change the naming scheme away from AODSLIM and AODFULL.
Removing.cc @cantel
Small one, noted a couple of references still to AODSMALL, AODLARGE from the R3 AMG planning doc.
It was decided not to change the naming scheme away from AODSLIM and AODFULL.
Removing.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67215[ATR-28532][ATR-28536] Rework how ExtraEDMList is applied2023-11-23T12:24:49+01:00Tim Martin[ATR-28532][ATR-28536] Rework how ExtraEDMList is appliedThis MR proposal lets `flags.Trigger.ExtraEDMList` work once again in `main`. And it now also propagates down to ESD, AOD - providing the flag continues to get set in the offline processing step (and even DAOD if producing DAOD_PHYSVAL, ...This MR proposal lets `flags.Trigger.ExtraEDMList` work once again in `main`. And it now also propagates down to ESD, AOD - providing the flag continues to get set in the offline processing step (and even DAOD if producing DAOD_PHYSVAL, or other DAOD with a complete trigger payload).
This resolves ATR-28532, however the mechanism was only working previously due to side-effects (mutation of a global state). Which is how it could be broken silently by a refactor in the first place. Opened ATR-28536 to follow up on this aspect.
cc @cantel and @damaziohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67197B-physics trigger: remove noGSF and noringer versions of bBeeM6000 chains (AT...2023-11-20T16:22:52+01:00Vladimir LyubushkinB-physics trigger: remove noGSF and noringer versions of bBeeM6000 chains (ATR-28162)Remove noGSF and noringer versions of bBeeM6000 chains from Dev_pp_run3_v1 Menu.
Also enable CA version of bBeeM6000 chains: the ComboHypo is ready to be used in CA.Remove noGSF and noringer versions of bBeeM6000 chains from Dev_pp_run3_v1 Menu.
Also enable CA version of bBeeM6000 chains: the ComboHypo is ready to be used in CA.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67093CA migration for Muon Trigger Isolation Sequence2023-11-20T16:16:28+01:00Savanna ShawCA migration for Muon Trigger Isolation SequenceMigrating the isolation sequence to MenuSequenceCA (ATR-25087)
- Migration of the hypo alg for the isolation and also the invariant mass hypo
- Update the edm config to match the new view names
- Exclude the DY combined hypo alg from ...Migrating the isolation sequence to MenuSequenceCA (ATR-25087)
- Migration of the hypo alg for the isolation and also the invariant mass hypo
- Update the edm config to match the new view names
- Exclude the DY combined hypo alg from the CA configuration as the CA version is not yet ready
- Switch the muon sequence to return a CA and move the menu sequence to MenuSequenceCAhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67071TriggerJobOpts+TrigEDMConfig: Add a flag to control whether run-1 data are co...2023-11-14T14:42:13+01:00Scott SnyderTriggerJobOpts+TrigEDMConfig: Add a flag to control whether run-1 data are converted to xAOD.Allow suppressing the conversion of run-1 data to xAOD.
Mostly for the use of PyDumper, to avoid dumping things twice.Allow suppressing the conversion of run-1 data to xAOD.
Mostly for the use of PyDumper, to avoid dumping things twice.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66963the new Run3 calratio triggers2023-12-15T15:17:17+01:00Tatiana Ovsiannikovathe new Run3 calratio triggersthe first version of the new Run3 calratio triggers ATR-22696.the first version of the new Run3 calratio triggers ATR-22696.