athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-04-10T23:07:11+02:00https://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/61767Draft: Remove boost from RDBAccessSvc2023-04-09T01:05:29+02:00Andrii VerbytskyiDraft: Remove boost from RDBAccessSvcRemove boost from RDBAccessSvc
Tag @sroeRemove boost from RDBAccessSvc
Tag @sroehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61982Draft: Change Split-level for dynamic aux store2023-04-06T18:15:26+02:00Peter Van GemmerenDraft: Change Split-level for dynamic aux storeThis will affect (mainly) ElementLinks to be unsplit in DAOD. Similar MR for upstream data was discussed in Reconstruction meeting and has been merged.This will affect (mainly) ElementLinks to be unsplit in DAOD. Similar MR for upstream data was discussed in Reconstruction meeting and has been merged.https://gitlab.cern.ch/atlas/athena/-/merge_requests/62134AF3: mirror showers for positrons and negative hadrons2023-04-05T19:17:28+02:00Christopher YoungAF3: mirror showers for positrons and negative hadronsWhen we derived the showers for AF3 we derived them for electrons and positive hadrons. We should therefore impose a phi -> -phi change for positrons and negative hadrons rather than all negative particles which was previously in the cod...When we derived the showers for AF3 we derived them for electrons and positive hadrons. We should therefore impose a phi -> -phi change for positrons and negative hadrons rather than all negative particles which was previously in the code.
These changes are pretty small but might help some electron ID agreement. Tests of the change on the angle of topoclusters are shown here;
https://indico.cern.ch/event/1274181/
indicating that this will be a small change to the physics but is in the correct direction.
Note that this will change the AF3 nightly output.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61820RootStorageSvc: cmake fix2023-03-24T16:12:30+01:00Scott SnyderRootStorageSvc: cmake fixUndefined/unneeded macro.Undefined/unneeded macro.https://gitlab.cern.ch/atlas/athena/-/merge_requests/55086Draft: RNTuple Storage Technology for Athena/APR2023-03-03T12:16:39+01:00Marcin NowakDraft: RNTuple Storage Technology for Athena/APRThis is an implementation of a new APR Storage Technology using ROOT RNTuple.
The eventual goal is to be able to use RNTuple in the same way as we use TTrees and TBranches now, simply by specifying the new StorageTech.
RNtuple Storag...This is an implementation of a new APR Storage Technology using ROOT RNTuple.
The eventual goal is to be able to use RNTuple in the same way as we use TTrees and TBranches now, simply by specifying the new StorageTech.
RNtuple Storage Technology can be enabled by setting this property:
AthenaPoolCnvSvc::StorageTechnology Property to ROOTRNTUPLE (now ROOTTREEINDEX)
Things not working yet:
* more complicated cases of DataVector can not be read back
* ElementLinks will not be initialized correctly when reading (no container name)
* backfilling for new dynamic attributes is disabled
* no support for std::map and std::set
Build procedure: use **asetup master--dev3LCG,latest,Athena**
packages to build:
+ Database/AthenaPOOL/AthenaPoolCnvSvc
+ Database/APR/.*
+ Database/AthenaRoot/RootAuxDynIO
+ Event/xAOD/xAODCore
Implementation details:
There is one RNTuple per original TTree, name is changed to RNT:<TreeName>Marcin NowakMarcin Nowakhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60355DataHeaderCnv will read the last DHForm in case of problems2023-02-24T13:30:19+01:00Marcin NowakDataHeaderCnv will read the last DHForm in case of problemsThis MR adds a functionality to find the last DataHeaderForm corresponding to the current DataHeader that is being converted P->T. DHForm is an extract of information common to many DataHeaders produced by the same Worker, but it can hav...This MR adds a functionality to find the last DataHeaderForm corresponding to the current DataHeader that is being converted P->T. DHForm is an extract of information common to many DataHeaders produced by the same Worker, but it can have several versions that grow incrementally as the info in DataHeader changes durting a job.
The last DHForm for a given worker should contain all information, so in case there is a problem reading the current DHForm, we can try to find the latest version and use it instead.
This is a better solution that I implemented recently in !60075 and it replaces it.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60951Draft: Associate last DataHeaderForms to all DataHeader objects w/o relying o...2023-02-23T23:29:20+01:00Peter Van GemmerenDraft: Associate last DataHeaderForms to all DataHeader objects w/o relying on DHF tokenIn the past some issues with robustness of the token information linking the DataHeader to its DataHeaderForm.
With '_p6' versions, a DataHeaderForm is written only when changes occur and its Token is added to the DataHeader, after both ...In the past some issues with robustness of the token information linking the DataHeader to its DataHeaderForm.
With '_p6' versions, a DataHeaderForm is written only when changes occur and its Token is added to the DataHeader, after both are registered for writing, but before data is stored on disk. This cycle is fragile in client/server cases or with non-ROOT technologies. However, since the information in DataHeaderForm is accumulated, the last DataHeaderForm can be used to decode all DataHeader.
The placement of the DataHeaderForm is fixed relative to the DataHeader itself and therefore the Token to the last DataHeaderForm can be determined. This MR will no longer use the DataHeaderForm Token store as part of the DataHeader, but use the last DataHeaderForm in the corresponding container. The MR changes reading of all data, but won't affect writing, in particular, the DataHeaderForm Token is still attached to the DataHeader.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60195Sweeping !60098 from master to 22.0.
AthenaPoolCnvSvc: Make dataHeaderID file...2023-01-30T17:11:12+01:00Atlas NightlybuildSweeping !60098 from master to 22.0.
AthenaPoolCnvSvc: Make dataHeaderID file-aware to fix DHForm in multi-stream legacy SharedWriter jobsAthenaPoolCnvSvc: Make dataHeaderID file-aware to fix DHForm in multi-stream legacy SharedWriter jobs
See merge request atlas/athena!60098AthenaPoolCnvSvc: Make dataHeaderID file-aware to fix DHForm in multi-stream legacy SharedWriter jobs
See merge request atlas/athena!60098https://gitlab.cern.ch/atlas/athena/-/merge_requests/60045Draft: Fix bug with legacy SharedWriter in multi-stream mode introduced by MR...2023-01-25T00:10:47+01:00Peter Van GemmerenDraft: Fix bug with legacy SharedWriter in multi-stream mode introduced by MR!59778This needs to be included to avoid having DAOD that can't be read with athenaThis needs to be included to avoid having DAOD that can't be read with athenahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59967Load more high-pt minbias is NumberOfHighPtMinBias is set too low2023-01-21T01:18:44+01:00Beojan Stanislausbeojan.stanislaus@cern.chLoad more high-pt minbias is NumberOfHighPtMinBias is set too lowShould solve issue raised in !59957Should solve issue raised in !59957https://gitlab.cern.ch/atlas/athena/-/merge_requests/58691Draft: Replace the substr() with resize as cppcheck suggests2022-11-27T18:38:34+01:00Andrii VerbytskyiDraft: Replace the substr() with resize as cppcheck suggestsReplace the substr() with resize as cppcheck suggests
Atg @sroe @fwinkelReplace the substr() with resize as cppcheck suggests
Atg @sroe @fwinkelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53134Draft: MDT calibration conditions2022-11-25T10:31:38+01:00Constantin HeideggerDraft: MDT calibration conditionsThis MR adds some updates for the MDT calibration conditions handling. This includes fixes in the `MdtCalibDbAlg` as well as moving to the new folder names `/MDT/RTJSONS` and `/MDT/T0JSONS` (as opposed to the old ones `/MDT/RTBLOB` and `...This MR adds some updates for the MDT calibration conditions handling. This includes fixes in the `MdtCalibDbAlg` as well as moving to the new folder names `/MDT/RTJSONS` and `/MDT/T0JSONS` (as opposed to the old ones `/MDT/RTBLOB` and `/MDT/T0BLOB`).
Replaces https://gitlab.cern.ch/atlas/athena/-/merge_requests/52297.https://gitlab.cern.ch/atlas/athena/-/merge_requests/56261Draft: IOVDbSvcConfig: Add DelayedConditionsCleanerSvc2022-10-09T10:28:42+02:00Tadej Novaktadej.novak@cern.chDraft: IOVDbSvcConfig: Add DelayedConditionsCleanerSvcA second attempt of `DelayedConditionsCleanerSvc` configuration after !56094. It seems a flag sync was missing to make it work reliably in wrapped jobs.
I tested the failing trigger test locally and I confirm this fixes ATR-26233 (but t...A second attempt of `DelayedConditionsCleanerSvc` configuration after !56094. It seems a flag sync was missing to make it work reliably in wrapped jobs.
I tested the failing trigger test locally and I confirm this fixes ATR-26233 (but then the test crashes somewhere else for me).
Running with ~"full-unit-tests" this time.
/cc @wlampl @rbielski @fwinkl @elmsheus @nstylesTadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/56154tauRecTools: fix conditional decoration in TauIDVarCalculator2022-09-02T16:05:10+02:00Bertrand Martin Dit LatourtauRecTools: fix conditional decoration in TauIDVarCalculatorHello,
As reported in ATLASRECTS-7186, there is a decoration that is only added onto certain taus (those with at least 1 track).
This causes trouble downstream, when making derivations.
This MR adds a dummy decoration for 0-prong taus.
...Hello,
As reported in ATLASRECTS-7186, there is a decoration that is only added onto certain taus (those with at least 1 track).
This causes trouble downstream, when making derivations.
This MR adds a dummy decoration for 0-prong taus.
Fortunately, this variable is no longer used in R22, it is deprecated, so it won't have any consequence.
But it's too late to phase it out.
Technically, it may be considered as violating frozen T0 policy as it alters the AOD content for 0p taus, but as the variable is not used at all in R22, I hope it won't be an issue.
Cheers,
BertrandBertrand Martin Dit LatourBertrand Martin Dit Latourhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55990MM offline DQ - plit PBC in 2 FEB in occupancy plots2022-08-18T21:35:15+02:00Michela BigliettiMM offline DQ - plit PBC in 2 FEB in occupancy plots- split PBC in 2 FEBs in occupancy histograms
- some cleanup
tagging DQ convenors: @sara @ytakubo- split PBC in 2 FEBs in occupancy histograms
- some cleanup
tagging DQ convenors: @sara @ytakubohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55989ATR-25904: fixed the RUN3_ROI_OVERFLOW_SHIFT and m_OverflowPerRoIMask to 122022-08-18T21:21:19+02:00Patrick Karl CzodrowskiATR-25904: fixed the RUN3_ROI_OVERFLOW_SHIFT and m_OverflowPerRoIMask to 12Fixing the bit shifts as described in ATR-25904Fixing the bit shifts as described in ATR-25904Patrick Karl CzodrowskiPatrick Karl Czodrowskihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55747Draft: Daily "22.0 to master" sweep: 09/08/222022-08-11T09:23:00+02:00Adam Edward BartonDraft: Daily "22.0 to master" sweep: 09/08/22Used the new scripts - no conflictsUsed the new scripts - no conflictsAdam Edward BartonAdam Edward Bartonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55139efex input data bytestream decoder2022-07-20T16:56:51+02:00Will Buttingerefex input data bytestream decoderFollows lead of https://gitlab.cern.ch/atlas/athena/-/merge_requests/53185 by pulling in code from online repo.
This MR depends on the completion of the EDM @ https://gitlab.cern.ch/atlas/athena/-/merge_requests/55015Follows lead of https://gitlab.cern.ch/atlas/athena/-/merge_requests/53185 by pulling in code from online repo.
This MR depends on the completion of the EDM @ https://gitlab.cern.ch/atlas/athena/-/merge_requests/55015Will ButtingerWill Buttingerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55158Update JetInputs DQ web display config to add missing plots2022-07-17T16:22:48+02:00Lee SawyerUpdate JetInputs DQ web display config to add missing plotsUpdate to the collisions_run.config files for JetInputs:
- Added missing EM Cluster Ave E and Occ maps for some thresholds and regions.
- Added expert plots in EM folders to better match plots for all clusters.
Fixes some of the issues ...Update to the collisions_run.config files for JetInputs:
- Added missing EM Cluster Ave E and Occ maps for some thresholds and regions.
- Added expert plots in EM folders to better match plots for all clusters.
Fixes some of the issues noted in https://its.cern.ch/jira/browse/ATLLARSWDPQ-419
Merge to R22 for ongoing DQ monitoring.Lee SawyerLee Sawyer