athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-29T10:51:48+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/701872024-03-28: merge of 24.0 into main2024-03-29T10:51:48+01:00Edward Moyse2024-03-28: merge of 24.0 into mainThis sweep contains the following MRs:
* !70158 athena.py: allow --config-only without storing config (legacy) ~Core
* !70181 Fix bug in han configuration merging ~DQ
* !70149 Update collisions_run.config - add the new han configurati...This sweep contains the following MRs:
* !70158 athena.py: allow --config-only without storing config (legacy) ~Core
* !70181 Fix bug in han configuration merging ~DQ
* !70149 Update collisions_run.config - add the new han configuration for all the l1calo monitoring changes ~DQ, ~L1Calo
* !70151 athena.py: remove cppyy_minvmem command line option ~Core
* !70155 TileMonitoring: Update Tile online monitoring script for cosmics ~DQ, ~Tile
* !70103 Optimization of the Trigger Menu generation: move CA generation after the alignment (ATR-29039) ~JetEtmiss, ~Trigger, ~TriggerMenu
* !69406 24.0 TRT high threshold tune ~Digitization, ~InnerDetector, ~Overlay, ~Run2-DataOverlay-output-changed, ~Run2-MCOverlay-output-changed, ~Run2-MCReco-output-changed, ~Run3-MCOverlay-output-changed, ~Run3-MCReco-output-changed, ~Tools, ~frozen-tier0-violating
* !70127 Improvements in Run2 to Run 3 nav conversion ~Trigger
* !70135 LArConfiguration: delete legacy job option fragments ~LAr
* !70134 LArROD: remove legacy configuration ~LAr
* !70130 TileSimAlgs: Remove legacy JO configurations (ATLASRECTS-7939) ~Digitization, ~Tile
* !70085 remove old taggers and add GN2v01 in PhysVal monitoring ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss
* !70138 Add HLT_noalg_L1MU14EOF to express ~Trigger, ~TriggerMenu
* !70083 Dev new histograms ~DQ, ~LAr, ~Trigger
* !70105 gFEX update jwoj threshold ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !70121 TileMonitoring: Remove legacy JO configurations (ATLASRECTS-7939) ~DQ, ~Tile
* !70126 TileMuId: Remove legacy JO configurations (ATLASRECTS-7939) ~Tile
* !70128 TileRecAlgs: Remove legacy JO configurations (ATLASRECTS-7939) ~Tile
* !69231 Implementing the MuonSelectionTool for selecting muon tracks. ~Analysis, ~BTagging, ~Derivation, ~JetEtmiss
* !70125 remove obsolete job-config files from CaloRec/share ~Calorimeter
* !70124 TileMonitoring: Remove legacy config from TileMBTSMonitorAlgorithm (ATLASRECTS-7939) ~DQ, ~Tile
* !70122 TileMonitoring: Remove legacy config from TileDQFragMonitorAlgorithm (ATLASRECTS-7939) ~DQ, ~Tile
There was one conflict (in `BTaggingValidationPlots.cxx`). As discussed in !70085, I resolved this by taking the `24.0` changes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69620btagging tool for json-based CDI2024-03-29T09:41:06+01:00Binbin Dongbtagging tool for json-based CDItowards the JSON-based CDI by adding a selection tool to handle JSON-based configuration.towards the JSON-based CDI by adding a selection tool to handle JSON-based configuration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69869CPAlgorithms: use Gaudi::Property and ToolHandles everywhere2024-03-28T18:28:31+01:00Baptiste Ravinabaptiste.ravina@cern.chCPAlgorithms: use Gaudi::Property and ToolHandles everywhereUpdate almost everything under PhysicsAnalysis/Algorithms: remove `declareProperty` and constructor initialisations everywhere in favour of `Gaudi::Property` declarations in the header files; similarly, use the full `ToolHandle` construc...Update almost everything under PhysicsAnalysis/Algorithms: remove `declareProperty` and constructor initialisations everywhere in favour of `Gaudi::Property` declarations in the header files; similarly, use the full `ToolHandle` constructor.
The only places left with `declareProperty` are the `SelectionHelpers` and `SystematicsHandles`. Not sure how to get rid of `owner->declareProperty` within the templated classes, maybe an expert can make a suggestion?https://gitlab.cern.ch/atlas/athena/-/merge_requests/70139Less verbose output from BTaggingEfficiencyTool2024-03-28T15:21:22+01:00Dan GuestLess verbose output from BTaggingEfficiencyToolWe should probably only print a lot of info if the user asks for a lot of info.We should probably only print a lot of info if the user asks for a lot of info.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70169Only run HLTJetFTagDecoration if trigger included (ATLSWUPGR-245)2024-03-28T14:34:30+01:00Thomas StreblerOnly run HLTJetFTagDecoration if trigger included (ATLSWUPGR-245)Follow up to !700062
Solves PHYSVAL crashes when no trigger is present as in Run 4 tests ATLSWUPGR-245Follow up to !700062
Solves PHYSVAL crashes when no trigger is present as in Run 4 tests ATLSWUPGR-245https://gitlab.cern.ch/atlas/athena/-/merge_requests/69513Use config flags in analysis config2024-03-28T13:34:35+01:00Tadej Novaktadej.novak@cern.chUse config flags in analysis configMake config flags the main way to steer analysis config. This will help people working on analysis and Athena to feel at home and prevent accumulation of arguments of the `ConfigAccumulator`.
The naming is not fixed, I will probably als...Make config flags the main way to steer analysis config. This will help people working on analysis and Athena to feel at home and prevent accumulation of arguments of the `ConfigAccumulator`.
The naming is not fixed, I will probably also convert more items to flags. This is mainly to start the discussion and freeze the API as soon asp possible. I will probably then break this into multiple MRs.
Also some core flags should be renamed (see https://its.cern.ch/jira/browse/ATEAM-964).
Tagging @krumnack, @jolamber, @gwatts, @ekourlit for core AMG. Also tagging interested parties @ravinab, @omajersk, @tstreble, @khoo, @jchapman.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68664Draft: Implementation of ONNX model score computation and decoration for Taus...2024-03-28T11:42:23+01:00Nadav Michael TamirDraft: Implementation of ONNX model score computation and decoration for Taus (GNTau)Add tools and wrappers to run ONNX-based models for Tau objects. Details can be found in [FTag software meeting presentation](https://indico.cern.ch/event/1378241/contributions/5792680/attachments/2794403/4874167/GNTau_ftagSW.pdf), but i...Add tools and wrappers to run ONNX-based models for Tau objects. Details can be found in [FTag software meeting presentation](https://indico.cern.ch/event/1378241/contributions/5792680/attachments/2794403/4874167/GNTau_ftagSW.pdf), but in short: a new class and tool are added to tauRecTools along with some new variable calculator functionalities to run model inference and decorate TauJets and TauTracks, and DerivationFrameworkTau + tauRec are modified to call the tools and decorate the DAOD TauJets (if one also decorates the DeepSetID at the moment).https://gitlab.cern.ch/atlas/athena/-/merge_requests/69743Adding the SUSY6 features to LLP1, JIRA: ATLASG-26902024-03-28T11:41:18+01:00Daiya AkiyamaAdding the SUSY6 features to LLP1, JIRA: ATLASG-2690For Whom It May Concern,
The SUSY6 derivations continuation was discussed in the derivation meetings, and it was concluded that this derivation format will be merge with the LLP1 format.
For this reason, we have opened the following Ji...For Whom It May Concern,
The SUSY6 derivations continuation was discussed in the derivation meetings, and it was concluded that this derivation format will be merge with the LLP1 format.
For this reason, we have opened the following Jira Ticket: ATLASG-2690
We have chatted with the LLP1 community and haven't gotten an objection to the merger.
Let us know how you would like to proceed.
Sincerely
Ismet Siral and Daiya Akiyama on Behalf of SUSY dE/dx analysis.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69231Implementing the MuonSelectionTool for selecting muon tracks.2024-03-28T11:30:34+01:00Michele D'AndreaImplementing the MuonSelectionTool for selecting muon tracks.I am opening this merge request to implement the `MuonSelectionTool` within the `TrackLeptonDecoratorAlg`. The changes related to this MR are as follows:
* The muon quality is now retrieved directly from the MuonSelectionTool output rat...I am opening this merge request to implement the `MuonSelectionTool` within the `TrackLeptonDecoratorAlg`. The changes related to this MR are as follows:
* The muon quality is now retrieved directly from the MuonSelectionTool output rather than from the xAODMuon object.
* The `MuonSelectionTool` and the `ElectronSelectionTool` are initialized in the `FtagDerivationConfig.py` and retrieved by the `TrackLeptonDecoratorAlg`
Tagging for information: @dguest, @fdibello, @svanstro and @hartman.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70085remove old taggers and add GN2v01 in PhysVal monitoring2024-03-28T11:30:33+01:00Ligang Xiaremove old taggers and add GN2v01 in PhysVal monitoring- remove old taggers: DL1dv00, GN1, GN2v00
- add GN2v01 for monitoring
- update physval automation scripts from python2 to python3
tagging @xuyang and @bdong- remove old taggers: DL1dv00, GN1, GN2v00
- add GN2v01 for monitoring
- update physval automation scripts from python2 to python3
tagging @xuyang and @bdonghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70143Update TauTrig collection in Derivations2024-03-27T17:16:27+01:00Antonio De MariaUpdate TauTrig collection in DerivationsThis MR is meant to update extra HLT tau containers + L1 Phase containers for Run3.
These additional containers can be used for the validation/studies of tau triggers
Tagging @smwang, @slai, @gipezzul, @martindl, @jbeaucam, @mashamim...This MR is meant to update extra HLT tau containers + L1 Phase containers for Run3.
These additional containers can be used for the validation/studies of tau triggers
Tagging @smwang, @slai, @gipezzul, @martindl, @jbeaucam, @mashamim, @sshaw and @khoohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70064PhysicsAnalysis: required modifications to allow for online and conditional b...2024-03-27T09:03:42+01:00Sven MenkePhysicsAnalysis: required modifications to allow for online and conditional b-tagging treatment in TopPhysThe recommendations for b-tagging scale factors and efficiencies that combine offline WPs with online WPs require changes to JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency and 11 TopPhys packages in order to include b-tag...The recommendations for b-tagging scale factors and efficiencies that combine offline WPs with online WPs require changes to JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency and 11 TopPhys packages in order to include b-tagging systematics and MC to data scale factors in 21.1-based top analyses. The proposed changes here allow to combine one offline WP with a online WP via the provided conditional (online given offline) probabilities provided by the CP-group. The offline trigger confirmation requires furthermore to combine two offline WP (from the same tagger) with the online WP. Also this functionality is provided in the MR.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70028Add TauTrig collection in 24.0 for Trigger validation during 2024 ramp-up period2024-03-27T07:32:08+01:00Antonio De MariaAdd TauTrig collection in 24.0 for Trigger validation during 2024 ramp-up periodThis MR is meant to add HLT tau containers + L1 Phase 1 containers in PHYS for branch 24.0
These additional containers will be needed for the validation of the Phase-1 tau triggers during 2024 ramp-up period
Tagging @smwang, @slai, @gi...This MR is meant to add HLT tau containers + L1 Phase 1 containers in PHYS for branch 24.0
These additional containers will be needed for the validation of the Phase-1 tau triggers during 2024 ramp-up period
Tagging @smwang, @slai, @gipezzul, @martindl, @jbeaucam, @mashamim, @sshaw and @khoohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70142Draft: HF classification added to PHYSLITE2024-03-26T22:26:43+01:00Abhishek SharmaDraft: HF classification added to PHYSLITEI'm adding the heavy flavour classification to PHYSLITE, backing up off work done for [PHYS](https://its.cern.ch/jira/browse/ATLASG-2374). The addition necessitated moving the extra variables list to the bottom of the script to allow for...I'm adding the heavy flavour classification to PHYSLITE, backing up off work done for [PHYS](https://its.cern.ch/jira/browse/ATLASG-2374). The addition necessitated moving the extra variables list to the bottom of the script to allow for easy adding of the variables HF_Classification and HF_SimpleClassification.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69780Adding SUSY20 derivation format2024-03-26T17:12:03+01:00Alessandro Salaalessandro.sala@cern.chAdding SUSY20 derivation formatSUSY20 derivation format is needed by compressed SUSY analyses aiming to exploit both Run-2 and Run-3 data. The format is obtained by upgrading the one already existing in R21 and makes use of a tool that will be added by the linked merg...SUSY20 derivation format is needed by compressed SUSY analyses aiming to exploit both Run-2 and Run-3 data. The format is obtained by upgrading the one already existing in R21 and makes use of a tool that will be added by the linked merge request (currently pending). Code lines in the python scripts that are commented out refer to variables/tools not needed for the moment but that will be restored once all compressed SUSY analyses will join the effort in R24.
Tagging also @tlarihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69391fix larege-R jet monitoring in physval2024-03-26T14:52:31+01:00Ligang Xiafix larege-R jet monitoring in physval- largeR-jet tagger GN2Xv01 scores are associated to AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets instead of a BTagging jet like AntiKt4EMPFlowJets.
- create a copy of fillDiscriminantVariables and fillTrackVariables.
A summary of changes:
...- largeR-jet tagger GN2Xv01 scores are associated to AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets instead of a BTagging jet like AntiKt4EMPFlowJets.
- create a copy of fillDiscriminantVariables and fillTrackVariables.
A summary of changes:
- pT cut: > 200 GeV
- no JVT cut on large-R jets
A list of available variables:
- Xbbscores,
- jet 4-momenta, truth label
- tracks
- hits
I think it is ready for review. tagging @bdong and @dguesthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70086Add missing TruthMetaData to LLP12024-03-26T14:13:29+01:00Jonathan LongAdd missing TruthMetaData to LLP1!61980 changed the way metadata is stored and !63100 fixed this for PHYS and PHYSLITE.!61980 changed the way metadata is stored and !63100 fixed this for PHYS and PHYSLITE.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70107Removed all remaining references to the InputFilePeeker2024-03-26T14:13:04+01:00Vakhtang TsulaiaRemoved all remaining references to the InputFilePeekerDropped either complete files or individual functions that unconditionally relied on the `InputFilePeeker`.
Also dropped the clients of such files/functions.
Closes ATEAM-716
CC @fwinkl @harkusha @amete @ssnyder (Please feel free to t...Dropped either complete files or individual functions that unconditionally relied on the `InputFilePeeker`.
Also dropped the clients of such files/functions.
Closes ATEAM-716
CC @fwinkl @harkusha @amete @ssnyder (Please feel free to tag more people as needed. Thanks)https://gitlab.cern.ch/atlas/athena/-/merge_requests/67272Add jet fold hash2024-03-26T11:52:53+01:00Dan GuestAdd jet fold hashThis just adds a variable to flavor tagging. Nothing else should change.
We found that our flavor tagging networks were a bit overtrained on the ttbar dataset we normally use. We're considering working around this by adding a per-jet ha...This just adds a variable to flavor tagging. Nothing else should change.
We found that our flavor tagging networks were a bit overtrained on the ttbar dataset we normally use. We're considering working around this by adding a per-jet hash and training several networks, so we can avoid ever applying the tagger to a jet we trained on.
This is adding the first part: the hash. It mixes some hit and constituent info with the event number to get something pretty random.
Tagging @svanstro, @hartman, @bdong, @liganghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60065remove CaloCalTopoClusters from FTAG12024-03-26T11:05:14+01:00Ligang Xiaremove CaloCalTopoClusters from FTAG1CaloCalTopoClusters is not needed and removed from FTAG1.
@coccaroCaloCalTopoClusters is not needed and removed from FTAG1.
@coccaro