athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-29T10:57:42+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/702072024-03-29: merge of 24.0 into main2024-03-29T10:57:42+01:00Edward Moyse2024-03-29: merge of 24.0 into mainThis sweep contains the following MRs:
* !70123 Read jFEX calibration values from the database in MC ~L1Calo, ~Run3-MCReco-output-changed, ~Tools, ~Trigger
* !70200 Update L1CaloFEXSimCfg.py - enable heuristic eTAU when running DQ envi...This sweep contains the following MRs:
* !70123 Read jFEX calibration values from the database in MC ~L1Calo, ~Run3-MCReco-output-changed, ~Tools, ~Trigger
* !70200 Update L1CaloFEXSimCfg.py - enable heuristic eTAU when running DQ environment... ~L1Calo, ~Trigger
* !70193 Fix timing monitoring histograms for ITk TrigInDetValidation ART tests (EFTRACK-463) ~ITk, ~Trigger, ~TriggerID
* !70192 HltAsyncEventLoopMgr: backport fixes from HltEventLoopMgr ~Trigger
* !70196 Valkyrie: delete legacy job options and executable ~Core
* !70111 CaloMonitoring: delete legacy job options and ROOT macros ~Calorimeter, ~DQ, ~Trigger
* !68758 MuonTrackingGeometry fix memory bugs ~LAr, ~MuonSpectrometer, ~Run2-DataReco-output-changed, ~Run2-MCReco-output-changed, ~Run3-DataReco-output-changed, ~Run3-MCReco-output-changed, ~Simulation, ~Tile, ~Tools, ~Tracking, ~frozen-tier0-violating
* !70159 TileTBRec: Remove legacy JO configurations (ATLASRECTS-7939) ~Tile
* !70167 TileMonitoring: Remove old Tile monitoring tools for physics events ~DQ, ~JetEtmiss, ~Tile
* !70157 TileCosmicAlgs: Remove legacy JO configurations (ATLASRECTS-7939) ~Tile, ~Trigger
* !70173 TriggerJobOpts: move HepMcParticleLink silencing to runHLTCfg ~Trigger
* !70166 TrigHLTJetHypo - on request of the menu decelopers, make Tool names unique within a chain only ~JetEtmiss, ~Trigger, ~TriggerJet
* !70165 Update Enhanced Bias menu for 2024 ~Trigger, ~TriggerMenu
* !70162 Remove info messages from UTT hypos and L2LayerNumberTool ~Trigger, ~TriggerIDhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70206MuonCalibTool: making calibMode configurable2024-03-29T12:05:00+01:00Luca MartinelliMuonCalibTool: making calibMode configurablemaking calibMode configurable. default value to -1
see https://its.cern.ch/jira/projects/ATLASMCP/issues/ATLASMCP-217?filter=allopenissuesmaking calibMode configurable. default value to -1
see https://its.cern.ch/jira/projects/ATLASMCP/issues/ATLASMCP-217?filter=allopenissuesLuca MartinelliLuca Martinellihttps://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/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/70203remove old files in FPGATrackSim2024-03-29T11:02:15+01:00Jahred Adelmanjahreda@gmail.comremove old files in FPGATrackSimFix https://its.cern.ch/jira/browse/EFTRACK-516Fix https://its.cern.ch/jira/browse/EFTRACK-516https://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/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/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/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.https://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/70179Clean up Event/xAOD legacy configs2024-03-29T11:46:43+01:00Thomas StreblerClean up Event/xAOD legacy configs`xAODEventFormatCnv` + `xAODEventInfoCnv/python/xAODEventInfoCreator.py` still to be cleaned up as CI tests need to be migrated to CA
FYI @maszyman`xAODEventFormatCnv` + `xAODEventInfoCnv/python/xAODEventInfoCreator.py` still to be cleaned up as CI tests need to be migrated to CA
FYI @maszymanhttps://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/70175Clean up some backtracking tracking pass flags2024-03-29T11:58:03+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-29T09:14:24+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.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/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/70163Draft: Improvement in update_ci_reference_files.py: finding digest changes, v...2024-03-27T17:19:41+01:00Duc TaDraft: Improvement in update_ci_reference_files.py: finding digest changes, verbose cp and mkdirTwo proposed changes to the update_ci_reference_files.py script:
- Explicitly search only lines with "digest" in it, protect script against output where the content changes instead (or in addition) of the digest
- added "-v" to cp and mk...Two proposed changes to the update_ci_reference_files.py script:
- Explicitly search only lines with "digest" in it, protect script against output where the content changes instead (or in addition) of the digest
- added "-v" to cp and mkdir commands
Can be tested on a recent CI/MR:
```update_ci_reference_files.py --test-run https://bigpanda.cern.ch/ciview/?rel=MR-68758-2024-03-27-15-28```
@emoyse can you have a look, if the changes make sense to you?Duc TaDuc Tahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70161Clean up TRT-only tracking pass flags2024-03-29T08:20:59+01:00Thomas StreblerClean up TRT-only tracking pass flagsEither setting those in place in the config or promoting them to global flags
Should reduce already by 7*31 the amount of tracking flags.
Similar clean ups to be expected in the near future.
Relevant for ATLASRECTS-7947Either setting those in place in the config or promoting them to global flags
Should reduce already by 7*31 the amount of tracking flags.
Similar clean ups to be expected in the near future.
Relevant for ATLASRECTS-7947https://gitlab.cern.ch/atlas/athena/-/merge_requests/70156Draft: write in-file metadata using RootKeyContainer2024-03-27T17:50:55+01:00Maciej Pawel SzymanskiDraft: write in-file metadata using RootKeyContainerAn experiment to check what's needed to switch metadata storage technologyAn experiment to check what's needed to switch metadata storage technology