athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-28T17:17:07+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70200Update L1CaloFEXSimCfg.py - enable heuristic eTAU when running DQ environment...2024-03-28T17:17:07+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/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/70197Additional plots in IDPVM: residuals, pull and cluster size vs eta2024-03-28T16:56:29+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/70196Valkyrie: delete legacy job options and executable2024-03-28T15:32:02+01:00Frank WinklmeierValkyrie: delete legacy job options and executableDelete the legacy job options to configure `ValgrindSvc`. Also delete
the (hopefully) unused `valkyrie.py` script. Our transforms support
running valgrind so this should no longer be needed.
Update documentation and apply some name chan...Delete the legacy job options to configure `ValgrindSvc`. Also delete
the (hopefully) unused `valkyrie.py` script. Our transforms support
running valgrind so this should no longer be needed.
Update documentation and apply some name changes.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/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/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/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/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/70190Adding nonEmpty file check in functions to fix memory crash2024-03-28T17:15:38+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...https://gitlab.cern.ch/atlas/athena/-/merge_requests/70189CPAlgorithms: fix logic for truth leptons in event selection2024-03-28T13:30:47+01:00Baptiste Ravinabaptiste.ravina@cern.chCPAlgorithms: fix logic for truth leptons in event selectionObvious bugfixes in the python logic following !70002 (could have been caught in review?).
Much appreciated if this could be merged before the Easter break!Obvious bugfixes in the python logic following !70002 (could have been caught in review?).
Much appreciated if this could be merged before the Easter break!https://gitlab.cern.ch/atlas/athena/-/merge_requests/70188Cleanup string/token writing code in APR Containers2024-03-28T14:28:46+01:00Marcin NowakCleanup string/token writing code in APR ContainersCode cleanup as side effect of the investigation into ROOT string writing bug (in ROOT HEAD)
No functionality changes expectedCode cleanup as side effect of the investigation into ROOT string writing bug (in ROOT HEAD)
No functionality changes expectedhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/701872024-03-28: merge of 24.0 into main2024-03-28T14:34:52+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/70180Draft: SUSYTools/jobOptions.py: migrated from AthFile to MetaReader2024-03-28T08:47:03+01:00Vakhtang TsulaiaDraft: SUSYTools/jobOptions.py: migrated from AthFile to MetaReaderRelated to ATEAM-528Related to ATEAM-528https://gitlab.cern.ch/atlas/athena/-/merge_requests/70179Clean up Event/xAOD legacy configs2024-03-28T09:58:33+01:00Thomas StreblerClean up Event/xAOD legacy configs`xAODEventFormatCnv` still to be cleaned up as CI tests need to be migrated to CA
FYI @maszyman`xAODEventFormatCnv` still to be cleaned up as CI tests need to be migrated to CA
FYI @maszymanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70178Move secondary track pass flags to global tracking flags2024-03-28T14:07:02+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/70177Clean up deprecated RobustReco tracking mode2024-03-28T10:53:27+01:00Thomas StreblerClean up deprecated RobustReco tracking modeRelevant for ATLASRECTS-7947Relevant for ATLASRECTS-7947https://gitlab.cern.ch/atlas/athena/-/merge_requests/70176Draft: EFTracking/FPGATrackSim: port spacepoint-based fitting, updated Hough ...2024-03-28T17:01:35+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/70175Clean up some backtracking tracking pass flags2024-03-28T14:39:24+01:00Thomas StreblerClean up some backtracking tracking pass flagsEither removing flags set to default C++ values and unlikely to be changed or promoting them to global flags.
Should reduce by 6*31 the amount of tracking flags.
Relevant for ATLASRECTS-7947Either removing flags set to default C++ values and unlikely to be changed or promoting them to global flags.
Should reduce by 6*31 the amount of tracking flags.
Relevant for ATLASRECTS-7947https://gitlab.cern.ch/atlas/athena/-/merge_requests/70174adding NSW combined offline DQ2024-03-28T15:31:36+01:00Michela Bigliettiadding NSW combined offline DQthis package is going to host combined NSW efficiencies for offline DQ purposes. For the time being is mainly an empty container.this package is going to host combined NSW efficiencies for offline DQ purposes. For the time being is mainly an empty container.