athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-25T14:46:45+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70077Revert merge request !69655 (ATLSWUPGR-242)2024-03-25T14:46:45+01:00John Derek ChapmanRevert merge request !69655 (ATLSWUPGR-242)Merge request !69655 causes unintended output changes in some ART tests: ATLSWUPGR-242
Therefore reverting for now to allow me to do some further testing/tweaking of the changes before reintroducing them.Merge request !69655 causes unintended output changes in some ART tests: ATLSWUPGR-242
Therefore reverting for now to allow me to do some further testing/tweaking of the changes before reintroducing them.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69376Allow DigitizationTests ART jobs to find 24.0-specific reference files (ATLAS...2024-03-01T20:36:13+01:00John Derek ChapmanAllow DigitizationTests ART jobs to find 24.0-specific reference files (ATLASSIM-7095)This update is necessary for the comparisons against fixed reference files in 24.0 to work properly.
The script is only used in Digitization ART jobs so will not affect the CI output.This update is necessary for the comparisons against fixed reference files in 24.0 to work properly.
The script is only used in Digitization ART jobs so will not affect the CI output.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68698Fixes for DigitizationTests ART jobs (ATLASSIM-7076)2024-02-08T19:42:48+01:00John Derek ChapmanFixes for DigitizationTests ART jobs (ATLASSIM-7076)Some variables in the DigitizationTests scripts had not been renamed properly. This caused ATLASSIM-7076.
Fixed this instance, plus a few other non-serious ones.
Tagging @zhubacekSome variables in the DigitizationTests scripts had not been renamed properly. This caused ATLASSIM-7076.
Fixed this instance, plus a few other non-serious ones.
Tagging @zhubacekhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68651Fix mc23 presampling ART tests2024-02-07T16:30:33+01:00Tadej Novaktadej.novak@cern.chFix mc23 presampling ART testsFix MC23 presampling ART tests - there was a typo in file paths.
/cc @jchapman @zhubacekFix MC23 presampling ART tests - there was a typo in file paths.
/cc @jchapman @zhubacekhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68096Remove explicit enum support in AthConfigFlag and use type2024-01-10T18:42:06+01:00Tadej Novaktadej.novak@cern.chRemove explicit enum support in AthConfigFlag and use typeRemove explicit enum support in `AthConfigFlag` and use type.
Also fix argument parsing with the type checking.
/cc @fwinklRemove explicit enum support in `AthConfigFlag` and use type.
Also fix argument parsing with the type checking.
/cc @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67681Patching MC23d configuration2023-12-08T11:10:53+01:00John Derek ChapmanPatching MC23d configurationSome issues were found in the first version of the MC23d configuration in !67101.
One of which could not be worked around. Unfortunately a `23.0.32.2,Athena` build will be required.
This merge request should fix them.
NB The `MC23dSimu...Some issues were found in the first version of the MC23d configuration in !67101.
One of which could not be worked around. Unfortunately a `23.0.32.2,Athena` build will be required.
This merge request should fix them.
NB The `MC23dSimulationNoIoV`, `MC23dSimulationSingleIoV`, `MC23dSimulationMultipleIoV` and
`MC23cSimulationMultipleIoVCalibrationHits` functions were not added as the simulation step will not
be re-run for MC23d. MC23c HITS will be used.
Tagging @tadej, @ewelina, @jferrand, @jmaurer, @dta, @ahabouel, @dsouth, @zmarshal, @jcatmore, @nstyleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67101MC23d Campaign configuration (ATLASSIM-6953)2023-12-07T16:08:37+01:00John Derek ChapmanMC23d Campaign configuration (ATLASSIM-6953)This merged request adds the revised pile-up profiles for MC23d and the corresponding Campaign configurations.
Currently a placeholder until we get the multi-beamspot profile.This merged request adds the revised pile-up profiles for MC23d and the corresponding Campaign configurations.
Currently a placeholder until we get the multi-beamspot profile.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66880Update to Gaudi v382024-01-30T12:16:59+01:00Frank WinklmeierUpdate to Gaudi v38Update athena projects to [Gaudi v38r0](https://gitlab.cern.ch/gaudi/Gaudi/-/releases/v38r0).
The main braking change is that in Gaudi v38, `std::unordered_set` properties are now represented as python `set` instead of `list`. This most...Update athena projects to [Gaudi v38r0](https://gitlab.cern.ch/gaudi/Gaudi/-/releases/v38r0).
The main braking change is that in Gaudi v38, `std::unordered_set` properties are now represented as python `set` instead of `list`. This mostly affects `CondInputLoader.Load` and the Algorithm's `ExtraInputs/Outputs` property. For details see https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1503 but in practice it means that code like
```py
MyAlg.ExtraInputs += ['foo']
```
has been updated to
```py
MyAlg.ExtraInputs.add('foo')
```
For the moment only `std::unordered_set` is mapped to a Python `set`. Regular `std::set` remains as Python `list` to maintain insertion order.
For backwards compatibility, we allow implicit conversion from `list`, i.e. the following still works:
```py
MyAlg.ExtraInputs = ['foo'] # implicitly converted to {'foo'}
```
In addition some minor `const` interface changes in `DataHandle` that propagate to our `VarHandleKey`.
cc @leggetthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66842main-bugfix-PixelDigitization2023-11-01T16:22:50+01:00Shaun Roemain-bugfix-PixelDigitizationAddresses ATLASSIM-6930; updates legacy configuration so that run1 sim test should pass. Tested locally with test_Digi_tf_mc15_2012_ttbar_no_pileup.sh.Addresses ATLASSIM-6930; updates legacy configuration so that run1 sim test should pass. Tested locally with test_Digi_tf_mc15_2012_ttbar_no_pileup.sh.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64180ART scripts/tests change master-> main. For 23.02023-07-07T17:00:44+02:00Christos Anastopouloschristos.anastopoulos@cern.chART scripts/tests change master-> main. For 23.0Art master-> main for 23.0 ART
This should just touch art tests
changing :
``# art-include: master/xxxxxx`` -> ``# art-include: main/xxxxx``
ping @akraszna @fwinkl @tadejArt master-> main for 23.0 ART
This should just touch art tests
changing :
``# art-include: master/xxxxxx`` -> ``# art-include: main/xxxxx``
ping @akraszna @fwinkl @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64086Update Digitization configuration unit test to use SimpleMergeMcEventCollTool...2023-07-03T18:06:23+02:00John Derek ChapmanUpdate Digitization configuration unit test to use SimpleMergeMcEventCollTool (ATLASSIM-6627)Missed updating this unit test as part of !64049
Closes ATLASSIM-6627
Tagging @wlampl and @abartonMissed updating this unit test as part of !64049
Closes ATLASSIM-6627
Tagging @wlampl and @abartonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62558ATR-27373 - Duplications of eEM26 items to eEM282023-04-24T14:59:48+02:00Francesco GiuliATR-27373 - Duplications of eEM26 items to eEM28https://gitlab.cern.ch/atlas/athena/-/merge_requests/61450Pileup mc23a2023-03-13T21:43:30+01:00Tommaso LariPileup mc23aUpdating the mc23a profile, correcting the bug in the data preparation script that resulted in 9% lower mu in the previous iteration.
The maximum number of pileup events is also updated (61.5 => 67.5) in the Campaigns package. While doi...Updating the mc23a profile, correcting the bug in the data preparation script that resulted in 9% lower mu in the previous iteration.
The maximum number of pileup events is also updated (61.5 => 67.5) in the Campaigns package. While doing this, I realized that it was set incorrectly (too low) for the mc23c campaign in the legacy file, so that is updated also to match the (correct) CA number.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61428Update pixel parameter for mc23a/c (ATLASRECTS-7461)2023-03-14T21:42:18+01:00Soshi TsunoUpdate pixel parameter for mc23a/c (ATLASRECTS-7461)Add new parameter set for mc23c for 2023 operation.
In addition, update complete parameter set for mc23a for 2022 operation, since current 2022 pixel simulation setting is based on the best guess that was made in 2021 (before actual dat...Add new parameter set for mc23c for 2023 operation.
In addition, update complete parameter set for mc23a for 2022 operation, since current 2022 pixel simulation setting is based on the best guess that was made in 2021 (before actual data taking).
Main updates are
- radiation damage fluence (based on data 2022, it will be more precise estimate)
- bias voltage setting (L1 and L2 bias voltage is updated)
- timing simulation (update from the 2022 timing scan data)
Toward for 2023 mc setting, ToT and analog threshold to be determined soon. Potentially, requires one more update.https://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/60916PileUpUtils: fix run and lumi profile generation2023-02-22T15:42:30+01:00Tadej Novaktadej.novak@cern.chPileUpUtils: fix run and lumi profile generationFix run and lumi profile generation where mu values may be the same by accident (as in case with flat profiles). The step number should override the mu so that it is used as the sorting criterium (we use the same code as for standard pil...Fix run and lumi profile generation where mu values may be the same by accident (as in case with flat profiles). The step number should override the mu so that it is used as the sorting criterium (we use the same code as for standard pile-up jobs). Also sort the resulting profile by step.
Sorry, I also fixed some whitespace inconsistencies when reading the code in detail to spot the issues.
/cc @jchapman @tlari @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60898Configuration for MC23c campaign2023-02-22T21:43:57+01:00Tommaso LariConfiguration for MC23c campaignI cloned all MC23a configurations (hopefully I catched all) to MC23c equivalents, changed the run number to the MC23c one, and included a flat pileup profile, to be replaced by the actual MC23c profile when available. However, simulation...I cloned all MC23a configurations (hopefully I catched all) to MC23c equivalents, changed the run number to the MC23c one, and included a flat pileup profile, to be replaced by the actual MC23c profile when available. However, simulation will not need that, so we don't need to wait for the actual
profile (in preparation).
Still a draft, waiting for @tadej to comment. The CI should be fine as they will not run the mc23c workflow, but I will run a test job to check it does not crash.
Tommasohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60527Fix digi metadata parsing2023-02-09T21:44:18+01:00Tadej Novaktadej.novak@cern.chFix digi metadata parsingFix digi metadata parsing when CA-based outputs are used in legacy config.
Not sure how this hasn't been spotted in PhysVal :shrug:
/cc @jchapman @martindl @tlari @mbandierFix digi metadata parsing when CA-based outputs are used in legacy config.
Not sure how this hasn't been spotted in PhysVal :shrug:
/cc @jchapman @martindl @tlari @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60524adding flat pileup profiles2023-02-10T21:43:35+01:00Tommaso Lariadding flat pileup profilesAdding two pileup profile files, with a flat mu profile (except for a bit more in the last bin because of the need to have the integer population sum to the mc21/mc23a pileup fractions) between 25-75 and 50-75 respectively. They can hope...Adding two pileup profile files, with a flat mu profile (except for a bit more in the last bin because of the need to have the integer population sum to the mc21/mc23a pileup fractions) between 25-75 and 50-75 respectively. They can hopefully be picked up with a postInclude (need to test that) for MC requests that need a flat pileup profile. They will be ignored by all standard workflows, so the CI won't be affected.
Tagging @tadej and @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60096Fix sTGC pad staggering (fuzziness)2023-02-06T10:47:50+01:00Alexandre LaurierFix sTGC pad staggering (fuzziness)sTGC pad staggering was incorrect for confirm wedges: yielded updates to the geometry XML and now requires a new geometry tag.
Fixed a sign error in MuonPadDesign regarding pad staggering.
Largest impact of this MR is the updated confi...sTGC pad staggering was incorrect for confirm wedges: yielded updates to the geometry XML and now requires a new geometry tag.
Fixed a sign error in MuonPadDesign regarding pad staggering.
Largest impact of this MR is the updated confirm wedge pad staggering which closes a 2-4mm gap in track reconstruction between pads.
Hoping for urgent merge prior to end-of January reprocessing.
The actual update of the geometry from the new XML file is discussed in ATLASSIM-6268
@chchau @estel