athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-28T11:41:18+01:00https://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/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/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/69957save only ditaus with 2 subjets candidates2024-03-28T15:45:48+01:00Antonio De Mariasave only ditaus with 2 subjets candidatesThis MR is meant to remove the 1 subject + 1 electron/muon selection to save a ditau object, keeping only ditaus with >= 1 subjet. The collimated 1 electron/muon + 1 tau is already covered by the Tau Ele OLR and Tau Muon OLR collections....This MR is meant to remove the 1 subject + 1 electron/muon selection to save a ditau object, keeping only ditaus with >= 1 subjet. The collimated 1 electron/muon + 1 tau is already covered by the Tau Ele OLR and Tau Muon OLR collections.
Tagging @martindl and @ntamirhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70164Add CA-based configuration for the FastIDKiller2024-03-28T16:41:23+01:00John Derek ChapmanAdd CA-based configuration for the FastIDKillerInitial version of FastIDKiller configuration - can be expanded as required.
Needed for egamma studies.Initial version of FastIDKiller configuration - can be expanded as required.
Needed for egamma studies.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69793AthContainers, etc: Move Accessor, etc. classes out of AuxElement.2024-03-28T17:43:29+01:00Scott SnyderAthContainers, etc: Move Accessor, etc. classes out of AuxElement.Accessor and related classes have been members of AuxElement, the original
thinking being that derived classes of AuxElement may want to redefine them.
However, in retrospect, there does not seem to be any circumstance in which
that woul...Accessor and related classes have been members of AuxElement, the original
thinking being that derived classes of AuxElement may want to redefine them.
However, in retrospect, there does not seem to be any circumstance in which
that would actually make sense. Further, it prevents having any specializations
for these classes. So move these classes out of AuxElement into the SG
namespace (but with the names brought into AuxElement via using declarations
for backwards compatibility).https://gitlab.cern.ch/atlas/athena/-/merge_requests/69229Updating LAr EM NTuple creation to CA based configuration2024-03-28T18:07:37+01:00Mustafa Andre SchmidtUpdating LAr EM NTuple creation to CA based configurationUpdating configuration file and README file to switch NTuple creation from legacy to CA-based configuration.Updating configuration file and README file to switch NTuple creation from legacy to CA-based configuration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70171Draft: ACTS two-way track finding2024-03-28T18:22:06+01:00Tim AdyeDraft: ACTS two-way track findingbasic two-way track finding, based on [#3066](https://github.com/acts-project/acts/pull/3066)basic two-way track finding, based on [#3066](https://github.com/acts-project/acts/pull/3066)https://gitlab.cern.ch/atlas/athena/-/merge_requests/70202Draft: InDetTrackPerfMon package: Adding TrackMatchingLookup and TrackTruthMa...2024-03-28T19:25:15+01:00Marco AparoDraft: InDetTrackPerfMon package: Adding TrackMatchingLookup and TrackTruthMatchingTool- Added infrastructure to cache Test-Reference matching information via (templated) `TrackMatchingLookup` tables implemented in `TrackAnalysisCollection`. The lookup table class has utility methods to access and modify matches found by t...- Added infrastructure to cache Test-Reference matching information via (templated) `TrackMatchingLookup` tables implemented in `TrackAnalysisCollection`. The lookup table class has utility methods to access and modify matches found by the matching tool
- Added `TrackTruthMatching` tool and its interface. This tool accesses the matching between each `xAOD::TrackParticle` and the linked `xaOD::TruthParticle` via the `truthParticleLink` decorations, and updates the corresponding `TrackMatchingLookup` tablehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69978Draft: Decoupling of Trigger analysis and SF application in configuration2024-03-28T19:32:37+01:00Philipp RinckeDraft: Decoupling of Trigger analysis and SF application in configurationTrigger analysis configurations are currently coupling the trigger selection and the trigger scale factor computation.
While the trigger scale factor computation requires calibrated objects and can only be run after the whole object cal...Trigger analysis configurations are currently coupling the trigger selection and the trigger scale factor computation.
While the trigger scale factor computation requires calibrated objects and can only be run after the whole object calibration sequence, the trigger selection should be applied as early as possible to avoid wasting CPU on the object calibration for events failing the trigger.
This MR implements a decoupling of those algorithms in two separate configs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/63853Draft: Rolling MR for ACTS nightly2024-03-28T20:34:06+01:00Paul Gessinger-BefurtDraft: Rolling MR for ACTS nightlyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70176Draft: EFTracking/FPGATrackSim: port spacepoint-based fitting, updated Hough ...2024-03-28T20:47:16+01:00Benjamin John RosserDraft: EFTracking/FPGATrackSim: port spacepoint-based fitting, updated Hough transforms, related changes from HTTSiimTagging @jahreda and @tbold:
I've put this together at @jahreda's request to incorporate as much of the missing spacepoint/Hough-related HTTSim functionality as possible. This includes the following (all mostly being ported over from 21...Tagging @jahreda and @tbold:
I've put this together at @jahreda's request to incorporate as much of the missing spacepoint/Hough-related HTTSim functionality as possible. This includes the following (all mostly being ported over from 21.9 with some minor changes):
* Updates to the spacepoint tool; there were originally two versions of the code, but only one of them worked, so we standardized on the working one (previously known as "v2") and eliminated the original. There are also various bugfixes/cleanup here ported over from HTTSim.
* Code to handle spacepoints properly in the Hough transform, matrix/fit constant generation, and linear track fit. The main thing is accounting for spacepoint "duplication"-- the tool writes out two copies of a spacepoint, one in the inner strip layer and one in the outer strip layer. Each copy of the spacepoint has the same "global" coordinates (x, y, z) but different "local" coordinates (etamod, phimod, layer, etc.). This makes it easy to mix spacepoints with normal strip hits, as needed, but it requires checks in a couple places to make sure that spacepoints are never accidentally split in "half".
* Updates to various other tools; the eta pattern filter, most notably the 2D and 1D hough transform tools. This includes bugfixes, plus support for running over spacepoints.
* A change eliminating the "Road_Hough" subclass in favor of just a single "Road" class.
* Some configuration changes. I made 9-layer-with-spacepoints the "default", where possible, as that seems to be the direction EF Tracking is going. But I think ultimately we want to standardize the configuration system (maybe using an updated version of HTTSim style tags?)-- so this can all be cleaned up in the future.
I think those are the highlights. Sorry it's kind of a large MR, I tried to make the individual commits as small and neat as possible.
I have successfully generated wrappers, maps, and fit constants with this branch in region 0. At the moment they are on the Chicago analysis facility but I can put them somewhere in eos if that would be useful. (Haven't tried to run the FPGATrackSim unit tests, I'm sure they will need updating).
This should supercede !69113; it includes those changes.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70204Draft: sTgcReadoutElement - Fixing wireGroup Positions2024-03-28T21:09:21+01:00Ishan Kiritbhai VyasDraft: sTgcReadoutElement - Fixing wireGroup Positions- Changing localChannelPosition function in the readout element to replicate the R3 wireGroup positions.
- Fixing the beam line radius
@alainb @jojungge @pscholer- Changing localChannelPosition function in the readout element to replicate the R3 wireGroup positions.
- Fixing the beam line radius
@alainb @jojungge @pscholerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70198CaloRec: delete unused legacy python modules2024-03-29T00:54:02+01:00Frank WinklmeierCaloRec: delete unused legacy python modulesA few modules are still remaining that are referenced outside this package.
cc @wlamplA few modules are still remaining that are referenced outside this package.
cc @wlamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69382Adding new AthenaExamples package - AthExBasics2024-03-29T08:19:32+01:00James CatmoreAdding new AthenaExamples package - AthExBasicsThis MR adds a new package to AthenaExamples. It is intended to contain examples of tools, algorithms and config scripts for doing very basic real-world tasks such as reading the trigger decision, accessing and selecting xAOD objects, ru...This MR adds a new package to AthenaExamples. It is intended to contain examples of tools, algorithms and config scripts for doing very basic real-world tasks such as reading the trigger decision, accessing and selecting xAOD objects, running trigger matching &c. It is hoped developers will add to these over time.
Obviously this will have no impact on any existing workflows.
This is part of the lead-up to the documentation week in April.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70197Additional plots in IDPVM: residuals, pull and cluster size vs eta2024-03-29T08:31:00+01:00Noemi CalaceAdditional plots in IDPVM: residuals, pull and cluster size vs etaSelf-explanatory title.
FYI: @lgagnonSelf-explanatory title.
FYI: @lgagnonNoemi CalaceNoemi Calacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70195refine Phase-2 eta hough transform2024-03-29T08:40:39+01:00Maximilian Emanuel Goblirsch-Kolbrefine Phase-2 eta hough transformMake the Phase-2 eta hough transform dynamically adapt its tan(theta) search space to the location of the current search bucket in the detector.
Gain a factor 10 speed and improve resolutions.
Also make some properties configurable.
...Make the Phase-2 eta hough transform dynamically adapt its tan(theta) search space to the location of the current search bucket in the detector.
Gain a factor 10 speed and improve resolutions.
Also make some properties configurable.
CC @jojungge and @minionshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70205CscRODReadOut TrigTauMonitorBase : Cppcheck and clang-tidy fixes2024-03-29T08:58:56+01:00Christos Anastopouloschristos.anastopoulos@cern.chCscRODReadOut TrigTauMonitorBase : Cppcheck and clang-tidy fixesCscRODReadOut TrigTauMonitorBase : Cppcheck and clang-tidy fixesCscRODReadOut TrigTauMonitorBase : Cppcheck and clang-tidy fixeshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70180SUSYTools/jobOptions.py: migrated from AthFile to MetaReader2024-03-29T09:00:11+01:00Vakhtang TsulaiaSUSYTools/jobOptions.py: migrated from AthFile to MetaReaderRelated to ATEAM-528Related to ATEAM-528https://gitlab.cern.ch/atlas/athena/-/merge_requests/70194initialise LargeRJetTruthLabel accessor as member of FlavourUncertaintyComponent2024-03-29T09:05:30+01:00Tobias Fitscheninitialise LargeRJetTruthLabel accessor as member of FlavourUncertaintyComponentInitialise LargeRJetTruthLabel accessor in FlavourUncertaintyComponent constructor rather than as static in member function. This makes it consistent with how `m_NjetAccessor` and `m_BjetAccessor` are implemented.
As it is implemented n...Initialise LargeRJetTruthLabel accessor in FlavourUncertaintyComponent constructor rather than as static in member function. This makes it consistent with how `m_NjetAccessor` and `m_BjetAccessor` are implemented.
As it is implemented now (as static in a function call) it is not possible to have several instances of `FlavourUncertaintyComponent` with multiple different definitions of truth labelling as they would overwrite each other.
This is a follow-up of an earlier MR: https://gitlab.cern.ch/atlas/athena/-/merge_requests/70160
That MR removed the `static` which solves the issue with the truth labels overwriting each other but introduces some overhead. This MR removes the overhead.