athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-26T14:38:23+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70108Remove nullptr initialiser that causes a crashing2024-03-26T14:38:23+01:00Rui ZhangRemove nullptr initialiser that causes a crashingRemove nullptr initialiser that causes a crashing when setting SetInterOpNumThreads/SetIntraOpNumThreads Subsequent merge of [!69945 (merged)](https://gitlab.cern.ch/atlas/athena/-/merge_requests/69945 "Prevent ONNX from spawning additio...Remove nullptr initialiser that causes a crashing when setting SetInterOpNumThreads/SetIntraOpNumThreads Subsequent merge of [!69945 (merged)](https://gitlab.cern.ch/atlas/athena/-/merge_requests/69945 "Prevent ONNX from spawning additional threads").
```plaintext
Prevent ONNX from spawning additional threads in the FastCaloSim implementation.
Should fix ATLASSIM-7146 (and potentially ATLASSIM-7031 ?)
```
fyi @zhangr @jchapmanhttps://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/68022Add utility for FastCaloSim standalone2024-01-08T06:56:46+01:00Joshua Falco Beirerjoshua.beirer@cern.chAdd utility for FastCaloSim standaloneNeeded includes for FastCaloSim standalone code developmentsNeeded includes for FastCaloSim standalone code developmentshttps://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/67628Make Input.RunNumber, Input.LumiBlockNumber and Input.TimeStamp in plural as ...2024-01-08T15:56:19+01:00Tadej Novaktadej.novak@cern.chMake Input.RunNumber, Input.LumiBlockNumber and Input.TimeStamp in plural as they are used as listMake `Input.RunNumber`, `Input.LumiBlockNumber` and `Input.TimeStamp` in plural as they are used as list.
The validation of the type will be implemented in a separate MR.
This also fixes run number argument parsing in reco and MC chann...Make `Input.RunNumber`, `Input.LumiBlockNumber` and `Input.TimeStamp` in plural as they are used as list.
The validation of the type will be implemented in a separate MR.
This also fixes run number argument parsing in reco and MC channel number handling in some derivation code as it was used incorrectly.
/cc @jchapman @nstyles @jcatmore @fwinklhttps://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/66460Bugfix for status values of quasi-stable particles in the new-style truth han...2023-10-13T15:43:00+02:00John Derek ChapmanBugfix for status values of quasi-stable particles in the new-style truth handlingFollows !63059. In the case that we are removing quasi-stable particle decays and child
particles from the `GenEvent` before starting the (Geant4) simulation, then the status values
of child particles produced by pre-defined quasi-stable...Follows !63059. In the case that we are removing quasi-stable particle decays and child
particles from the `GenEvent` before starting the (Geant4) simulation, then the status values
of child particles produced by pre-defined quasi-stable particle decays should be set to 1
(or 2 if they themselves have pre-defined decays) rather than 20001 (the status value usually
used to indicate a new secondary particle created during simulation).
Needed for ATLPHYSVAL-960
For reference:
A quasi-stable particle is defined as one which has been decayed by the generator, but could
potentially deposit energy in sensitive regions of the detector. It is therefore passed to
Geant4, which propagates it through the detector then allows it to undergo its pre-defined decay.
Sketch of how `GenParticle` status should be updated for the new scheme.
| Scenario | Old status | Old barcode | New status |
| ------ | ------ | ------ | ------ |
| Nth Truth particle created+decayed during evgen (including particles produced in pre-defined decays) | 2 | N | 2 |
| Nth Truth Particle created, but not decayed during evgen (including particles produced in pre-defined decays) | 1| N | 1 |
| Nth Secondary particle created by an interaction/decay during sim | 1 | 200000 + N | 20001 |
| Generator created particle with has survived M interactions during sim (B = original barcode) |1| B + M*1000000 | 1 + M*100000 |
| Secondary particle created during sim, which has survived M interactions (B = original barcode) |1|B + M*1000000|20001 + M*100000|
Sketch of how `GenVertex` status should be updated for the new scheme.
| Scenario | Old status | Old barcode | New status |
| ------ | ------ | ------ | ------ |
| Nth Truth vertex created during evgen | <1000 (generator specific) | -N | <1000 (same as old scheme) |
| Nth Truth vertex created during sim | 1000 + G4 process | -200000 - N | 20000 + 1000 + G4 process |https://gitlab.cern.ch/atlas/athena/-/merge_requests/64335add DSIDs for pthard1 and pthard2 PowPy8 ttbar samples in HIGG8D1 and HIGG4D52023-07-19T09:05:15+02:00Mahsana Haleemadd DSIDs for pthard1 and pthard2 PowPy8 ttbar samples in HIGG8D1 and HIGG4D5Added DSIDs for pthard1 and pthard2 PowPy8 ttbar samples in HIGG8D1 and HIGG4D5 configuration. This will be enable HF classification variables for them.Added DSIDs for pthard1 and pthard2 PowPy8 ttbar samples in HIGG8D1 and HIGG4D5 configuration. This will be enable HF classification variables for them.ATLAS RobotATLAS Robothttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64277Work around G4 10.6.patch03 bug where Anti-neutrons are considered stable (AT...2023-09-05T15:26:44+02:00John Derek ChapmanWork around G4 10.6.patch03 bug where Anti-neutrons are considered stable (ATLASSIM-6634)Some jobs running Fatras + Geant4 got caught by a bug in Geant4 10.6, where anti-neutrons were considered to be
stable. This leads to the issues described in ATLASSIM-6634. This is fixed in Geant4 11 onwards, but ATLAS will
most likely n...Some jobs running Fatras + Geant4 got caught by a bug in Geant4 10.6, where anti-neutrons were considered to be
stable. This leads to the issues described in ATLASSIM-6634. This is fixed in Geant4 11 onwards, but ATLAS will
most likely not switch to that for a while. For now, fixing the bug at runtime for jobs running Fatras + Geant4,
in the future the bug could be fixed for all simulation configurations. Due to the rarity of the process, then this
should have minimal impact on physics distributions.
Tagging @mbandier, @tlari, @fatsai, @lmijovic, @pagacova, @sjiggins.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/64088Do not try to set DoSlimming property for SimpleMergeMcEventCollTool (ATLASSI...2023-07-03T18:06:23+02:00John Derek ChapmanDo not try to set DoSlimming property for SimpleMergeMcEventCollTool (ATLASSIM-6622)Fixes legacy configuration for the case where some pile-up truth is saved. Missed update from !64049.
Closes ATLASSIM-6622
Tagging @martindlFixes legacy configuration for the case where some pile-up truth is saved. Missed update from !64049.
Closes ATLASSIM-6622
Tagging @martindlhttps://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/64071ISF_PunchThroughTools: Fix the counter for breaking out of a possible infinit...2023-07-01T22:30:15+02:00Alaettin Serhan MeteISF_PunchThroughTools: Fix the counter for breaking out of a possible infinite loopThis seems to be lost in translation in !58061. Let me mark this as `urgent` because if I understood correctly this affects the ongoing physics validation.
cc: @jchapmanThis seems to be lost in translation in !58061. Let me mark this as `urgent` because if I understood correctly this affects the ongoing physics validation.
cc: @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62993Legacy code not in ActsConfig. And Acts ISF JO as well2023-05-12T15:42:01+02:00Carlo Varnicarlo.varni@cern.chLegacy code not in ActsConfig. And Acts ISF JO as wellRevert back some file movements. Legacy JOs and going outside of the `ActsConfig` package as well as all ISF ACTS JOs
That implies:
- `ISF_ActsToolsConfig`, `ISF_ActsToolsConfigDb` and `ISF_ActsToolsConfigLegacy`
- `ActsGeometryConfigDb...Revert back some file movements. Legacy JOs and going outside of the `ActsConfig` package as well as all ISF ACTS JOs
That implies:
- `ISF_ActsToolsConfig`, `ISF_ActsToolsConfigDb` and `ISF_ActsToolsConfigLegacy`
- `ActsGeometryConfigDb` and `ActsGeometryConfigLegacy`
- `ActsTrackingGeometryTool`
I have kept `ActsGeometryConfig` in `ActsConfig` since that is a CA JO
/cc @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62448Configure MuonIdHelperSvc correctly for legacy config HITSMerge_tf.py jobs2023-04-19T19:25:16+02:00John Derek ChapmanConfigure MuonIdHelperSvc correctly for legacy config HITSMerge_tf.py jobsFix for the legacy configuration of `MuonIdHelperSvc` in HITS merging after !62133. Fixes ATLASSIM-6548.
Tagging @jojungge, @tadej, @tlari, @mbandier, @jmaurer, @strichteFix for the legacy configuration of `MuonIdHelperSvc` in HITS merging after !62133. Fixes ATLASSIM-6548.
Tagging @jojungge, @tadej, @tlari, @mbandier, @jmaurer, @strichte