athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-05-05T10:38:40+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/59051LumiCalc: merge website updates back into master2023-05-05T10:38:40+02:00Eric TorrenceLumiCalc: merge website updates back into masterSeveral updates of iLumiCalc and associated scripts and html files
have been updated for the atlas-lumicalc website over the years without
ever being committed back to the git master.
This patch brings the git master back into sync w...Several updates of iLumiCalc and associated scripts and html files
have been updated for the atlas-lumicalc website over the years without
ever being committed back to the git master.
This patch brings the git master back into sync with the code on the website,
and provides bugfixes for iLumiCalc that had been deployed on the website.
In particular, this MR includes fixes to make LumiCalc run on Run3 data.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61707Cleanup CMake configuration2023-04-28T16:44:09+02:00Edward MoyseCleanup CMake configurationThis is part of a bigger MR I'm working on now, but I realised that the issues I thought were related to this commit were actually caused by something else, so I could cherry-pick this out (which will - hopefully - make @akraszna happy! ...This is part of a bigger MR I'm working on now, but I realised that the issues I thought were related to this commit were actually caused by something else, so I could cherry-pick this out (which will - hopefully - make @akraszna happy! ;-) )
This is a purely technical change and will have no effect on output.
I also compiled all clients (see below) of this package to make sure that they were not affected either.
```
+ Tracking/Acts/ActsTrkAlgs/ActsTrkAnalysis
+ Tracking/Acts/ActsTrkAlgs/ActsTrkFinding
+ Tracking/Acts/ActsTrkAlgs/ActsTrkFittingAlgs
+ Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding
+ Tracking/Acts/ActsTrkTools/ActsTrkFindingTool
+ Tracking/Acts/ActsTrkTools/ActsTrkFittingTools
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/61526Update muon CP alg sequence to very latest Run 3 recommendations2023-04-28T01:09:36+02:00Teng Jian KhooUpdate muon CP alg sequence to very latest Run 3 recommendationsAs is starting to be a trend, the CP alg configs are lagging behind the CP group recommendations (see !61011).
If they are not kept up to date, having the central implementation is self-defeating. Changing two python lines is not any mo...As is starting to be a trend, the CP alg configs are lagging behind the CP group recommendations (see !61011).
If they are not kept up to date, having the central implementation is self-defeating. Changing two python lines is not any more effort than requesting the calib area be updated. Tagging @vimartin and @hrussell in the hopes that we can get some sort of process going such that propagating updates to the XAnalysisAlgorithms config is bound tightly to releasing recommendations. A quick search for related MRs only shows an AnalysisTop update, so it seems that there was no change needed in the MCP code. This suggests that we can't depend on anything in Git to flag the need for such updates, and the solution has to be some sort of procedural one.
I'll also note that this silences many many warnings like
```
CollectionContainer WARNING Could not find any SF period in Central matching the run number 430536
CollectionContainer WARNING Could not find any SF period in CentralLowPt matching the run number 430580
```
which I was unable to modify with message level settings, which was the catalyst for my finding the discrepancy.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62533createTagMetaInfoFS update2023-04-24T16:04:56+02:00Mikhail MineevcreateTagMetaInfoFS updateSmall update:
- added a possibility to set CREST server root endpoint in the constructor,
- updated createTagMetaInfoFs.Small update:
- added a possibility to set CREST server root endpoint in the constructor,
- updated createTagMetaInfoFs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62567V0Tools: Remove extrapolator and simplify2023-04-23T08:22:41+02:00Adam Edward BartonV0Tools: Remove extrapolator and simplifyNo code actually uses the extrapolator in V0Tools. So here I factor it out. This simplifies configuration of tools. Any algorithm wanting to use those functions can pass an extrapolator.
I also remove some unused convenience functions t...No code actually uses the extrapolator in V0Tools. So here I factor it out. This simplifies configuration of tools. Any algorithm wanting to use those functions can pass an extrapolator.
I also remove some unused convenience functions that make maintenance harder. Once we have C++20 I will add spans to simplify things further.
Request opinions from @christos @tstreble @bouhovahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59901Draft: First import of HTTByteStream2023-04-20T16:01:57+02:00Sudha AhujaDraft: First import of HTTByteStreamMigrating the version of the HTTByteStream Encoder+Decoder code into the EFTracking/EFTrackingSim repository.Migrating the version of the HTTByteStream Encoder+Decoder code into the EFTracking/EFTrackingSim repository.Sudha AhujaSudha Ahujahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62370Add Modifiable ptr to the code base2023-04-15T16:01:55+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chAdd Modifiable ptr to the code baseThe pointer allows non-const access if the object caring it is also modifiable. Otherwise only const-access is grantedThe pointer allows non-const access if the object caring it is also modifiable. Otherwise only const-access is grantedhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62107DetDescSvc - Some clean up2023-04-15T12:54:42+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chDetDescSvc - Some clean up`DetDescrCnvSvc`:
* Use ATH_MSG messaging macros
* Add switches to toggle all muon sub detectors seperately
* Useage of ATH_CHECK macros
`DetDescrConverter`:
* Remove commented code
`IdDictDetDescrCnv`:
* Inherit from `AthMessaging`
*...`DetDescrCnvSvc`:
* Use ATH_MSG messaging macros
* Add switches to toggle all muon sub detectors seperately
* Useage of ATH_CHECK macros
`DetDescrConverter`:
* Remove commented code
`IdDictDetDescrCnv`:
* Inherit from `AthMessaging`
* Factor common structures into seperate methods
`MuonIdHelperSvc`:
* Toggle the remaining subdetectors from the description
Tagging: @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62294Draft: Projects: update flake8 error codes2023-04-14T18:35:54+02:00Frank WinklmeierDraft: Projects: update flake8 error codesThe latest flake8 version seems to treat enabling of extensions
differently. Need to go back to explicitly enable `ATL902` (Copyright
check) again. Also add `--isolated` to make sure no other configuration
files are read.The latest flake8 version seems to treat enabling of extensions
differently. Need to go back to explicitly enable `ATL902` (Copyright
check) again. Also add `--isolated` to make sure no other configuration
files are read.https://gitlab.cern.ch/atlas/athena/-/merge_requests/59650Draft: Should be faster fastcalosim2023-04-13T17:23:54+02:00Andrii VerbytskyiDraft: Should be faster fastcalosimShould be faster fastcalosim. Do not merge. Draft.
Tag @jchapman
To be discussed if this is needed.Should be faster fastcalosim. Do not merge. Draft.
Tag @jchapman
To be discussed if this is needed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60432Add linear extrapolation in old charge calibration (ATLASRECTS-7337)2023-04-13T09:55:21+02:00Soshi TsunoAdd linear extrapolation in old charge calibration (ATLASRECTS-7337)Mainly, there are two changes.
1. adding the functionality of the linear extrapolation also in the old pixel charge calibration. (default: false)
2. change /PIXEL/PixCalib/ to /PIXEL/ChargeCalibration/ also in the old pixel charge calib...Mainly, there are two changes.
1. adding the functionality of the linear extrapolation also in the old pixel charge calibration. (default: false)
2. change /PIXEL/PixCalib/ to /PIXEL/ChargeCalibration/ also in the old pixel charge calibration.
For (1), the default is false. Thus, no impact at all for this MR. In the time of the reprocessing of RUN1/RUN2 data, it will be activated.
For (2), the new format /PIXEL/ChargeCalibration also keeps contents from /PIXEL/PixCalib/. The /PIXEL/PixCalib/ is obsoleted and it is not practical any more to maintain because maintaining both folders simply leads double burden.
Supposing the contents in both conditions DB are identical used in this CI test, the results should be identical.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62269Daily merge of 23.0 into master2023-04-12T19:25:48+02:00Vakhtang TsulaiaDaily merge of 23.0 into masterNo conflicts.
This sweep contains the following MRs:
* !62259 RpcTrackAnaAlg - Do not flood the log files ~DQ, ~MuonSpectrometer
* !62248 Added missing boost components explicitly where those are used ~Analysis, ~Core, ~Derivation, ~F...No conflicts.
This sweep contains the following MRs:
* !62259 RpcTrackAnaAlg - Do not flood the log files ~DQ, ~MuonSpectrometer
* !62248 Added missing boost components explicitly where those are used ~Analysis, ~Core, ~Derivation, ~ForwardDetectors
* !62254 move to git 2.12 ~Build
* !62250 TruthJetFilter: downgrade INFO messages to DEBUG ~Generators, ~JetEtmiss
* !62246 ATLASRECTS-7583: Ignore more ONNXRuntime warnings ~Analysis, ~BTagging, ~JetEtmiss
* !62245 egamma only. Disable also Lucid and AFP ~Egamma, ~Reconstruction
* !62241 TgcRawMonitoring - Remove tgcDetectorElement retrieval ~DQ, ~MuonSpectrometer
* !62238 ATLASRECTS-7581: VERBOSE is template param so we can use constexpr. ~InnerDetector
* !62237 Drop useless code from OldSpclMcFilterTool ~Analysis
* !62236 Avoid temporary objects in hepmcparticlelink if possible ~Generators
* !62226 CaloClusterMomentsMaker :Reduce verbosity , Print list of moments once ~Calorimeter
* !62140 Avoid duplication of attributes already serialized in other way ~Generators, ~Run2-AF3-output-changed, ~Run2-DataOverlay-output-changed, ~Run2-FullSim-output-changed, ~Run2-MCOverlay-output-changed, ~Run2-MCReco-output-changed, ~Run3-FullSim-output-changed, ~Run3-MCOverlay-output-changed, ~Tools, ~frozen-tier0-violating
* !62212 Egamma : Clang16 tidy related fixes ~Analysis, ~Derivation, ~EDM, ~Egamma
* !60007 FTAG: Adding support in Athena for Gn1 Aux tasks ~Analysis, ~BTagging, ~JetEtmiss
* !62185 rework ID trigger sequence ~Trigger, ~TriggerID
* !62253 L1CaloFEXByteStream: fix unmerged monitoring CA ~Trigger
* !61942 Migrate ALFA and AFP sequences to CA ~Trigger, ~TriggerMenu, ~TriggerMinBias
* !62252 Adding meaningful name-identifier to cell links ~Trigger
* !62242 TriggerEgammaCA: Migrating HI calo sequence to CA ~Egamma, ~JetEtmiss, ~Trigger, ~TriggerMenu
* !62199 Use hasFlag rather than relying on catching `RuntimeError` s ~Simulation, ~Trigger, ~TriggerID
* !62187 Relocating histograms to display only with detailedHistograms condition - TrigEgammaMonitoring ~DQ, ~Egamma, ~Trigger
* !62117 Set the prescale value to -1 when the chain is disabled (ATR-25967) ~Trigger
* !60831 Use the position of the vertex instead of barcode ~Generators, ~Simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62261Draft: Print an ERROR message on the import of RecExCommon top options.2023-04-12T09:50:28+02:00Tim MartinDraft: Print an ERROR message on the import of RecExCommon top options.This is a speculative MR, I don't think we will likely merge it at this time.
Running a CI round to assess the reliance of RecExCommon still in the CI system.This is a speculative MR, I don't think we will likely merge it at this time.
Running a CI round to assess the reliance of RecExCommon still in the CI system.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62146move to git 2.12 in .devcontainer for vscode2023-04-11T23:43:26+02:00Ruggero Turramove to git 2.12 in .devcontainer for vscodeIn the Docker image used by vscode (`.devcontainer/Dockerfile`) we setup git 2.5 which is very old (2015?). This is quite annoying if you are using extensions as gitlens, who require newer version.
Here I am moving to git 2.12, which is,...In the Docker image used by vscode (`.devcontainer/Dockerfile`) we setup git 2.5 which is very old (2015?). This is quite annoying if you are using extensions as gitlens, who require newer version.
Here I am moving to git 2.12, which is, as a far as I know the latest available on SCLo (not sure why we are using that, @akraszna ?). Take into account that `lsetup git` now setup 2.39
This is targeting ~master, an identical MR (!62254) is targeting ~"23.0"https://gitlab.cern.ch/atlas/athena/-/merge_requests/62266Daily merge of 23.0 into master2023-04-11T21:35:05+02:00Vakhtang TsulaiaDaily merge of 23.0 into masterNo conflicts.
This sweep contains the following MRs:
* !62187 Relocating histograms to display only with detailedHistograms condition - TrigEgammaMonitoring ~DQ, ~Egamma, ~Trigger
* !62117 Set the prescale value to -1 when the chain i...No conflicts.
This sweep contains the following MRs:
* !62187 Relocating histograms to display only with detailedHistograms condition - TrigEgammaMonitoring ~DQ, ~Egamma, ~Trigger
* !62117 Set the prescale value to -1 when the chain is disabled (ATR-25967) ~Trigger
* !60831 Use the position of the vertex instead of barcode ~Generators, ~Simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60896Draft: Simplerplinks22023-04-11T19:56:32+02:00Andrii VerbytskyiDraft: Simplerplinks2Try to find out how may places need an explicit constructor with particlesTry to find out how may places need an explicit constructor with particleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62184Add deprecate decorator2023-04-11T14:25:04+02:00Jon BurrAdd deprecate decoratorThere have been a few places I've seen where we've wanted to remove/deprecate a function (see, for example, the `__call__` operator on the `ComponentAccumulator` and `AthConfigFlags` classes).
Having this decorator would make this much ...There have been a few places I've seen where we've wanted to remove/deprecate a function (see, for example, the `__call__` operator on the `ComponentAccumulator` and `AthConfigFlags` classes).
Having this decorator would make this much easier...
As-is it requires a reason for the deprecation to be given, in which we could suggest an alternative function to use.
I imagine that folk like @fwinkl, @wlampl or @dguest may have opinions (and indeed many others besides...)https://gitlab.cern.ch/atlas/athena/-/merge_requests/61372Draft: Heavy Ion reco flags to use in preInclude2023-04-11T10:24:39+02:00Sebastian Tapia ArayaDraft: Heavy Ion reco flags to use in preIncludeAdding functionality to switch between HI and HIP mode using preInclude syntax, as discussed in ATLHI-480Adding functionality to switch between HI and HIP mode using preInclude syntax, as discussed in ATLHI-480https://gitlab.cern.ch/atlas/athena/-/merge_requests/62198Daily merge of 23.0 into master2023-04-10T23:07:11+02:00Walter LamplDaily merge of 23.0 into masterThis sweep contains the following MRs:
* !62113 : ATR-26605 Switch to CA for test using Trig_reco_tf
* !60888 : Improve consistency between jet trigger CA and legacy config
* !62152 : HLTSeeding: catch exception from RoI unpackers
* ...This sweep contains the following MRs:
* !62113 : ATR-26605 Switch to CA for test using Trig_reco_tf
* !60888 : Improve consistency between jet trigger CA and legacy config
* !62152 : HLTSeeding: catch exception from RoI unpackers
* !62158 : jFEX input data and TOB decoders created now a histogram and solve ATR-27246
* !62115 : OutputStreamAthenaPOOL: Simplify the check for doWrite flag in addMetaData
* !62132 : PrimaryDPDMaker: Configure metadata for DESDM formats
* !62137 : EventIndexProducer: Configure metadata for AODEventPicking.py
* !62148 : TrigPSC: fix setting OutputLevel when running from DB
No merge conflict encounteredhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62173Raise an AttributeError for __getattr__ methods in AthConfigFlags2023-04-07T17:54:04+02:00Jon BurrRaise an AttributeError for __getattr__ methods in AthConfigFlagsCloses ATEAM-898.
@amete noted that the existing approach of raising `RuntimeError` (`FlagAddress`) or just blindly creating a `FlagAddress` object (`AthConfigFlags`) breaks the use of `getattr`. It also violates basic python rules...
...Closes ATEAM-898.
@amete noted that the existing approach of raising `RuntimeError` (`FlagAddress`) or just blindly creating a `FlagAddress` object (`AthConfigFlags`) breaks the use of `getattr`. It also violates basic python rules...
This unifies the logic between the two implementations and ensures that an `AttributeError` is raised as required by python.
I guess this should also go into 23.0, but I'm not sure how to do that. Is it better to cherry-pick the commit or open an MR to 23.0 and then have it swept to master?