athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-28T13:34:35+01:00https://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/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/701872024-03-28: merge of 24.0 into main2024-03-29T07:32:06+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/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/70072Create HIGG1D3 for Higgs->yy + eta_c->4pi2024-03-25T11:16:45+01:00Xin ChenCreate HIGG1D3 for Higgs->yy + eta_c->4piCreating a new derivation format HIGG1D3 for Higgs->yy + eta_c->4pi search. Borrowing the good stuff from HIGG1D1 about Higgs->yy and adding the facility class EtacTo4TracksVertex in BPhys for eta_c. The new format's python file lives in...Creating a new derivation format HIGG1D3 for Higgs->yy + eta_c->4pi search. Borrowing the good stuff from HIGG1D1 about Higgs->yy and adding the facility class EtacTo4TracksVertex in BPhys for eta_c. The new format's python file lives in DerivationFrameworkHiggs.Xin ChenXin Chenhttps://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/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/69620btagging tool for json-based CDI2024-03-29T01:01:07+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/69361Draft: add unit test reference files for DL1dv012024-03-01T10:18:21+01:00Ligang XiaDraft: add unit test reference files for DL1dv01- add unit test references for DL1dv01
- The motivation for this MR is to detect (avoid) the impact on using old tagger due to implementing new features, like https://gitlab.cern.ch/atlas/athena/-/merge_requests/68453.
tagging @bdong- add unit test references for DL1dv01
- The motivation for this MR is to detect (avoid) the impact on using old tagger due to implementing new features, like https://gitlab.cern.ch/atlas/athena/-/merge_requests/68453.
tagging @bdonghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69157Draft: Remove wrong defined "RNNEleScoreSigTrans" variable (xAOD change)2024-02-27T08:10:03+01:00Antonio De MariaDraft: Remove wrong defined "RNNEleScoreSigTrans" variable (xAOD change)This MR is meant to remove "RNNEleScoreSigTrans" variable in xAODs since this is a variable derived from buggy flattening procedure. This should be substituted by "RNNEleScoreSigTrans_v1". The drop of "RNNEleScoreSigTrans" from PHYS and ...This MR is meant to remove "RNNEleScoreSigTrans" variable in xAODs since this is a variable derived from buggy flattening procedure. This should be substituted by "RNNEleScoreSigTrans_v1". The drop of "RNNEleScoreSigTrans" from PHYS and PHYSLITE was already done previously (https://gitlab.cern.ch/atlas/athena/-/merge_requests/66089), so the only change expect here is at xAOD level
Also, given this change, the following flags won't be defined anymore:
* IsTauFlag.EleRNNLoose
* IsTauFlag.EleRNNMedium
* IsTauFlag.EleRNNTighthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69062Draft: Try to use templates in the MCtruthClassifier to avoid declatrations o...2024-03-21T23:15:45+01:00Andrii VerbytskyiDraft: Try to use templates in the MCtruthClassifier to avoid declatrations of multiple functionsTry to use templates in the MCtruthClassifier to avoid declatrations of multiple functionsTry to use templates in the MCtruthClassifier to avoid declatrations of multiple functionshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68960Draft: Use std::format instead of boost::format2024-02-27T09:58:01+01:00Andrii VerbytskyiDraft: Use std::format instead of boost::formatUse std::format instead of boost::formatUse std::format instead of boost::formathttps://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/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 filehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67951Draft: Implementation of GRL decoration of events for PHYSLITE derivation2024-03-19T19:07:40+01:00Axel GallenDraft: Implementation of GRL decoration of events for PHYSLITE derivationAs a part of my AQP (see Jira: ATLASG-2617), I've implemented a way for the PHYSLITE derivation to decorate events with a boolean, letting the user know if the AOD used for the derivation of a PHYSLITE file contains events in/out of a se...As a part of my AQP (see Jira: ATLASG-2617), I've implemented a way for the PHYSLITE derivation to decorate events with a boolean, letting the user know if the AOD used for the derivation of a PHYSLITE file contains events in/out of a set of GRLs.
In the log.Derivation file created from `Derivation_tf.py`, the algorithm tagger can be seen to work, and by inspecting CollectionTree of a derived PHYSLITE file, using e.g. the following command: `CollectionTree->Scan("EventInfoAuxDyn.<DecoratorName>")` one can see the boolean attached to each event.
This set of GRLs is currently defined in the form of an ordered dictionary located at the top of DerivationFrameworkPhys/.../PHYSLITE.py, but is meant to be stored somewhere else, such as in the /share/ folder; but from trying to import the dictionary from the /share/ folder, this does not work. What is the best way to proceed regarding this?
All development has been done with Athena 24.0.14.Axel GallenAxel Gallenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67271Run3 Derivations for heavy Ion group (part of my QT) v02024-03-19T09:35:52+01:00Sebastian Alonso Infante CabanasRun3 Derivations for heavy Ion group (part of my QT) v0Migration for HION4 almost done, lacking augmentations and string triggers for run3, some smart collections of run2 HION4 not working for now
Migration for HION7 in progress, in need of the "pt" needed and the triggers
Rest of migratio...Migration for HION4 almost done, lacking augmentations and string triggers for run3, some smart collections of run2 HION4 not working for now
Migration for HION7 in progress, in need of the "pt" needed and the triggers
Rest of migrations not started as of november 21 of 2023
No derivative is made to get truth data as i dont have truth data files for testinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67195Draft: Added new TruthParticle and TruthVertex aux containers.2024-03-13T11:57:38+01:00John Derek ChapmanDraft: Added new TruthParticle and TruthVertex aux containers.Extra changes on top of !66561
Tagging @akraszna, @averbyts and @pclarkExtra changes on top of !66561
Tagging @akraszna, @averbyts and @pclark