athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-02-23T13:55:29+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/69091Fix correlated smearing bug in JER in JetUncertainties in 22.02024-02-23T13:55:29+01:00Christopher YoungFix correlated smearing bug in JER in JetUncertainties in 22.0This is a copy of https://gitlab.cern.ch/atlas/athena/-/merge_requests/68331 but in 22.0
(if 22.0 is closed then we can probably reject this MR)
@markowen found that the JER was using the same seed for smearing jets as is done in JetCal...This is a copy of https://gitlab.cern.ch/atlas/athena/-/merge_requests/68331 but in 22.0
(if 22.0 is closed then we can probably reject this MR)
@markowen found that the JER was using the same seed for smearing jets as is done in JetCalibTools. This results in a correlated smearing and a large over-estimation of the uncertainty. Additionally, as most people use MC as pseudo-data it is more correct to use the max(MC,data) resolution. This was not anticipated when the tool was originally written but results in very small changes. Finally advanced users can set the seed themselves, but this currently set the seed the same for all jets which is not a usual use-case so this has also been modified.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64024Adding helper transformations2023-06-30T10:51:45+02:00Stylianos AngelidakisAdding helper transformationsModest MR adding a couple of helper function to perform transformations that are useful to the muon alignment group.
(Same as !64007 but for rel. 22).Modest MR adding a couple of helper function to perform transformations that are useful to the muon alignment group.
(Same as !64007 but for rel. 22).https://gitlab.cern.ch/atlas/athena/-/merge_requests/63952Modified SCT wafer threshold for DQ histogram for run3 in v222023-08-02T13:29:56+02:00Sayuka KitaModified SCT wafer threshold for DQ histogram for run3 in v22Hit requirement for inner silicon tracker was changed 7 to 8 in run3. Because of this, SCT hit requirement for DQ monitoring histogram was changed 3 to 4 in athena v23.0. But v22.0 has not changed yet, so I modified like as v23.0.
@granc...Hit requirement for inner silicon tracker was changed 7 to 8 in run3. Because of this, SCT hit requirement for DQ monitoring histogram was changed 3 to 4 in athena v23.0. But v22.0 has not changed yet, so I modified like as v23.0.
@grancagn @csanderhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63948Improve message of the expression parser if type information is missing.2023-08-02T13:27:53+02:00Goetz GayckenImprove message of the expression parser if type information is missing.- Suggest to provide missing type information to property of the top level
algorithm sequence, in case no type information is available for a
certain variable.
- Distinguish between missing type information and missing inheritance
...- Suggest to provide missing type information to property of the top level
algorithm sequence, in case no type information is available for a
certain variable.
- Distinguish between missing type information and missing inheritance
information.https://gitlab.cern.ch/atlas/athena/-/merge_requests/63947Set inheritance information for TrackMeasurementValidation.2023-08-02T11:18:58+02:00Goetz GayckenSet inheritance information for TrackMeasurementValidation.The inheritance information is need to allow using a xAOD::TrackValidationMeasurement container in expressions passed to the ExpressionParser.
This is used by the luminosity determination based on PixelCluster counting.The inheritance information is need to allow using a xAOD::TrackValidationMeasurement container in expressions passed to the ExpressionParser.
This is used by the luminosity determination based on PixelCluster counting.https://gitlab.cern.ch/atlas/athena/-/merge_requests/63692Draft: photon trigger hypo config for nopid chains2023-06-14T21:05:45+02:00Juan Lieber MarinDraft: photon trigger hypo config for nopid chainsThis is a MR to configure the Hypo code for photon trigger in order to deal with nopid chains. This is mainly for 2023 ringer for photons tuning procedure (ATR-26406).
Pinging @eegidiop @safarzad @dbakshig @jodafons @mverissiThis is a MR to configure the Hypo code for photon trigger in order to deal with nopid chains. This is mainly for 2023 ringer for photons tuning procedure (ATR-26406).
Pinging @eegidiop @safarzad @dbakshig @jodafons @mverissihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63288Fix z0 calculation in emerging jets trigger2023-05-25T06:26:35+02:00Jackson Carl BurzynskiFix z0 calculation in emerging jets triggerThe z0 calculation in `TrigJetEJsHypoTool` did not take into account the beamspot z position which led to large rates for periods with significant beamspot shifts (see ATR-27603). The implementation now aligns with the recommended way to...The z0 calculation in `TrigJetEJsHypoTool` did not take into account the beamspot z position which led to large rates for periods with significant beamspot shifts (see ATR-27603). The implementation now aligns with the recommended way to compute z0 (see https://twiki.cern.ch/twiki/bin/view/AtlasProtected/TrackingCPRecsRun2Final#Calculating_z0_and_d0_significan)
This will lead to rate changes. I am not sure the exact protocol for updating active chains so please let me know if there are additional approvals or discussions needed.
Tagging @cpollard, @jmasik, @strom, @dguest, @ggustavi, @mgenesthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63057Tier0Chaintests: compare to fixed references and don't keep POOL outputs2023-05-19T13:34:06+02:00Julien MaurerTier0Chaintests: compare to fixed references and don't keep POOL outputssimilar to !63035
also removed some of the extra q445 tests that are mostly redundant by now.
:flag_fi: @strichtesimilar to !63035
also removed some of the extra q445 tests that are mostly redundant by now.
:flag_fi: @strichtehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62326Updated leakage and pileup correction for Rel 222023-04-13T16:54:11+02:00Luis Pascual DominguezUpdated leakage and pileup correction for Rel 22Hello,
This MR updates the leakage and pileup correction files for Release 22. In particular, I have changed the nominal release to be used by default (now REL22) and updated the paths to the files (now placed in the v6 directory).
T...Hello,
This MR updates the leakage and pileup correction files for Release 22. In particular, I have changed the nominal release to be used by default (now REL22) and updated the paths to the files (now placed in the v6 directory).
Tagging @jdevivi to verify that everything looks healthy...
Best,
Luishttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61172cherry pick !58016 and !60550 from master to fix build warnings2023-03-03T14:25:01+01:00Julien Maurercherry pick !58016 and !60550 from master to fix build warningsTwo isses with duplicated properties were fixed in master but not in 22.0, porting the fixes to keep this legacy branch in a clean state build-wise.Two isses with duplicated properties were fixed in master but not in 22.0, porting the fixes to keep this legacy branch in a clean state build-wise.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61164Superchic: remove the wrong definition of LHAPDF. It causes crash of ART tests.2023-03-02T16:26:32+01:00Ewelina Maria LobodzinskaSuperchic: remove the wrong definition of LHAPDF. It causes crash of ART tests.LHAPATH is already defined in atlasexternal,
manual sweep,
analogous MR was already merged for master: https://gitlab.cern.ch/atlas/athena/-/merge_requests/60911LHAPATH is already defined in atlasexternal,
manual sweep,
analogous MR was already merged for master: https://gitlab.cern.ch/atlas/athena/-/merge_requests/60911https://gitlab.cern.ch/atlas/athena/-/merge_requests/61091MC21 configuration for the 2022 low mu run (420000)2023-03-02T15:48:20+01:00John Derek ChapmanMC21 configuration for the 2022 low mu run (420000)Cleaned-up configurations for ATLMCPROD-10458.
PreInclude for Simulation (with this then the DataRunNumber setting is no longer required): `Campaigns/MC21SimulationLowMuRun.py`
PreInclude for Digitization (with this then the preExec ...Cleaned-up configurations for ATLMCPROD-10458.
PreInclude for Simulation (with this then the DataRunNumber setting is no longer required): `Campaigns/MC21SimulationLowMuRun.py`
PreInclude for Digitization (with this then the preExec to set `digitizationFlags.dataRunNumber` is no longer required): `Campaigns/MC21NoPileUpLowMuRun.py`
Tagging @kkrizkahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60999SiHitCollectionCnv_p3(_p2) Protect against values stored std::vector<unsigned...2023-02-24T17:45:46+01:00John Derek ChapmanSiHitCollectionCnv_p3(_p2) Protect against values stored std::vector<unsigned short> exceeding USHRT_MAXThis was a "fun" one.
As part of the compression of `SiHitCollection` properties which are shared between successive `SiHit` objects are only recorded once in the persistent format. Other vectors in the persistent format keep track of ...This was a "fun" one.
As part of the compression of `SiHitCollection` properties which are shared between successive `SiHit` objects are only recorded once in the persistent format. Other vectors in the persistent format keep track of how many `SiHit` instances share the current value. These vectors are `std::vector<unsigned short>`. There was an implicit assumption that we would never get more than `USHRT_MAX` consecutive `SiHit` objects with a matching property. The logic in `SiHitCollectionCnv_p2/p3` has been unchanged for a long time, but the samples requested in ATLMCPROD-10454 managed to break it. The fix is to check if the number of consecutive `SiHit` objects with a matching property has reached `USHRT_MAX` and behave as if the value of the property has changed in that case. NB `TRT_HitCollectionCnv_p3/p4` already have this protection, so no changes are required there.
This fixes ATLASSIM-6398, needed by ATLMCPROD-10454 - a new 22.0.X release will be required unfortunately. Tagging @jmaurer and @strichte.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60626TrkVKalVrtFitter: Fix Trk::Track creation for perigee track2023-02-20T14:58:58+01:00Louis-Guillaume Gagnonlouis.guillaume.gagnon@cern.chTrkVKalVrtFitter: Fix Trk::Track creation for perigee trackThis MR ports a change from master to 22.0 that fixes perigee track creation in VKalVrtFitter. The corresponding commit on master cannot be cherry-picked since it contains changes unrelated to the bugfix.
Commit on master branch: https:...This MR ports a change from master to 22.0 that fixes perigee track creation in VKalVrtFitter. The corresponding commit on master cannot be cherry-picked since it contains changes unrelated to the bugfix.
Commit on master branch: https://gitlab.cern.ch/atlas/athena/-/commit/5b26e1d93833c1b9f066f55606b496ec04074192https://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/60177Use cached AMI tag request in job transforms, 22.0 edition2023-01-30T16:48:35+01:00Tadej Novaktadej.novak@cern.chUse cached AMI tag request in job transforms, 22.0 editionUse cached AMI tag request in job transforms
See merge request atlas/athena!59882
(cherry picked from commit 245b1f1af7578bd28ad3b29d3c56250e2762d919)
e655f281 Use cached AMI tag request in job transformsUse cached AMI tag request in job transforms
See merge request atlas/athena!59882
(cherry picked from commit 245b1f1af7578bd28ad3b29d3c56250e2762d919)
e655f281 Use cached AMI tag request in job transformshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59976Bug fixes for Run 2 (2015) analysis2023-01-24T21:26:22+01:00Brian Andrew Colebrian.cole@cern.chBug fixes for Run 2 (2015) analysisPush bug fixes for Run 2 (2015) analysis to 22.0 branchPush bug fixes for Run 2 (2015) analysis to 22.0 branchhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59947Fixes for M21a Monopole Simulation (ATLASSIM-5960)2023-01-25T16:56:29+01:00John Derek ChapmanFixes for M21a Monopole Simulation (ATLASSIM-5960)Manual sweep of !59219 (and !58728) from ~master into ~"22.0".
These changes are required to allow Monopole Simulation to run without crashing.
This is required so that samples needed for Run3 trigger tuning can be produced before
the M...Manual sweep of !59219 (and !58728) from ~master into ~"22.0".
These changes are required to allow Monopole Simulation to run without crashing.
This is required so that samples needed for Run3 trigger tuning can be produced before
the MC23 Full Chain is validated. Fixes ATLASSIM-5960.
Tagging @jmaurer, @tlari, @mbandier, @wsonghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59621Merge branch 'NswPadTriggerRenameRdoContainer' into 'master'2023-01-06T16:26:49+01:00Alexander Naip TunaMerge branch 'NswPadTriggerRenameRdoContainer' into 'master'NSW pad trigger: rename RDO container according to existing convention
See merge request atlas/athena!59597
(cherry picked from commit 9a934e612cdfa483d62bf93da9f34b95fe1751b4)
2aef1a90 Rename RDO container according to existing conve...NSW pad trigger: rename RDO container according to existing convention
See merge request atlas/athena!59597
(cherry picked from commit 9a934e612cdfa483d62bf93da9f34b95fe1751b4)
2aef1a90 Rename RDO container according to existing conventionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59618Command-line cherry-pick of !57755, !57847, !58364 from master into 22.02023-01-06T16:26:26+01:00Alexander Naip TunaCommand-line cherry-pick of !57755, !57847, !58364 from master into 22.0Development of MuonNSWCommonDecode has proceeded in master, and we'd like to catch up 22.0 with master.
There are a couple commits from master which I think need to be cherry-picked into 22.0. I believe they're all included here. I use...Development of MuonNSWCommonDecode has proceeded in master, and we'd like to catch up 22.0 with master.
There are a couple commits from master which I think need to be cherry-picked into 22.0. I believe they're all included here. I used the command line because gitlab's cherry-pick interface gave an error.
- `git cherry-pick 4a5e0a77 -m 1` (https://gitlab.cern.ch/atlas/athena/-/merge_requests/57755)
- `git cherry-pick 597c72f2` (https://gitlab.cern.ch/atlas/athena/-/merge_requests/57847)
- `git cherry-pick c08eb462` (https://gitlab.cern.ch/atlas/athena/-/merge_requests/58364) (the big one)
cc @sfrances