athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-28T15:45:48+01:00https://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/70172PadDesign - Fixing sTgc Pad Positions2024-03-28T16:08:54+01:00Ishan Kiritbhai VyasPadDesign - Fixing sTgc Pad Positions- Pad Corners Aligned.
- Adding frameOffset parameter in Geometry Tool to correct beamline radius until we find a fix.
- Modifying the globalChannelPosition function in the readout element to correct last half-strip position in gasgap la...- Pad Corners Aligned.
- Adding frameOffset parameter in Geometry Tool to correct beamline radius until we find a fix.
- Modifying the globalChannelPosition function in the readout element to correct last half-strip position in gasgap layers
- Fixing minor errors and bugs
@alainb @jojungge @pscholerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69382Adding new AthenaExamples package - AthExBasics2024-03-28T16:34:15+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/70192HltAsyncEventLoopMgr: backport fixes from HltEventLoopMgr2024-03-28T16:35:19+01:00Frank WinklmeierHltAsyncEventLoopMgr: backport fixes from HltEventLoopMgrPort the following changes to the `HltAsyncEventLoopMgr` that were missed in the original fork (https://gitlab.cern.ch/atlas/athena/-/merge_requests/69464):
- set the default of `HltAsyncEventLoopMgr.setMagFieldFromPtree` to `true` (145e...Port the following changes to the `HltAsyncEventLoopMgr` that were missed in the original fork (https://gitlab.cern.ch/atlas/athena/-/merge_requests/69464):
- set the default of `HltAsyncEventLoopMgr.setMagFieldFromPtree` to `true` (145e0240)
- Use C++17 std::filesystem instead of boost::filesystem where possible (2b7217bc)
- only send event to debug stream if severely truncated (34b5d520)
None of these have any impact on P1 operations.
Relates to ATR-26285.https://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/70193Fix timing monitoring histograms for ITk TrigInDetValidation ART tests (EFTRA...2024-03-28T16:52:11+01:00Elliot WattonFix timing monitoring histograms for ITk TrigInDetValidation ART tests (EFTRACK-463)Currently, the timing histograms for the ITk trigger ART tests are setup with x-axis ranges being too small, leading to many entries in overflow for certain situations (e.g fullscan chains when running on ttbar + 200 PU ITk RDO). This sm...Currently, the timing histograms for the ITk trigger ART tests are setup with x-axis ranges being too small, leading to many entries in overflow for certain situations (e.g fullscan chains when running on ttbar + 200 PU ITk RDO). This small change fixes the issue by sending the correct signature name to be checked against when setting up the monitoring. This only impacts the monitoring for ITk jobs, but targetting 24.0 to keep configurations in step. Changes will be eventually swept to main.
This work for running FTF with ITk in the trigger is tracked by EFTRACK-463
Tagging @baineshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70198CaloRec: delete unused legacy python modules2024-03-28T16:58:38+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/70194initialise LargeRJetTruthLabel accessor as member of FlavourUncertaintyComponent2024-03-28T17:02:54+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.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70191Suppress some PathResolver output2024-03-28T17:03:53+01:00Samuel Van StroudSuppress some PathResolver output- I don't think we need to `INFO` when a file is downloaded
- A `WARN` is better if the download fails than a `DEBUG`
- I'm disabling the progress bar in `TFile::Cp`- I don't think we need to `INFO` when a file is downloaded
- A `WARN` is better if the download fails than a `DEBUG`
- I'm disabling the progress bar in `TFile::Cp`https://gitlab.cern.ch/atlas/athena/-/merge_requests/70195refine Phase-2 eta hough transform2024-03-28T17:05:29+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/69620btagging tool for json-based CDI2024-03-28T17:09: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/70123Read jFEX calibration values from the database in MC2024-03-28T17:26:10+01:00Paul ThompsonRead jFEX calibration values from the database in MCTowards having the jFEX read database values from the DB also for MC.
The first version of the database values aim to replicate the results of the present hard coded defaults.
Allows to overwrite the DB values for MC during commissioning...Towards having the jFEX read database values from the DB also for MC.
The first version of the database values aim to replicate the results of the present hard coded defaults.
Allows to overwrite the DB values for MC during commissioning of the jFEX in 2024.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70197Additional plots in IDPVM: residuals, pull and cluster size vs eta2024-03-28T17:36:01+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/70176Draft: EFTracking/FPGATrackSim: port spacepoint-based fitting, updated Hough ...2024-03-28T17:43:21+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/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/70178Move secondary track pass flags to global tracking flags2024-03-28T17:54:36+01:00Thomas StreblerMove secondary track pass flags to global tracking flagsRelevant for ATLASRECTS-7947
The secondary tracking pass flags are actually identical for all passes in most cases.
The `RobustReco` is removed with !70177 so they can be promoted to global tracking flags.Relevant for ATLASRECTS-7947
The secondary tracking pass flags are actually identical for all passes in most cases.
The `RobustReco` is removed with !70177 so they can be promoted to global tracking flags.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70200Update L1CaloFEXSimCfg.py - enable heuristic eTAU when running DQ environment...2024-03-28T17:57:47+01:00Will ButtingerUpdate L1CaloFEXSimCfg.py - enable heuristic eTAU when running DQ environment...Update L1CaloFEXSimCfg.py - enable heuristic eTAU when running DQ environment at tier0, so that monitoring plots can compare BDT tau (new nominal) to themUpdate L1CaloFEXSimCfg.py - enable heuristic eTAU when running DQ environment at tier0, so that monitoring plots can compare BDT tau (new nominal) to themhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70180Draft: SUSYTools/jobOptions.py: migrated from AthFile to MetaReader2024-03-28T18:05:17+01:00Vakhtang TsulaiaDraft: SUSYTools/jobOptions.py: migrated from AthFile to MetaReaderRelated to ATEAM-528Related to ATEAM-528https://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/70190Adding nonEmpty file check in functions to fix memory crash2024-03-28T18:08:24+01:00Revital KopelianskyAdding nonEmpty file check in functions to fix memory crashSeveral functions in TimingClass.cxx are operating over 4 txt files (EMB, EMEC, HCAL FCAL), if one is empty due to zero stat, the script crashes.
As solution I have added a dedicated function that checks if the file is empty beforehand, ...Several functions in TimingClass.cxx are operating over 4 txt files (EMB, EMEC, HCAL FCAL), if one is empty due to zero stat, the script crashes.
As solution I have added a dedicated function that checks if the file is empty beforehand, and if so, the process will return to the calling function avoiding the crash.
Hopefully...